Merge branch 'master' into federation

Larissa Reis
2 parents 78f2974d ba577a75
Showing 68 changed files with 1055 additions and 504 deletions Show diff stats
app/api/entities.rb
app/api/v1/blocks.rb
app/api/v1/profiles.rb
app/helpers/application_helper.rb
app/models/article.rb
app/models/block.rb
app/models/profile.rb
app/models/user.rb
app/views/blocks/profile_info.html.erb
app/views/profile/send_mail.html.erb
config/initializers/00_dependencies.rb
config/initializers/active_record_extensions.rb
lib/noosfero/plugin.rb
plugins/analytics/lib/analytics_plugin/base.rb
plugins/comment_paragraph/controllers/profile/comment_paragraph_plugin_profile_controller.rb
plugins/comment_paragraph/lib/comment_paragraph_plugin.rb
plugins/comment_paragraph/lib/comment_paragraph_plugin/api.rb
plugins/comment_paragraph/lib/comment_paragraph_plugin/comments_report.rb
plugins/comment_paragraph/test/functional/comment_paragraph_plugin_profile_controller_test.rb
plugins/comment_paragraph/test/unit/api_test.rb
@@ -88,13 +88,16 @@ module Api
       expose :id, :type, :settings, :position, :enabled
       expose :mirror, :mirror_block_id, :title
       expose :api_content, if: lambda { |object, options| options[:display_api_content] || object.display_api_content_by_default? }
+      expose :permissions do |block, options|
+        Entities.permissions_for_entity(block, options[:current_person], :allow_edit?)
+      end
     end
  
     class Box < Entity
       root 'boxes', 'box'
       expose :id, :position
       expose :blocks, :using => Block do |box, options|
-        box.blocks.select {|block| block.visible_to_user?(options[:current_person]) }
+        box.blocks.select {|block| block.visible_to_user?(options[:current_person]) || block.allow_edit?(options[:current_person]) }
       end
     end
  
@@ -121,6 +124,10 @@ module Api
       expose :type
       expose :custom_header
       expose :custom_footer
+      expose :permissions do |profile, options|
+        Entities.permissions_for_entity(profile, options[:current_person],
+        :allow_post_content?, :allow_edit?, :allow_destroy?)
+      end
     end
  
     class UserBasic < Entity
@@ -5,8 +5,15 @@ module Api
       resource :blocks do
         get ':id' do
           block = Block.find(params["id"])
-          return forbidden! unless block.visible_to_user?(current_person)
-          present block, :with => Entities::Block, display_api_content: true
+          return forbidden! unless block.visible_to_user?(current_person) || block.allow_edit?(current_person)
+          present block, :with => Entities::Block, display_api_content: true, current_person: current_person
+        end
+
+        post ':id' do
+          block = Block.find(params["id"])
+          return forbidden! unless block.allow_edit?(current_person)
+          block.update_attributes!(params[:block])
+          present block, :with => Entities::Block, display_api_content: true, current_person: current_person
         end
       end
     end
@@ -27,7 +27,7 @@ module Api
         post ':id' do
           authenticate!
           profile = environment.profiles.find_by(id: params[:id])
-          return forbidden! unless current_person.has_permission?(:edit_profile, profile)
+          return forbidden! unless profile.allow_edit?(current_person)
           profile.update_attributes!(params[:profile])
           present profile, :with => Entities::Profile, :current_person => current_person
         end
@@ -39,7 +39,7 @@ module Api
  
           not_found! if profile.blank?
  
-          if current_person.has_permission?(:destroy_profile, profile)
+          if profile.allow_destroy?(current_person)
             profile.destroy
           else
             forbidden!
@@ -723,11 +723,11 @@ module ApplicationHelper
   def display_short_format(article, options={})
     options[:comments_link] ||= true
     options[:read_more_link] ||= true
+    lead_links = (options[:comments_link] ? link_to_comments(article) : '') + (options[:read_more_link] ? reference_to_article( _('Read more'), article) : '')
     html = content_tag('div',
              article.lead +
              content_tag('div',
-               (options[:comments_link] ? link_to_comments(article) : '') +
-               (options[:read_more_link] ? reference_to_article( _('Read more'), article) : ''),
+               lead_links.html_safe,
                :class => 'read-more'
              ),
              :class => 'short-post'
@@ -567,7 +567,7 @@ class Article &lt; ApplicationRecord
  
   def allow_post_content?(user = nil)
     return true if allow_edit_topic?(user)
-    user && (user.has_permission?('post_content', profile) || allow_publish_content?(user) && (user == author))
+    user && (profile.allow_post_content?(user) || allow_publish_content?(user) && (user == author))
   end
  
   def allow_publish_content?(user = nil)
@@ -309,6 +309,16 @@ class Block &lt; ApplicationRecord
     false
   end
  
+  def allow_edit?(person)
+    return false if person.nil? || (!person.is_admin? && !editable?(person))
+    if self.owner.kind_of?(Profile)
+      return person.has_permission?(:edit_profile_design, owner)
+    elsif self.owner.kind_of?(Environment)
+      return person.has_permission?(:edit_environment_design, owner)
+    end
+    false
+  end
+
   private
  
   def home_page_path
@@ -1137,4 +1137,15 @@ private :generate_url, :url_options
     false
   end
  
+  def allow_post_content?(person = nil)
+    person.kind_of?(Profile) && person.has_permission?('post_content', self)
+  end
+
+  def allow_edit?(person = nil)
+    person.kind_of?(Profile) && person.has_permission?('edit_profile', self)
+  end
+
+  def allow_destroy?(person = nil)
+    person.kind_of?(Profile) && person.has_permission?('destroy_profile', self)
+  end
 end
 require 'digest/sha1'
-require 'user_activation_job'
 require 'securerandom'
  
 # User models the system users, and is generated by the acts_as_authenticated
@@ -30,7 +30,7 @@
   [ [ profile.city, 'locality' ],
     [ profile.state, 'region' ],
     [ profile.country_name, 'country-name' ]
-  ].map{ |s,c| s =~ /^\s*$/ ? nil : content_tag( 'span', s, :class => c ) }.compact.join ' - '
+  ].map{ |s,c| s =~ /^\s*$/ ? nil : content_tag( 'span', s, :class => c ) }.compact.safe_join ' - '
 %>
 </div>
 <% end %>
@@ -9,8 +9,8 @@
 <div class="template-selection">
   <% if @email_templates.present? %>
     <%= labelled_form_field(_('Select a template:'), select_tag(:template, options_from_collection_for_select(@email_templates, :id, :name), :include_blank => true, 'data-url' => url_for(:controller => 'email_templates', :action => 'show_parsed'))) %>
-  </div>
-<% end %>
+  <% end %>
+</div>
  
 <%= form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
  
@@ -25,7 +25,6 @@ require &#39;acts_as_customizable&#39;
 require 'route_if'
 require 'maybe_add_http'
 require 'set_profile_region_from_city_state'
-require 'authenticated_system'
 require 'needs_profile'
 require 'white_list_filter'
  
@@ -2,8 +2,6 @@ require &#39;upload_sanitizer&#39;
  
 module ActiveRecordExtension
  
-  extend ActiveSupport::Concern
-
   module ClassMethods
     def reflect_on_association(name)
       reflection = super
@@ -13,6 +13,10 @@ class Noosfero::Plugin
     context.environment if self.context
   end
  
+  def profile
+    context.send :profile if self.context
+  end
+
   class << self
  
     include Noosfero::Plugin::ParentMethods
@@ -42,7 +42,7 @@ class AnalyticsPlugin::Base &lt; Noosfero::Plugin
     {
       title: I18n.t('analytics_plugin.lib.plugin.panel_button'),
       icon: 'analytics-access',
-      url: {controller: 'analytics_plugin/stats', action: :index}
+      url: {controller: 'analytics_plugin/stats', profile: profile.identifier, action: :index}
     }
   end
  
@@ -21,4 +21,16 @@ class CommentParagraphPluginProfileController &lt; CommentController
     }
   end
  
+  include CommentParagraphPlugin::CommentsReport
+
+  def export_comments
+    article_id = params[:id]
+    article = profile.articles.find(article_id)
+    result = export_comments_csv(article)
+    filename = "comments_for_article#{article_id}_#{DateTime.now.to_i}.csv"
+    send_data result,
+      :type => 'text/csv; charset=UTF-8; header=present',
+      :disposition => "attachment; filename=#{filename}"
+  end
+
 end
@@ -47,12 +47,19 @@ class CommentParagraphPlugin &lt; Noosfero::Plugin
   def article_extra_toolbar_buttons(article)
     user = context.send :user
     return [] if !article.comment_paragraph_plugin_enabled? || !article.allow_edit?(user) || article.kind_of?(CommentParagraphPlugin::Discussion)
-    {
+    buttons = [
+      {
       :title => article.comment_paragraph_plugin_activated? ? _('Deactivate Comments') : _('Activate Comments'),
       :url => {:controller => 'comment_paragraph_plugin_myprofile', :profile => article.profile.identifier, :action => 'toggle_activation', :id => article.id},
       :icon => :toggle_comment_paragraph
-    }
-
+      }
+    ]
+    buttons << {
+      :title => _('Export Comments'),
+      :url => {:controller => 'comment_paragraph_plugin_profile', :profile => article.profile.identifier, :action => 'export_comments', :id => article.id},
+      :icon => :toggle_comment_paragraph
+    } if article.comment_paragraph_plugin_activated?
+    buttons
   end
  
   def self.api_mount_points
+require_relative 'comments_report'
+
 # Can't be called Api as will result in:
 # warning: toplevel constant Api referenced by CommentParagraphPlugin::Api
 # To fix this CommentParagraphPlugin should be a module
 class CommentParagraphPlugin::API < Grape::API
+
   MAX_PER_PAGE = 20
  
+  helpers CommentParagraphPlugin::CommentsReport
+
   resource :articles do
     paginate max_per_page: MAX_PER_PAGE
     get ':id/comment_paragraph_plugin/comments' do
@@ -31,5 +36,16 @@ class CommentParagraphPlugin::API &lt; Grape::API
       comments = select_filtered_collection_of(article, :comments, params)
       comments.group(:paragraph_uuid).count
     end
+
+    get ":id/comment_paragraph_plugin/export" do
+      article = find_article(environment.articles, params[:id])
+      result = export_comments_csv(article)
+      filename = "comments_for_article#{article.id}_#{DateTime.now.to_i}.csv"
+      content_type 'text/csv; charset=UTF-8; header=present'
+      env['api.format'] = :binary # there's no formatter for :binary, data will be returned "as is"
+      header 'Content-Disposition', "attachment; filename*=UTF-8''#{CGI.escape(filename)}"
+      result
+    end
+
   end
 end
@@ -0,0 +1,52 @@
+require 'csv'
+
+module CommentParagraphPlugin::CommentsReport
+
+  def export_comments_csv(article)
+    comments_map = article.comments.group_by { |comment| comment.paragraph_uuid }
+    @export = []
+    doc =  Nokogiri::HTML(article.body)
+    paragraph_id = 1
+    doc.css("[data-macro-paragraph_uuid]").map do |paragraph|
+      uuid = paragraph.attributes['data-macro-paragraph_uuid'].value
+      comments_for_paragraph = comments_map[uuid]
+      if comments_for_paragraph
+        # Put comments for the paragraph
+        comments_for_paragraph.each do | comment |
+          @export << create_comment_element(comment, paragraph, paragraph_id)
+        end
+      else # There are no comments for this paragraph
+        @export << create_comment_element(nil, paragraph, paragraph_id)
+      end
+      paragraph_id += 1
+    end
+    # Now we need to put all other comments that are not attached to a paragraph
+    comments_without_paragrah = comments_map[nil] || []
+    comments_without_paragrah.each do | comment |
+      @export << create_comment_element(comment, nil, nil)
+    end
+    return _("No comments for article[%{id}]: %{path}\n\n") % {:id => article.id, :path => article.path} if @export.empty?
+
+    column_names = @export.first.keys
+    CSV.generate(force_quotes: true) do |csv|
+      csv << column_names
+      @export.each { |x| csv << x.values }
+    end
+  end
+
+  private
+
+  def create_comment_element(comment, paragraph, paragraph_id)
+    {
+      paragraph_id: paragraph_id,
+      paragraph_text: paragraph.present? ? paragraph.text.strip : nil,
+      comment_id: comment.present? ? comment.id : '-',
+      comment_reply_to: comment.present? ? comment.reply_of_id : '-',
+      comment_title: comment.present? ? comment.title : '-',
+      comment_content: comment.present? ? comment.body : '-',
+      comment_author_name: comment.present? ? comment.author_name : '-',
+      comment_author_email: comment.present? ? comment.author_email : '-'
+    }
+  end
+
+end
@@ -50,4 +50,18 @@ class CommentParagraphPluginProfileControllerTest &lt; ActionController::TestCase
     assert_select "#comment_paragraph_uuid[value=?]", '0'
   end
  
+  should 'export comments as CSV' do
+    comment1 = fast_create(Comment, :created_at => Time.now - 1.days, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'a comment', :paragraph_uuid => nil)
+    comment2 = fast_create(Comment, :created_at => Time.now - 2.days, :source_id => article, :author_id => profile, :title => 'b comment', :body => 'b comment', :paragraph_uuid => nil)
+    xhr :get, :export_comments, :profile => @profile.identifier, :id => article.id
+    assert_equal 'text/csv; charset=UTF-8; header=present', @response.content_type
+    lines = @response.body.split("\n")
+    assert_equal '"paragraph_id","paragraph_text","comment_id","comment_reply_to","comment_title","comment_content","comment_author_name","comment_author_email"', lines.first
+    assert_equal "\"\",\"\",\"#{comment2.id}\",\"\",\"b comment\",\"b comment\",\"#{comment2.author_name}\",\"#{comment2.author_email}\"", lines.second
+  end
+
+  should 'not export any comments as CSV' do
+    xhr :get, :export_comments, :profile => @profile.identifier, :id => article.id
+    assert_equal "No comments for article[#{article.id}]: #{article.path}", @response.body.split("\n")[0]
+  end
 end
@@ -90,4 +90,18 @@ class APITest &lt;  ActiveSupport::TestCase
     assert_equal "CommentParagraphPlugin::Discussion", json["article"]["type"]
     assert json["article"]["setting"]["comment_paragraph_plugin_activate"]
   end
+
+  should 'export comments' do
+    login_api
+    article = fast_create(Article, :profile_id => person.id, :name => "Some thing")
+    comment1 = fast_create(Comment, :created_at => Time.now - 1.days, :source_id => article, :title => 'a comment', :body => 'a comment', :paragraph_uuid => nil)
+    comment2 = fast_create(Comment, :created_at => Time.now - 2.days, :source_id => article, :title => 'b comment', :body => 'b comment', :paragraph_uuid => nil)
+    get "/api/v1/articles/#{article.id}/comment_paragraph_plugin/export?#{params.to_query}"
+    assert_equal 200, last_response.status
+    assert_equal 'text/csv; charset=UTF-8; header=present', last_response.content_type
+    lines = last_response.body.split("\n")
+    assert_equal '"paragraph_id","paragraph_text","comment_id","comment_reply_to","comment_title","comment_content","comment_author_name","comment_author_email"', lines.first
+    assert_equal "\"\",\"\",\"#{comment2.id}\",\"\",\"b comment\",\"b comment\",\"#{comment2.author_name}\",\"#{comment2.author_email}\"", lines.second
+  end
+
 end
@@ -71,7 +71,7 @@ class CommentParagraphPluginTest &lt; ActiveSupport::TestCase
     article.expects(:allow_edit?).with(user).returns(true)
     article.expects(:comment_paragraph_plugin_activated?).at_least_once.returns(false)
  
-    assert_equal 'Activate Comments', plugin.article_extra_toolbar_buttons(article)[:title]
+    assert_equal 'Activate Comments', plugin.article_extra_toolbar_buttons(article).first[:title]
   end
  
   should 'display Deactivate Comments title if comment paragraph plugin is deactivated' do
@@ -81,7 +81,17 @@ class CommentParagraphPluginTest &lt; ActiveSupport::TestCase
     article.expects(:allow_edit?).with(user).returns(true)
     article.expects(:comment_paragraph_plugin_activated?).at_least_once.returns(true)
  
-    assert_equal 'Deactivate Comments', plugin.article_extra_toolbar_buttons(article)[:title]
+    assert_equal 'Deactivate Comments', plugin.article_extra_toolbar_buttons(article).first[:title]
+  end
+
+  should 'display export comments button when comment paragraph plugin is activated' do
+    profile = fast_create(Profile)
+    article = fast_create(Article, :profile_id => profile.id)
+    article.expects(:comment_paragraph_plugin_enabled?).returns(true)
+    article.expects(:allow_edit?).with(user).returns(true)
+    article.expects(:comment_paragraph_plugin_activated?).at_least_once.returns(true)
+
+    assert_includes plugin.article_extra_toolbar_buttons(article).map {|b| b[:title]}, 'Export Comments'
   end
  
   should 'not display button to toggle comment paragraph if article is a discussion' do
@@ -0,0 +1,23 @@
+require_relative '../test_helper'
+
+class CommentsReportTest < ActiveSupport::TestCase
+
+  include CommentParagraphPlugin::CommentsReport
+  
+  def setup
+    profile = fast_create(Community)
+    @article = fast_create(Article, :profile_id => profile.id)
+  end
+
+  attr_reader :article
+
+  should 'export comments in csv format with the first line as a header' do
+    comment1 = fast_create(Comment, :created_at => Time.now - 1.days, :source_id => article, :title => 'a comment', :body => 'a comment', :paragraph_uuid => nil)
+    comment2 = fast_create(Comment, :created_at => Time.now - 2.days, :source_id => article, :title => 'b comment', :body => 'b comment', :paragraph_uuid => nil)
+    csv = export_comments_csv(article)
+    lines = csv.split("\n")
+    assert_equal '"paragraph_id","paragraph_text","comment_id","comment_reply_to","comment_title","comment_content","comment_author_name","comment_author_email"', lines.first
+    assert_equal "\"\",\"\",\"#{comment2.id}\",\"\",\"b comment\",\"b comment\",\"#{comment2.author_name}\",\"#{comment2.author_email}\"", lines.second
+  end
+
+end
@@ -13,7 +13,7 @@ class CustomFormsPlugin &lt; Noosfero::Plugin
   end
  
   def control_panel_buttons
-    {:title => _('Manage Forms'), :icon => 'custom-forms', :url => {:controller => 'custom_forms_plugin_myprofile'}}
+    {title: _('Manage Forms'), icon: 'custom-forms', url: {profile: profile.identifier, controller: 'custom_forms_plugin_myprofile'}}
   end
  
 end
@@ -7,8 +7,8 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.3~rc2-1-ga15645d\n"
 "POT-Creation-Date: 2015-10-30 16:35-0300\n"
-"PO-Revision-Date: 2015-03-09 09:51+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"PO-Revision-Date: 2016-06-15 11:38+0000\n"
+"Last-Translator: Becca Cook <b.cook28@gmail.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/plugin-"
 "display-content/es/>\n"
 "Language: es\n"
@@ -16,7 +16,7 @@ msgstr &quot;&quot;
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.3-dev\n"
+"X-Generator: Weblate 2.7-dev\n"
  
 #: plugins/display_content/lib/display_content_plugin.rb:10
 msgid ""
@@ -65,7 +65,7 @@ msgstr &quot;%{day} de %{month_name} de %{year}&quot;
  
 #: plugins/display_content/lib/display_content_block.rb:197
 msgid "%{month_name} %{day}"
-msgstr ""
+msgstr "%{nombre_del_mes} %{día}"
  
 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:5
 msgid "Choose which attributes should be displayed and drag to reorder them:"
@@ -656,6 +656,23 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
     assert_match /#{a.published_at}/, render_block_content(block)
   end
  
+  should 'show image if defined by user' do
+    profile = create_user('testuser').person
+    a = create(TinyMceArticle, :name => 'test article 1', :profile_id => profile.id, :image_builder => { :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')})
+    a.save!
+
+    process_delayed_job_queue
+
+    block = DisplayContentBlock.new
+    block.nodes = [a.id]
+    block.sections = [{:value => 'image', :checked => true}]
+    box = mock()
+    block.stubs(:box).returns(box)
+    box.stubs(:owner).returns(profile)
+
+    assert_tag_in_string render_block_content(block), :tag => 'div', :attributes => {:class => 'image'}
+  end
+
   should 'show articles in recent order' do
     profile = create_user('testuser').person
     Article.delete_all
@@ -13,7 +13,7 @@
     div class='body'
       = (item.body || '').html_safe
   - when 'image'
-    - unless item.image || item.image.public_filename
+    - if item.image && item.image.public_filename
       div class='image'
         = link_to(image_tag(item.image.public_filename), item.url)
   - when 'tags'
 gem 'omniauth', '~> 1.2.2'
 gem 'omniauth-facebook', '~> 2.0.0'
+gem 'omniauth-twitter', '~> 1.0.1'
 gem "omniauth-google-oauth2", '~> 0.2.6'
 gem "omniauth-oauth2", '~> 1.3.1'
+gem "omniauth-github", '~> 1.1.2'
@@ -33,6 +33,20 @@ Facebook
  
 [Create Facebook application](https://developers.facebook.com/docs/facebook-login/v2.1)
  
+Github
+--------
+
+[Create Github application](https://github.com/settings/developers)
+
+Twitter
+--------
+
+- Specially on twitter you need to request user's email address, see more
+in https://dev.twitter.com/rest/reference/get/account/verify_credentials
+
+[Create Twitter application](https://apps.twitter.com/)
+
+
 Callback
 ========
  
@@ -0,0 +1,20 @@
+Feature: Create Twitter provider
+  As a environment admin
+  I want to be able to create a new twitter provider
+  So that users can login wth different strategies
+
+Background:
+    Given "OauthProvider" plugin is enabled
+    And I am logged in as admin
+    And I go to /admin/plugins
+    And I check "Oauth Client Plugin"
+    And I press "Save changes"
+
+Scenario: Create a twitter provider
+    Given I go to /admin/plugin/oauth_client/new
+    And I fill in "oauth_client_plugin_provider_name" with "myid"
+    And I fill in "oauth_client_plugin_provider[name]" with "google"
+    And I fill in "oauth_client_plugin_provider_client_secret" with "mysecret"
+    And I check "oauth_client_plugin_provider[enabled]"
+    And I select "twitter" from "oauth_client_plugin_provider_strategy"
+    Then I should see "To use this provider you need to request the user email in your app"
@@ -31,13 +31,20 @@ class OauthClientPlugin &lt; Noosfero::Plugin
  
   PROVIDERS = {
     :facebook => {
-      :name => 'Facebook'
+      :name => 'Facebook',
+      :info_fields => 'name,email'
     },
     :google_oauth2 => {
       :name => 'Google'
     },
     :noosfero_oauth2 => {
       :name => 'Noosfero'
+    },
+    :github => {
+      :name => 'Github'
+    },
+    :twitter => {
+      :name => 'Twitter'
     }
   }
  
@@ -62,8 +69,9 @@ class OauthClientPlugin &lt; Noosfero::Plugin
         provider_id = request.params['id']
         provider_id ||= request.session['omniauth.params']['id'] if request.session['omniauth.params']
         provider = environment.oauth_providers.find(provider_id)
+        strategy.options.merge! consumer_key: provider.client_id, consumer_secret: provider.client_secret
         strategy.options.merge! client_id: provider.client_id, client_secret: provider.client_secret
-        strategy.options.merge! provider.options.symbolize_keys
+        strategy.options.merge! options
  
         request.session[:provider_id] = provider_id
       }
@@ -95,4 +103,8 @@ class OauthClientPlugin &lt; Noosfero::Plugin
     }
   end
  
+  def js_files
+  ["script.js"]
+  end
+
 end
@@ -0,0 +1,21 @@
+$(document).ready(function(){
+	select_box_event();
+});
+
+var toggle_info_message = function(){
+  var selected_option = $("#oauth_client_plugin_provider_strategy option:selected");
+  if (selected_option.length){
+    if (selected_option.val() === "twitter"){
+      $(".remember-enable-email").removeClass("hidden");
+    } else {
+      $(".remember-enable-email").addClass("hidden");
+    }
+  }
+};
+
+var select_box_event = function(){
+	var select_box = $("#oauth_client_plugin_provider_strategy");
+	select_box.on("change",function(){
+		toggle_info_message();
+	});
+};
@@ -16,3 +16,7 @@
 .oauth-login .provider .developer {
   display: none;
 }
+
+.remember-enable-email.hidden {
+  display: none;
+}
@@ -15,6 +15,10 @@
     <%= labelled_form_field _('Strategy'), f.select(:strategy, OauthClientPlugin::PROVIDERS) %>
   </div>
  
+  <div class="remember-enable-email hidden">
+    <span class="error"><%=_('To use this provider you need to request the user email in your app')%></span>
+  </div>
+
   <div class="client-id">
     <%= labelled_form_field _('Client Id'), f.text_field(:client_id) %>
   </div>
 <% min_rate = env_organization_ratings_config.minimum_ratings %>
 <% default_rating = env_organization_ratings_config.default_rating %>
  
-<div class="star-page-title">
-  <%= @plugins.dispatch(:organization_ratings_title).collect { |content| instance_exec(&content) }.join("") %>
-</div>
-
 <div class="star-rate-data">
  
   <div class="star-profile-information">
 <%= error_messages_for 'rating' %>
  
 <% config = env_organization_ratings_config %>
+<div class="star-page-title">
+  <%= @plugins.dispatch(:organization_ratings_title).collect { |content| instance_exec(&content) }.join("") %>
+</div>
 <% if logged_in? %>
   <%= render :partial => "new_rating_fields" %>
 <% else %>
 <% logged_in_image = link_to profile_image(current_user.person, :portrait), current_user.person.url if current_user %>
 <% logged_in_name = link_to current_user.person.name,  current_user.person.url if current_user %>
-<% logged_out_image = image_tag('plugins/organization_ratings/public/images/user-not-logged.png') %>
+<% logged_out_image = image_tag('plugins/organization_ratings/images/user-not-logged.png') %>
  
 <div class="make-report-block">
   <div class="star-profile-information">
@@ -7,16 +7,16 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.3~rc2-1-ga15645d\n"
 "POT-Creation-Date: 2015-10-30 16:35-0300\n"
-"PO-Revision-Date: 2014-11-03 15:52+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/"
-"noosfero/es/>\n"
+"PO-Revision-Date: 2016-06-15 12:26+0000\n"
+"Last-Translator: Becca Cook <b.cook28@gmail.com>\n"
+"Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/plugin-"
+"people-block/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.0-dev\n"
+"X-Generator: Weblate 2.7-dev\n"
  
 #: plugins/people_block/lib/friends_block.rb:8
 #, fuzzy
@@ -77,8 +77,8 @@ msgstr &quot;Ver todos&quot;
  
 #: plugins/people_block/views/blocks/friends.html.erb:5
 msgid "Some suggestions for you"
-msgstr ""
+msgstr "Algunas sugerencias para ti"
  
 #: plugins/people_block/views/blocks/friends.html.erb:10
 msgid "See all suggestions"
-msgstr ""
+msgstr "Ver todas las sugerencias"
@@ -0,0 +1,18 @@
+Feature: person tags
+
+Background:
+  Given the following users
+    | login   |
+    | joao    |
+  And I am logged in as "joao"
+  And "PersonTags" plugin is enabled
+
+Scenario: add tags to person
+  Given I am on joao's control panel
+  And I follow "Edit Profile"
+  When I fill in "profile_data_tag_list" with "linux,debian"
+  And I press "Save"
+  And I go to joao's control panel
+  And I follow "Edit Profile"
+  Then the "profile_data_tag_list" field should contain "linux"
+  And the "profile_data_tag_list" field should contain "debian"
@@ -0,0 +1,8 @@
+require_dependency 'person'
+
+class Person
+  attr_accessible :tag_list
+
+  acts_as_taggable_on :tags
+  N_('Fields of interest')
+end
@@ -0,0 +1,36 @@
+class PersonTagsPlugin < Noosfero::Plugin
+
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::FormTagHelper
+  include FormsHelper
+
+  def self.plugin_name
+    "PersonTagsPlugin"
+  end
+
+  def self.plugin_description
+    _("People can define tags that describe their interests.")
+  end
+
+  def profile_editor_extras
+    expanded_template('profile-editor-extras.html.erb').html_safe
+  end
+
+  def self.api_mount_points
+    [PersonTagsPlugin::API]
+  end
+
+  def self.extra_blocks
+    {
+      PersonTagsPlugin::InterestsBlock => { type: Person }
+    }
+  end
+
+  def self.has_admin_url?
+    false
+  end
+
+  def stylesheet?
+    true
+  end
+end
@@ -0,0 +1,9 @@
+class PersonTagsPlugin::API < Grape::API
+  resource :people do
+    get ':id/tags' do
+      person = environment.people.visible.find_by(id: params[:id])
+      return not_found! if person.blank?
+      present person.tag_list
+    end
+  end
+end
@@ -0,0 +1,29 @@
+class PersonTagsPlugin::InterestsBlock < Block
+  def view_title
+    self.default_title 
+  end
+
+  def tags
+    owner.tag_list
+  end
+
+  def extra_option
+    {}
+  end
+
+  def self.description
+    _('Fields of Interest')
+  end
+
+  def help
+    _('Things that this person is interested in')
+  end
+
+  def default_title
+    _('Fields of Interest')
+  end
+
+  def self.expire_on
+    { profile: [:profile] }
+  end
+end
@@ -0,0 +1,13 @@
+.person-tags-block ul {
+  padding: 0;
+  margin: 0;
+}
+
+.person-tags-block li {
+  float: left;
+  list-style: none;
+  padding: 5px;
+  color: #fff;
+  background: #000;
+  margin: 5px;
+}
@@ -0,0 +1 @@
+require_relative '../../../test/test_helper'
@@ -0,0 +1,27 @@
+require_relative '../test_helper'
+require_relative '../../../../test/api/test_helper'
+
+class APITest <  ActiveSupport::TestCase
+
+  def setup
+    create_and_activate_user
+    environment.enable_plugin(PersonTagsPlugin)
+  end
+
+  should 'return tags for a person' do
+    person = create_user('person').person
+    person.tag_list.add('linux')
+    person.save!
+    person.reload
+    get "/api/v1/people/#{person.id}/tags?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal ['linux'], json
+  end
+
+  should 'return empty list if person has no tags' do
+    person = create_user('person').person
+    get "/api/v1/people/#{person.id}/tags?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal [], json
+  end
+end
@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class PersonTagsPluginTest < ActiveSupport::TestCase
+
+  def setup
+    @environment = Environment.default
+    @environment.enable_plugin(PersonTagsPlugin)
+  end
+
+  should 'have tags' do
+    person = create_user('person').person
+    assert_equal [], person.tags
+    person.tag_list.add('linux')
+    assert_equal ['linux'], person.tag_list
+  end
+end
@@ -0,0 +1,14 @@
+<%= block_title(block.view_title, block.subtitle) %>
+
+<div class="person-tags-block">
+  <% unless block.tags.size == 0 %>
+    <ul>
+      <% block.tags.each do |tag| %>
+        <li><%= tag %></li>
+      <% end %>
+    </ul>
+  <% else %>
+    <div class="person-tags-block-none"><%= c_('None') %></div>
+  <% end %>
+  <br style="clear:both" />
+</div>
@@ -0,0 +1 @@
+box_organizer
 \ No newline at end of file
@@ -0,0 +1,8 @@
+<h2><%= _('Select your fields of interest') %></h2>
+<%= text_field_tag('profile_data[tag_list]', context.profile.tag_list.join(','), size: 64) %>
+<br />
+<%= content_tag( 'small', _('Separate tags with commas') ) %>
+
+<script>
+  jQuery('#profile_data_tag_list').inputosaurus();
+</script>
@@ -0,0 +1 @@
+box_organizer
 \ No newline at end of file
@@ -38,7 +38,7 @@ class RequireAuthToCommentPlugin &lt; Noosfero::Plugin
   end
  
   def body_beginning
-    "<meta name='profile.allow_unauthenticated_comments'/>" if allowed_by_profile
+    tag :meta, name: 'profile.allow_unauthenticated_comments' if allowed_by_profile
   end
  
   protected
@@ -5,8 +5,8 @@ li.dropdown
     = image_tag user.profile_custom_icon(gravatar_default), class: 'menu-user-gravatar'
     = content_tag :strong, user.identifier
     - if pending_tasks_count
-      span class='badge' onclick="document.location='#{url_for(user.tasks_url)}'" title="#{_("Manage your pending tasks")}"
-        count
+      span class='badge' onclick="document.location='#{url_for user.tasks_url}'" title="#{_("Manage your pending tasks")}"
+        = pending_tasks_count
  
   ul class='dropdown-menu' role='menu'
     li
@@ -36,7 +36,7 @@
     <%=
       @plugins.dispatch(:body_beginning).map do |content|
         if content.respond_to?(:call) then instance_exec(&content).to_s.html_safe else content.to_s.html_safe end
-      end.join("\n")
+      end.safe_join
     %>
     <div id="global-header">
       <%= global_header %>
@@ -20,7 +20,7 @@ class SubOrganizationsPlugin &lt; Noosfero::Plugin
  
   def control_panel_buttons
     if context.profile.organization? && Organization.parents(context.profile).blank?
-      { :title => _('Manage sub-groups'), :icon => 'groups', :url => {:controller => 'sub_organizations_plugin_myprofile'} }
+      { title: _('Manage sub-groups'), icon: 'groups', url: {profile: profile.identifier, controller: :sub_organizations_plugin_myprofile} }
     end
   end
  
@@ -50,13 +50,13 @@ class WorkAssignmentPlugin::EmailContact
       mail(options)
     end
  
-    def build_mail_message(email_contact, uploaded_files)
+    def self.build_mail_message(email_contact, uploaded_files)
       message = ""
       if uploaded_files && uploaded_files.first && uploaded_files.first.parent && uploaded_files.first.parent.parent
         article = uploaded_files.first.parent.parent
         message = article.default_email + "<br>"
         uploaded_files.each do |file|
-          url = url_for(file.url)
+          url = Rails.application.routes.url_helpers.url_for(file.url)
           message += "<br><a href='#{url}'>#{url}</a>"
         end
       end
@@ -16,7 +16,7 @@ module WorkAssignmentPlugin::Helper
   end
  
   def display_author_folder(author_folder, user)
-    return if author_folder.children.empty?
+    return if author_folder.children(true).empty?
     content_tag('tr',
       content_tag('td', link_to_last_submission(author_folder, user)) +
       content_tag('td', time_format(author_folder.children.last.created_at)) +
@@ -35,6 +35,14 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_response :success
   end
  
+  should 'display users submissions' do
+    folder = work_assignment.find_or_create_author_folder(@person)
+    submission = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :profile => organization, :parent => folder)
+    get :view_page, :profile => @organization.identifier, :page => work_assignment.path
+    assert_response :success
+    assert_match /rails.png/, @response.body
+  end
+
   should "display 'Upload files' when create children of image gallery" do
     login_as(profile.identifier)
     f = Gallery.create!(:name => 'gallery', :profile => profile)
@@ -7,16 +7,16 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2013-12-10 15:48-0300\n"
-"PO-Revision-Date: 2016-01-06 17:09+0000\n"
-"Last-Translator: María Vecino <mariavecino@ecoalternative.net>\n"
-"Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/"
-"documentation/es/>\n"
+"PO-Revision-Date: 2016-06-15 12:16+0000\n"
+"Last-Translator: Becca Cook <b.cook28@gmail.com>\n"
+"Language-Team: Spanish "
+"<https://hosted.weblate.org/projects/noosfero/documentation/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.5-dev\n"
+"X-Generator: Weblate 2.7-dev\n"
  
 # type: Content of: <h1>
 #. type: Content of: <h1>
@@ -343,8 +343,9 @@ msgstr &quot;&quot;
 # type: Content of: <h1>
 #. type: Content of: <h1>
 #: doc/noosfero/plugins/index.en.xhtml:1
+#, fuzzy
 msgid "Plugins"
-msgstr "Complementos"
+msgstr "Características adicionales"
  
 # type: Content of: <h1>
 #. type: Content of: <h1>
@@ -7,8 +7,8 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.3~rc2-8-g01ea9f7\n"
 "POT-Creation-Date: 2015-11-04 12:36-0300\n"
-"PO-Revision-Date: 2016-05-09 16:09+0000\n"
-"Last-Translator: daniel <dtygel@eita.org.br>\n"
+"PO-Revision-Date: 2016-06-15 13:24+0000\n"
+"Last-Translator: Becca Cook <b.cook28@gmail.com>\n"
 "Language-Team: Spanish "
 "<https://hosted.weblate.org/projects/noosfero/noosfero/es/>\n"
 "Language: es\n"
@@ -100,40 +100,35 @@ msgid &quot;Community fields not updated successfully.&quot;
 msgstr "El campo comunidad no se actualizo correctamente."
  
 #: app/controllers/admin/licenses_controller.rb:14
-#, fuzzy
 msgid "License created"
-msgstr "Licencia"
+msgstr "Licencia creada"
  
 #: app/controllers/admin/licenses_controller.rb:17
-#, fuzzy
 msgid "License could not be created"
-msgstr "%s no pudo ser actualizado"
+msgstr "Licencia no pudo ser creada"
  
 #: app/controllers/admin/licenses_controller.rb:27
-#, fuzzy
 msgid "License updated"
-msgstr "Última actualización"
+msgstr "Licencia actualizada"
  
 #: app/controllers/admin/licenses_controller.rb:30
-#, fuzzy
 msgid "License could not be updated"
-msgstr "%s no pudo ser actualizado"
+msgstr "Licencia no pudo ser actualizada"
  
 #: app/controllers/admin/licenses_controller.rb:40
 #, fuzzy
 msgid "License removed"
-msgstr "Artículo eliminado."
+msgstr "Licencia eliminada"
  
 #: app/controllers/admin/licenses_controller.rb:42
 #: app/controllers/admin/licenses_controller.rb:45
-#, fuzzy
 msgid "License could not be removed"
-msgstr "%s no pudo ser actualizado"
+msgstr "Licencia no pudo ser eliminada"
  
 #: app/controllers/admin/organizations_controller.rb:7
 #, fuzzy
 msgid "Organization profiles"
-msgstr "Método de aprobación de la organización"
+msgstr "Perfiles de organización"
  
 #: app/controllers/admin/organizations_controller.rb:9
 #: app/models/community.rb:8 app/models/community.rb:11
@@ -158,32 +153,32 @@ msgstr &quot;Todo&quot;
 #: app/controllers/admin/organizations_controller.rb:33
 #, fuzzy
 msgid "%s enabled"
-msgstr "%s no estaba habilitado."
+msgstr "%s habilitado"
  
 #: app/controllers/admin/organizations_controller.rb:35
 #, fuzzy
 msgid "%s could not be enabled"
-msgstr "%s no pudo ser actualizado"
+msgstr "%s no pudo ser habilitado"
  
 #: app/controllers/admin/organizations_controller.rb:42
 #, fuzzy
 msgid "%s disabled"
-msgstr "Deshabilitar"
+msgstr "%s deshabilitado"
  
 #: app/controllers/admin/organizations_controller.rb:44
 #, fuzzy
 msgid "%s could not be disable"
-msgstr "%s no pudo ser actualizado"
+msgstr "%s no pudo ser deshabilitado"
  
 #: app/controllers/admin/organizations_controller.rb:52
 #, fuzzy
 msgid "%s removed"
-msgstr "eliminar"
+msgstr "&s eliminado"
  
 #: app/controllers/admin/organizations_controller.rb:54
 #, fuzzy
 msgid "%s could not be removed"
-msgstr "%s no pudo ser actualizado"
+msgstr "%s no pudo ser eliminado"
  
 #: app/controllers/admin/plugins_controller.rb:12
 msgid "Plugins updated successfully."
@@ -207,64 +202,65 @@ msgstr &quot;No se pudo editar el rol&quot;
 #: app/controllers/admin/templates_controller.rb:11
 #: app/controllers/admin/templates_controller.rb:23
 #: app/controllers/admin/templates_controller.rb:35
+#, fuzzy
 msgid "New template created"
-msgstr ""
+msgstr "Nueva plantilla creada"
  
 #: app/controllers/admin/templates_controller.rb:14
 #: app/controllers/admin/templates_controller.rb:26
 #: app/controllers/admin/templates_controller.rb:38
+#, fuzzy
 msgid "Name has already been taken"
-msgstr ""
+msgstr "Este nombre ya ha sido tomado"
  
 #: app/controllers/admin/templates_controller.rb:47
 #, fuzzy
 msgid "Community not found. The template could no be changed."
-msgstr "El mensaje no pudo ser enviado"
+msgstr "Comunidad no encontrado. La plantilla no pudo ser cambiado."
  
 #: app/controllers/admin/templates_controller.rb:51
 #: app/controllers/admin/templates_controller.rb:65
 #: app/controllers/admin/templates_controller.rb:79
+#, fuzzy
 msgid "%s defined as default"
-msgstr ""
+msgstr "&s definado como default"
  
 #: app/controllers/admin/templates_controller.rb:61
 #, fuzzy
 msgid "Person not found. The template could no be changed."
-msgstr "El mensaje no pudo ser enviado"
+msgstr "Persona no encontrado. La plantilla no pudo ser cambiado."
  
 #: app/controllers/admin/templates_controller.rb:75
 #, fuzzy
 msgid "Enterprise not found. The template could no be changed."
-msgstr "El mensaje no pudo ser enviado"
+msgstr "Empresa no encontrado. La plantilla no pudo ser cambiado."
  
 #: app/controllers/admin/trusted_sites_controller.rb:14
 msgid "New trusted site added."
-msgstr ""
+msgstr "Nueva página de confianza añadida."
  
 #: app/controllers/admin/trusted_sites_controller.rb:17
-#, fuzzy
 msgid "Failed to add trusted site."
-msgstr "No se pudo editar el rol"
+msgstr "No se pudo añadir la página de confianza."
  
 #: app/controllers/admin/trusted_sites_controller.rb:26
-#, fuzzy
 msgid "Trusted site was not found"
-msgstr "La entrada no fue encontrada"
+msgstr "La página de confianza no fue encontrada"
  
 #: app/controllers/admin/trusted_sites_controller.rb:37
 #, fuzzy
 msgid "Failed to edit trusted site."
-msgstr "No se pudo editar el rol"
+msgstr "No se pudo editar la página de confianza."
  
 #: app/controllers/admin/trusted_sites_controller.rb:44
 #, fuzzy
 msgid "Trusted site removed"
-msgstr "Artículo eliminado."
+msgstr "Página de confianza eliminada."
  
 #: app/controllers/admin/trusted_sites_controller.rb:46
 #, fuzzy
 msgid "Trusted site could not be removed"
-msgstr "%s no pudo ser actualizado"
+msgstr "No se pudo eliminar la página de confianza"
  
 #: app/controllers/admin/users_controller.rb:53
 #: app/controllers/my_profile/profile_editor_controller.rb:84
@@ -272,9 +268,8 @@ msgid &quot;The profile was deleted.&quot;
 msgstr "El perfil fue eliminado."
  
 #: app/controllers/admin/users_controller.rb:55
-#, fuzzy
 msgid "Could not remove profile"
-msgstr "El perfil no puede ser eliminado"
+msgstr "El perfil no se pudo ser eliminado"
  
 #: app/controllers/admin/users_controller.rb:95
 #: app/controllers/public/profile_controller.rb:364
@@ -287,32 +282,30 @@ msgid &quot;Could not create the e-mail&quot;
 msgstr "No se ha podido crear el correo electrónico"
  
 #: app/controllers/application_controller.rb:41
+#, fuzzy
 msgid "Origin not in allowed."
-msgstr ""
+msgstr "Origen no permitido"
  
 #: app/controllers/box_organizer_controller.rb:114
 msgid "Failed to remove block"
 msgstr "No se ha podido eliminar el bloque"
  
 #: app/controllers/my_profile/cms_controller.rb:197
-#, fuzzy
 msgid "Homepage reseted."
-msgstr "Contenido de la página de inicio"
+msgstr "Página de inicio reinicializada."
  
 #: app/controllers/my_profile/cms_controller.rb:199
-#, fuzzy
 msgid "\"%s\" configured as homepage."
 msgstr "\"%s\" configurado como página de inicio."
  
 #: app/controllers/my_profile/cms_controller.rb:231
 #, fuzzy
 msgid "File(s) successfully uploaded"
-msgstr "Los roles fueron actualizados correctamente"
+msgstr "(Los) archivo(s) fueron subidos correctamente"
  
 #: app/controllers/my_profile/cms_controller.rb:247
-#, fuzzy
 msgid "\"%s\" was removed."
-msgstr "Contrato eliminado."
+msgstr "\"%s\" fue eliminado."
  
 #: app/controllers/my_profile/cms_controller.rb:291
 #, fuzzy
@@ -320,9 +313,8 @@ msgid &quot;You published this content successfully&quot;
 msgstr "Tu solicitud de publicación ha sido enviada satisfactoriamente"
  
 #: app/controllers/my_profile/cms_controller.rb:311
-#, fuzzy
 msgid "Select some group to publish your article"
-msgstr "Selecciona los grupos donde quieres publicar tu artículo"
+msgstr "Selecciona un grupo para publicar tu artículo"
  
 #: app/controllers/my_profile/cms_controller.rb:323
 #: app/controllers/my_profile/cms_controller.rb:343
@@ -330,9 +322,8 @@ msgid &quot;Your publish request was sent successfully&quot;
 msgstr "Tu solicitud de publicación ha sido enviada satisfactoriamente"
  
 #: app/controllers/my_profile/cms_controller.rb:330
-#, fuzzy
 msgid "Some of your publish requests couldn't be sent."
-msgstr "Tu solicitud de publicación no pudo ser enviada."
+msgstr "Parte de tu solicitud de publicación no pudo ser enviada."
  
 #: app/controllers/my_profile/cms_controller.rb:345
 msgid "Your publish request couldn't be sent."
@@ -363,9 +354,8 @@ msgid &quot;Images&quot;
 msgstr "Imágenes"
  
 #: app/controllers/my_profile/cms_controller.rb:504
-#, fuzzy
 msgid "Files"
-msgstr "Archivo"
+msgstr "Archivos"
  
 #: app/controllers/my_profile/mailconf_controller.rb:23
 msgid ""
@@ -426,10 +416,13 @@ msgid &quot;Address was updated successfully!&quot;
 msgstr "¡La dirección fue actualizada satisfactoriamente!"
  
 #: app/controllers/my_profile/memberships_controller.rb:30
+#, fuzzy
 msgid ""
 "Your new community creation request will be evaluated by an administrator. "
 "You will be notified."
 msgstr ""
+"Tu nuevo solicitud de creación de comunidad será evaluado por un "
+"administrador. Se le notificará."
  
 # habilitado o permitido? estaba o está?
 #: app/controllers/my_profile/profile_editor_controller.rb:44
@@ -448,37 +441,35 @@ msgstr &quot;El perfil no puede ser eliminado&quot;
 #: app/controllers/my_profile/profile_editor_controller.rb:103
 #, fuzzy
 msgid "Welcome page saved successfully."
-msgstr "e-Mail fue deshabilitado correctamente."
+msgstr "Página de bienvendia fue guardada correctamente."
  
 #: app/controllers/my_profile/profile_editor_controller.rb:106
 #, fuzzy
 msgid "Welcome page could not be saved."
-msgstr "El mensaje no pudo ser enviado"
+msgstr "La página de bienvenida no pudo ser guardada."
  
 #: app/controllers/my_profile/profile_editor_controller.rb:116
-#, fuzzy
 msgid "The profile '%s' was deactivated."
-msgstr "El perfil fue eliminado."
+msgstr "El perfil '%s' fue desactivado."
  
 #: app/controllers/my_profile/profile_editor_controller.rb:118
 #, fuzzy
 msgid "Could not deactivate profile."
-msgstr "El perfil no puede ser eliminado"
+msgstr "No pudo desactivar el perfil."
  
 #: app/controllers/my_profile/profile_editor_controller.rb:130
-#, fuzzy
 msgid "The profile '%s' was activated."
-msgstr "El perfil fue eliminado."
+msgstr "El perfil '%s' fue activado."
  
 #: app/controllers/my_profile/profile_editor_controller.rb:132
 #, fuzzy
 msgid "Could not activate the profile."
-msgstr "El perfil no puede ser eliminado"
+msgstr "No pudo activar el perfil."
  
 #: app/controllers/my_profile/profile_editor_controller.rb:171
 #, fuzzy
 msgid "You can not destroy the profile."
-msgstr "El perfil no puede ser eliminado"
+msgstr "No puedes eliminar el perfil."
  
 # desasociar o desvincular?
 #: app/controllers/my_profile/profile_members_controller.rb:79
@@ -503,26 +494,25 @@ msgstr &quot;La lista de miembros fue actualizada.&quot;
 #: app/controllers/my_profile/profile_roles_controller.rb:52
 #, fuzzy
 msgid "Role successfuly removed!"
-msgstr "El producto se ha eliminado correctamente"
+msgstr "¡Se ha eliminado el rol correctamente!"
  
 #: app/controllers/my_profile/profile_roles_controller.rb:54
-#, fuzzy
 msgid "Failed to remove role!"
-msgstr "No se ha podido crear el rol"
+msgstr "¡No se ha podido eliminar el rol!"
  
 #: app/controllers/my_profile/profile_roles_controller.rb:85
 msgid "Error"
-msgstr ""
+msgstr "Error"
  
 #: app/controllers/my_profile/tasks_controller.rb:31
 #, fuzzy
 msgid "Task already assigned!"
-msgstr "El lenguaje ya está en uso"
+msgstr "¡La tarea ya está asignada!"
  
 #: app/controllers/my_profile/tasks_controller.rb:37
 #, fuzzy
 msgid "Task responsible successfully updated!"
-msgstr "Los roles fueron actualizados correctamente"
+msgstr "¡Tarea responsable fue actualizada correctamente!"
  
 #: app/controllers/my_profile/tasks_controller.rb:63
 msgid "All decisions were applied successfully."
@@ -543,9 +533,7 @@ msgstr &quot;Tu cuenta ha sido activada, ¡ahora puedes iniciar sesión!&quot;
 #: app/controllers/public/account_controller.rb:28
 #, fuzzy
 msgid "Thanks for registering. The administrators were notified."
-msgstr ""
-"Gracias por tu sugerencia. Los administradores de la comunidad fueron "
-"notificados."
+msgstr "Gracias por inscribirse. Los administradores fueron notificados."
  
 #: app/controllers/public/account_controller.rb:36
 msgid ""
@@ -563,17 +551,17 @@ msgid &quot;Incorrect username or password&quot;
 msgstr "Nombre de usuario o contraseña incorrecta"
  
 #: app/controllers/public/account_controller.rb:90
+#, fuzzy
 msgid "This environment doesn't allow user registration."
-msgstr ""
+msgstr "Esta comunidad no permite inscripciones usuarios."
  
 #: app/controllers/public/account_controller.rb:114
 msgid "Captcha (the human test)"
-msgstr ""
+msgstr "Captcha (la prueba de humanas)"
  
 #: app/controllers/public/account_controller.rb:139
-#, fuzzy
 msgid "Thanks for registering!"
-msgstr "¡Gracias por ingresar!"
+msgstr "¡Gracias por inscribirte!"
  
 #: app/controllers/public/account_controller.rb:158
 msgid "You have been logged out."
@@ -585,19 +573,21 @@ msgstr &quot;¡Tu contraseña fue modificada correctamente!&quot;
  
 #: app/controllers/public/account_controller.rb:182
 msgid "This environment doesn't allow password recovery."
-msgstr ""
+msgstr "Esta comunidad no permite la recuperación de contraseñas."
  
 #: app/controllers/public/account_controller.rb:198
+#, fuzzy
 msgid "Can not recover user password with blank value."
-msgstr ""
+msgstr "No se puede recuperar la contraseña del usuario con valor en blanco."
  
 #: app/controllers/public/account_controller.rb:200
+#, fuzzy
 msgid "Could not find any user with %s equal to \"%s\"."
-msgstr ""
+msgstr "No se pudo encontrar ningún usuario con %s que sean iguales a \"%s\"."
  
 #: app/controllers/public/account_controller.rb:203
 msgid "Could not perform password recovery for the user."
-msgstr ""
+msgstr "No se pudo realizar la recuperación de la contraseña para el usuario."
  
 #: app/controllers/public/account_controller.rb:286
 #: app/views/account/_signup_form.html.erb:193
@@ -611,7 +601,7 @@ msgstr &quot;Este nombre de usuario no está disponible&quot;
 #: app/controllers/public/account_controller.rb:294
 #, fuzzy
 msgid "This field can't be blank"
-msgstr "Este archivo no puede ser guardado"
+msgstr "Este no puede ser vacío"
  
 #: app/controllers/public/account_controller.rb:301
 msgid "This e-mail address is available"
@@ -623,41 +613,35 @@ msgstr &quot;Esta dirección de correo electrónico está en uso&quot;
  
 # contexto de parent
 #: app/controllers/public/comment_controller.rb:18
-#, fuzzy
 msgid "Page not found."
-msgstr "Carpeta padre"
+msgstr "Página no encontrada."
  
 #: app/controllers/public/comment_controller.rb:27
 #, fuzzy
 msgid "Comment not allowed in this article"
-msgstr "No tienes permitido ver esta página."
+msgstr "No se permite los comentarios en este artículo"
  
 #: app/controllers/public/comment_controller.rb:44
-#, fuzzy
 msgid "Comment was rejected"
-msgstr "Contador de comentarios"
+msgstr "El comentario fue rechazado"
  
 #: app/controllers/public/comment_controller.rb:68
-#, fuzzy
 msgid "Your comment is waiting for approval."
-msgstr "Asociaciones de espera de aprobación:"
+msgstr "Tu comentario está en espera de aprobación."
  
 #: app/controllers/public/comment_controller.rb:84
-#, fuzzy
 msgid "Comment successfully created."
-msgstr "Comentario añadido correctamente."
+msgstr "Comentario creado correctamente."
  
 # borrado, exterminado, destruido?
 #: app/controllers/public/comment_controller.rb:96
-#, fuzzy
 msgid "The comment was not removed."
-msgstr "El artículo fue eliminado."
+msgstr "El comentario no fue eliminado."
  
 #: app/controllers/public/comment_controller.rb:107
 #, fuzzy
 msgid "You couldn't mark this comment as spam."
-msgstr ""
-"¿Estás seguro de que quieres eliminar este comentario y todas sus respuestas?"
+msgstr "No pudiste marcar este comentario como spam."
  
 #: app/controllers/public/contact_controller.rb:12
 msgid "Contact successfully sent"
@@ -670,7 +654,7 @@ msgstr &quot;Contacto no enviado&quot;
 #: app/controllers/public/content_viewer_controller.rb:266
 #, fuzzy
 msgid "Notification of new comments to '%s' was successfully canceled"
-msgstr "Notificación eliminada correctamente."
+msgstr "Notificación de nuevos comentarios a '%s' fue eliminada correctamente"
  
 #: app/controllers/public/invite_controller.rb:33
 #: app/controllers/public/invite_controller.rb:69
@@ -682,9 +666,8 @@ msgid &quot;Please enter a valid email address.&quot;
 msgstr "Por favor, introduzca una dirección de correo electrónico válida."
  
 #: app/controllers/public/invite_controller.rb:77
-#, fuzzy
 msgid "Please enter a valid profile."
-msgstr "Por favor, introduzca una dirección de correo electrónico válida."
+msgstr "Por favor, introduzca un perfil válido."
  
 #: app/controllers/public/profile_controller.rb:44
 #: app/controllers/public/profile_controller.rb:45
@@ -863,8 +846,8 @@ msgstr &quot;se ha unido a la comunidad.&quot;
 #, fuzzy
 msgid "uploaded 1 image"
 msgid_plural "uploaded %d images"
-msgstr[0] "archivo cargado"
-msgstr[1] "archivo cargado"
+msgstr[0] "1 imagen subido"
+msgstr[1] "%d imagenes subidos"
  
 #: app/helpers/action_tracker_helper.rb:55
 msgid "sent a message to %{receiver}: <br /> \"%{message}\""
@@ -875,24 +858,21 @@ msgid &quot;wrote: &lt;br /&gt; \&quot;%{text}\&quot;&quot;
 msgstr "escribió: <br /> \"%{text}\""
  
 #: app/helpers/action_tracker_helper.rb:71
-#, fuzzy
 msgid "created the product %{title}"
-msgstr "Crear producto"
+msgstr "creó el producto %{título}"
  
 #: app/helpers/action_tracker_helper.rb:77
-#, fuzzy
 msgid "updated the product %{title}"
-msgstr "Regresar a la lista de productos"
+msgstr "ha actualizado el producto %{título}"
  
 #: app/helpers/action_tracker_helper.rb:83
-#, fuzzy
 msgid "removed the product %{title}"
-msgstr "No se ha podido eliminar el producto"
+msgstr "ha eliminado el producto %{título}"
  
 #: app/helpers/action_tracker_helper.rb:89
 #, fuzzy
 msgid "favorited enterprise %{title}"
-msgstr "Empresas favoritas de %s"
+msgstr "le gusta la empresa %{título}"
  
 #: app/helpers/application_helper.rb:91 app/helpers/boxes_helper.rb:244
 #: app/models/link_list_block.rb:25
@@ -1058,8 +1038,9 @@ msgid &quot;Article&quot;
 msgstr "Artículo"
  
 #: app/helpers/application_helper.rb:944
+#, fuzzy
 msgid "Clone %s"
-msgstr ""
+msgstr "Clónico %s"
  
 #: app/helpers/application_helper.rb:958
 msgid "Online Manual"
@@ -1245,34 +1226,34 @@ msgid &quot;Report this profile for abusive behaviour&quot;
 msgstr "Reportar este perfil por comportamiento abusivo"
  
 #: app/helpers/application_helper.rb:1307
-#, fuzzy
 msgid ""
 "Are you sure that you want to remove the folder \"%s\"? Note that all the "
 "items inside it will also be removed!"
 msgstr ""
-"¿Estás seguro que quieres eliminar esta carpeta? ¡Ten en cuenta que todos "
-"los elementos dentro serán también borrados!"
+"¿Estás seguro que quieres eliminar la carpeta \"%s\"? ¡Ten en cuenta que "
+"todos los elementos dentro también serán borrados!"
  
 #: app/helpers/application_helper.rb:1309
-#, fuzzy
 msgid "Are you sure that you want to remove the item \"%s\"?"
-msgstr "¿Estás seguro que quieres eliminar estos elementos?"
+msgstr "¿Estás seguro que quieres eliminar el elemento \"%s\"?"
  
 #: app/helpers/application_helper.rb:1352
 #, fuzzy
 msgid "Profile organization"
-msgstr "Una organización"
+msgstr "Organización de perfiles"
  
 #: app/helpers/application_helper.rb:1353
+#, fuzzy
 msgid ""
 "Your profile will be created according to the selected template. Click on "
 "the options to view them."
 msgstr ""
+"Tu perfil será creado según la plantilla seleccionada. Haz clic en las "
+"opciones para verlas."
  
 #: app/helpers/application_helper.rb:1388
-#, fuzzy
 msgid "Errors while saving"
-msgstr "Mensaje de error"
+msgstr "Errores al guardar"
  
 #: app/helpers/application_helper.rb:1398
 msgid "The content here is available to %s's friends only."
@@ -1282,29 +1263,27 @@ msgstr &quot;Este contenido está disponible solamente para amigos de %s.&quot;
 #, fuzzy
 msgid "The contents in this profile is available to members only."
 msgstr ""
-"El contenido en esta comunidad está disponible solamente para sus miembros."
+"El contenido en este perfil está disponible solamente para sus miembros."
  
 #: app/helpers/application_helper.rb:1471
-#, fuzzy
 msgid "See all connections"
-msgstr "Buscar todo el contenido"
+msgstr "Ver todas las conexiones"
  
 #: app/helpers/application_helper.rb:1494
-#, fuzzy
 msgid "Full screen"
-msgstr "Publicación completa"
+msgstr "Pantalla completa"
  
 #: app/helpers/application_helper.rb:1499
 msgid "Go to full screen mode"
-msgstr ""
+msgstr "Ir al modo de pantalla completa"
  
 #: app/helpers/application_helper.rb:1502
 msgid "Exit full screen"
-msgstr ""
+msgstr "Salir de pantalla completa"
  
 #: app/helpers/application_helper.rb:1508
 msgid "Exit full screen mode"
-msgstr ""
+msgstr "Salir de pantalla completa"
  
 #: app/helpers/article_helper.rb:16
 msgid "Options"
@@ -1330,26 +1309,24 @@ msgstr &quot;&quot;
 #: app/helpers/article_helper.rb:42
 #, fuzzy
 msgid "I want to approve comments on this article"
-msgstr "Deseo recibir comentarios sobre este artículo"
+msgstr "Deseo aprobar comentarios de este artículo"
  
 #: app/helpers/article_helper.rb:49
 msgid "I want this article to display the number of hits it received"
 msgstr "Quiero que este artículo muestre el número de visitas que recibió"
  
 #: app/helpers/article_helper.rb:56
-#, fuzzy
 msgid "I want this article to display a link to older versions"
-msgstr "Quiero que este artículo muestre el número de visitas que recibió"
+msgstr "Quiero que este artículo muestre un enlace a versiones antiguas"
  
 #: app/helpers/article_helper.rb:62
-#, fuzzy
 msgid "Visibility"
-msgstr "Visible"
+msgstr "Visibilidad"
  
 #: app/helpers/article_helper.rb:66
 #, fuzzy
 msgid "Public (visible to other people)"
-msgstr "Este artículo debe ser público (visible a otras personas)"
+msgstr "Público (visible a otras personas)"
  
 #: app/helpers/article_helper.rb:70
 msgid "Private"
@@ -1358,30 +1335,31 @@ msgstr &quot;Privado&quot;
 #: app/helpers/article_helper.rb:85
 #, fuzzy
 msgid "Topic creation"
-msgstr "Ubicación:"
+msgstr "Creación de tema"
  
 #: app/helpers/article_helper.rb:86
 msgid "Who will be able to create new topics on this forum?"
-msgstr ""
+msgstr "¿Quién podrá crear nuevos temas en este foro?"
  
 #: app/helpers/article_helper.rb:108
-#, fuzzy
 msgid "For all community members"
-msgstr "Editar plantilla de comunidad"
+msgstr "Para todos los miembros de la comunidad"
  
 #: app/helpers/article_helper.rb:108
-#, fuzzy
 msgid "For all your friends"
-msgstr "Invita a tus amigos"
+msgstr "Para todos tus amigos"
  
 #: app/helpers/article_helper.rb:126
+#, fuzzy
 msgid "Fill in the search field to add the exception users to see this content"
 msgstr ""
+"Rellene el campo de búsqueda para añadir la excepción ususarios para ver "
+"este contenido"
  
 #: app/helpers/article_helper.rb:135 app/views/features/index.html.erb:48
 #, fuzzy
 msgid "Type in a search term for a user"
-msgstr "Escribe un término de búsqueda para los usuarios"
+msgstr "Escribe un término de búsqueda para un usuario"
  
 #: app/helpers/article_helper.rb:151 app/helpers/folder_helper.rb:70
 #: app/models/approve_article.rb:74 app/views/shared/user_menu.html.erb:23
@@ -1413,11 +1391,12 @@ msgstr &quot;Artículos&quot;
  
 #: app/helpers/blog_helper.rb:10
 msgid "Visualization of posts"
-msgstr ""
+msgstr "Visualización de publicaciones"
  
 #: app/helpers/blog_helper.rb:14
+#, fuzzy
 msgid "I want to display the preview of posts before the text"
-msgstr ""
+msgstr "Deseo mostrar la vista anticipada de publicaciones antes del texto"
  
 # sigue la duda sobre como traducir "post"
 #: app/helpers/blog_helper.rb:19
@@ -1467,26 +1446,32 @@ msgid &quot;Are you sure you want to remove this block?&quot;
 msgstr "¿Estás seguro de que deseas eliminar este bloque?"
  
 #: app/helpers/boxes_helper.rb:240
+#, fuzzy
 msgid "Clone"
-msgstr ""
+msgstr "Clónico"
  
 #: app/helpers/boxes_helper.rb:244
 msgid "Help on this block"
 msgstr "Ayuda sobre este bloque"
  
 #: app/helpers/boxes_helper.rb:251
+#, fuzzy
 msgid "Embed block code"
-msgstr ""
+msgstr "Incrustar código de bloque"
  
 #: app/helpers/boxes_helper.rb:252
+#, fuzzy
 msgid ""
 "Below, youll see a field containing embed code for the block. Just copy the "
 "code and paste it into your website or blogging software."
 msgstr ""
+"Abajo, verás un campo con el código para el bloque. Simplemente copia el "
+"código y pegalo en tu página web o software de blogs."
  
 #: app/helpers/boxes_helper.rb:255
+#, fuzzy
 msgid "Embed code"
-msgstr ""
+msgstr "Incrustar código"
  
 #: app/helpers/catalog_helper.rb:18
 msgid "Start"
@@ -1583,20 +1568,19 @@ msgstr &quot;, por %s&quot;
 #: app/helpers/comment_helper.rb:60
 #: app/views/content_viewer/_comment.html.erb:58
 #: app/views/spam/_task.html.erb:11
+#, fuzzy
 msgid "Mark as NOT SPAM"
-msgstr ""
+msgstr "Marcar como NO ES SPAM"
  
 #: app/helpers/comment_helper.rb:62
 #: app/views/content_viewer/_comment.html.erb:62
 msgid "Mark as SPAM"
-msgstr ""
+msgstr "Marcar como SPAM"
  
 #: app/helpers/comment_helper.rb:62
 #: app/views/content_viewer/_comment.html.erb:62
-#, fuzzy
 msgid "Are you sure you want to mark this comment as SPAM?"
-msgstr ""
-"¿Estás seguro de que quieres eliminar este comentario y todas sus respuestas?"
+msgstr "¿Estás seguro de que quieres marcar este comentario como SPAM?"
  
 #: app/helpers/comment_helper.rb:75
 #: app/views/content_viewer/_comment.html.erb:73
@@ -1613,11 +1597,10 @@ msgstr &quot;%s comentarios&quot;
 #: app/helpers/content_viewer_helper.rb:9
 #, fuzzy
 msgid "no comments yet"
-msgstr "Sin comentarios aun"
+msgstr "Sin comentarios aún"
  
 #: app/helpers/content_viewer_helper.rb:9
 #: app/views/content_viewer/view_page.html.erb:12
-#, fuzzy
 msgid "One comment"
 msgstr "Un comentario"
  
@@ -1640,41 +1623,37 @@ msgstr &quot;%{day} de %{month_name} de %{year}&quot;
  
 # LAs cadenas de este tipo NO se traducen
 #: app/helpers/dates_helper.rb:26
-#, fuzzy
 msgid "%{month_name} %{day}"
-msgstr "%{month} %{year}"
+msgstr "%{nombre_del_mes} %{día}"
  
 # LAs cadenas de este tipo NO se traducen
 #: app/helpers/dates_helper.rb:35
-#, fuzzy
 msgid "%{month}/%{year}"
-msgstr "%{month} %{year}"
+msgstr "%{mes}/%{año}"
  
 # LAs cadenas de este tipo NO se traducen
 #: app/helpers/dates_helper.rb:38
-#, fuzzy
 msgid "%{month_name}"
-msgstr "%{month} %{year}"
+msgstr "%{nombre_del_mes}"
  
 #: app/helpers/dates_helper.rb:38
-#, fuzzy
 msgid "%{month_name}, %{year}"
-msgstr "%{day} de %{month} %{year}"
+msgstr "%{nombre_del_mes}, %{año}"
  
 #: app/helpers/dates_helper.rb:48
 #, fuzzy
 msgid "%{month}/%{day}/%{year}, %{hour}:%{minutes}"
-msgstr "%{day} de %{month} de %{year}, %{hour}:%{minutes}"
+msgstr "%{día} de %{mes} de %{año}, %{hora}:%{minutos}"
  
 #: app/helpers/dates_helper.rb:52
 #, fuzzy
 msgid "%{month_name} %{day}, %{year} %{hour}:%{minutes}"
-msgstr "%{day} de %{month} de %{year}, %{hour}:%{minutes}"
+msgstr "%{día} de %{mes} de %{año}, %{hora}:%{minutos}"
  
 #: app/helpers/dates_helper.rb:52
 #, fuzzy
 msgid "%{month_name} %{day} %{hour}:%{minutes}"
-msgstr "%{day} de %{month} de %{year}, %{hour}:%{minutes}"
+msgstr "%{día} de %{mes} de %{año}, %{hora}:%{minutos}"
  
 #: app/helpers/dates_helper.rb:65
 msgid "from %{month} %{day1} to %{day2}, %{year}"
@@ -1717,9 +1696,8 @@ msgid &quot;Sun&quot;
 msgstr "Dom"
  
 #: app/helpers/dates_helper.rb:106
-#, fuzzy
 msgid "%{month}"
-msgstr "%{day} de %{month} %{year}"
+msgstr "%{mes}"
  
 # LAs cadenas de este tipo NO se traducen
 #: app/helpers/dates_helper.rb:108
@@ -1783,18 +1761,16 @@ msgid &quot;Events for %s&quot;
 msgstr "Eventos para %s"
  
 #: app/helpers/events_helper.rb:10
-#, fuzzy
 msgid "No events for this month"
-msgstr "No hay eventos para esta fecha"
+msgstr "No hay eventos para este mes"
  
 #: app/helpers/events_helper.rb:19
 msgid " to "
 msgstr " a "
  
 #: app/helpers/events_helper.rb:21
-#, fuzzy
 msgid "Place: "
-msgstr "Precio: "
+msgstr "Lugar: "
  
 #: app/helpers/features_helper.rb:4
 msgid "Administrator must approve all new organizations"
@@ -1890,11 +1866,11 @@ msgstr &quot;&quot;
  
 #: app/helpers/forms_helper.rb:151
 msgid "Done"
-msgstr ""
+msgstr "Hecho"
  
 #: app/helpers/forms_helper.rb:153
 msgid "Today"
-msgstr ""
+msgstr "Hoy"
  
 #: app/helpers/forms_helper.rb:155
 msgid "Wednesday"
@@ -1925,37 +1901,30 @@ msgid &quot;Saturday&quot;
 msgstr "Sábado"
  
 #: app/helpers/forms_helper.rb:156
-#, fuzzy
 msgid "We"
 msgstr "Mié"
  
 #: app/helpers/forms_helper.rb:156
-#, fuzzy
 msgid "Th"
 msgstr "Jue"
  
 #: app/helpers/forms_helper.rb:156
-#, fuzzy
 msgid "Fr"
 msgstr "Vie"
  
 #: app/helpers/forms_helper.rb:156
-#, fuzzy
 msgid "Sa"
 msgstr "Sáb"
  
 #: app/helpers/forms_helper.rb:156
-#, fuzzy
 msgid "Tu"
 msgstr "Mar"
  
 #: app/helpers/forms_helper.rb:156
-#, fuzzy
 msgid "Mo"
 msgstr "Lun"
  
 #: app/helpers/forms_helper.rb:156
-#, fuzzy
 msgid "Su"
 msgstr "Dom"
  
@@ -2009,66 +1978,56 @@ msgstr &quot;Noviembre&quot;
  
 #: app/helpers/forms_helper.rb:167
 msgid "Dec"
-msgstr ""
+msgstr "Dic"
  
 #: app/helpers/forms_helper.rb:167
-#, fuzzy
 msgid "Nov"
-msgstr "No"
+msgstr "Nov"
  
 #: app/helpers/forms_helper.rb:167
-#, fuzzy
 msgid "Oct"
-msgstr "Octubre"
+msgstr "Oct"
  
 #: app/helpers/forms_helper.rb:167
-#, fuzzy
 msgid "Sep"
-msgstr "Sexo"
+msgstr "Sep"
  
 #: app/helpers/forms_helper.rb:167
-#, fuzzy
 msgid "Jan"
 msgstr "Enero"
  
 #: app/helpers/forms_helper.rb:167
 msgid "Feb"
-msgstr ""
+msgstr "Feb"
  
 #: app/helpers/forms_helper.rb:167
-#, fuzzy
 msgid "Mar"
-msgstr "Marzo"
+msgstr "Mar"
  
 #: app/helpers/forms_helper.rb:167
-#, fuzzy
 msgid "Aug"
 msgstr "Agosto"
  
 #: app/helpers/forms_helper.rb:167
-#, fuzzy
 msgid "Jul"
-msgstr "Julio"
+msgstr "Jul"
  
 #: app/helpers/forms_helper.rb:167
-#, fuzzy
 msgid "Jun"
-msgstr "Junio"
+msgstr "Jun"
  
 #: app/helpers/forms_helper.rb:167
-#, fuzzy
 msgid "Apr"
-msgstr "Abril"
+msgstr "Abr"
  
 #: app/helpers/forms_helper.rb:171
-#, fuzzy
 msgid "Prev"
 msgstr "Anterior"
  
 #: app/helpers/forms_helper.rb:182
 #, fuzzy
 msgid "Wk"
-msgstr "Trabajo"
+msgstr "Semana"
  
 #: app/helpers/forms_helper.rb:248
 msgid "From"
@@ -2076,7 +2035,7 @@ msgstr &quot;De&quot;
  
 #: app/helpers/forms_helper.rb:249
 msgid "until"
-msgstr ""
+msgstr "hasta"
  
 #: app/helpers/forms_helper.rb:253
 msgid "root"
@@ -2560,8 +2519,9 @@ msgid &quot;Select domain&quot;
 msgstr "Seleciona el dominio"
  
 #: app/helpers/profile_editor_helper.rb:151
+#, fuzzy
 msgid "This field must be public"
-msgstr ""
+msgstr "Este campo debe ser público"
  
 #: app/helpers/profile_helper.rb:38 app/models/enterprise.rb:32
 #: app/views/maps/edit_location.html.erb:12
@@ -2577,21 +2537,19 @@ msgstr &quot;correo electrónico&quot;
  
 #: app/helpers/profile_helper.rb:40
 #: app/views/profile_editor/_person_form.html.erb:16
+#, fuzzy
 msgid "Jabber"
 msgstr ""
  
 #: app/helpers/profile_helper.rb:41
-#, fuzzy
 msgid "Date of birth"
-msgstr "Fecha de nacimiento:"
+msgstr "Fecha de nacimiento"
  
 #: app/helpers/profile_helper.rb:42
-#, fuzzy
 msgid "Profile created at"
-msgstr "perfil creado en:"
+msgstr "Perfil creado en"
  
 #: app/helpers/profile_helper.rb:44
-#, fuzzy
 msgid "Privacy setting"
 msgstr "Opciones de privacidad"
  
@@ -2619,38 +2577,34 @@ msgstr[0] &quot;Una imagen&quot;
 msgstr[1] "%{num} imágenes"
  
 #: app/helpers/search_helper.rb:11
-#, fuzzy
 msgid "More popular"
-msgstr "Más populares"
+msgstr "Más popular"
  
 #: app/helpers/search_helper.rb:12
-#, fuzzy
 msgid "More active"
-msgstr "Más activas"
+msgstr "Más activa"
  
 #: app/helpers/search_helper.rb:13
 msgid "More recent"
 msgstr "Más recientes"
  
 #: app/helpers/search_helper.rb:14
-#, fuzzy
 msgid "More comments"
-msgstr "Moderar comentarios"
+msgstr "Más comentarios"
  
 #: app/helpers/search_helper.rb:17 app/helpers/search_helper.rb:115
-#, fuzzy
 msgid "Map"
-msgstr "Mayo"
+msgstr "Mapa"
  
 #: app/helpers/search_helper.rb:18 app/helpers/search_helper.rb:116
 #, fuzzy
 msgid "Full"
-msgstr "Nombre completo"
+msgstr "Completo"
  
 #: app/helpers/search_helper.rb:19 app/helpers/search_helper.rb:114
 #, fuzzy
 msgid "Compact"
-msgstr "Computación"
+msgstr "Compacto"
  
 #: app/helpers/search_helper.rb:52
 msgid ", "
@@ -2661,14 +2615,13 @@ msgid &quot;search in all categories&quot;
 msgstr "buscar en todas las categorías"
  
 #: app/helpers/search_helper.rb:118
-#, fuzzy
 msgid "Display"
-msgstr "Mostrar nombre"
+msgstr "Mostrar"
  
 #: app/helpers/search_helper.rb:155
 #, fuzzy
 msgid "Choose a template"
-msgstr "La plantilla \"%s\""
+msgstr "Eligir una plantilla"
  
 # Usamos etiquetas o entendemos qeu tag es de uso común?
 #: app/helpers/tags_helper.rb:34
@@ -2715,17 +2668,15 @@ msgstr &quot;Todos los usuarios&quot;
 #: app/helpers/users_helper.rb:5
 #, fuzzy
 msgid "Admin users"
-msgstr "Cantidad utilizada"
+msgstr "Usuarios de admin"
  
 #: app/helpers/users_helper.rb:6
-#, fuzzy
 msgid "Activated users"
-msgstr "Activo"
+msgstr "Usuarios activados"
  
 #: app/helpers/users_helper.rb:7
-#, fuzzy
 msgid "Deativated users"
-msgstr "Administrar usuarios"
+msgstr "Usuarios desactivados"
  
 #: app/helpers/users_helper.rb:16 app/views/memberships/index.html.erb:16
 #: app/views/tasks/index.html.erb:25
@@ -2739,7 +2690,7 @@ msgstr &quot;¡[%s] tienes un nuevo comentario!&quot;
 #: app/mailers/comment_notifier.rb:37
 #, fuzzy
 msgid "[%s] %s commented on a content of %s"
-msgstr "Artículos más comentados"
+msgstr "[%s] %s ha comentado en un contendio de %s"
  
 #: app/mailers/contact.rb:23 app/views/contact/new.html.erb:23
 #: app/views/contact/sender/notification.html.erb:14
@@ -2790,8 +2741,9 @@ msgid &quot;Welcome to environment %s&quot;
 msgstr "Bienvenido a %s"
  
 #: app/mailers/user_mailer.rb:57
+#, fuzzy
 msgid "[%s] What about grow up your network?"
-msgstr ""
+msgstr "[%s] ¿Qué de crecer tu red?"
  
 #: app/models/abuse_complaint.rb:28
 msgid "Abuse complaint"
@@ -3063,7 +3015,7 @@ msgstr &quot;Documento de texto HTML&quot;
 #: app/models/article.rb:429
 #, fuzzy
 msgid "Language not supported by the environment."
-msgstr "Lenguaje no soportado por Noosfero"
+msgstr "Lenguaje no soportado por"
  
 #: app/models/article.rb:435
 msgid "Language is already used"
@@ -3268,7 +3220,7 @@ msgstr &quot;&quot;
 #: app/models/comment.rb:34
 #, fuzzy
 msgid "{fn} can only be informed for unauthenticated authors"
-msgstr "%{fn} solamente puede ser informado por autores no autentificados"
+msgstr "{fn} solamente puede ser informado para autores no autentificados"
  
 #: app/models/comment.rb:82
 msgid "(unauthenticated user)"
@@ -3419,7 +3371,6 @@ msgid &quot;Management information&quot;
 msgstr "Información de gestión"
  
 #: app/models/create_enterprise.rb:47
-#, fuzzy
 msgid "{fn} is not a validator for the chosen region"
 msgstr "{fn} no es un validador para la región escogida"
  
@@ -3737,7 +3688,6 @@ msgid &quot;Moderator&quot;
 msgstr "Moderador"
  
 #: app/models/environment.rb:118
-#, fuzzy
 msgid "Disable search for articles "
 msgstr "Desactivar la búsqueda de artículos "
  
@@ -3915,7 +3865,7 @@ msgstr &quot;Permanecer en la misma página en la que el usuario se identificó.&quot;
 #: app/models/environment.rb:170 app/models/environment.rb:182
 #, fuzzy
 msgid "Redirects the user to the environment homepage."
-msgstr "Redirige al usuario a la home"
+msgstr "Redirige el usuario a la página de inicio."
  
 #: app/models/environment.rb:171 app/models/environment.rb:183
 msgid "Redirects the user to his profile page."
@@ -3941,7 +3891,7 @@ msgstr &quot;&quot;
 #: app/models/environment.rb:186
 #, fuzzy
 msgid "Redirects the user to the environment welcome page."
-msgstr "Redirige al usuario a la página de bienvenida."
+msgstr "Redirige el usuario a la página de bienvenida."
  
 #: app/models/environment.rb:291
 msgid "This enterprise needs to be enabled."
@@ -3960,9 +3910,8 @@ msgid &quot;have unsupported languages.&quot;
 msgstr "no permite ciertos idiomas."
  
 #: app/models/event.rb:33
-#, fuzzy
 msgid "{fn} cannot come before end date."
-msgstr "%{fn} no puede aparecer antes de la fecha final."
+msgstr "{fn} no puede aparecer antes de la fecha final."
  
 #: app/models/event.rb:63
 msgid "A calendar event."
@@ -4044,7 +3993,7 @@ msgstr &quot;Usuarios registrados&quot;
 #: app/models/forum.rb:41
 #, fuzzy
 msgid "Me"
-msgstr "Mí"
+msgstr "Yo"
  
 #: app/models/forum.rb:45
 msgid "Administrators"
@@ -4197,18 +4146,22 @@ msgid &quot;Right&quot;
 msgstr "Derecha"
  
 #: app/models/link_list_block.rb:17
+#, fuzzy
 msgid "Gray Up"
 msgstr ""
  
 #: app/models/link_list_block.rb:18
+#, fuzzy
 msgid "Gray Down"
 msgstr ""
  
 #: app/models/link_list_block.rb:19
+#, fuzzy
 msgid "Gray Left"
 msgstr ""
  
 #: app/models/link_list_block.rb:20
+#, fuzzy
 msgid "Gray Right"
 msgstr ""
  
@@ -4317,10 +4270,9 @@ msgid &quot;%{sender} tried to register.&quot;
 msgstr "%{sender} intentó registrarse."
  
 #: app/models/moderate_user_registration.rb:54
-#, fuzzy
 msgid "You need to login on %{system} in order to approve or reject this user."
 msgstr ""
-"Debes iniciar sesión en  %{system} para aprobar o rechazar este artículo."
+"Hay que iniciar sesión en %{sistema} para aprobar o rechazar este usuario."
  
 #: app/models/moderate_user_registration.rb:58
 msgid ""
@@ -4350,9 +4302,8 @@ msgstr &quot;Nombre nombre de ciudad o estado inválido.&quot;
 #: app/models/organization.rb:138 app/models/person.rb:261
 #: app/views/profile_editor/_person_form.html.erb:26
 #: app/views/shared/_organization_custom_fields.html.erb:13
-#, fuzzy
 msgid "Address reference"
-msgstr "Dirección:"
+msgstr "Referencia de dirección"
  
 #: app/models/organization.rb:138 app/models/person.rb:261
 #: app/views/profile_editor/_person_form.html.erb:27
@@ -4529,7 +4480,6 @@ msgid &quot;There are no sub-categories for %s&quot;
 msgstr "No existe subcategoria para  %s"
  
 #: app/models/product_categories_block.rb:36
-#, fuzzy
 msgid "Only on the catalog"
 msgstr "Solamente en el catálogo"
  
@@ -4602,14 +4552,13 @@ msgid &quot;Invite members&quot;
 msgstr "Invitar miembros"
  
 #: app/models/profile.rb:82
-#, fuzzy
 msgid "Send e-Mail to members"
 msgstr "Enviar correo electrónico a los miembros"
  
 #: app/models/profile.rb:83
 #, fuzzy
 msgid "Manage custom roles"
-msgstr "Administrar roles de usuarios"
+msgstr "Administrar roles personalizados"
  
 #: app/models/profile.rb:137
 msgid ""
@@ -4921,14 +4870,12 @@ msgid &quot;does not match.&quot;
 msgstr "no coinciden."
  
 #: app/presenters/image.rb:16
-#, fuzzy
 msgid "Image (%s)"
-msgstr "Imágenes"
+msgstr "Imagen (%s)"
  
 #: app/views/account/_identifier_status.html.erb:6
-#, fuzzy
 msgid "Available: "
-msgstr "Distancia:"
+msgstr "Disponible: "
  
 #: app/views/account/_login_form.html.erb:15
 #: app/views/account/login.html.erb:26
@@ -4937,18 +4884,18 @@ msgid &quot;Log in&quot;
 msgstr "Iniciar sesión"
  
 #: app/views/account/_signup_form.html.erb:3
-#, fuzzy
 msgid "Are you a robot?"
-msgstr "¿Estás seguro?"
+msgstr "¿Eres un robot?"
  
 #: app/views/account/_signup_form.html.erb:4
+#, fuzzy
 msgid "Please, prove that you are human by filling the captcha."
-msgstr ""
+msgstr "Por favor, demuestra que eres humano por llenar este captcha."
  
 #: app/views/account/_signup_form.html.erb:12
 #, fuzzy
 msgid "The account could not be created"
-msgstr "El mensaje no pudo ser enviado"
+msgstr "La cuenta no pudo ser creada"
  
 #: app/views/account/_signup_form.html.erb:42
 msgid ""
@@ -4967,27 +4914,31 @@ msgstr &quot;&quot;
 "menos 4 caracteres."
  
 #: app/views/account/_signup_form.html.erb:52
+#, fuzzy
 msgid "Short"
-msgstr ""
+msgstr "Bajo"
  
 #: app/views/account/_signup_form.html.erb:55
-#, fuzzy
 msgid "Bad"
-msgstr "Marzo"
+msgstr "Mal"
  
 #: app/views/account/_signup_form.html.erb:58
+#, fuzzy
 msgid "Good"
-msgstr ""
+msgstr "Buen"
  
 #: app/views/account/_signup_form.html.erb:61
 msgid "Strong"
-msgstr ""
+msgstr "Fuerte"
  
 #: app/views/account/_signup_form.html.erb:68
+#, fuzzy
 msgid ""
 "We need to be sure that you filled in your password correctly. Confirm you "
 "password."
 msgstr ""
+"Tenemos que asegurar de que llenaste correctamente tu contraseña. Confirma "
+"tu contraseña."
  
 #: app/views/account/_signup_form.html.erb:74
 msgid "This e-mail address will be used to contact you."
@@ -4998,8 +4949,9 @@ msgid &quot;Full name&quot;
 msgstr "Nombre completo"
  
 #: app/views/account/_signup_form.html.erb:99
+#, fuzzy
 msgid "Tell us your name, it will be used to identify yourself."
-msgstr ""
+msgstr "Dinos tu nombre, se va a usarlo para indentificarte."
  
 #: app/views/account/_signup_form.html.erb:116
 msgid "I accept the %s"
@@ -5178,7 +5130,7 @@ msgstr &quot;¿Olvidaste tu contraseña?&quot;
  
 #: app/views/account/forgot_password.html.erb:3
 msgid "Instructions to password recovery could not be sent"
-msgstr ""
+msgstr "No se pudo enviar las instrucciones para la recuperación de contraseña"
  
 #: app/views/account/forgot_password.html.erb:10
 msgid "Send instructions"
@@ -5293,7 +5245,7 @@ msgstr &quot;&quot;
  
 #: app/views/account/login.html.erb:19
 msgid "Keep me logged in"
-msgstr ""
+msgstr "No cerrar sesión"
  
 #: app/views/account/login.html.erb:40
 #: app/views/account/login_block.html.erb:31
@@ -5373,8 +5325,11 @@ msgid &quot;Go to my enterprise control panel&quot;
 msgstr "Ir al panel de control de mi empresa"
  
 #: app/views/admin_panel/_signup_intro.html.erb:2
+#, fuzzy
 msgid "This text will be shown to the user on the top of the sign up form."
 msgstr ""
+"El usuario va a poder ver este texto en la parte arriba del formulario de "
+"inscripción."
  
 #: app/views/admin_panel/_signup_intro.html.erb:5
 #: app/views/admin_panel/_signup_welcome_screen.html.erb:4
@@ -5384,28 +5339,41 @@ msgid &quot;Body&quot;
 msgstr "Cuerpo"
  
 #: app/views/admin_panel/_signup_welcome_screen.html.erb:2
+#, fuzzy
 msgid ""
 "If you enable this feature on the \"Features\" section of the Administration "
 "Panel, this text will be shown as a welcome message to users after signup."
 msgstr ""
+"Si habilitas este característica en la sección de \"Características\" del "
+"Panel de Administración, se va a mostrar este texto como un mensaje de "
+"bienvenida para los usuarios después de inscribirse."
  
 #: app/views/admin_panel/_signup_welcome_screen.html.erb:7
+#, fuzzy
 msgid ""
 "If this content is left blank, the following page will be displayed to the "
 "user:"
 msgstr ""
+"Si este contento se queda vacío, se va a mostrar la siguiente página para el "
+"usuario:"
  
 #: app/views/admin_panel/_signup_welcome_text.html.erb:2
+#, fuzzy
 msgid ""
 "This text will be sent to new users if the feature \"Send welcome e-mail to "
 "new users\" is enabled on environment."
 msgstr ""
+"Se va a enviar este texto a nuevos usuarios si la característica \"Enviar e-"
+"mail de bienvenida a nuevos usuarios\" está habilitado."
  
 #: app/views/admin_panel/_signup_welcome_text.html.erb:3
+#, fuzzy
 msgid ""
 "Including %s on body, it will be replaced by the real name of the e-mail "
 "recipient."
 msgstr ""
+"Incluyendo %s en el cuerpo, se va a reemplazarlo por el nombre real del "
+"recipiente del correo."
  
 #: app/views/admin_panel/_site_info.html.erb:1
 msgid "Site name"
@@ -5414,46 +5382,44 @@ msgstr &quot;Nombre del sitio&quot;
 #: app/views/admin_panel/_site_info.html.erb:3
 #, fuzzy
 msgid "No reply email"
-msgstr "Nuevo correo electrónico"
+msgstr "No correo de respuesta"
  
 #: app/views/admin_panel/_site_info.html.erb:5
 msgid "Theme"
 msgstr "Tema"
  
 #: app/views/admin_panel/_site_info.html.erb:8
-#, fuzzy
 msgid "Article's date format"
-msgstr "Resumen del artículo"
+msgstr "Formato de la fecha del artículo"
  
 #: app/views/admin_panel/_site_info.html.erb:11
 msgid "mm/dd/yyyy"
-msgstr ""
+msgstr "mm/dd/aaaa"
  
 #: app/views/admin_panel/_site_info.html.erb:12
 msgid "mm/dd"
-msgstr ""
+msgstr "mm/dd"
  
 #: app/views/admin_panel/_site_info.html.erb:13
 msgid "Month dd, yyyy"
-msgstr ""
+msgstr "Mes dd, aaaa"
  
 #: app/views/admin_panel/_site_info.html.erb:14
 msgid "Month dd"
-msgstr ""
+msgstr "Mes dd"
  
 #: app/views/admin_panel/_site_info.html.erb:15
 msgid "X minutes/hours/days/months/years ago"
-msgstr ""
+msgstr "Hace X minutos/horas/días/meses/años"
  
 #: app/views/admin_panel/_site_info.html.erb:22
 #, fuzzy
 msgid "Default language"
-msgstr "todos los idiomas"
+msgstr "Idioma predeterminado"
  
 #: app/views/admin_panel/_site_info.html.erb:23
-#, fuzzy
 msgid "Available languages"
-msgstr "todos los idiomas"
+msgstr "Idiomas disponibles"
  
 #: app/views/admin_panel/_site_info.html.erb:34
 msgid "Homepage content"
@@ -5464,9 +5430,8 @@ msgid &quot;Administrator Panel&quot;
 msgstr "Panel del administrador"
  
 #: app/views/admin_panel/index.html.erb:3
-#, fuzzy
 msgid "System settings"
-msgstr "Configuraciones"
+msgstr "Configuraciones del sistema"
  
 # Entorno o ambiente?
 #: app/views/admin_panel/index.html.erb:6
@@ -5475,78 +5440,68 @@ msgid &quot;Environment settings&quot;
 msgstr "Configuración del entorno"
  
 #: app/views/admin_panel/index.html.erb:7
-#, fuzzy
 msgid "Features"
-msgstr "Característica"
+msgstr "Características"
  
 #: app/views/admin_panel/index.html.erb:8
 #: app/views/admin_panel/index.html.erb:31
 #, fuzzy
 msgid "Plugins"
-msgstr "Característica adicional"
+msgstr "Características adicionales"
  
 #: app/views/admin_panel/index.html.erb:9
-#, fuzzy
 msgid "Appearance"
-msgstr "Editar apariencia"
+msgstr "Apariencia"
  
 #: app/views/admin_panel/index.html.erb:10
-#, fuzzy
 msgid "Sideboxes"
-msgstr "Editar cajas laterales"
+msgstr "Cajas laterales"
  
 #: app/views/admin_panel/index.html.erb:12
-#, fuzzy
 msgid "Licenses"
-msgstr "Licencia"
+msgstr "Licencias"
  
 #: app/views/admin_panel/index.html.erb:13
+#, fuzzy
 msgid "Trusted sites"
-msgstr ""
+msgstr "Páginas de confianza"
  
 #: app/views/admin_panel/index.html.erb:16
-#, fuzzy
 msgid "Profiles"
-msgstr "Perfil"
+msgstr "Perfiles"
  
 #: app/views/admin_panel/index.html.erb:19
-#, fuzzy
 msgid "User roles"
-msgstr "Administrar roles de usuario"
+msgstr "Roles de usuario"
  
 #: app/views/admin_panel/index.html.erb:20
-#, fuzzy
 msgid "Users"
-msgstr "Usuario"
+msgstr "Usuarios"
  
 #: app/views/admin_panel/index.html.erb:21
 #: app/views/organizations/index.html.erb:1
-#, fuzzy
 msgid "Organizations"
-msgstr "Organización"
+msgstr "Organizaciones"
  
 #: app/views/admin_panel/index.html.erb:22
 #, fuzzy
 msgid "Profile templates"
-msgstr "Imagen de perfil"
+msgstr "Plantillas del perfil"
  
 #: app/views/admin_panel/index.html.erb:23
-#, fuzzy
 msgid "Fields"
-msgstr "Campo"
+msgstr "Campos"
  
 #: app/views/admin_panel/index.html.erb:39
 #, fuzzy
 msgid "Enterprise-related settings"
-msgstr "Información y configuración de la empresa"
+msgstr "Ajustes relacionados con empresas"
  
 #: app/views/admin_panel/index.html.erb:42
-#, fuzzy
 msgid "Message for disabled enterprises"
-msgstr "Editar mensaje para empresas deshabilitadas"
+msgstr "Mensaje para empresas deshabilitadas"
  
 #: app/views/admin_panel/index.html.erb:43
-#, fuzzy
 msgid "Validators by region"
 msgstr "Validadores por región"
  
@@ -5585,7 +5540,7 @@ msgstr &quot;Seleccionar carpeta del portal&quot;
 #: app/views/admin_panel/set_portal_community.html.erb:21
 #, fuzzy
 msgid "Define news amount on portal"
-msgstr "Define la cantidad por carpeta"
+msgstr "Definir la cantidad de noticias en el portal"
  
 #: app/views/admin_panel/set_portal_folders.html.erb:1
 msgid "Select folders"
@@ -5618,22 +5573,20 @@ msgstr &quot;&quot;
 #: app/views/admin_panel/set_portal_news_amount.html.erb:1
 #, fuzzy
 msgid "News amount on portal"
-msgstr "Cantidad de noticias por carpeta"
+msgstr "Cantidad de noticias en el portal"
  
 #: app/views/admin_panel/set_portal_news_amount.html.erb:5
-#, fuzzy
 msgid "Number of highlighted news"
-msgstr "Número de noticias"
+msgstr "Número de noticias destacadas"
  
 #: app/views/admin_panel/set_portal_news_amount.html.erb:6
 #, fuzzy
 msgid "Number of portal news"
-msgstr "Número de noticias"
+msgstr "Número de noticias del portal"
  
 #: app/views/admin_panel/set_portal_news_amount.html.erb:7
-#, fuzzy
 msgid "Number of news by folder"
-msgstr "Número de noticias"
+msgstr "Número de noticias por carpeta"
  
 #: app/views/admin_panel/site_info.html.erb:11
 msgid "Terms of use"
@@ -5642,34 +5595,36 @@ msgstr &quot;Términos de uso&quot;
 #: app/views/admin_panel/site_info.html.erb:16
 #, fuzzy
 msgid "Signup welcome email"
-msgstr "Enviar correo electrónico a los usuarios"
+msgstr "Correo electrónico de bienvenida de inscripción"
  
 #: app/views/admin_panel/site_info.html.erb:18
+#, fuzzy
 msgid "Signup welcome page"
-msgstr ""
+msgstr "Página de bienvenida de inscripción"
  
 #: app/views/admin_panel/site_info.html.erb:20
 #, fuzzy
 msgid "Signup introduction text"
-msgstr "Enviar instrucciones"
+msgstr "Texto de introducción de inscripción"
  
 #: app/views/api/index.html.erb:4
+#, fuzzy
 msgid "api-playground|Try the %s"
-msgstr ""
+msgstr "api-patio Prueba el %s"
  
 #: app/views/api/playground.html.erb:29
+#, fuzzy
 msgid "Use the login endpoint"
-msgstr ""
+msgstr "Utilice el punto final de inicio de sesión"
  
 #: app/views/api/playground.html.erb:33
-#, fuzzy
 msgid "Add parameter"
-msgstr "Añadir miembros"
+msgstr "Añadir parámetro"
  
 #: app/views/api/playground.html.erb:34
 #, fuzzy
 msgid "Run"
-msgstr "Dom"
+msgstr "Correr"
  
 #: app/views/blocks/communities.html.erb:2
 #: app/views/blocks/communities.html.erb:4
@@ -5677,14 +5632,12 @@ msgid &quot;communities|View all&quot;
 msgstr "Ver todas"
  
 #: app/views/blocks/communities.html.erb:9
-#, fuzzy
 msgid "Some suggestions for you"
-msgstr "Sugerencias: %s"
+msgstr "Algunas sugerencias para ti"
  
 #: app/views/blocks/communities.html.erb:14
-#, fuzzy
 msgid "See all suggestions"
-msgstr "Sugerencia de artículos"
+msgstr "Ver todas las sugerencias"
  
 #: app/views/blocks/disabled_enterprise_message.html.erb:5
 msgid "Unblock"
@@ -5711,9 +5664,8 @@ msgid &quot;Logged in as %s&quot;
 msgstr "Autenticado como %s"
  
 #: app/views/blocks/login_block.html.erb:5
-#, fuzzy
 msgid "User since %s/%s"
-msgstr "Precio: %s (%s)"
+msgstr "Usuario desde %s/%s"
  
 #: app/views/blocks/my_network.html.erb:5
 #: app/views/blocks/profile_info.html.erb:19
@@ -5753,18 +5705,16 @@ msgstr[0] &quot;Una comunidad&quot;
 msgstr[1] "%{num} comunidades"
  
 #: app/views/blocks/product_categories.html.erb:1
-#, fuzzy
 msgid "Catalog start"
-msgstr "Estado del chat"
+msgstr "Empieza del católogo"
  
 #: app/views/blocks/profile_info.html.erb:27
 msgid "Since %{year}/%{month}"
 msgstr "Desde %{month}/%{year}"
  
 #: app/views/blocks/profile_info_actions/_community.html.erb:12
-#, fuzzy
 msgid "Send an e-mail to the administrators"
-msgstr "Enviar correo electrónico a %s"
+msgstr "Enviar un correo electrónico a los administradores"
  
 #: app/views/blocks/profile_info_actions/_enterprise.html.erb:4
 msgid "Add enterprise as favorite"
@@ -5777,7 +5727,7 @@ msgstr &quot;Añadir como favorito&quot;
 #: app/views/blocks/profile_info_actions/_join_leave_community.html.erb:4
 #, fuzzy
 msgid "Your membership is waiting for approval"
-msgstr "Asociaciones de espera de aprobación:"
+msgstr "Tu afiliación está en espera de aprobación"
  
 #: app/views/blocks/profile_info_actions/_join_leave_community.html.erb:10
 #: app/views/blocks/profile_info_actions/_join_leave_community.html.erb:14
@@ -5788,7 +5738,7 @@ msgstr &quot;Unirse a esta comunidad&quot;
 #: app/views/blocks/profile_info_actions/_join_leave_community.html.erb:23
 #, fuzzy
 msgid "Please confirm to leave the community '%{name}'"
-msgstr "se ha unido a una comunidad: <br /> %{name}"
+msgstr "Por favor, confirma que quieres salir de la comunidad '%{nombre}'"
  
 #: app/views/blocks/profile_info_actions/_person.html.erb:6
 #: app/views/profile/_private_profile.html.erb:13
@@ -5808,14 +5758,12 @@ msgstr &quot;&quot;
 "usar este bloque correctamente."
  
 #: app/views/box_organizer/_article_block.html.erb:19
-#, fuzzy
 msgid "Number of posts:"
-msgstr "Número de productores"
+msgstr "Número de publicaciones:"
  
 #: app/views/box_organizer/_article_block.html.erb:24
-#, fuzzy
 msgid "How to display this content:"
-msgstr "Como mostrar las publicaciones:"
+msgstr "Cómo mostrar este contento:"
  
 #: app/views/box_organizer/_article_block.html.erb:27
 #: app/views/cms/_blog.html.erb:66
@@ -5999,7 +5947,7 @@ msgstr &quot;¿En que área te gustaría colocar tu nuevo bloque?&quot;
  
 #: app/views/box_organizer/add_block.html.erb:8
 msgid "Main area"
-msgstr ""
+msgstr "Área principal"
  
 #: app/views/box_organizer/add_block.html.erb:8
 msgid "Area %d"
@@ -6020,7 +5968,7 @@ msgstr &quot;Mostrar este bloque:&quot;
 #: app/views/box_organizer/edit.html.erb:16
 #, fuzzy
 msgid "Display to users:"
-msgstr "Mostrar el color"
+msgstr "Mostrar a los usuarios:"
  
 #: app/views/box_organizer/edit.html.erb:20
 msgid "all languages"
@@ -6031,18 +5979,17 @@ msgid &quot;Show for:&quot;
 msgstr "Mostrar para:"
  
 #: app/views/box_organizer/edit.html.erb:24
-#, fuzzy
 msgid "Edit options:"
-msgstr "Configuración del correo"
+msgstr "Editar las opciones:"
  
 #: app/views/box_organizer/edit.html.erb:27
-#, fuzzy
 msgid "Move options:"
-msgstr "Opciones de moderación"
+msgstr "Mover las opciones:"
  
 #: app/views/box_organizer/edit.html.erb:33
+#, fuzzy
 msgid "Mirror"
-msgstr ""
+msgstr "Espejo"
  
 #: app/views/box_organizer/index.html.erb:1
 msgid "Editing sideboxes"
@@ -6069,9 +6016,8 @@ msgid &quot;Manage Products/Services&quot;
 msgstr "Administrar productos y servicios"
  
 #: app/views/catalog/index.html.erb:28
-#, fuzzy
 msgid "Highlighted product"
-msgstr "Destacar este producto"
+msgstr "Producto destacado"
  
 #: app/views/catalog/index.html.erb:33
 #: app/views/cms/_text_editor_sidebar.html.erb:5
@@ -6147,9 +6093,8 @@ msgid &quot;Display in the menu&quot;
 msgstr "Mostrar en el menú"
  
 #: app/views/categories/_form.html.erb:24
-#, fuzzy
 msgid "Pick a color"
-msgstr "Mostrar el color"
+msgstr "Elige un color"
  
 #: app/views/categories/_form.html.erb:28
 #: app/views/manage_products/_form.html.erb:11
@@ -6215,7 +6160,7 @@ msgstr &quot;Descripción:&quot;
 #: app/views/cms/_blog.html.erb:60
 #, fuzzy
 msgid "Cover image:"
-msgstr "Sin imagen"
+msgstr "Imagen de portada:"
  
 #: app/views/cms/_blog.html.erb:61
 #: app/views/manage_products/_edit_image.html.erb:8
@@ -6234,11 +6179,12 @@ msgstr &quot;Primer párrafo&quot;
 #: app/views/cms/_blog.html.erb:68
 #, fuzzy
 msgid "First paragraph, with post picture"
-msgstr "Primer párrafo"
+msgstr "Primer párrafo, con imagen de la publicación"
  
 #: app/views/cms/_blog.html.erb:69
+#, fuzzy
 msgid "Title, Image, Lead"
-msgstr ""
+msgstr "Título, Imagen, Lead"
  
 #: app/views/cms/_blog.html.erb:72 app/views/cms/_forum.html.erb:15
 msgid "Posts per page:"
@@ -6287,15 +6233,15 @@ msgid &quot;Drag images to add them to the text.&quot;
 msgstr "Arrastrar imágenes para añadirlas al texto."
  
 #: app/views/cms/_drag_and_drop_note.html.erb:4
-#, fuzzy
 msgid "Click on file names to add links to the text."
-msgstr "Arrastrar imágenes para añadirlas al texto."
+msgstr "Haz clic en los nombres de los archivos para añadir enlaces al texto."
  
 #: app/views/cms/_enterprise_homepage.html.erb:3
 msgid "Text"
 msgstr "Texto"
  
 #: app/views/cms/_event.html.erb:11
+#, fuzzy
 msgid "%Y-%m-%d %H:%M"
 msgstr ""
  
@@ -6310,7 +6256,7 @@ msgstr &quot;Mi foro&quot;
 #: app/views/cms/_forum.html.erb:17
 #, fuzzy
 msgid "Has terms of use:"
-msgstr "términos de uso"
+msgstr "Tiene términos de uso:"
  
 #: app/views/cms/_forum.html.erb:20
 #, fuzzy
@@ -6321,7 +6267,7 @@ msgstr &quot;Términos de uso&quot;
 #: app/views/cms/_general_fields.html.erb:1
 #, fuzzy
 msgid "Parent folder:"
-msgstr "Carpeta padre"
+msgstr "Carpeta padre:"
  
 #: app/views/cms/_general_fields.html.erb:3
 msgid "License"
@@ -6330,18 +6276,17 @@ msgstr &quot;Licencia&quot;
 #: app/views/cms/_link_article.html.erb:3
 #, fuzzy
 msgid "Reference"
-msgstr "Dirección: "
+msgstr "Referencia"
  
 #: app/views/cms/_media_new_folder.html.erb:1
-#, fuzzy
 msgid "Create new folder"
-msgstr "Crear nuevo rol"
+msgstr "Crear nueva carpeta"
  
 # contexto de parent
 #: app/views/cms/_media_new_folder.html.erb:3
 #, fuzzy
 msgid "Choose parent folder:"
-msgstr "Carpeta padre"
+msgstr "Eligir carpeta principal:"
  
 #: app/views/cms/_media_new_folder.html.erb:11
 #: app/views/manage_products/_form.html.erb:6
@@ -6392,9 +6337,8 @@ msgid &quot;Add to the text&quot;
 msgstr "Añadir al texto"
  
 #: app/views/cms/_text_editor_sidebar.html.erb:8
-#, fuzzy
 msgid "Show/Hide"
-msgstr "Mostrar"
+msgstr "Mostrar/Esconder"
  
 #: app/views/cms/_text_editor_sidebar.html.erb:8
 msgid "Insert media"
@@ -6407,24 +6351,21 @@ msgstr &quot;Selecciona la carpeta para subir los archivos:&quot;
  
 # contexto de parent
 #: app/views/cms/_text_editor_sidebar.html.erb:21
-#, fuzzy
 msgid "New folder"
-msgstr "Carpeta padre"
+msgstr "Nueva carpeta"
  
 #: app/views/cms/_text_editor_sidebar.html.erb:26
-#, fuzzy
 msgid "Hide all uploads"
-msgstr "Ver todos los productos"
+msgstr "Esconder todos los archivos subidos"
  
 #: app/views/cms/_text_editor_sidebar.html.erb:27
-#, fuzzy
 msgid "Show all uploads"
-msgstr "Ver todos los productos"
+msgstr "Ver todos los archivos subidos"
  
 #: app/views/cms/_text_editor_sidebar.html.erb:33
 #, fuzzy
 msgid "Recent media"
-msgstr "Insertar multimedia"
+msgstr "Media reciente"
  
 #: app/views/cms/_textile_quick_reference.html.erb:3
 msgid "Textile markup quick reference"
@@ -6511,7 +6452,7 @@ msgstr &quot;Usar como página de inicio&quot;
 #: app/views/cms/_view_items.html.erb:23 app/views/cms/view.html.erb:10
 #, fuzzy
 msgid "Reset homepage"
-msgstr "Usar como página de inicio"
+msgstr "Reajustar página de inicio"
  
 #: app/views/cms/destroy.html.erb:1
 msgid "Delete: %s"
@@ -6566,40 +6507,44 @@ msgid &quot;Separate tags with commas&quot;
 msgstr "Separa las etiquetas con comas"
  
 #: app/views/cms/publish.html.erb:3
-#, fuzzy
 msgid "Where do you want to publish this article?"
-msgstr "Selecciona los grupos donde quieres publicar tu artículo"
+msgstr "¿Dónde quieres publicar este artículo?"
  
 #: app/views/cms/publish.html.erb:7
 msgid "There were errors with the following communities: "
 msgstr "Hubo errores con las siguientes comunidades: "
  
 #: app/views/cms/publish.html.erb:22
-#, fuzzy
 msgid "Publish this article on your profile"
-msgstr "Publicar tu artículo en el portal comunitario"
+msgstr "Publicar este artículo en tu perfil"
  
 #: app/views/cms/publish.html.erb:23
+#, fuzzy
 msgid ""
 "You can publish this article on your profile where your friends and "
 "followers will see."
 msgstr ""
+"Puedes publicar este artículo en tu perfil donde tus amigos y seguidores lo "
+"verán."
  
 #: app/views/cms/publish.html.erb:37
 #, fuzzy
 msgid "Publish this article on communities you are part of"
-msgstr "Publicar tu artículo en el portal comunitario"
+msgstr "Publicar este artículo en comunidades de que eres parte"
  
 #: app/views/cms/publish.html.erb:38
+#, fuzzy
 msgid ""
 "You can submit this article to one or more communities you are a member of, "
 "just search for the community below."
 msgstr ""
+"Puedes entregar este artículo en una o más comunidades de que eres parte, "
+"sólo hay que buscar la comunidad abajo."
  
 #: app/views/cms/publish.html.erb:42
 #, fuzzy
 msgid "Type in a search for your community"
-msgstr "Escribe un término de búsqueda para los usuarios"
+msgstr "Escribe un término de búsqueda para tu comunidad"
  
 #: app/views/cms/publish.html.erb:54
 #: app/views/cms/publish_on_portal_community.html.erb:2
@@ -6607,10 +6552,13 @@ msgid &quot;Publish your article on portal community&quot;
 msgstr "Publicar tu artículo en el portal comunitario"
  
 #: app/views/cms/publish.html.erb:55
+#, fuzzy
 msgid ""
 "You can suggest this article to the portal community, where it can show up "
 "on the homepage."
 msgstr ""
+"Puedes sugerir este artículo para la comunidad del portal, donde puede "
+"aparecer en la página de incio."
  
 #: app/views/cms/publish_on_portal_community.html.erb:14
 msgid "There is no portal community in this environment."
@@ -6690,10 +6638,9 @@ msgstr &quot;Gestión de contenido&quot;
 #: app/views/cms/view.html.erb:7
 #, fuzzy
 msgid "Profile homepage:"
-msgstr "Imagen de perfil"
+msgstr "Página de incio del perfil:"
  
 #: app/views/cms/view.html.erb:12
-#, fuzzy
 msgid "Profile Information"
 msgstr "Información del perfil"
  
@@ -6793,17 +6740,15 @@ msgid &quot;Post comment&quot;
 msgstr "Publicar comentario"
  
 #: app/views/comment_notifier/mail_to_followers.html.erb:1
-#, fuzzy
 msgid "Hi!"
-msgstr "¡Hola %s!"
+msgstr "¡Hola!"
  
 #: app/views/comment_notifier/mail_to_followers.html.erb:3
-#, fuzzy
 msgid ""
 "%{sender} (%{sender_link}) commented on the content \"%{article_title}\"."
 msgstr ""
-"%{sender} (%{sender_link}) creó un nuevo comentario en tu artículo"
-"\"%{article_title}\"."
+"%{sender} (%{sender_link}) creó un nuevo comentario en el artículo\""
+"%{article_title}\"."
  
 #: app/views/comment_notifier/mail_to_followers.html.erb:5
 #: app/views/comment_notifier/notification.text.erb:5
@@ -6816,14 +6761,14 @@ msgid &quot;Comment:&quot;
 msgstr "Comentario: "
  
 #: app/views/comment_notifier/mail_to_followers.html.erb:12
-#, fuzzy
 msgid "Click on the address below to view this comment:"
-msgstr "Accede a la dirección de abajo para ver este comentario:"
+msgstr "Haz clic en la dirección de abajo para ver este comentario:"
  
 #: app/views/comment_notifier/mail_to_followers.html.erb:15
-#, fuzzy
 msgid "Click on the address below to cancel the notification of new comments:"
-msgstr "Accede a la dirección de abajo para ver este comentario:"
+msgstr ""
+"Haz clic en la dirección de abajo para cancelar las notificaciones de nuevos "
+"comentarios:"
  
 #: app/views/comment_notifier/mail_to_followers.html.erb:18
 #: app/views/comment_notifier/notification.text.erb:15
@@ -6880,13 +6825,12 @@ msgid &quot;Send an e-mail to %s&quot;
 msgstr "Enviar correo electrónico a %s"
  
 #: app/views/contact/new.html.erb:4
-#, fuzzy
 msgid "Send an e-mail to administrators"
-msgstr "Enviar correo electrónico a %s"
+msgstr "Enviar un correo electrónico a los administradores"
  
 #: app/views/contact/new.html.erb:6
 msgid "The e-mail will be sent to the administrators of '%s'"
-msgstr ""
+msgstr "Se va a enviar el correo electrónico a los administradores de '%s'"
  
 #: app/views/contact/new.html.erb:31
 msgid "I want to receive a copy of the message in my e-mail."
@@ -6918,34 +6862,34 @@ msgstr &quot;Sugerir un artículo&quot;
  
 #: app/views/content_viewer/_article_toolbar.html.erb:51
 #: app/views/content_viewer/versioned_article.html.erb:8
-#, fuzzy
 msgid "All versions"
-msgstr "Ver todos los productos"
+msgstr "Todas las versiones"
  
 #: app/views/content_viewer/_article_toolbar.html.erb:65
-#, fuzzy
 msgid "RSS feed"
 msgstr "Noticias RSS"
  
 #: app/views/content_viewer/_confirm_unfollow.html.erb:3
 msgid "Cancel notification of new comments"
-msgstr ""
+msgstr "Cancelar notificaciones de nuevos comentarios"
  
 #: app/views/content_viewer/_confirm_unfollow.html.erb:4
+#, fuzzy
 msgid ""
 "Fill in the following field with your e-mail if you don't want to be "
 "notified when this content receives new comments anymore."
 msgstr ""
+"Rellene el siguiente campo con tu correo electrónico si ya no quieres "
+"notificaciones cuando este artículo reciba nuevos comentarios."
  
 #: app/views/content_viewer/_confirm_unfollow.html.erb:7
-#, fuzzy
 msgid "Enter your e-Mail"
-msgstr "Escribe tu comentario"
+msgstr "Introduce tu correo electrónico"
  
 #: app/views/content_viewer/_confirm_unfollow.html.erb:9
 #, fuzzy
 msgid "Cancel notifications for e-mail above"
-msgstr "Cancela recuperación de correos electronicos"
+msgstr "Cancelar notificaciones para el correo electrónico arriba"
  
 #: app/views/content_viewer/_publishing_info.html.erb:19
 msgid "Viewed one time"
@@ -6955,24 +6899,27 @@ msgstr[1] &quot;Visto %{num} veces&quot;
  
 #: app/views/content_viewer/_publishing_info.html.erb:25
 #: app/views/content_viewer/versioned_article.html.erb:33
+#, fuzzy
 msgid "Licensed under %s"
-msgstr ""
+msgstr "Licenciada debajo %s"
  
 #: app/views/content_viewer/article_versions.html.erb:2
 #, fuzzy
 msgid "Go back to latest version"
-msgstr "Regresar a %s"
+msgstr "Regresar a la version anterior"
  
 #: app/views/content_viewer/article_versions.html.erb:7
+#, fuzzy
 msgid ""
 "This is the list of all versions of this content. Select a version to see it "
 "and then revert to it."
 msgstr ""
+"Esta es la lista de todas las versiones de este contenido. Elige una versión "
+"para verla y luego revertirla."
  
 #: app/views/content_viewer/article_versions.html.erb:15
-#, fuzzy
 msgid "Version %s"
-msgstr "Permisos"
+msgstr "Versión %s"
  
 #: app/views/content_viewer/article_versions.html.erb:16
 #: app/views/profile_themes/index.html.erb:16
@@ -6984,11 +6931,11 @@ msgstr &quot;(actual)&quot;
 #: app/views/content_viewer/article_versions.html.erb:17
 #, fuzzy
 msgid "by %{author}"
-msgstr "Autor"
+msgstr "Por %{author}"
  
 #: app/views/content_viewer/article_versions.html.erb:56
 msgid "Show differences between selected versions"
-msgstr ""
+msgstr "Mostrar las diferencias entre las versiones seleccionadas"
  
 #: app/views/content_viewer/blog_page.html.erb:3
 msgid "(external feed was not loaded yet)"
@@ -7021,45 +6968,43 @@ msgstr &quot;Regresar a la galeria&quot;
  
 #: app/views/content_viewer/versioned_article.html.erb:2
 #: app/views/content_viewer/versions_diff.html.erb:2
-#, fuzzy
 msgid "Back to the versions"
-msgstr "Regresar a la lista de productos"
+msgstr "Regresar a las versiones"
  
 #: app/views/content_viewer/versioned_article.html.erb:11
-#, fuzzy
 msgid "Revert to this version"
-msgstr "No hay eventos para esta fecha"
+msgstr "Revertir a esta versión"
  
 #: app/views/content_viewer/versioned_article.html.erb:16
-#, fuzzy
 msgid "Go to latest version"
-msgstr "No hay eventos para esta fecha"
+msgstr "Ir a la última versión"
  
 #: app/views/content_viewer/versioned_article.html.erb:20
+#, fuzzy
 msgid "Version %{version} - %{author} on %{date}"
-msgstr ""
+msgstr "Versión %{version} - %{author} en %{date}"
  
 #: app/views/content_viewer/versioned_article.html.erb:24
 msgid "This is not the latest version of this content."
 msgstr ""
  
 #: app/views/content_viewer/versions_diff.html.erb:5
-#, fuzzy
 msgid "Changes on \"%s\""
-msgstr "Cambiando rol de %s"
+msgstr "Cambios en \"%s\""
  
 #: app/views/content_viewer/versions_diff.html.erb:7
+#, fuzzy
 msgid "Changes from %s &rarr; %s"
-msgstr ""
+msgstr "Cambios de %s &rarr; 1 %s"
  
 #: app/views/content_viewer/versions_diff.html.erb:12
+#, fuzzy
 msgid "These versions range have no differences."
-msgstr ""
+msgstr "Estas versiones no tienen diferencias."
  
 #: app/views/content_viewer/view_page.html.erb:13
-#, fuzzy
 msgid "comments"
-msgstr "comentario"
+msgstr "comentarios"
  
 #: app/views/content_viewer/view_page.html.erb:14
 msgid "No comments yet"
@@ -7074,14 +7019,12 @@ msgid &quot;This article&#39;s tags:&quot;
 msgstr "Etiquetas de este artículo:"
  
 #: app/views/content_viewer/view_page.html.erb:76
-#, fuzzy
 msgid "Oldest first"
-msgstr "Fecha (más antiguo primero)"
+msgstr "Más antiguo primero"
  
 #: app/views/content_viewer/view_page.html.erb:76
-#, fuzzy
 msgid "Newest first"
-msgstr "Fecha (más reciente primero)"
+msgstr "Más reciente primero"
  
 #: app/views/doc/_path.html.erb:2
 msgid "You are here:"
@@ -7183,7 +7126,7 @@ msgstr &quot;Ahora ya puedes administrar tu empresa.&quot;
 #: app/views/enterprise_registration/creation.html.erb:5
 #: app/views/memberships/welcome.html.erb:5
 msgid "What can I do with a %s?"
-msgstr ""
+msgstr "¿Qué puedo hacer con un %s?"
  
 #: app/views/enterprise_registration/select_validator.html.erb:1
 msgid "Enterprise registration: validator organization"
@@ -7468,9 +7411,8 @@ msgstr &quot;¿Mostrar al crear?&quot;
 #: app/views/features/_manage_community_fields.html.erb:13
 #: app/views/features/_manage_enterprise_fields.html.erb:13
 #: app/views/features/_manage_person_fields.html.erb:13
-#, fuzzy
 msgid "Check/Uncheck All"
-msgstr "Desmarcar todos"
+msgstr "Marcar/Desmarcar todos"
  
 #: app/views/features/_manage_community_fields.html.erb:60
 #: app/views/features/_manage_enterprise_fields.html.erb:60
@@ -7529,13 +7471,15 @@ msgid &quot;Configure features&quot;
 msgstr "Configurar características"
  
 #: app/views/features/index.html.erb:29
+#, fuzzy
 msgid "Page to redirect after signup"
-msgstr ""
+msgstr "Página se va a redirigir después de la inscripción"
  
 #: app/views/features/index.html.erb:32
 #: app/views/profile_editor/_redirection_after_login.html.erb:5
+#, fuzzy
 msgid "Page to redirect after login"
-msgstr ""
+msgstr "La página se va a redirigir después de iniciar una sesión"
  
 #: app/views/features/index.html.erb:36
 msgid "Organization Approval Method"
@@ -7549,37 +7493,36 @@ msgstr &quot;Miembros: %s&quot;
 #: app/views/features/index.html.erb:43
 #, fuzzy
 msgid "Enable whitelist"
-msgstr "Habilitar correo electrónico"
+msgstr "Habilitar la lista blanca"
  
 #: app/views/features/index.html.erb:46
 #, fuzzy
 msgid "Allow these people to access this environment:"
-msgstr "¿Deseas ver otras personas en este entorno?"
+msgstr "¿Deseas permitir que otras personas puedan acceder este entorno?"
  
 #: app/views/features/manage_fields.html.erb:1
 #, fuzzy
 msgid "Manage fields displayed for profiles"
-msgstr "Administrar roles de usuarios"
+msgstr "Administrar campos mostrados para perfiles"
  
 #: app/views/features/manage_fields.html.erb:6
 #, fuzzy
 msgid "Person's fields"
-msgstr "Manejar los campos de personas"
+msgstr "Los campos de personas"
  
 #: app/views/features/manage_fields.html.erb:8
 #, fuzzy
 msgid "Community's fields"
-msgstr "Perfil de la comunidad"
+msgstr "Campos de la comunidad"
  
 #: app/views/features/manage_fields.html.erb:11
 #, fuzzy
 msgid "Enterprise's fields"
-msgstr "Perfil de empresas"
+msgstr "Campos de empresas"
  
 #: app/views/file_presenter/_generic.html.erb:5
-#, fuzzy
 msgid "Download"
-msgstr "Abajo"
+msgstr "Descargar"
  
 #: app/views/file_presenter/_image.html.erb:7
 #: app/views/file_presenter/_image.html.erb:9
@@ -7608,9 +7551,8 @@ msgstr &quot;Contenido etiquetado con \&quot;%s\&quot;&quot;
  
 #: app/views/friends/connections.html.erb:4
 #: app/views/friends/suggest.html.erb:4
-#, fuzzy
 msgid "Go to friends list"
-msgstr "No tienes nuevos amigos aun."
+msgstr "Ir a la lista de amigos"
  
 #: app/views/friends/index.html.erb:3 app/views/profile/friends.html.erb:3
 msgid "%s's friends"
@@ -7633,12 +7575,11 @@ msgstr &quot;Encontrar gente&quot;
 #: app/views/profile/friends.html.erb:21
 #, fuzzy
 msgid "Invite people"
-msgstr "Invitar miembros"
+msgstr "Invitar gente"
  
 #: app/views/friends/index.html.erb:31
-#, fuzzy
 msgid "Friends suggestions"
-msgstr "Sugerencia de artículos"
+msgstr "Sugerencias de amigos"
  
 #: app/views/friends/remove.html.erb:3
 msgid "Removing friend: %s"
@@ -7657,14 +7598,12 @@ msgstr &quot;&quot;
 "también quiera eliminarte de su lista de amigos."
  
 #: app/views/friends/remove_suggestion.html.erb:2
-#, fuzzy
 msgid "Removing suggestion for friend: %s"
-msgstr "Eliminando amigo: %s"
+msgstr "Eliminando sugerencia de amigo: %s"
  
 #: app/views/friends/suggest.html.erb:1
-#, fuzzy
 msgid "Friends suggestions for %s"
-msgstr "Ajustes de perfil para %s"
+msgstr "Sugerencias de amigos para %s"
  
 #: app/views/home/index.html.erb:2
 msgid "News"
@@ -7717,15 +7656,18 @@ msgid &quot;user&quot;
 msgstr "usuario"
  
 #: app/views/home/welcome.html.erb:15
+#, fuzzy
 msgid "Wait for admin approvement!"
-msgstr ""
+msgstr "¡Espera que la admin lo apruebe!"
  
 #: app/views/home/welcome.html.erb:16
+#, fuzzy
 msgid "The administrators will evaluate your signup request for approvement."
 msgstr ""
+"Los administradores van a evaluar tu solicitud de inscripción para "
+"aprobación."
  
 #: app/views/home/welcome.html.erb:17
-#, fuzzy
 msgid "You won't appear as %s until your account is approved."
 msgstr "No aparecerás como %s hasta que tu cuenta sea confirmada."
  
@@ -7734,14 +7676,18 @@ msgid &quot;What to do next?&quot;
 msgstr "¿Qué hacer después?"
  
 #: app/views/home/welcome.html.erb:20
+#, fuzzy
 msgid "Access your %s and see your face on the network!"
-msgstr ""
+msgstr "¡Acceder tu %s y ver tu cara en la red!"
  
 #: app/views/home/welcome.html.erb:22
+#, fuzzy
 msgid ""
 "You can also explore your %s to customize your profile. Here are some %s on "
 "what you can do there."
 msgstr ""
+"También puedes explorar tu %s para personalizar tu perfil. Aquí están "
+"algunos %s de qué puedes hacer allí."
  
 #: app/views/home/welcome.html.erb:23
 #: app/views/profile_editor/index.html.erb:6
@@ -7750,7 +7696,7 @@ msgstr &quot;Panel de control&quot;
  
 #: app/views/home/welcome.html.erb:24
 msgid "tips"
-msgstr ""
+msgstr "consejos"
  
 #: app/views/home/welcome.html.erb:25
 msgid "Invite and find"
@@ -7777,7 +7723,7 @@ msgstr &quot;¡Comienza explorando y diviértete!&quot;
  
 #: app/views/home/welcome.html.erb:29
 msgid "What can I do as a %s?"
-msgstr ""
+msgstr "¿Qué puedo hacer como un %s?"
  
 #: app/views/invite/_dialog_wait_loading.html.erb:8
 msgid "Please, wait..."
@@ -7848,7 +7794,7 @@ msgstr &quot;&quot;
 #: app/views/invite/invite_friends.html.erb:2
 #, fuzzy
 msgid "Ask for friendship"
-msgstr "%s amigos"
+msgstr "Pedir la amistad"
  
 #: app/views/invite/invite_friends.html.erb:3
 msgid "You can search for user profiles and ask them to become your friends."
@@ -13,8 +13,8 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.3~rc2-8-g01ea9f7\n"
 "POT-Creation-Date: 2015-11-04 12:36-0300\n"
-"PO-Revision-Date: 2016-03-14 15:58+0000\n"
-"Last-Translator: Eduardo Vital <vitaldu@gmail.com>\n"
+"PO-Revision-Date: 2016-06-20 20:14+0000\n"
+"Last-Translator: Gabriel Silva <gabriel93.silva@gmail.com>\n"
 "Language-Team: Portuguese "
 "<https://hosted.weblate.org/projects/noosfero/noosfero/pt/>\n"
 "Language: pt\n"
@@ -22,7 +22,7 @@ msgstr &quot;&quot;
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.5\n"
+"X-Generator: Weblate 2.7-dev\n"
  
 #: app/models/approve_comment.rb:17
 msgid "Anonymous"
@@ -4141,7 +4141,7 @@ msgstr &quot;%s não pôde ser desabilitado&quot;
  
 #: app/controllers/admin/organizations_controller.rb:52
 msgid "%s removed"
-msgstr "% foi removido"
+msgstr "%s foi removido"
  
 #: app/controllers/admin/organizations_controller.rb:54
 msgid "%s could not be removed"
@@ -2042,16 +2042,6 @@ table.cms-articles .article-name {
   font-weight: bold;
 }
  
-#theme-footer #language-chooser {
-  text-align: left;
-}
-
-/* armengue */
-/* didn't find why .no-boxes has bigger width than its parent */
-.no-boxes {
-  width: 96%;
-}
-
 @media screen and (min-width:1200px) {
   #top-bar a.icon-help {
     font-size: 0;
@@ -53,6 +53,16 @@ class BlocksTest &lt; ActiveSupport::TestCase
     assert_equal 403, last_response.status
   end
  
+  should 'get an invisible profile block for an user with permission' do
+    profile = fast_create(Profile, public_profile: false)
+    profile.add_admin(person)
+    box = fast_create(Box, :owner_id => profile.id, :owner_type => Profile.name)
+    block = fast_create(Block, box_id: box.id)
+    get "/api/v1/blocks/#{block.id}?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal block.id, json["block"]["id"]
+  end
+
   should 'get a block for an user with permission in a private profile' do
     profile = fast_create(Profile, public_profile: false)
     profile.add_admin(person)
@@ -94,4 +104,41 @@ class BlocksTest &lt; ActiveSupport::TestCase
     assert_equal "<div>test</div>", json["block"]["api_content"]["html"]
   end
  
+  should 'not allow block edition when user has not the permission for profile' do
+    box = fast_create(Box, :owner_id => profile.id, :owner_type => Profile.name)
+    block = fast_create(Block, box_id: box.id)
+    post "/api/v1/blocks/#{block.id}?#{params.to_query}"
+    assert_equal 403, last_response.status
+  end
+
+  should 'allow block edition when user has permission to edit profile design' do
+    box = fast_create(Box, :owner_id => profile.id, :owner_type => Profile.name)
+    block = fast_create(Block, box_id: box.id)
+    give_permission(person, 'edit_profile_design', profile)
+    params[:block] = {title: 'block title'}
+    post "/api/v1/blocks/#{block.id}?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal 201, last_response.status
+    assert_equal 'block title', json['block']['title']
+  end
+
+  should 'save custom block parameters' do
+    box = fast_create(Box, :owner_id => profile.id, :owner_type => Profile.name)
+    block = fast_create(RawHTMLBlock, box_id: box.id)
+    Environment.default.add_admin(person)
+    params[:block] = {title: 'block title', html: "block content"}
+    post "/api/v1/blocks/#{block.id}?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal 201, last_response.status
+    assert_equal 'block content', json['block']['api_content']['html']
+  end
+
+  should 'list block permissions when get a block' do
+    box = fast_create(Box, :owner_id => profile.id, :owner_type => Profile.name)
+    block = fast_create(Block, box_id: box.id)
+    give_permission(person, 'edit_profile_design', profile)
+    get "/api/v1/blocks/#{block.id}?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_includes json["block"]["permissions"], 'allow_edit'
+  end
 end
@@ -81,6 +81,18 @@ class BoxesTest &lt; ActiveSupport::TestCase
     assert_equal [block.id], json["boxes"].first["blocks"].map {|b| b['id']}
   end
  
+  should 'list a block with not logged in display_user for an admin user' do
+    profile = fast_create(Profile)
+    profile.add_admin(person)
+    box = fast_create(Box, :owner_id => profile.id, :owner_type => Profile.name)
+    block = fast_create(Block, box_id: box.id)
+    block.display_user = 'not_logged'
+    block.save!
+    get "/api/v1/profiles/#{profile.id}/boxes?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal [block.id], json["boxes"].first["blocks"].map {|b| b['id']}
+  end
+
   should 'not list boxes for user without permission' do
     profile = fast_create(Profile, public_profile: false)
     box = fast_create(Box, :owner_id => profile.id, :owner_type => Profile.name)
@@ -191,4 +191,13 @@ class ProfilesTest &lt; ActiveSupport::TestCase
     post "/api/v1/profiles/#{profile.id}?#{params.to_query}"
     assert_equal 403, last_response.status
   end
+
+  should 'list profile permissions when get an article' do
+    login_api
+    profile = fast_create(Profile)
+    give_permission(person, 'post_content', profile)
+    get "/api/v1/profiles/#{profile.id}?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_includes json["permissions"], 'allow_post_content'
+  end
 end
@@ -175,4 +175,15 @@ class SafeStringsTest &lt; ActionDispatch::IntegrationTest
     assert_select '.icon-selector .icon-edit'
   end
  
+  should 'not escape read more link to article on display short format' do
+    profile = fast_create Profile
+    blog = fast_create Blog, :name => 'Blog', :profile_id => profile.id
+    fast_create(TinyMceArticle, :name => "Post Test", :profile_id => profile.id, :parent_id => blog.id, :accept_comments => false, :body => '<p>Lorem ipsum dolor sit amet</p>')
+    blog.update_attribute(:visualization_format, 'short')
+
+    get "/#{profile.identifier}/blog"
+    assert_tag :tag => 'div', :attributes => {:class => 'read-more'}, :child => {:tag => 'a', :content => 'Read more'}
+  end
+
+
 end
@@ -8,7 +8,7 @@ require &#39;rails/test_help&#39;
  
 require 'mocha'
 require 'mocha/mini_test'
-
+require "minitest/spec"
 require "minitest/reporters"
 Minitest::Reporters.use! Minitest::Reporters::ProgressReporter.new, ENV, Minitest.backtrace_filter
  
@@ -52,19 +52,13 @@ class ActiveSupport::TestCase
   # then set this back to true.
   self.use_instantiated_fixtures  = false
  
-  # Add more helper methods to be used by all tests here...
+  extend Test::Should
  
-  # for fixture_file_upload
   include ActionDispatch::TestProcess
-
   include Noosfero::Factory
-
   include AuthenticatedTestHelper
-
   include PerformanceHelper
  
-  extend Test::Should
-
   fixtures :environments, :roles
  
   def self.all_fixtures
@@ -421,4 +421,60 @@ class BlockTest &lt; ActiveSupport::TestCase
     block.expects(:display_to_user?).returns(false)
     assert !block.visible_to_user?(nil)
   end
+
+  should 'not allow block edition when user has not the permission for profile design' do
+    block = Block.new
+    profile = fast_create(Profile)
+    block.stubs(:owner).returns(profile)
+    person = create_user('person_one').person
+    assert !block.allow_edit?(person)
+  end
+
+  should 'allow block edition when user has permission to edit profile design' do
+    block = Block.new
+    profile = fast_create(Profile)
+    block.stubs(:owner).returns(profile)
+    person = create_user('person_one').person
+    give_permission(person, 'edit_profile_design', profile)
+    assert block.allow_edit?(person)
+  end
+
+  should 'not allow block edition when user is nil' do
+    block = Block.new
+    assert !block.allow_edit?(nil)
+  end
+
+  should 'not allow block edition when block is not editable' do
+    block = Block.new
+    person = create_user('person_one').person
+    block.expects(:editable?).returns(false)
+    assert !block.allow_edit?(person)
+  end
+
+  should 'allow block edition when block is not editable but user is admin' do
+    block = Block.new
+    profile = fast_create(Profile)
+    block.stubs(:owner).returns(profile)
+    person = create_user('person_one').person
+    Environment.default.add_admin(person)
+    block.stubs(:editable?).returns(false)
+    assert block.allow_edit?(person)
+  end
+
+  should 'not allow block edition when user has not the permission for environment design' do
+    block = Block.new
+    environment = Environment.default
+    block.stubs(:owner).returns(environment)
+    person = create_user('person_one').person
+    assert !block.allow_edit?(person)
+  end
+
+  should 'allow block edition when user has the permission for environment design' do
+    block = Block.new
+    environment = Environment.default
+    block.stubs(:owner).returns(environment)
+    person = create_user('person_one').person
+    give_permission(person, 'edit_environment_design', environment)
+    assert block.allow_edit?(person)
+  end
 end
@@ -2204,4 +2204,24 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert_not_includes profiles, p3
     assert_not_includes profiles, p4
   end
+  
+  ['post_content', 'edit_profile', 'destroy_profile'].each do |permission|
+    should "return true in #{permission} when user has this permission" do
+      profile = fast_create(Profile)
+      person = fast_create(Person)
+      give_permission(person, permission, profile)
+      assert profile.send("allow_#{permission.gsub(/_profile/,'')}?", person)
+    end
+
+    should "return false in #{permission} when user doesn't have this permission" do
+      profile = fast_create(Profile)
+      person = fast_create(Person)
+      assert !profile.send("allow_#{permission.gsub(/_profile/,'')}?", person)
+    end
+
+    should "return false in #{permission} when user is nil" do
+      profile = fast_create(Profile)
+      assert !profile.send("allow_#{permission.gsub(/_profile/,'')}?", nil)
+    end
+  end
 end
...	...	@@ -88,13 +88,16 @@ module Api
88	88	expose :id, :type, :settings, :position, :enabled
89	89	expose :mirror, :mirror_block_id, :title
90	90	expose :api_content, if: lambda { \|object, options\| options[:display_api_content] \|\| object.display_api_content_by_default? }
	91	+ expose :permissions do \|block, options\|
	92	+ Entities.permissions_for_entity(block, options[:current_person], :allow_edit?)
	93	+ end
91	94	end
92	95
93	96	class Box < Entity
94	97	root 'boxes', 'box'
95	98	expose :id, :position
96	99	expose :blocks, :using => Block do \|box, options\|
97		- box.blocks.select {\|block\| block.visible_to_user?(options[:current_person]) }
	100	+ box.blocks.select {\|block\| block.visible_to_user?(options[:current_person]) \|\| block.allow_edit?(options[:current_person]) }
98	101	end
99	102	end
100	103
...	...	@@ -121,6 +124,10 @@ module Api
121	124	expose :type
122	125	expose :custom_header
123	126	expose :custom_footer
	127	+ expose :permissions do \|profile, options\|
	128	+ Entities.permissions_for_entity(profile, options[:current_person],
	129	+ :allow_post_content?, :allow_edit?, :allow_destroy?)
	130	+ end
124	131	end
125	132
126	133	class UserBasic < Entity
...	...
...	...	@@ -5,8 +5,15 @@ module Api
5	5	resource :blocks do
6	6	get ':id' do
7	7	block = Block.find(params["id"])
8		- return forbidden! unless block.visible_to_user?(current_person)
9		- present block, :with => Entities::Block, display_api_content: true
	8	+ return forbidden! unless block.visible_to_user?(current_person) \|\| block.allow_edit?(current_person)
	9	+ present block, :with => Entities::Block, display_api_content: true, current_person: current_person
	10	+ end
	11	+
	12	+ post ':id' do
	13	+ block = Block.find(params["id"])
	14	+ return forbidden! unless block.allow_edit?(current_person)
	15	+ block.update_attributes!(params[:block])
	16	+ present block, :with => Entities::Block, display_api_content: true, current_person: current_person
10	17	end
11	18	end
12	19	end
...	...
...	...	@@ -27,7 +27,7 @@ module Api
27	27	post ':id' do
28	28	authenticate!
29	29	profile = environment.profiles.find_by(id: params[:id])
30		- return forbidden! unless current_person.has_permission?(:edit_profile, profile)
	30	+ return forbidden! unless profile.allow_edit?(current_person)
31	31	profile.update_attributes!(params[:profile])
32	32	present profile, :with => Entities::Profile, :current_person => current_person
33	33	end
...	...	@@ -39,7 +39,7 @@ module Api
39	39
40	40	not_found! if profile.blank?
41	41
42		- if current_person.has_permission?(:destroy_profile, profile)
	42	+ if profile.allow_destroy?(current_person)
43	43	profile.destroy
44	44	else
45	45	forbidden!
...	...
...	...	@@ -723,11 +723,11 @@ module ApplicationHelper
723	723	def display_short_format(article, options={})
724	724	options[:comments_link] \|\|= true
725	725	options[:read_more_link] \|\|= true
	726	+ lead_links = (options[:comments_link] ? link_to_comments(article) : '') + (options[:read_more_link] ? reference_to_article( _('Read more'), article) : '')
726	727	html = content_tag('div',
727	728	article.lead +
728	729	content_tag('div',
729		- (options[:comments_link] ? link_to_comments(article) : '') +
730		- (options[:read_more_link] ? reference_to_article( _('Read more'), article) : ''),
	730	+ lead_links.html_safe,
731	731	:class => 'read-more'
732	732	),
733	733	:class => 'short-post'
...	...
...	...	@@ -567,7 +567,7 @@ class Article < ApplicationRecord
567	567
568	568	def allow_post_content?(user = nil)
569	569	return true if allow_edit_topic?(user)
570		- user && (user.has_permission?('post_content', profile) \|\| allow_publish_content?(user) && (user == author))
	570	+ user && (profile.allow_post_content?(user) \|\| allow_publish_content?(user) && (user == author))
571	571	end
572	572
573	573	def allow_publish_content?(user = nil)
...	...
...	...	@@ -309,6 +309,16 @@ class Block < ApplicationRecord
309	309	false
310	310	end
311	311
	312	+ def allow_edit?(person)
	313	+ return false if person.nil? \|\| (!person.is_admin? && !editable?(person))
	314	+ if self.owner.kind_of?(Profile)
	315	+ return person.has_permission?(:edit_profile_design, owner)
	316	+ elsif self.owner.kind_of?(Environment)
	317	+ return person.has_permission?(:edit_environment_design, owner)
	318	+ end
	319	+ false
	320	+ end
	321	+
312	322	private
313	323
314	324	def home_page_path
...	...
...	...	@@ -1137,4 +1137,15 @@ private :generate_url, :url_options
1137	1137	false
1138	1138	end
1139	1139
	1140	+ def allow_post_content?(person = nil)
	1141	+ person.kind_of?(Profile) && person.has_permission?('post_content', self)
	1142	+ end
	1143	+
	1144	+ def allow_edit?(person = nil)
	1145	+ person.kind_of?(Profile) && person.has_permission?('edit_profile', self)
	1146	+ end
	1147	+
	1148	+ def allow_destroy?(person = nil)
	1149	+ person.kind_of?(Profile) && person.has_permission?('destroy_profile', self)
	1150	+ end
1140	1151	end
...	...
1	1	require 'digest/sha1'
2		-require 'user_activation_job'
3	2	require 'securerandom'
4	3
5	4	# User models the system users, and is generated by the acts_as_authenticated
...	...
...	...	@@ -30,7 +30,7 @@
30	30	[ [ profile.city, 'locality' ],
31	31	[ profile.state, 'region' ],
32	32	[ profile.country_name, 'country-name' ]
33		- ].map{ \|s,c\| s =~ /^\s*$/ ? nil : content_tag( 'span', s, :class => c ) }.compact.join ' - '
	33	+ ].map{ \|s,c\| s =~ /^\s*$/ ? nil : content_tag( 'span', s, :class => c ) }.compact.safe_join ' - '
34	34	%>
35	35	</div>
36	36	<% end %>
...	...
...	...	@@ -9,8 +9,8 @@
9	9	<div class="template-selection">
10	10	<% if @email_templates.present? %>
11	11	<%= labelled_form_field(_('Select a template:'), select_tag(:template, options_from_collection_for_select(@email_templates, :id, :name), :include_blank => true, 'data-url' => url_for(:controller => 'email_templates', :action => 'show_parsed'))) %>
12		- </div>
13		-<% end %>
	12	+ <% end %>
	13	+</div>
14	14
15	15	<%= form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do \|f\| %>
16	16
...	...