Merge branch 'next' into AI3133-email_article_to_community_members

Leandro Santos
2 parents e1398378 82193169
Showing 242 changed files with 25499 additions and 14541 deletions Show diff stats
AUTHORS.md
Gemfile
HACKING.themes.md
Rakefile.release
app/controllers/application_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/content_viewer_controller.rb
app/controllers/public/search_controller.rb
app/controllers/public_controller.rb
app/helpers/application_helper.rb
app/helpers/cms_helper.rb
app/helpers/dates_helper.rb
app/helpers/layout_helper.rb
app/helpers/plugins_helper.rb
app/helpers/search_helper.rb
app/models/add_friend.rb
app/models/article.rb
app/models/comment.rb
app/models/event.rb
app/models/main_block.rb
@@ -120,16 +120,21 @@ Diego Araujo + Rodrigo Souto + Rafael Manzo &lt;rr.manzo@gmail.com&gt;
 Diego + Jefferson <diegoamc90@gmail.com>
 Diego Martinez <diegoamc90@gmail.com>
 Diego + Renan <renanteruoc@gmail.com>
+DylanGuedes <djmgguedes@gmail.com>
+Eduardo Passos <eduardo@risa.localdomain.localhost>
+Eduardo Passos <eduardosteps@gmail.com>
 Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
 Evandro Jr <evandrojr@gmail.com>
 Evandro Junior <evandrojr@gmail.com>
 Fabio Teixeira <fabio1079@gmail.com>
+FAMMA TV NOTICIAS MEDIOS DE CO <revistafammatvmusic.oficial@gmail.com>
 Fernanda Lopes <nanda.listas+psl@gmail.com>
 Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
 Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
 Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
 Francisco Marcelo de Araújo Lima Júnior <maljunior@gmail.com>
 Gabriela Navarro <navarro1703@gmail.com>
+Gonzalo Exequiel Pedone <hipersayan.x@gmail.com>
 Grazieno Pellegrino <grazieno@gmail.com>
 Gust <darksshades@hotmail.com>
 Hebert Douglas <hebertdougl@gmail.com>
@@ -186,18 +191,23 @@ Leandro Nunes dos Santos &lt;81665687568@serpro-1541727.(none)&gt;
 Leandro Nunes dos Santos <leandronunes@gmail.com>
 Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
 LinguÁgil 2010 <linguagil.bahia@gmail.com>
+Lucas Kanashiro <kanashiro.duarte@gmail.com>
 Lucas Melo <lucas@colivre.coop.br>
 Lucas Melo <lucaspradomelo@gmail.com>
 Luciano <lucianopcbr@gmail.com>
 Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
 Luis David Aguilar Carlos <ludwig9003@gmail.com>
 Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com>
+Marcos <marcos.rpj2@gmail.com>
 Marcos Ramos <ms.ramos@outlook.com>
 Martín Olivera <molivera@solar.org.ar>
+Maurilio Atila <cabelotaina@gmail.com>
+M for Momo <mo@rtnp.org>
 Michal Čihař <michal@cihar.com>
 Moises Machado <moises@colivre.coop.br>
 Naíla Alves <naila@colivre.coop.br>
 Nanda Lopes <nanda.listas+psl@gmail.com>
+Niemand Jedermann <predatorix@web.de>
 Parley Martins <parleypachecomartins@gmail.com>
 Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
 Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
@@ -234,8 +244,11 @@ Ronny Kursawe &lt;kursawe.ronny@googlemail.com&gt;
 root <root@debian.sdr.serpro>
 Samuel R. C. Vale <srcvale@holoscopio.com>
 Tallys Martins <tallysmartins@gmail.com>
+Tallys Martins <tallysmartins@yahoo.com.br>
+tallys <tallys@tallys>
 tallys <tallys@tallys.(none)>
 Thiago Zoroastro <thiago.zoroastro@bol.com.br>
+Tuux <tuxa@galaxie.eu.org>
 Valessio Brito <contato@valessiobrito.com.br>
 Valessio Brito <contato@valessiobrito.info>
 Valessio Brito <valessio@gmail.com>
@@ -2,7 +2,7 @@ source &quot;https://rubygems.org&quot;
 gem 'rails',                    '~> 3.2.21'
 gem 'minitest',                 '~> 3.2.0'
 gem 'fast_gettext',             '~> 0.6.8'
-gem 'acts-as-taggable-on',      '~> 3.0.2'
+gem 'acts-as-taggable-on',      '~> 3.4.2'
 gem 'rails_autolink',           '~> 1.1.5'
 gem 'pg',                       '~> 0.13.2'
 gem 'rmagick',                  '~> 2.13.1'
@@ -15,10 +15,10 @@ gem &#39;nokogiri&#39;,                 &#39;~&gt; 1.5.5&#39;
 gem 'rake', :require => false
 gem 'rest-client',              '~> 1.6.7'
 gem 'exception_notification',   '~> 4.0.1'
-gem 'gettext',                  '~> 2.2.1', :require => false, :group => :development
+gem 'gettext',                  '~> 2.2.1', :require => false
 gem 'locale',                   '~> 2.0.5'
 gem 'whenever', :require => false
-gem 'eita-jrails', :require => false
+gem 'eita-jrails', '>= 0.9.5', :require => 'jrails'
  
 group :production do
   gem 'dalli', '~> 2.7.0'
@@ -0,0 +1,60 @@
+Noosfero Instructions for Theme Developers
+==========================================
+
+To build Noosfero themes you must to know HTML and CSS. You may also get some advantages with Ruby and Noosfero hacking knowledge because all customizable pieces of the theme's HTML structure are [erb](http://en.wikipedia.org/wiki/ERuby) files.
+
+
+Organization Basics
+-------------------
+
+A theme is a directory and must inside `noosfero/public/designs/themes`, and you will find tis themes in a fresh installation:
+`noosfero`, `aluminium`, `base`, `butter`, `chameleon`, `chocolate`, `orange`, `plum`, `scarletred` and `skyblue`. The `default` is only a link to `noosfero` and you can change this link to any other.
+
+`noosfero` is the default theme with a big header. All other are colored themes with a thin header. That colored ones can be used as additional themes for any environment, as they will search for `/images/thin-logo.png` inside the current environment.theme, to use as top left logo.
+
+Inside a theme we can found:
+* `theme.yml` — Theme description with some nice configuration options.
+* `preview.png` — A 100x100 screenshot of this theme to the theme selection UI.
+* `style.css` — The main file. The magic happens here.
+* `errors.css` — Change the error page look. (only if this theme is linked by `defaut`)
+* `favicon.ico` — The identifier icon for your web site.
+* `images` — Another name can be found by your CSS, but will not allow to reuse the logo.
+  * `thin-logo.png` — The logo to be reused by the colored themes.
+  * *many images...*
+* `site_title.html.erb` — A nice place to put your logo, any code here will be placed inside `h1#site-title`.
+* `header.html.erb` — That goes inside `div#theme-header`.
+* `navigation.html.erb` — That goes inside `div#navigation ul`, so use `<li>`s.
+* `footer.html.erb` — That goes inside `div#theme-footer`.
+
+You can add more files like javascript and modularized CSS, but you must to refer that by the described files above.
+
+To refer one of this files trough the web the path is `<domain>/designs/themes/<thistheme>/<somefile>`.
+
+
+theme.yml
+---------
+
+A simple definition file. See this example:
+```yml
+name: "My Cool Theme"
+layout: "application-ng"
+jquery_theme: "smoothness"
+icon_theme: [default, pidgin]
+gravatar: "retro"
+```
+
+About non obvious:
+* `layout` is about the theme structure to use. The `application-ng` is enough for 99.97358% use cases. If you want to use another structure, you must add a new `*.html.erb` file at `app/views/layouts/`.
+* `icon_theme` point to something inside `public/designs/icons/`.
+* `gravatar` set the default gravatar *(avatar picture)* for people without picture.
+
+
+Theme Intervention from Environment Theme
+-----------------------------------------
+
+Sometimes an environment (as instace http://cirandas.net) wants to allow profiles to set its own theme, but with some environment identification or functions, like a top bar with the social network logo and a top menu (as instace http://cirandas.net/rango-vegan).
+To make the magic happens you can add some files to the environment theme.
+All are optional:
+* `global.css` — this must be used to style all extra html added by your intervention partials. As it is a free form css file you can style anything, but this is a conflict risk.
+* `global_header.html.erb` — Will add content to `#global-header`.
+* `global_footer.html.erb` — Will add content to `#global-footer`.
@@ -0,0 +1,18 @@
+# This Rakefile is intentionally independent from Rails to it can be used to
+# handle release-related tasks without having to load the entire Rails
+# environment (which is slow, requires a database connection and several other
+# inconveniences).
+
+$: << 'lib'
+require 'noosfero'
+require 'noosfero/version'
+
+load 'lib/tasks/gettext.rake'
+load 'lib/tasks/doc.rake'
+load 'lib/tasks/error_messages.rake'
+load 'lib/tasks/translation.rake'
+
+load 'lib/tasks/package.rake'
+load 'lib/tasks/release.rake'
+
+task :default => 'noosfero:translations:compile'
@@ -179,6 +179,7 @@ class ApplicationController &lt; ActionController::Base
   include SearchTermHelper
  
   def find_by_contents(asset, context, scope, query, paginate_options={:page => 1}, options={})
+    scope = scope.with_templates(options[:template_id]) unless options[:template_id].blank?
     search = plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options)
     register_search_term(query, scope.count, search[:results].count, context, asset)
     search
@@ -315,7 +315,11 @@ class AccountController &lt; ApplicationController
       session[:notice] = nil # consume the notice
     end
  
-    @plugins.each { |plugin| user_data.merge!(plugin.user_data_extras) }
+    @plugins.each do |plugin|
+      user_data_extras = plugin.user_data_extras
+      user_data_extras = instance_exec(&user_data_extras) if user_data_extras.kind_of?(Proc)
+      user_data.merge!(user_data_extras)
+    end
  
     render :text => user_data.to_json, :layout => false, :content_type => "application/javascript"
   end
@@ -221,7 +221,7 @@ class ContentViewerController &lt; ApplicationController
       #      relation.
       posts = posts.native_translations if blog_with_translation?(@page)
  
-      @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile))).to_a
+      @posts = posts.display_filter(user, profile).paginate({ :page => params[:npage], :per_page => @page.posts_per_page }).to_a
  
       if blog_with_translation?(@page)
         @posts.replace @posts.map{ |p| p.get_translation_to(FastGettext.locale) }.compact
@@ -9,6 +9,7 @@ class SearchController &lt; PublicController
   before_filter :load_search_assets, :except => :suggestions
   before_filter :load_query, :except => :suggestions
   before_filter :load_order, :except => :suggestions
+  before_filter :load_templates, :except => :suggestions
  
   # Backwards compatibility with old URLs
   def redirect_asset_param
@@ -61,7 +62,7 @@ class SearchController &lt; PublicController
   end
  
   def articles
-    @scope = @environment.articles.public
+    @scope = @environment.articles.public.paginate(paginate_options)
     full_text_search
   end
  
@@ -75,7 +76,7 @@ class SearchController &lt; PublicController
   end
  
   def products
-    @scope = @environment.products
+    @scope = @environment.products.paginate(paginate_options)
     full_text_search
   end
  
@@ -210,6 +211,11 @@ class SearchController &lt; PublicController
     end
   end
  
+  def load_templates
+    @templates = {}
+    @templates[@asset] = environment.send(@asset.to_s).templates if [:people, :enterprises, :communities].include?(@asset)
+  end
+
   def limit
     if map_search?(@searches)
       MAP_SEARCH_LIMIT
@@ -230,7 +236,7 @@ class SearchController &lt; PublicController
   end
  
   def full_text_search
-    @searches[@asset] = find_by_contents(@asset, environment, @scope, @query, paginate_options, {:category => @category, :filter => @order})
+    @searches[@asset] = find_by_contents(@asset, environment, @scope, @query, paginate_options, {:category => @category, :filter => @order, :template_id => params[:template_id]})
   end
  
   private
@@ -238,7 +244,7 @@ class SearchController &lt; PublicController
   def visible_profiles(klass, *extra_relations)
     relations = [:image, :domains, :environment, :preferred_domain]
     relations += extra_relations
-    @environment.send(klass.name.underscore.pluralize).visible.includes(relations)
+    @environment.send(klass.name.underscore.pluralize).visible.includes(relations).paginate(paginate_options)
   end
  
   def per_page
@@ -13,7 +13,7 @@ class PublicController &lt; ApplicationController
  
   def private_profile
     private_profile_partial_parameters
-    render :template => 'shared/access_denied.html.erb', :status => 403
+    render :template => 'profile/_private_profile', :status => 403, :formats => [:html]
   end
  
   def invisible_profile
@@ -212,6 +212,7 @@ module ApplicationHelper
   end
  
   def button(type, label, url, html_options = {})
+    html_options ||= {}
     the_class = 'with-text'
     if html_options.has_key?(:class)
       the_class << ' ' << html_options[:class]
@@ -398,19 +399,27 @@ module ApplicationHelper
       end
   end
  
-  def theme_view_file(template)
+  def theme_view_file(template, theme=nil)
     # Since we cannot control what people are doing in external themes, we
     # will keep looking for the deprecated .rhtml extension here.
-    file = Rails.root.join('public', theme_path[1..-1], template + '.html.erb')
+    addr = theme ? "designs/themes/#{theme}" : theme_path[1..-1]
+    file = Rails.root.join('public', addr, template + '.html.erb')
     return file if File.exists?(file)
     nil
   end
  
   def theme_include(template, options = {})
-    file = theme_view_file(template)
-    options.merge!({:file => file, :use_full_path => false})
+    from_theme_include(nil, template, options)
+  end
+
+  def env_theme_include(template, options = {})
+    from_theme_include(environment.theme, template, options)
+  end
+
+  def from_theme_include(theme, template, options = {})
+    file = theme_view_file(template, theme)
     if file
-      render options
+      render options.merge(file: file, use_full_path: false)
     else
       nil
     end
@@ -446,6 +455,14 @@ module ApplicationHelper
     @theme_extra_navigation ||= theme_include 'navigation'
   end
  
+  def global_header
+    @global_header ||= env_theme_include 'global_header'
+  end
+
+  def global_footer
+    @global_footer ||= env_theme_include 'global_footer'
+  end
+
   def is_testing_theme
     !controller.session[:theme].nil?
   end
@@ -9,12 +9,6 @@ module CmsHelper
     mime_type.gsub('/', '_').gsub('-', '')
   end
  
-  def add_upload_file_field(name, locals)
-    button_to_function :add, name, nil do |page|
-      page.insert_html :bottom, :uploaded_files, CGI::escapeHTML(render(:partial => 'upload_file', :locals => locals, :object => UploadedFile.new))
-    end
-  end
-
   def pagination_links(collection, options={})
     options = {:previous_label => '&laquo; ', :next_label => ' &raquo;', :page_links => false}.merge(options)
     will_paginate(collection, options)
@@ -2,13 +2,15 @@ require &#39;noosfero/i18n&#39;
  
 module DatesHelper
  
-  MONTHS = I18n.t('date.month_names')
+  def months
+    I18n.t('date.month_names')
+  end
  
   def month_name(n, abbreviated = false)
     if abbreviated
       I18n.t('date.abbr_month_names')[n]
     else
-      MONTHS[n]
+      months[n]
     end
   end
  
@@ -37,7 +39,7 @@ module DatesHelper
     end
   end
  
-  # formats a datetime for displaying. 
+  # formats a datetime for displaying.
   def show_time(time)
     if time
       _('%{day} %{month} %{year}, %{hour}:%{minutes}') % { :year => time.year, :month => month_name(time.month), :day => time.day, :hour => time.hour, :minutes => time.strftime("%M") }
@@ -138,7 +140,7 @@ module DatesHelper
     else
       order = [:day, :month, :year]
     end
-    date_select(object, method, html_options.merge(options.merge(:include_blank => true, :order => order, :use_month_names => MONTHS)))
+    date_select(object, method, html_options.merge(options.merge(:include_blank => true, :order => order, :use_month_names => months)))
   end
  
 end
@@ -49,24 +49,33 @@ module LayoutHelper
       'selectordie',
       'inputosaurus',
       'chat',
+      'selectordie-theme',
       pngfix_stylesheet_path,
     ] + tokeninput_stylesheets
-    plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| plugin.class.public_path('style.css') }
-
-    output = ''
-    output += stylesheet_link_tag standard_stylesheets, :cache => 'cache/application'
-    output += stylesheet_link_tag template_stylesheet_path
-    output += stylesheet_link_tag icon_theme_stylesheet_path
-    output += stylesheet_link_tag jquery_ui_theme_stylesheet_path
+    plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin|
+      plugin.class.public_path('style.css')
+    }
+    global_css_pub = "/designs/themes/#{environment.theme}/global.css"
+    global_css_at_fs = Rails.root.join 'public' + global_css_pub
+
+    output = []
+    output << stylesheet_link_tag(standard_stylesheets, :cache => 'cache/application')
+    output << stylesheet_link_tag(template_stylesheet_path)
+    output << stylesheet_link_tag(icon_theme_stylesheet_path)
+    output << stylesheet_link_tag(jquery_ui_theme_stylesheet_path)
     unless plugins_stylesheets.empty?
-      output += stylesheet_link_tag plugins_stylesheets, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_stylesheets.to_s}"
+      cacheid = "cache/plugins-#{Digest::MD5.hexdigest plugins_stylesheets.to_s}"
+      output << stylesheet_link_tag(plugins_stylesheets, :cache => cacheid)
     end
-    output += stylesheet_link_tag theme_stylesheet_path
-    output
+    if File.exists? global_css_at_fs
+      output << stylesheet_link_tag(global_css_pub)
+    end
+    output << stylesheet_link_tag(theme_stylesheet_path)
+    output.join "\n"
   end
  
   def pngfix_stylesheet_path
-    'iepngfix/iepngfix.css'
+    'iepngfix/iepngfix.css' #TODO: deprecate it
   end
  
   def tokeninput_stylesheets
@@ -6,4 +6,11 @@ module PluginsHelper
     end
   end
  
+  def plugins_toolbar_actions_for_article(article)
+    toolbar_actions = Array.wrap(@plugins.dispatch(:article_extra_toolbar_buttons, article))
+    toolbar_actions.each do |action|
+      [:title, :url, :icon].each { |param| raise "No #{param} was passed as parameter for #{action}" unless action.has_key?(param) }
+    end
+  end
+
 end
@@ -148,4 +148,11 @@ module SearchHelper
     link_to(@enabled_searches[asset], "/search/#{asset}")
   end
  
+  def assets_submenu(asset)
+    return '' if @templates[asset].blank? || @templates[asset].length == 1
+    options = @templates[asset].map {|template| [template.name, template.id]}
+    options = options_for_select([[_('Choose a template'), nil]] + options, selected: (params[:template_id]))
+    select_tag('template_id', options, :id => 'submenu')
+  end
+
 end
@@ -4,7 +4,7 @@ class AddFriend &lt; Task
  
   validates_presence_of :requestor_id, :target_id
  
-  validates_uniqueness_of :target_id, :scope => [ :requestor_id ]
+  validates_uniqueness_of :target_id, scope: [ :requestor_id, :status ], if: proc{ |t| t.status == Task::Status::ACTIVE }
  
   validates_length_of :group_for_person, :group_for_friend, :maximum => 150, :allow_nil => true
  
@@ -486,15 +486,18 @@ class Article &lt; ActiveRecord::Base
   scope :more_comments, :order => "comments_count DESC"
   scope :more_recent, :order => "created_at DESC"
  
-  def self.display_filter(user, profile)
-    return {:conditions => ['articles.published = ?', true]} if !user
-    {:conditions => ["  articles.published = ? OR
-                        articles.last_changed_by_id = ? OR
-                        articles.profile_id = ? OR
-                        ? OR  articles.show_to_followers = ? AND ?",
-                        true, user.id, user.id, user.has_permission?(:view_private_content, profile),
-                        true, user.follows?(profile)]}
-  end
+  scope :display_filter, lambda {|user, profile|
+    return published if (user.nil? && profile && profile.public?)
+    return [] if user.nil? || (profile && !profile.public? && !user.follows?(profile))
+    where(
+      [
+       "published = ? OR last_changed_by_id = ? OR profile_id = ? OR ? 
+        OR  (show_to_followers = ? AND ?)", true, user.id, user.id, 
+        profile.nil? ?  false : user.has_permission?(:view_private_content, profile),
+        true, user.follows?(profile)
+      ] 
+    )
+  }
  
  
   def display_unpublished_article_to?(user)
@@ -33,6 +33,8 @@ class Comment &lt; ActiveRecord::Base
     end
   end
  
+  acts_as_having_settings
+
   xss_terminate :only => [ :body, :title, :name ], :on => 'validation'
  
   def comment_root
@@ -145,11 +145,9 @@ class Event &lt; Article
     ((self.end_date || self.start_date) - self.start_date).to_i
   end
  
+  alias_method :article_lead, :lead
   def lead
-    content_tag('div',
-      show_period(start_date, end_date),
-      :class => 'event-dates'
-    ) + super
+    self.class.action_view.render 'content_viewer/event_lead', event: self
   end
  
   def event?
@@ -24,4 +24,10 @@ class MainBlock &lt; Block
     ['always', 'except_home_page']
   end
  
+  def display_user_options
+    @display_user_options = {
+      'all'            => _('All users')
+    }
+  end
+
 end
@@ -150,7 +150,7 @@ roles] }
   end
  
   def already_request_friendship?(person)
-    person.tasks.find_by_requestor_id(self.id, :conditions => { :type => 'AddFriend' })
+    person.tasks.where(requestor_id: self.id, type: 'AddFriend', status: Task::Status::ACTIVE).first
   end
  
   def remove_friend(friend)
@@ -435,6 +435,7 @@ roles] }
   end
  
   def follows?(profile)
+    return false if profile.nil?
     profile.followed_by?(self)
   end
  
@@ -3,7 +3,7 @@
 # which by default is the one returned by Environment:default.
 class Profile < ActiveRecord::Base
  
-  attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time, :redirection_after_login, :email_suggestions, :allow_members_to_invite, :invite_friends_only
+  attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time, :redirection_after_login, :email_suggestions, :allow_members_to_invite, :invite_friends_only, :secret
  
   # use for internationalizable human type names in search facets
   # reimplement on subclasses
@@ -85,7 +85,15 @@ class Profile &lt; ActiveRecord::Base
   #FIXME: these will work only if the subclass is already loaded
   scope :enterprises, lambda { {:conditions => (Enterprise.send(:subclasses).map(&:name) << 'Enterprise').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
   scope :communities, lambda { {:conditions => (Community.send(:subclasses).map(&:name) << 'Community').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
-  scope :templates, {:conditions => {:is_template => true}}
+  scope :templates, lambda { |template_id = nil|
+    conditions = {:conditions => {:is_template => true}}
+    conditions[:conditions].merge!({:id => template_id}) unless template_id.nil?
+    conditions
+  }
+
+  scope :with_templates, lambda { |templates|
+    {:conditions => {:template_id => templates}}
+  }
   scope :no_templates, {:conditions => {:is_template => false}}
  
   def members
@@ -119,9 +127,9 @@ class Profile &lt; ActiveRecord::Base
     Profile.column_names.map{|n| [Profile.table_name, n].join('.')}.join(',')
   end
  
-  scope :visible, :conditions => { :visible => true }
+  scope :visible, :conditions => { :visible => true, :secret => false }
   scope :disabled, :conditions => { :visible => false }
-  scope :public, :conditions => { :visible => true, :public_profile => true }
+  scope :public, :conditions => { :visible => true, :public_profile => true, :secret => false }
   scope :enabled, :conditions => { :enabled => true }
  
   # Subclasses must override this method
@@ -159,6 +159,7 @@ class User &lt; ActiveRecord::Base
     @task.name = self.name
     @task.email = self.email
     @task.target = self.environment
+    @task.requestor = self.person
     @task.save
   end
  
@@ -301,6 +302,10 @@ class User &lt; ActiveRecord::Base
     end
   end
  
+  def moderate_registration_pending?
+    return ModerateUserRegistration.exists?(:requestor_id => self.person.id, :target_id => self.environment.id, :status => Task::Status::ACTIVE)
+  end
+
   def data_hash(gravatar_default = nil)
     friends_list = {}
     enterprises = person.enterprises.map { |e| { 'name' => e.short_name, 'identifier' => e.identifier } }
 <p><%= file_field_tag('uploaded_files[]', :size => size) %></p>
-<%= javascript_tag("jQuery('#uploaded_files')[0].scrollTop = jQuery('#uploaded_files')[0].scrollHeight") %>
@@ -13,7 +13,7 @@
 <%= hidden_field_tag('back_to', @back_to) %>
  
 <% button_bar do %>
-  <%= add_upload_file_field(_('More files'), {:size => size}) %>
+  <%= button_to_function :add, _('More files'), "add_new_file_fields()" %>
   <% if @back_to %>
     <%= submit_button :save, _('Upload'), :cancel => @back_to %>
   <% else %>
@@ -50,6 +50,10 @@
       <%= button(:clock, _('All versions'), {:controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions'}, :id => 'article-versions-link') %>
     <% end %>
  
+    <% plugins_toolbar_actions_for_article(@page).each do |plugin_button| %>
+      <%= button plugin_button[:icon], plugin_button[:title], plugin_button[:url], plugin_button[:html_options] %>
+    <% end %>
+
     <%= report_abuse(profile, :link, @page) %>
  
   </div>
@@ -0,0 +1,7 @@
+
+<div class="event-dates">
+  <%= show_period event.start_date, event.end_date %>
+</div>
+
+<%= event.article_lead %>
+
@@ -9,7 +9,7 @@
                         enterprise.identifier, :class => 'profile-link' %>
     <%# profile_image_link enterprise, :portrait, 'div' %>
     <div class="controll">
-      <%= button(:delete, _('remove'), { :action => 'remove', :id => enterprise.id },:title => _('remove')) %>
+      <%= button_without_text(:delete, _('remove'), { :action => 'remove', :id => enterprise.id },:title => _('remove')) %>
     </div><!-- end class="controll" -->
   </li>
 <% end %>
@@ -5,7 +5,10 @@
     <%= yield(:feeds) %>
     <!--<meta http-equiv="refresh" content="1"/>-->
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <meta name="description" content="<%= @environment.name %>" />
+
+    <% unless defined? MetadataPlugin and environment.enabled_plugins.include? 'MetadataPlugin' %>
+      <meta name="description" content="<%= @environment.name %>" />
+    <% end %>
  
     <!-- site root -->
     <meta property="noosfero:root" content="<%= Noosfero.root %>"/>
@@ -22,7 +25,7 @@
       end.join("\n")
     %>
  
-    <script type='text/javascript'>
+    <script type="text/javascript">
       DEFAULT_LOADING_MESSAGE = <%="'#{ _('loading...') }'" %>;
     </script>
  
@@ -35,9 +38,12 @@
         if content.respond_to?(:call) then instance_exec(&content).to_s.html_safe else content.to_s.html_safe end
       end.join("\n")
     %>
+    <div id="global-header">
+      <%= global_header %>
+    </div>
  
     <div id="wrap-1">
-      <div id='theme-header'>
+      <div id="theme-header">
         <%= theme_header %>
       </div>
       <div id="wrap-2">
@@ -57,9 +63,14 @@
       </div><!-- end id="wrap-2" -->
     </div><!-- end id="wrap-1" -->
     <%= render_environment_features(:logged_in) if logged_in? %>
-    <div id="theme-footer">
-      <%= theme_footer %>
-    </div><!-- end id="theme-footer" -->
+    <div id="footer">
+      <div id="theme-footer">
+        <%= theme_footer %>
+      </div><!-- end id="theme-footer" -->
+      <div id="global-footer">
+        <%= global_footer %>
+      </div><!-- end id="global-footer" -->
+    </div><!-- end id="footer" -->
     <%= noosfero_layout_features %>
     <%= addthis_javascript %>
     <%=
@@ -52,6 +52,9 @@
       registerDocumentSize();
       // -->
     </script>
+    <div id="global-header">
+      <%= global_header %>
+    </div>
  
     <div id="accessibility_menu">
       <a href="#content" id="link_go_content"><span><%= _('Go to content') %></span></a>
@@ -112,8 +115,13 @@
     </div><!-- id="wrap" -->
  
     <div id="footer">
-      <%= theme_footer %>
-    </div><!-- id="footer" -->
+      <div id="theme-footer">
+        <%= theme_footer %>
+      </div><!-- end id="theme-footer" -->
+      <div id="global-footer">
+        <%= global_footer %>
+      </div><!-- end id="global-footer" -->
+    </div><!-- end id="footer" -->
  
     <%# if you need to add HTML stuff to the layout, include it in
     app/views/shared/noosfero_layout_features.html.erb! %>
@@ -34,10 +34,13 @@
     </div>
   <% else %>
     <div>
-      <%= labelled_radio_button _('Public &mdash; show content of this group to all internet users'), 'profile_data[public_profile]', true, @profile.public_profile? %>
+      <%= labelled_check_box _("Secret &mdash; hide the community and all its contents for non members and other people can't join this community unless they are invited to."), 'profile_data[secret]', true, profile.secret, :class => "profile-secret-box" %>
     </div>
     <div>
-      <%= labelled_radio_button _('Private &mdash; show content of this group only to members'), 'profile_data[public_profile]', false, !@profile.public_profile? %>
+      <%= labelled_radio_button _('Public &mdash; show content of this group to all internet users'), 'profile_data[public_profile]', true, @profile.public_profile?, :class => "public-community-button" %>
+    </div>
+    <div>
+      <%= labelled_radio_button _('Private &mdash; show content of this group only to members'), 'profile_data[public_profile]', false, !@profile.public_profile?, :class => "private-community-button" %>
     </div>
   <% end %>
  
@@ -85,4 +88,6 @@
       <% end %>
     <% end %>
   <% end %>
-<% end %>
 \ No newline at end of file
+<% end %>
+
+<%= javascript_include_tag 'profile_editor' %>
 <div id='search-content'>
+  <div class='total'>
+    <%= _('Total of %s results ') % @searches[@asset][:results].total_entries.inspect %>
+  </div>
+
 <%= display_results(@searches, @asset) %>
 <% if params[:display] != 'map' %>
   <%= pagination_links @searches[@asset][:results] %>
@@ -5,8 +5,12 @@
     <div id='search-header'>
       <%= assets_menu(@asset) %>
       <%= filters(@asset) %>
+      <div class="clear"></div>
     </div>
  
+    <div id='search-subheader'>
+      <%= assets_submenu(@asset) %>
+    </div>
     <div class="search-field">
       <span class="formfield">
         <%= search_input_with_suggestions('query', @asset, @query, {:id => 'search-input', :size => 50, :placeholder => hint}) %>
@@ -82,7 +82,7 @@
           <a data-id='%{jid_id}' class='icon-menu-%{presence_status}-11' href='#'>
             <span class="unread-messages"></span>
             %{avatar}
-            <span class="name">%{name}<span>
+            <span class="name">%{name}</span>
           </a>
         </li>
       </div>
@@ -1,2 +0,0 @@
-export PS1="[Noosfero upgrade] (\w) $ "
-eval `dircolors -b`
@@ -1 +0,0 @@
-require 'jrails'
@@ -0,0 +1,15 @@
+# This migration comes from acts_as_taggable_on_engine (originally 3)
+class AddTaggingsCounterCacheToTags < ActiveRecord::Migration
+  def self.up
+    add_column :tags, :taggings_count, :integer, default: 0
+
+    ActsAsTaggableOn::Tag.reset_column_information
+    ActsAsTaggableOn::Tag.find_each do |tag|
+      ActsAsTaggableOn::Tag.reset_counters(tag.id, :taggings)
+    end
+  end
+
+  def self.down
+    remove_column :tags, :taggings_count
+  end
+end
@@ -0,0 +1,10 @@
+# This migration comes from acts_as_taggable_on_engine (originally 4)
+class AddMissingTaggableIndex < ActiveRecord::Migration
+  def self.up
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+
+  def self.down
+    remove_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+end
@@ -0,0 +1,5 @@
+class AddSecretToProfile < ActiveRecord::Migration
+  def change
+    add_column :profiles, :secret, :boolean, :default => false
+  end
+end
@@ -0,0 +1,5 @@
+class AddSettingsToComments < ActiveRecord::Migration
+  def change
+    add_column :comments, :settings, :text
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20150122165042) do
+ActiveRecord::Schema.define(:version => 20150223180806) do
  
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -535,6 +535,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150122165042) do
     t.integer  "welcome_page_id"
     t.boolean  "allow_members_to_invite",               :default => true
     t.boolean  "invite_friends_only",                   :default => false
+    t.boolean  "secret",                                :default => false
   end
  
   add_index "profiles", ["activities_count"], :name => "index_profiles_on_activities_count"
@@ -655,12 +656,14 @@ ActiveRecord::Schema.define(:version =&gt; 20150122165042) do
   end
  
   add_index "taggings", ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], :name => "taggings_idx", :unique => true
+  add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
   add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type"
  
   create_table "tags", :force => true do |t|
     t.string  "name"
     t.integer "parent_id"
-    t.boolean "pending",   :default => false
+    t.boolean "pending",        :default => false
+    t.integer "taggings_count", :default => 0
   end
  
   add_index "tags", ["name"], :name => "index_tags_on_name", :unique => true
+noosfero (1.1~rc2) wheezy; urgency=low
+
+  * Second release candidate for Noosfero 1.1
+
+ -- Antonio Terceiro <terceiro@colivre.coop.br>  Mon, 09 Mar 2015 12:47:39 -0300
+
+noosfero (1.1~rc1) wheezy; urgency=low
+
+  * First release candidate for Noosfero 1.1
+
+ -- Antonio Terceiro <terceiro@colivre.coop.br>  Thu, 05 Mar 2015 12:35:49 -0300
+
 noosfero (1.0) wheezy; urgency=low
  
   * Noosfero 1.0 \o/
@@ -42,7 +42,7 @@ Depends: adduser,
          ruby-acts-as-taggable-on,
          ruby-daemons,
          ruby-dalli,
-         ruby-eita-jrails (>= 0.9.3-3~),
+         ruby-eita-jrails (>= 0.9.3-5~),
          ruby-eventmachine (>= 0.12.10-4~),
          ruby-exception-notification,
          ruby-fast-gettext,
@@ -9,6 +9,7 @@ config/environments               usr/share/noosfero/config
 config/initializers               usr/share/noosfero/config
 config/locales                    usr/share/noosfero/config
 config/routes.rb                  usr/share/noosfero/config
+config/schedule.rb                usr/share/noosfero/config
 db                                usr/share/noosfero
 debian/database.yml.template      usr/share/noosfero/config
 debian/dbinstall                  usr/lib/noosfero
-usr/share/rails-ruby1.8                             usr/share/noosfero/vendor/rails
 var/tmp/noosfero                                    usr/share/noosfero/tmp
 var/log/noosfero                                    usr/share/noosfero/log
 etc/noosfero/database.yml                           usr/share/noosfero/config/database.yml
@@ -33,4 +33,4 @@ override_dh_clean:
  
 override_dh_auto_build:
 	dh_auto_build
-	rake noosfero:translations:compile > /dev/null
+	rake -f Rakefile.release > /dev/null
@@ -36,7 +36,9 @@ NOOSFERO_USER=noosfero
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
  
 # Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
+if [ -e /lib/init/vars.sh ]; then
+  . /lib/init/vars.sh
+fi
  
 if [ -z "$NOOSFERO_DIR" ] || [ -z "$NOOSFERO_USER" ]; then
   echo "NOOSFERO_DIR or NOOSFERO_USER not defined, noosfero not being started."
@@ -123,7 +125,7 @@ do_restart() {
 }
  
 running(){
-  pgrep -u noosfero -f 'thin server' > /dev/null
+  main_script running
 }
  
 case "$1" in
@@ -0,0 +1,60 @@
+Feature: Use a secret community
+  As a community administrator
+  I want to manage the community privacy
+
+  Background:
+    Given the following users
+      | login | name           |
+      | jose  | Jose Wilker    |
+      | maria | Maria Carminha |
+    And the following community
+      | identifier  | name         |
+      | mycommunity | My Community |
+    And "Jose Wilker" is admin of "My Community"
+    And I am logged in as "jose"
+    And I go to mycommunity's control panel
+    And I follow "Community Info and settings"
+    And I check "Secret"
+    And I press "Save"
+    And I follow "Logout"
+
+  @selenium
+  Scenario: Hide privacity options when secret is checked
+    Given I am logged in as "jose"
+    And I go to mycommunity's control panel
+    And I follow "Community Info and settings"
+    Then I should not see "Public — show content of this group to all internet users"
+    And I should not see "Private — show content of this group only to members"
+    And I uncheck "Secret"
+    Then I should see "Public — show content of this group to all internet users"
+    Then I should see "Private — show content of this group only to members"
+
+  @selenium
+  Scenario: Non members shouldn't see secret communit's content
+    Given I am logged in as "maria"
+    And I go to mycommunity's homepage
+    And I should see "Access denied"
+    And I follow "Communities"
+    Then I should not see "My Community"
+
+  Scenario: A member should see the secret community's content
+    Given I am logged in as "maria"
+    And "Maria Carminha" is a member of "My Community"
+    And I go to maria's control panel
+    And I follow "Manage my groups"
+    And I follow "My Community"
+    Then I should see "My Community"
+
+  @selenium
+  Scenario: public article on a secret profile should not be displayed
+    Given I am logged in as "jose"
+    And I go to mycommunity's control panel
+    And I follow "Manage Content"
+    And I follow "New content"
+    And I follow "Text article with visual editor"
+    And I fill in "Title" with "My public article"
+    And I choose "Public"
+    And I press "Save and continue"
+    When I am logged in as "maria"
+    And I go to /mycommunity/my-public-article
+    Then I should not see "My public article"
@@ -85,6 +85,13 @@ module ActsAsFileSystem
       end
     end
  
+    def descendents_options
+      ["#{self.ancestry_column} LIKE ?", "%#{self.formatted_ancestry_id}%"]
+    end
+    def descendents
+      self.class.scoped :conditions => descendents_options
+    end
+
     # calculates the level of the record in the records hierarchy. Top-level
     # records have level 0; the children of the top-level records have
     # level 1; the children of records with level 1 have level 2, and so on.
@@ -6,6 +6,22 @@ class ActiveRecord::Base
     ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
   end
  
+  # an ActionView instance for rendering views on models
+  def self.action_view
+    @action_view ||= begin
+      view_paths = ActionController::Base.view_paths
+      action_view = ActionView::Base.new view_paths
+      # for using Noosfero helpers inside render calls
+      action_view.extend ApplicationHelper
+      action_view
+    end
+  end
+
+  # default value needed for the above ActionView
+  def to_partial_path
+    self.class.name.underscore
+  end
+
   alias :meta_cache_key :cache_key
   def cache_key
     key = [Noosfero::VERSION, meta_cache_key]
@@ -437,6 +437,19 @@ class Noosfero::Plugin
     []
   end
  
+  # -> Adds aditional action buttons to article
+  # returns = { :title => title, :icon => icon, :url => url, :html_options => {} }
+  #   title         = name that will be displayed.
+  #   icon          = css class name (for customized icons include them in a css file).
+  #   url           = url or route to which the button will redirect.
+  #   html_options  = Html options for customization
+  #
+  # Multiple values could be passed as parameter.
+  # returns = [{:title => title, :icon => icon}, {:title => title, :icon => icon}]
+  def article_extra_toolbar_buttons(article)
+    []
+  end
+
   # -> Adds adicional content to article
   # returns = lambda block that creates html code
   def article_extra_contents(article)
@@ -685,6 +698,8 @@ class Noosfero::Plugin
     # returns = string with reason of expiration
     elsif method.to_s =~ /^content_expire_(#{content_actions.join('|')})$/
       nil
+    elsif context.respond_to?(method)
+      context.send(method)
     else
       super
     end
@@ -18,7 +18,7 @@ Dir.glob(Rails.root.join(plugins_root, &#39;*&#39;, &#39;controllers&#39;)) do |controllers_dir|
   controllers_by_folder.each do |folder, controllers|
     controllers.each do |controller|
       controller_name = controller.gsub("#{plugin_name}_plugin_",'')
-      if %w[profile myprofile].include?(folder)
+      if %w[profile myprofile].include?(folder.to_s)
         match "#{prefixes_by_folder[folder]}/#{plugin_name}/#{controller_name}(/:action(/:id))", :controller => controller, :profile => /#{Noosfero.identifier_format}/
       else
         match "#{prefixes_by_folder[folder]}/#{plugin_name}/#{controller_name}(/:action(/:id))", :controller => controller
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '1.0'
+  VERSION = '1.1~rc2'
 end
  
-if File.exist?(File.join(Rails.root, '.git'))
-  Noosfero::VERSION.clear << Dir.chdir(Rails.root) { `git describe --tags`.strip }
+root = File.expand_path(File.dirname(__FILE__) + '/../..')
+if File.exist?(File.join(root, '.git'))
+  Noosfero::VERSION.clear << Dir.chdir(root) { `git describe --tags`.strip.sub('-rc', '~rc') }
 end
+require 'noosfero'
+require 'pathname'
+
 namespace :noosfero do
   namespace :doc do
     def plugins_textiles
@@ -9,8 +12,9 @@ namespace :noosfero do
       end
     end
     task :unlink_plugins_textiles do
-      rm_f Dir.glob(Rails.root.join('doc/noosfero/plugins/*.textile')) -
-        [Rails.root.join('doc/noosfero/plugins/index.textile')]
+      root = Pathname.new(File.dirname(__FILE__) + '/../..').expand_path
+      rm_f Dir.glob(root.join('doc/noosfero/plugins/*.textile')) -
+        [root.join('doc/noosfero/plugins/index.textile')]
     end
     input = Dir.glob('doc/noosfero/**/*.textile') + plugins_textiles.map{|i| "doc/noosfero/plugins/#{File.basename(i)}"}
     topics_xhtml = input.map { |item| item.sub('.textile', '.en.xhtml') }.uniq
@@ -22,7 +26,8 @@ namespace :noosfero do
       begin
         require 'redcloth'
         File.open(output ,'w') do |output_file|
-          output_file.write(RedCloth.new(File.read(input)).to_html)
+          text = File.read(input, encoding: Encoding::UTF_8)
+          output_file.write(RedCloth.new(text).to_html)
           puts "#{input} -> #{output}"
         end
       rescue Exception => e
-templates = Dir.glob(Rails.root.join('public', '*.html.erb'))
+root = Pathname(File.dirname(__FILE__)).join('../../').expand_path
+templates = Dir.glob(root.join('public', '*.html.erb'))
 targets = []
 templates.each do |template|
   target = template.gsub(/.erb$/, '')
@@ -16,6 +17,6 @@ end
 namespace :noosfero do
   namespace 'error-pages' do
     desc 'Translates Noosfero error pages'
-    task :translate => [:environment] + targets
+    task :translate => targets
   end
 end
@@ -2,6 +2,8 @@
 # Added for Ruby-GetText-Package
 #
  
+require 'pathname'
+
 makemo_stamp = 'tmp/makemo.stamp'
 desc "Create mo-files for L10n"
 task :makemo => makemo_stamp
@@ -37,14 +39,15 @@ task :symlinkmo do
   langmap = {
     'pt' => 'pt_BR',
   }
-  mkdir_p(Rails.root.join('locale'))
-  Dir.glob(Rails.root.join('po/*/')).each do |dir|
+  root = Pathname.new(File.dirname(__FILE__) + '/../..').expand_path
+  mkdir_p(root.join('locale'))
+  Dir.glob(root.join('po/*/')).each do |dir|
     lang = File.basename(dir)
     orig_lang = langmap[lang] || lang
-    mkdir_p(Rails.root.join('locale', "#{lang}", 'LC_MESSAGES'))
+    mkdir_p(root.join('locale', "#{lang}", 'LC_MESSAGES'))
     ['iso_3166'].each do |domain|
       origin = "/usr/share/locale/#{orig_lang}/LC_MESSAGES/#{domain}.mo"
-      target = Rails.root.join('locale', "#{lang}", 'LC_MESSAGES', "#{domain}.mo")
+      target = root.join('locale', "#{lang}", 'LC_MESSAGES', "#{domain}.mo")
       if !File.symlink?(target)
         ln_s origin, target
       end
-
 desc "Generate source tarball"
 task :package => 'package:clobber' do
   require_dependency 'noosfero'
 # encoding: UTF-8
  
-require 'noosfero/version'
 $version = Noosfero::VERSION
  
 namespace :noosfero do
@@ -132,13 +131,13 @@ EOF
  
     if target =~ /-test$/
       if new_version =~ /~rc\d+/
-        new_version.sub!(/\~rc([0-9]+)/) { "~rc#{$1.to_i + 1}" }
+        new_version.sub!(/\~rc([0-9]+).*/) { "~rc#{$1.to_i + 1}" }
       else
         new_version += '~rc1'
       end
     else
-      if new_version =~ /~rc\d+/
-        new_version.sub!(/~rc[0-9]+/, '')
+      if new_version =~ /~rc\d+.*/
+        new_version.sub!(/~rc[0-9]+.*/, '')
       else
         components = new_version.split('.').map(&:to_i)
         if components.size < 3
@@ -158,9 +157,10 @@ EOF
     sh "sed -i \"s/VERSION = '[^']*'/VERSION = '#{new_version}'/\" lib/noosfero/version.rb"
     ENV['DEBFULLNAME'] ||= `git config user.name`.strip
     ENV['DEBEMAIL'] ||= `git config user.email`.strip
-    sh "dch --newversion #{new_version} --distribution #{target} --force-distribution '#{release_message}'"
+    distribution = `dpkg-parsechangelog | sed '/Distribution:/!d; s/^.*:\s*//'`.strip
+    sh "dch --newversion #{new_version} --distribution #{distribution} --force-distribution '#{release_message}'"
  
-    sh 'git diff debian/changelog lib/noosfero/version.rb'
+    sh 'git diff --color debian/changelog lib/noosfero/version.rb'
     if confirm("Commit version bump to #{new_version} on #{target} distribution")
       sh 'git add debian/changelog lib/noosfero/version.rb'
       sh "git commit -m 'Bumping version #{new_version}'"
@@ -5,7 +5,7 @@ namespace :noosfero do
     task :update => ['updatepo', 'noosfero:doc:rebuild']
  
     desc 'Compiles all translations'
-    task :compile => ['makemo', 'environment', 'noosfero:doc:translate']
+    task :compile => ['makemo', 'noosfero:doc:translate']
  
   end
 end
 class UserActivationJob < Struct.new(:user_id)
   def perform
     user = User.find(user_id)
-    user.destroy unless user.activated? || user.person.is_template?
+    user.destroy unless user.activated? || user.person.is_template? || user.moderate_registration_pending?
   end
 end
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:44-0300\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:10-0300\n"
 "PO-Revision-Date: 2014-12-12 14:23+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/noosfero/noosfero/"
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:44-0300\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:10-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -2,8 +2,9 @@ class BreadcrumbsPlugin::ContentBreadcrumbsBlock &lt; Block
  
   settings_items :show_cms_action, :type => :boolean, :default => true
   settings_items :show_profile, :type => :boolean, :default => true
+  settings_items :show_section_name, :type => :boolean, :default => true
  
-  attr_accessible :show_cms_action, :show_profile
+  attr_accessible :show_cms_action, :show_profile, :show_section_name
  
   def self.description
     _('Content Breadcrumbs')
@@ -40,7 +41,18 @@ class BreadcrumbsPlugin::ContentBreadcrumbsBlock &lt; Block
     proc do
       trail = block.trail(@page, @profile, params)
       if !trail.empty?
-        trail.map { |t| link_to(t[:name], t[:url], :class => 'item') }.join(content_tag('span', ' > ', :class => 'separator'))
+        separator = content_tag('span', ' > ', :class => 'separator')
+
+        breadcrumb = trail.map do |t|
+          link_to(t[:name], t[:url], :class => 'item')
+        end.join(separator)
+
+        if block.show_section_name
+          section_name = block.show_profile ? trail.second[:name] : trail.first[:name]
+          breadcrumb << content_tag('div', section_name, :class => 'section-name')
+        end
+
+        breadcrumb
       else
         ''
       end
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:43-0300\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -41,4 +41,9 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
     assert !@block.show_cms_action
   end
  
+  should 'be able save breadcrumbs block with show_section_name option' do
+    get :edit, :id => @block.id, :profile => @profile.identifier
+    post :save, :id => @block.id, :profile => @profile.identifier, :block => {:title => 'breadcrumbs', :show_cms_action => false, :show_profile => true, :show_section_name => true }
+    assert @block.show_section_name
+  end
 end
 <div id='edit-breadcrumbs-block'>
   <%= labelled_form_field check_box(:block, :show_cms_action) + _('Show cms action'), '' %>
   <%= labelled_form_field check_box(:block, :show_profile) + _('Show profile'), '' %>
+  <%= labelled_form_field check_box(:block, :show_section_name) + _('Show section name'), '' %>
 </div>
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:43-0300\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
 "PO-Revision-Date: 2014-12-12 14:23+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/noosfero/noosfero/"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:43-0300\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-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/"
@@ -4,9 +4,9 @@
 # , 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-02 21:43-0300\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
 "PO-Revision-Date: 2014-12-12 14:22+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/noosfero/noosfero/"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:43-0300\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
 "PO-Revision-Date: 2009-10-26 16:20-0300\n"
 "Last-Translator: Anahit Minassian <anahit.minassian@cooperation.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:43-0300\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:43-0300\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
 "PO-Revision-Date: 2014-12-12 14:23+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/noosfero/"
@@ -6,18 +6,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:43-0300\n"
-"PO-Revision-Date: 2014-12-12 14:23+0200\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"PO-Revision-Date: 2015-02-23 11:38+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: German <https://hosted.weblate.org/projects/noosfero/noosfero/"
-"de/>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/noosfero/plugin-"
+"comment-classification/de/>\n"
 "Language: de\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.2-dev\n"
+"X-Generator: Weblate 2.3-dev\n"
  
 #: plugins/comment_classification/lib/comment_classification_plugin.rb:11
 #, fuzzy
@@ -127,7 +127,7 @@ msgstr &quot;Verwaltungsinformationen&quot;
 #: plugins/comment_classification/views/comment_classification_plugin_labels/_form.html.erb:6
 #: plugins/comment_classification/views/comment_classification_plugin_status/_form.html.erb:6
 msgid "Name"
-msgstr ""
+msgstr "Name"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/_form.html.erb:7
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:10
@@ -173,7 +173,7 @@ msgstr &quot;Aktiviert&quot;
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:12
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:12
 msgid "Actions"
-msgstr ""
+msgstr "Aktionen"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:21
 #, fuzzy
@@ -212,7 +212,7 @@ msgstr &quot;Sind Sie sicher, dass Sie diesen Eintrag entfernen möchten?&quot;
  
 #: plugins/comment_classification/views/comment/comments_labels_select.html.erb:3
 msgid "[Select ...]"
-msgstr ""
+msgstr "[Auswahl...]"
  
 #: plugins/comment_classification/views/comment_classification_plugin_admin/index.html.erb:1
 #, fuzzy
@@ -5,85 +5,72 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:43-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"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"PO-Revision-Date: 2015-02-24 20:46+0200\n"
+"Last-Translator: Gonzalo Exequiel Pedone <hipersayan.x@gmail.com>\n"
+"Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/plugin-"
+"comment-classification/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.3-dev\n"
  
 #: plugins/comment_classification/lib/comment_classification_plugin.rb:11
-#, fuzzy
 msgid "A plugin that allow classification of comments."
-msgstr "Un bloque que muestra tus grupos"
+msgstr "Un plugin que permite clasificar comentarios."
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_labels_controller.rb:16
-#, fuzzy
 msgid "Label created"
-msgstr "Licencia"
+msgstr "Etiqueta creada"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_labels_controller.rb:19
-#, fuzzy
 msgid "Label could not be created"
-msgstr "%s no pudo ser actualizado"
+msgstr "La etiqueta no pudo ser creada"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_labels_controller.rb:31
-#, fuzzy
 msgid "Label updated"
-msgstr "Última actualización"
+msgstr "Etiqueta actualizada"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_labels_controller.rb:34
-#, fuzzy
 msgid "Failed to edit label"
-msgstr "No se pudo editar el rol"
+msgstr "Fallo al editar la etiqueta"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_labels_controller.rb:45
-#, fuzzy
 msgid "Label removed"
-msgstr "Artículo eliminado."
+msgstr "Etiqueta eliminada"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_labels_controller.rb:47
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_labels_controller.rb:50
-#, fuzzy
 msgid "Label could not be removed"
-msgstr "%s no pudo ser actualizado"
+msgstr "No se puede eliminar la etiqueta"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_status_controller.rb:15
-#, fuzzy
 msgid "Status created"
-msgstr "Contrato creado."
+msgstr "Estado creado"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_status_controller.rb:18
-#, fuzzy
 msgid "Status could not be created"
-msgstr "%s no pudo ser actualizado"
+msgstr "No se puede crear el estado"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_status_controller.rb:29
-#, fuzzy
 msgid "Status updated"
-msgstr "Fecha de inicio"
+msgstr "Estado actualizado"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_status_controller.rb:32
-#, fuzzy
 msgid "Failed to edit status"
-msgstr "No se pudo editar el rol"
+msgstr "Fallo al editar el estado"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_status_controller.rb:43
-#, fuzzy
 msgid "Status removed"
-msgstr "Contrato eliminado."
+msgstr "Estado eliminado"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_status_controller.rb:45
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_status_controller.rb:48
-#, fuzzy
 msgid "Status could not be removed"
-msgstr "El contrato no puede ser eliminado. ¡Perdón! ^^"
+msgstr "No se puede eliminar el estado"
  
 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/_status_form.html.erb:6
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:9
@@ -92,79 +79,72 @@ msgid &quot;Status&quot;
 msgstr "Estado"
  
 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/_status_form.html.erb:7
-#, fuzzy
 msgid "Reason:"
-msgstr "Razón"
+msgstr "Razón:"
  
 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/add_status.html.erb:1
-#, fuzzy
 msgid "Status for comment"
-msgstr "sin comentarios"
+msgstr "Estado del comentario"
  
 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/add_status.html.erb:16
 msgid ""
 "<i>%{user}</i> added the status <i>%{status_name}</i> at <i>%{created_at}</"
 "i>."
 msgstr ""
+"<i>%{user}</i> ha agregado el estado <i>%{status_name}</i> en "
+"<i>%{created_at}</i>."
  
 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/add_status.html.erb:18
 msgid "<i>Reason:</i> %s"
-msgstr ""
+msgstr "<i>Razón:</i> %s"
  
 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/add_status.html.erb:24
 #: plugins/comment_classification/views/comment_classification_plugin_status/create.html.erb:1
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:29
-#, fuzzy
 msgid "Add a new status"
-msgstr "Añadir nuevo producto"
+msgstr "Agregar nuevo estado"
  
 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/index.html.erb:1
-#, fuzzy
 msgid "Manage comment classification"
-msgstr "Información de gestión"
+msgstr "Gestionar la clasificación de comentarios"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/_form.html.erb:6
 #: plugins/comment_classification/views/comment_classification_plugin_status/_form.html.erb:6
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/_form.html.erb:7
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:10
 msgid "Color"
-msgstr ""
+msgstr "Color"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/_form.html.erb:8
-#, fuzzy
 msgid "Enable this label?"
-msgstr "Habilitar correo electrónico"
+msgstr "¿Habilitar esta etiqueta?"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/edit.html.erb:1
-#, fuzzy
 msgid "Editing label %s"
-msgstr "Editando %s"
+msgstr "Editar etiqueta %s"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/create.html.erb:1
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:29
-#, fuzzy
 msgid "Add a new label"
-msgstr "Agregar un archivo CSS"
+msgstr "Agregar una nueva etiqueta"
  
 # pendiente
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:1
-#, fuzzy
 msgid "Manage comments labels"
-msgstr "Manejar los campos de la comunidad"
+msgstr "Gestionar la etiqueta de los comentarios"
  
 # Le ponemos "no registrado" o "sin registrar"? O no especificado?
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:5
-#, fuzzy
 msgid "(no label registered yet)"
-msgstr "(producto no registrado aun)"
+msgstr "(todavía no se ha registrado una etiqueta)"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:9
 #: plugins/comment_classification/views/comment/comments_labels_select.html.erb:3
 msgid "Label"
-msgstr ""
+msgstr "Etiqueta"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:11
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:10
@@ -174,60 +154,50 @@ msgstr &quot;Habilitado&quot;
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:12
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:12
 msgid "Actions"
-msgstr ""
+msgstr "Acciones"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:21
-#, fuzzy
 msgid "Are you sure you want to  remove this label?"
-msgstr "¿Estás seguro de que deseas eliminar este bloque?"
+msgstr "¿Estás seguro de que deseas eliminar esta etiqueta?"
  
 #: plugins/comment_classification/views/comment_classification_plugin_status/_form.html.erb:7
-#, fuzzy
 msgid "Enable this status?"
-msgstr "Habilitar \"contáctanos\""
+msgstr "¿Habilitar este estado?"
  
 #: plugins/comment_classification/views/comment_classification_plugin_status/edit.html.erb:1
-#, fuzzy
 msgid "Editing status %s"
-msgstr "Editando %s"
+msgstr "Editando el estado %s"
  
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:1
-#, fuzzy
 msgid "Manage comments status"
-msgstr "Administrar contactos"
+msgstr "Gestionar el estado de los comentarios"
  
 # Le ponemos "no registrado" o "sin registrar"? O no especificado?
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:5
-#, fuzzy
 msgid "(no status registered yet)"
-msgstr "(producto no registrado aun)"
+msgstr "(todavía no se ha registrado un estado)"
  
 # habilitado o permitido? estaba o está?
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:11
-#, fuzzy
 msgid "Reason enabled?"
-msgstr "No habilitado"
+msgstr "¿Razón habilitada?"
  
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:21
-#, fuzzy
 msgid "Are you sure you want to remove this status?"
-msgstr "¿Estás seguro de que deseas eliminar este elemento?"
+msgstr "¿Estás seguro de que deseas eliminar este estado?"
  
 #: plugins/comment_classification/views/comment/comments_labels_select.html.erb:3
 msgid "[Select ...]"
-msgstr ""
+msgstr "[Seleccione ...]"
  
 #: plugins/comment_classification/views/comment_classification_plugin_admin/index.html.erb:1
-#, fuzzy
 msgid "Comments classification options"
-msgstr "Opciones de moderación"
+msgstr "Opciones de clasificación de comentarios"
  
 #: plugins/comment_classification/views/comment_classification_plugin_admin/index.html.erb:4
-#, fuzzy
 msgid "Manage Labels"
-msgstr "Administrar campos"
+msgstr "Gestionar Etiquetas"
  
 #: plugins/comment_classification/views/comment_classification_plugin_admin/index.html.erb:5
-#, fuzzy
 msgid "Manage Status"
-msgstr "Administrar contactos"
+msgstr "Gestionar Estados"
@@ -4,167 +4,147 @@
 # , 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-02 21:43-0300\n"
-"PO-Revision-Date: 2014-12-12 14:22+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: French <https://hosted.weblate.org/projects/noosfero/noosfero/"
-"fr/>\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"PO-Revision-Date: 2015-03-07 12:26+0200\n"
+"Last-Translator: Tuux <tuxa@galaxie.eu.org>\n"
+"Language-Team: French <https://hosted.weblate.org/projects/noosfero/plugin-"
+"comment-classification/fr/>\n"
 "Language: fr\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.2-dev\n"
+"X-Generator: Weblate 2.3-dev\n"
  
 #: plugins/comment_classification/lib/comment_classification_plugin.rb:11
-#, fuzzy
 msgid "A plugin that allow classification of comments."
-msgstr "Un bloc qui affiche vos groupes"
+msgstr "Un greffon qui permet de ranger du contenue."
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_labels_controller.rb:16
-#, fuzzy
 msgid "Label created"
-msgstr "Adresse électronique de contact"
+msgstr "Label crée"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_labels_controller.rb:19
-#, fuzzy
 msgid "Label could not be created"
-msgstr "Ce fichier n'a pas pu être sauvegardé"
+msgstr "Le label n'a pas pu êtres créer"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_labels_controller.rb:31
-#, fuzzy
 msgid "Label updated"
-msgstr "Dernière mise à jour"
+msgstr "Label mis à jour"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_labels_controller.rb:34
-#, fuzzy
 msgid "Failed to edit label"
-msgstr "Échec dans l'édition du rôle"
+msgstr "Erreur lors de l'édition du label"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_labels_controller.rb:45
-#, fuzzy
 msgid "Label removed"
-msgstr "Corps de l'article"
+msgstr "Label supprimé"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_labels_controller.rb:47
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_labels_controller.rb:50
-#, fuzzy
 msgid "Label could not be removed"
-msgstr "Ce fichier n'a pas pu être sauvegardé"
+msgstr "Le label n'a pas pu êtres supprimé"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_status_controller.rb:15
-#, fuzzy
 msgid "Status created"
-msgstr "Adresse électronique de contact"
+msgstr "Statut créé"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_status_controller.rb:18
-#, fuzzy
 msgid "Status could not be created"
-msgstr "Ce fichier n'a pas pu être sauvegardé"
+msgstr "Les statuts n'ont pas pu êtres créés"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_status_controller.rb:29
-#, fuzzy
 msgid "Status updated"
-msgstr "Date de début"
+msgstr "Les statuts sont à jour"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_status_controller.rb:32
-#, fuzzy
 msgid "Failed to edit status"
-msgstr "Échec dans l'édition du rôle"
+msgstr "Échec dans l'édition des statuts"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_status_controller.rb:43
-#, fuzzy
 msgid "Status removed"
-msgstr "Corps de l'article"
+msgstr "Les statuts ont été supprimés"
  
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_status_controller.rb:45
 #: plugins/comment_classification/controllers/admin/comment_classification_plugin_status_controller.rb:48
-#, fuzzy
 msgid "Status could not be removed"
-msgstr "Ce fichier n'a pas pu être sauvegardé"
+msgstr "Les statuts ne peuvent pas êtres supprimés"
  
 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/_status_form.html.erb:6
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:9
 #: plugins/comment_classification/views/comment/comment_extra.html.erb:12
 msgid "Status"
-msgstr "Statut"
+msgstr "Statuts"
  
 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/_status_form.html.erb:7
-#, fuzzy
 msgid "Reason:"
-msgstr "Région"
+msgstr "Raison:"
  
 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/add_status.html.erb:1
-#, fuzzy
 msgid "Status for comment"
-msgstr "Un commentaire"
+msgstr "Statuts pour le commentaire"
  
 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/add_status.html.erb:16
 msgid ""
 "<i>%{user}</i> added the status <i>%{status_name}</i> at <i>%{created_at}</"
 "i>."
 msgstr ""
+"<i>%{utilisateur}</i> ajout des statuts <i>%{nom_ du_statut}</i> à "
+"<i>%{creer_a}</i>."
  
 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/add_status.html.erb:18
 msgid "<i>Reason:</i> %s"
-msgstr ""
+msgstr "<i>Raison:</i> %s"
  
 # (second try of this knid of contents)
 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/add_status.html.erb:24
 #: plugins/comment_classification/views/comment_classification_plugin_status/create.html.erb:1
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:29
-#, fuzzy
 msgid "Add a new status"
-msgstr "Une entreprise"
+msgstr "Ajouter un nouveau statut"
  
 #: plugins/comment_classification/views/comment_classification_plugin_myprofile/index.html.erb:1
-#, fuzzy
 msgid "Manage comment classification"
-msgstr "Information sur les dirigeants"
+msgstr "Manager le rangement de commentaire"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/_form.html.erb:6
 #: plugins/comment_classification/views/comment_classification_plugin_status/_form.html.erb:6
 msgid "Name"
-msgstr ""
+msgstr "Nom"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/_form.html.erb:7
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:10
 msgid "Color"
-msgstr ""
+msgstr "Couleur"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/_form.html.erb:8
-#, fuzzy
 msgid "Enable this label?"
-msgstr "Activer l'entreprise"
+msgstr "Activer ce label?"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/edit.html.erb:1
-#, fuzzy
 msgid "Editing label %s"
-msgstr "Édition de %s"
+msgstr "Édition du label %s"
  
 # (second try of this knid of contents)
 #: plugins/comment_classification/views/comment_classification_plugin_labels/create.html.erb:1
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:29
-#, fuzzy
 msgid "Add a new label"
-msgstr "Une entreprise"
+msgstr "Ajouter un nouveau label"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:1
-#, fuzzy
 msgid "Manage comments labels"
-msgstr "Gérer les champs des groupes"
+msgstr "Gérer les commentaires des labels"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:5
-#, fuzzy
 msgid "(no label registered yet)"
-msgstr "(pas encore de matière brute enregistrée)"
+msgstr "(pour le moment aucun label n'est enregistré)"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:9
 #: plugins/comment_classification/views/comment/comments_labels_select.html.erb:3
 msgid "Label"
-msgstr ""
+msgstr "Label"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:11
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:10
@@ -174,32 +154,27 @@ msgstr &quot;Activé&quot;
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:12
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:12
 msgid "Actions"
-msgstr ""
+msgstr "Actions"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:21
-#, fuzzy
 msgid "Are you sure you want to  remove this label?"
-msgstr "Êtes-vous sûr(e) que vous voulez retirer ce commentaire ?"
+msgstr "Êtes-vous sûr(e) que vous voulez retirer ce label ?"
  
 #: plugins/comment_classification/views/comment_classification_plugin_status/_form.html.erb:7
-#, fuzzy
 msgid "Enable this status?"
-msgstr "Gérer les contacts."
+msgstr "Activer ce statut?"
  
 #: plugins/comment_classification/views/comment_classification_plugin_status/edit.html.erb:1
-#, fuzzy
 msgid "Editing status %s"
-msgstr "Édition de %s"
+msgstr "Édition du statut %s"
  
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:1
-#, fuzzy
 msgid "Manage comments status"
-msgstr "Gérer les contacts."
+msgstr "Gérer les commentaires des statuts"
  
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:5
-#, fuzzy
 msgid "(no status registered yet)"
-msgstr "genre non enregistré"
+msgstr "(il n'y a pas de statut enregistré pour le moment)"
  
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:11
 #, fuzzy
@@ -207,25 +182,21 @@ msgid &quot;Reason enabled?&quot;
 msgstr "%s n'était pas activé(e)"
  
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:21
-#, fuzzy
 msgid "Are you sure you want to remove this status?"
-msgstr "Êtes-vous sûr(e) de vouloir ôter cet élément ?"
+msgstr "Êtes-vous sûr(e) de vouloir supprimer ce statut?"
  
 #: plugins/comment_classification/views/comment/comments_labels_select.html.erb:3
 msgid "[Select ...]"
-msgstr ""
+msgstr "[Choisir...]"
  
 #: plugins/comment_classification/views/comment_classification_plugin_admin/index.html.erb:1
-#, fuzzy
 msgid "Comments classification options"
-msgstr "Options de modération"
+msgstr "Options de rangement des commentaires"
  
 #: plugins/comment_classification/views/comment_classification_plugin_admin/index.html.erb:4
-#, fuzzy
 msgid "Manage Labels"
-msgstr "Gérer les champs"
+msgstr "Gérer les labels"
  
 #: plugins/comment_classification/views/comment_classification_plugin_admin/index.html.erb:5
-#, fuzzy
 msgid "Manage Status"
-msgstr "Gérer les contacts."
+msgstr "Gérer les statuts"
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:43-0300\n"
-"PO-Revision-Date: 2009-10-26 16:20-0300\n"
-"Last-Translator: Anahit Minassian <anahit.minassian@cooperation.net>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"PO-Revision-Date: 2015-02-23 11:37+0200\n"
+"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"Language-Team: Armenian <https://hosted.weblate.org/projects/noosfero/plugin-"
+"comment-classification/hy/>\n"
 "Language: hy\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: Pootle 1.1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Weblate 2.3-dev\n"
  
 #: plugins/comment_classification/lib/comment_classification_plugin.rb:11
 #, fuzzy
@@ -125,7 +126,7 @@ msgstr &quot;Տեղեկություններ ղեկավարության մասին&quot;
 #: plugins/comment_classification/views/comment_classification_plugin_labels/_form.html.erb:6
 #: plugins/comment_classification/views/comment_classification_plugin_status/_form.html.erb:6
 msgid "Name"
-msgstr ""
+msgstr "Անվանում"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/_form.html.erb:7
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:10
@@ -171,7 +172,7 @@ msgstr &quot;Ակտիվացված է&quot;
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:12
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:12
 msgid "Actions"
-msgstr ""
+msgstr "Գործողություններ"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:21
 #, fuzzy
@@ -11,18 +11,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:43-0300\n"
-"PO-Revision-Date: 2014-12-18 18:40-0200\n"
-"Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
-"noosfero/pt/>\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"PO-Revision-Date: 2015-02-23 11:38+0200\n"
+"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
+"/plugin-comment-classification/pt/>\n"
 "Language: pt\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\n"
+"X-Generator: Weblate 2.3-dev\n"
  
 #: plugins/comment_classification/lib/comment_classification_plugin.rb:11
 msgid "A plugin that allow classification of comments."
@@ -117,7 +117,7 @@ msgstr &quot;Gerenciar classificação de comentário&quot;
 #: plugins/comment_classification/views/comment_classification_plugin_labels/_form.html.erb:6
 #: plugins/comment_classification/views/comment_classification_plugin_status/_form.html.erb:6
 msgid "Name"
-msgstr ""
+msgstr "Nome"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/_form.html.erb:7
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:10
@@ -158,7 +158,7 @@ msgstr &quot;Habilitado&quot;
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:12
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:12
 msgid "Actions"
-msgstr ""
+msgstr "Ações"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:21
 msgid "Are you sure you want to  remove this label?"
@@ -190,7 +190,7 @@ msgstr &quot;Tem certeza de que quer excluir este status?&quot;
  
 #: plugins/comment_classification/views/comment/comments_labels_select.html.erb:3
 msgid "[Select ...]"
-msgstr ""
+msgstr "[Selecione ...]"
  
 #: plugins/comment_classification/views/comment_classification_plugin_admin/index.html.erb:1
 msgid "Comments classification options"
@@ -5,19 +5,19 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:43-0300\n"
-"PO-Revision-Date: 2014-12-12 14:23+0200\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"PO-Revision-Date: 2015-02-23 11:37+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Russian <https://hosted.weblate.org/projects/noosfero/"
-"noosfero/ru/>\n"
+"Language-Team: Russian <https://hosted.weblate.org/projects/noosfero/plugin-"
+"comment-classification/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 2.2-dev\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
+"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 2.3-dev\n"
  
 #: plugins/comment_classification/lib/comment_classification_plugin.rb:11
 #, fuzzy
@@ -127,7 +127,7 @@ msgstr &quot;Информация о менеджменте&quot;
 #: plugins/comment_classification/views/comment_classification_plugin_labels/_form.html.erb:6
 #: plugins/comment_classification/views/comment_classification_plugin_status/_form.html.erb:6
 msgid "Name"
-msgstr ""
+msgstr "Имя"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/_form.html.erb:7
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:10
@@ -173,7 +173,7 @@ msgstr &quot;Разрешено&quot;
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:12
 #: plugins/comment_classification/views/comment_classification_plugin_status/index.html.erb:12
 msgid "Actions"
-msgstr ""
+msgstr "Действия"
  
 #: plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb:21
 #, fuzzy
@@ -212,7 +212,7 @@ msgstr &quot;Вы уверены что хотите удалить этот элем
  
 #: plugins/comment_classification/views/comment/comments_labels_select.html.erb:3
 msgid "[Select ...]"
-msgstr ""
+msgstr "[Выберите...]"
  
 #: plugins/comment_classification/views/comment_classification_plugin_admin/index.html.erb:1
 #, fuzzy
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:44-0300\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:43-0300\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:43-0300\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
 "PO-Revision-Date: 2014-12-12 14:23+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/noosfero/noosfero/"
@@ -5,23 +5,22 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:43-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"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"PO-Revision-Date: 2015-02-24 19:06+0200\n"
+"Last-Translator: Gonzalo Exequiel Pedone <hipersayan.x@gmail.com>\n"
+"Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/plugin-"
+"community-track/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.3-dev\n"
  
 #: plugins/community_track/lib/community_track_plugin.rb:8
-#, fuzzy
 msgid "New kind of content for communities."
-msgstr "Deshabilitar búsqueda por organizaciones"
+msgstr "Nuevo tipo de contenido para las comunidades."
  
 #: plugins/community_track/lib/community_track_plugin/step.rb:13
 #, fuzzy
@@ -34,15 +33,15 @@ msgstr &quot;&quot;
  
 #: plugins/community_track/lib/community_track_plugin/step.rb:52
 msgid "Step"
-msgstr ""
+msgstr "Paso"
  
 #: plugins/community_track/lib/community_track_plugin/step.rb:56
 msgid "Defines a step."
-msgstr ""
+msgstr "Definir un paso."
  
 #: plugins/community_track/lib/community_track_plugin/track_card_list_block.rb:4
 msgid "Track Card List"
-msgstr ""
+msgstr "Seguimiento de Lista de Tarjetas"
  
 #: plugins/community_track/lib/community_track_plugin/track_card_list_block.rb:8
 #, fuzzy
@@ -54,23 +53,22 @@ msgid &quot;Closed&quot;
 msgstr "Cerrado"
  
 #: plugins/community_track/lib/community_track_plugin/step_helper.rb:4
-#, fuzzy
 msgid "Join!"
-msgstr "Unirse"
+msgstr "Unete!"
  
 #: plugins/community_track/lib/community_track_plugin/step_helper.rb:4
 #: plugins/community_track/test/unit/community_track_plugin/step_helper_test.rb:33
 msgid "Soon"
-msgstr ""
+msgstr "Pronto"
  
 #: plugins/community_track/lib/community_track_plugin/track.rb:11
-#, fuzzy
 msgid "should not be blank."
-msgstr "%s no pudo ser actualizado"
+msgstr "no debe estar vacío."
  
 #: plugins/community_track/lib/community_track_plugin/track.rb:19
+#, fuzzy
 msgid "Track"
-msgstr ""
+msgstr "Seguir"
  
 #: plugins/community_track/lib/community_track_plugin/track.rb:23
 msgid "Defines a track."
@@ -176,7 +174,7 @@ msgstr &quot;Oculto&quot;
  
 #: plugins/community_track/views/blocks/_track_card.html.erb:25
 msgid "hits"
-msgstr ""
+msgstr "aciertos"
  
 #: plugins/community_track/views/blocks/_track_list_more.html.erb:5
 #, fuzzy
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:43-0300\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:44-0300\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
 function enableMoveContainerChildren(container, box) {
   var div = jQuery('#box-'+box+' > .block-outer > .block');
   if(!div.is('.ui-resizable')) {
+    div.removeClass('ui-draggable');
     div.resizable({
       handles: 'e, w',
       containment: '#block-'+container+' .block-inner-2',
@@ -14,6 +15,7 @@ function enableMoveContainerChildren(container, box) {
 function disableMoveContainerChildren(container, box) {
   var div = jQuery('#box-'+box+' > .block-outer > .block');
   if(div.is('.ui-resizable')) {
+    div.addClass('ui-draggable');
     div.resizable('destroy');
   }
 }
@@ -10,7 +10,7 @@
 <div class="clear"></div>
  
 <style>
-  <% box_decorator.select_blocks(block.blocks, { :article => @page, :request_path => request.path, :locale => locale }).each do |child| %>
+  <% box_decorator.select_blocks(block, block.blocks, { :article => @page, :request_path => request.path, :locale => locale, params: request.params, controller: controller}).each do |child| %>      
     #block-<%=block.id%> #block-<%=child.id%> { width: <%= block.child_width(child.id) %>px; }
   <% end %>
 </style>
@@ -11,8 +11,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:44-0300\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
 "PO-Revision-Date: 2014-12-18 18:40-0200\n"
 "Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
@@ -9,7 +9,7 @@ class CustomFormsPluginProfileController &lt; ProfileController
       @submission = CustomFormsPlugin::Submission.find_by_form_id_and_profile_id(@form.id,user.id)
       @submission ||= CustomFormsPlugin::Submission.new(:form => @form, :profile => user)
     else
-      @submission = CustomFormsPlugin::Submission.new(:form => @for)
+      @submission = CustomFormsPlugin::Submission.new(:form => @form)
     end
  
     # build the answers
@@ -5,7 +5,7 @@ class CustomFormsPlugin::Submission &lt; Noosfero::Plugin::ActiveRecord
   # validation is done manually, see below
   has_many :answers, :class_name => 'CustomFormsPlugin::Answer', :dependent => :destroy, :validate => false
  
-  attr_accessible :form, :profile
+  attr_accessible :form, :profile, :author_name, :author_email
  
   validates_presence_of :form
   validates_presence_of :author_name, :author_email, :if => lambda {|submission| submission.profile.nil?}
@@ -13,13 +13,16 @@ class CustomFormsPlugin::Submission &lt; Noosfero::Plugin::ActiveRecord
   validates_format_of :author_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda {|submission| !submission.author_email.blank?})
   validate :check_answers
  
-  def self.human_attribute_name(attrib)
-    if /\d+/ =~ attrib and (f = CustomFormsPlugin::Field.find_by_id(attrib.to_i))
+  def self.human_attribute_name_with_customization(attrib, options={})
+    if /\d+/ =~ attrib and (f = CustomFormsPlugin::Field.find_by_id(attrib.to_s))
       f.name
     else
-      attrib
+      _(self.human_attribute_name_without_customization(attrib))
     end
   end
+  class << self
+    alias_method_chain :human_attribute_name, :customization
+  end
  
   before_create do |submission|
     if submission.profile
@@ -6,18 +6,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:44-0300\n"
-"PO-Revision-Date: 2014-12-12 14:23+0200\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:10-0300\n"
+"PO-Revision-Date: 2015-03-09 09:51+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: German <https://hosted.weblate.org/projects/noosfero/noosfero/"
-"de/>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/noosfero/plugin-"
+"custom-forms/de/>\n"
 "Language: de\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.2-dev\n"
+"X-Generator: Weblate 2.3-dev\n"
  
 #: plugins/custom_forms/lib/custom_forms_plugin/form.rb:67
 msgid "Invalid string format of access."
@@ -188,7 +188,7 @@ msgstr &quot;Neues Formular&quot;
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:5
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb:6
 msgid "Name"
-msgstr ""
+msgstr "Name"
  
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:6
 msgid "Value"
@@ -198,6 +198,10 @@ msgstr &quot;Wert&quot;
 msgid "Add a new option"
 msgstr "Neue Option hinzufügen"
  
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:29
+msgid "Ok"
+msgstr "OK"
+
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_alternative.html.erb:10
 #, fuzzy
 msgid "Remove alternative"
@@ -355,7 +359,7 @@ msgstr &quot;Beiträge&quot;
  
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb:10
 msgid "Actions"
-msgstr ""
+msgstr "Aktionen"
  
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb:20
 msgid "Pending"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:44-0300\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:10-0300\n"
 "PO-Revision-Date: 2014-11-05 13:05+0200\n"
 "Last-Translator: Aurélio A. Heckert <aurelio@colivre.coop.br>\n"
 "Language-Team: Esperanto <https://hosted.weblate.org/projects/noosfero/"
@@ -184,6 +184,10 @@ msgstr &quot;&quot;
 msgid "Add a new option"
 msgstr ""
  
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:29
+msgid "Ok"
+msgstr ""
+
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_alternative.html.erb:10
 msgid "Remove alternative"
 msgstr ""
@@ -5,18 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:44-0300\n"
-"PO-Revision-Date: 2014-11-03 15:52+0200\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:10-0300\n"
+"PO-Revision-Date: 2015-03-09 09:51+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/"
-"noosfero/es/>\n"
+"Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/plugin-"
+"custom-forms/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.3-dev\n"
  
 #: plugins/custom_forms/lib/custom_forms_plugin/form.rb:67
 #, fuzzy
@@ -201,7 +201,7 @@ msgstr &quot;Forma Legal&quot;
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:5
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb:6
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
  
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:6
 msgid "Value"
@@ -212,6 +212,10 @@ msgstr &quot;&quot;
 msgid "Add a new option"
 msgstr "Añadir nuevo producto"
  
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:29
+msgid "Ok"
+msgstr "Ok"
+
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_alternative.html.erb:10
 #, fuzzy
 msgid "Remove alternative"
@@ -377,7 +381,7 @@ msgstr &quot;Permisos&quot;
  
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb:10
 msgid "Actions"
-msgstr ""
+msgstr "Acciones"
  
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb:20
 msgid "Pending"
@@ -4,19 +4,19 @@
 # , 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-02 21:44-0300\n"
-"PO-Revision-Date: 2014-12-12 14:22+0200\n"
+"POT-Creation-Date: 2015-03-05 12:10-0300\n"
+"PO-Revision-Date: 2015-02-23 11:38+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: French <https://hosted.weblate.org/projects/noosfero/noosfero/"
-"fr/>\n"
+"Language-Team: French <https://hosted.weblate.org/projects/noosfero/plugin-"
+"custom-forms/fr/>\n"
 "Language: fr\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.2-dev\n"
+"X-Generator: Weblate 2.3-dev\n"
  
 #: plugins/custom_forms/lib/custom_forms_plugin/form.rb:67
 msgid "Invalid string format of access."
@@ -199,7 +199,7 @@ msgstr &quot;Nouveau dossier&quot;
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:5
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb:6
 msgid "Name"
-msgstr ""
+msgstr "Nom"
  
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:6
 msgid "Value"
@@ -211,6 +211,10 @@ msgstr &quot;&quot;
 msgid "Add a new option"
 msgstr "Une entreprise"
  
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:29
+msgid "Ok"
+msgstr ""
+
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_alternative.html.erb:10
 #, fuzzy
 msgid "Remove alternative"
@@ -383,7 +387,7 @@ msgstr &quot;Permissions&quot;
  
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb:10
 msgid "Actions"
-msgstr ""
+msgstr "Actions"
  
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb:20
 #, fuzzy
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:44-0300\n"
-"PO-Revision-Date: 2009-10-26 16:20-0300\n"
-"Last-Translator: Anahit Minassian <anahit.minassian@cooperation.net>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:10-0300\n"
+"PO-Revision-Date: 2015-02-23 11:37+0200\n"
+"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"Language-Team: Armenian <https://hosted.weblate.org/projects/noosfero/plugin-"
+"custom-forms/hy/>\n"
 "Language: hy\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: Pootle 1.1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Weblate 2.3-dev\n"
  
 #: plugins/custom_forms/lib/custom_forms_plugin/form.rb:67
 msgid "Invalid string format of access."
@@ -197,7 +198,7 @@ msgstr &quot;Նոր թղթապանակ&quot;
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:5
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb:6
 msgid "Name"
-msgstr ""
+msgstr "Անվանում"
  
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:6
 msgid "Value"
@@ -208,6 +209,10 @@ msgstr &quot;&quot;
 msgid "Add a new option"
 msgstr "Մեկ ձեռնարկություն"
  
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:29
+msgid "Ok"
+msgstr ""
+
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_alternative.html.erb:10
 #, fuzzy
 msgid "Remove alternative"
@@ -375,7 +380,7 @@ msgstr &quot;Թույլտվություններ&quot;
  
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb:10
 msgid "Actions"
-msgstr ""
+msgstr "Գործողություններ"
  
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb:20
 #, fuzzy
@@ -11,18 +11,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:44-0300\n"
-"PO-Revision-Date: 2014-12-18 18:40-0200\n"
-"Last-Translator: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
-"noosfero/pt/>\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:10-0300\n"
+"PO-Revision-Date: 2015-03-12 15:13+0200\n"
+"Last-Translator: daniel <dtygel@eita.org.br>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
+"/plugin-custom-forms/pt/>\n"
 "Language: pt\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\n"
+"X-Generator: Weblate 2.3-dev\n"
  
 #: plugins/custom_forms/lib/custom_forms_plugin/form.rb:67
 msgid "Invalid string format of access."
@@ -133,11 +133,11 @@ msgstr &quot;Gerenciar Formulários&quot;
  
 #: plugins/custom_forms/controllers/custom_forms_plugin_myprofile_controller.rb:26
 msgid "Custom form %s was successfully created."
-msgstr "\"O formulário %s foi criado com sucesso.\""
+msgstr "O formulário %s foi criado com sucesso."
  
 #: plugins/custom_forms/controllers/custom_forms_plugin_myprofile_controller.rb:46
 msgid "Custom form %s was successfully updated."
-msgstr "O formulário personalizado %s foi atualizado com sucesso"
+msgstr "O formulário personalizado %s foi atualizado com sucesso."
  
 #: plugins/custom_forms/controllers/custom_forms_plugin_myprofile_controller.rb:49
 msgid "Form could not be updated"
@@ -185,7 +185,7 @@ msgstr &quot;Novo formulário&quot;
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:5
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb:6
 msgid "Name"
-msgstr ""
+msgstr "Nome"
  
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:6
 msgid "Value"
@@ -195,6 +195,10 @@ msgstr &quot;Valor&quot;
 msgid "Add a new option"
 msgstr "Adicionar uma nova opção"
  
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:29
+msgid "Ok"
+msgstr "Ok"
+
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_alternative.html.erb:10
 msgid "Remove alternative"
 msgstr "Remover alternativa"
@@ -340,7 +344,7 @@ msgstr &quot;Submissões&quot;
  
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb:10
 msgid "Actions"
-msgstr ""
+msgstr "Ações"
  
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb:20
 msgid "Pending"
@@ -5,19 +5,19 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:44-0300\n"
-"PO-Revision-Date: 2014-12-12 14:23+0200\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:10-0300\n"
+"PO-Revision-Date: 2015-03-09 09:51+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Russian <https://hosted.weblate.org/projects/noosfero/"
-"noosfero/ru/>\n"
+"Language-Team: Russian <https://hosted.weblate.org/projects/noosfero/plugin-"
+"custom-forms/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 2.2-dev\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
+"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 2.3-dev\n"
  
 #: plugins/custom_forms/lib/custom_forms_plugin/form.rb:67
 msgid "Invalid string format of access."
@@ -200,7 +200,7 @@ msgstr &quot;Новая папка&quot;
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:5
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb:6
 msgid "Name"
-msgstr ""
+msgstr "Имя"
  
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:6
 msgid "Value"
@@ -211,6 +211,10 @@ msgstr &quot;&quot;
 msgid "Add a new option"
 msgstr "Одна компания"
  
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:29
+msgid "Ok"
+msgstr "OK"
+
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_alternative.html.erb:10
 #, fuzzy
 msgid "Remove alternative"
@@ -379,7 +383,7 @@ msgstr &quot;Разрешения&quot;
  
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb:10
 msgid "Actions"
-msgstr ""
+msgstr "Действия"
  
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb:20
 msgid "Pending"
@@ -29,6 +29,30 @@ class CustomFormsPluginProfileControllerTest &lt; ActionController::TestCase
     assert_redirected_to :action => 'show'
   end
  
+  should 'save submission if fields are ok and user is not logged in' do
+    logout
+    form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')
+    field = CustomFormsPlugin::TextField.create(:name => 'Name', :form => form)
+
+    assert_difference 'CustomFormsPlugin::Submission.count', 1 do
+      post :show, :profile => profile.identifier, :id => form.id, :author_name => "john", :author_email => 'john@example.com', :submission => {field.id.to_s => 'Noosfero'}
+    end
+    assert_redirected_to :action => 'show'
+  end
+
+  should 'display errors if user is not logged in and author_name is not uniq' do
+    logout
+    form = CustomFormsPlugin::Form.create(:profile => profile, :name => 'Free Software')
+    field = CustomFormsPlugin::TextField.create(:name => 'Name', :form => form)
+    submission = CustomFormsPlugin::Submission.create(:form => form, :author_name => "john", :author_email => 'john@example.com')
+
+    assert_no_difference 'CustomFormsPlugin::Submission.count' do
+      post :show, :profile => profile.identifier, :id => form.id, :author_name => "john", :author_email => 'john@example.com', :submission => {field.id.to_s => 'Noosfero'}
+    end
+    assert_equal "Submission could not be saved", session[:notice]
+    assert_tag :tag => 'div', :attributes => { :class => 'errorExplanation', :id => 'errorExplanation' }
+  end
+
   should 'disable fields if form expired' do
     form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software', :begining => Time.now + 1.day)
     form.fields << CustomFormsPlugin::TextField.create(:name => 'Field Name', :form => form, :default_value => "First Field")
@@ -6,18 +6,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:43-0300\n"
-"PO-Revision-Date: 2014-12-12 14:23+0200\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"PO-Revision-Date: 2015-02-23 11:37+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: German <https://hosted.weblate.org/projects/noosfero/noosfero/"
-"de/>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/noosfero/plugin-"
+"display-content/de/>\n"
 "Language: de\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.2-dev\n"
+"X-Generator: Weblate 2.3-dev\n"
  
 #: plugins/display_content/lib/display_content_plugin.rb:10
 msgid ""
@@ -49,17 +49,16 @@ msgid &quot;Abstract&quot;
 msgstr "Zusammenfassung"
  
 #: plugins/display_content/lib/display_content_block.rb:151
-#, fuzzy
 msgid "Read more"
-msgstr "Mehr zeigen"
+msgstr "Mehr lesen"
  
 #: plugins/display_content/lib/display_content_block.rb:194
 msgid "%{month}/%{day}/%{year}"
-msgstr ""
+msgstr "%{day}.%{month}.%{year}"
  
 #: plugins/display_content/lib/display_content_block.rb:194
 msgid "%{month}/%{day}"
-msgstr ""
+msgstr "%{day}.%{month}."
  
 #: plugins/display_content/lib/display_content_block.rb:197
 msgid "%{month_name} %{day}, %{year}"
@@ -5,18 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2015-02-02 21:43-0300\n"
-"PO-Revision-Date: 2014-11-03 15:52+0200\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"PO-Revision-Date: 2015-03-09 09:51+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/"
-"noosfero/es/>\n"
+"Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/plugin-"
+"display-content/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.3-dev\n"
  
 #: plugins/display_content/lib/display_content_plugin.rb:10
 msgid ""
@@ -48,21 +48,20 @@ msgid &quot;Abstract&quot;
 msgstr "Resumen"
  
 #: plugins/display_content/lib/display_content_block.rb:151
-#, fuzzy
 msgid "Read more"
-msgstr "Ver más"
+msgstr "Leer más"
  
 #: plugins/display_content/lib/display_content_block.rb:194
 msgid "%{month}/%{day}/%{year}"
-msgstr ""
+msgstr "%{day} de %{month} %{year}"
  
 #: plugins/display_content/lib/display_content_block.rb:194
 msgid "%{month}/%{day}"
-msgstr ""
+msgstr "%{day}/%{month}"
  
 #: plugins/display_content/lib/display_content_block.rb:197
 msgid "%{month_name} %{day}, %{year}"
-msgstr ""
+msgstr "%{day} de %{month_name} de %{year}"
  
 #: plugins/display_content/lib/display_content_block.rb:197
 msgid "%{month_name} %{day}"
@@ -4,113 +4,110 @@
 # , 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-02 21:43-0300\n"
-"PO-Revision-Date: 2014-12-12 14:22+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: French <https://hosted.weblate.org/projects/noosfero/noosfero/"
-"fr/>\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"PO-Revision-Date: 2015-03-07 02:11+0200\n"
+"Last-Translator: Tuux <tuxa@galaxie.eu.org>\n"
+"Language-Team: French <https://hosted.weblate.org/projects/noosfero/plugin-"
+"display-content/fr/>\n"
 "Language: fr\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.2-dev\n"
+"X-Generator: Weblate 2.3-dev\n"
  
 #: plugins/display_content/lib/display_content_plugin.rb:10
 msgid ""
 "A plugin that adds a block where you could choose any of your content and "
 "display it."
 msgstr ""
+"Un greffon qui permet d'ajouter une zone ou vous pourrez y afficher le "
+"contenue de votre choix."
  
 #: plugins/display_content/lib/display_content_block.rb:34
-#, fuzzy
 msgid "Display your contents"
-msgstr "Afficher un de vos contenus."
+msgstr "Afficher vos contenus"
  
 #: plugins/display_content/lib/display_content_block.rb:38
-#, fuzzy
 msgid ""
 "This block displays articles chosen by you. You can edit the block to select "
 "which of your articles is going to be displayed in the block."
 msgstr ""
-"Ce bloc affiche un de vos articles. Vous pouvez éditer le bloc pour "
+"Ce bloc affiche l'article de votre choix. Vous pouvez éditer le bloc pour "
 "sélectionner lequel de vos articles va être affiche dans ce bloc."
  
 #: plugins/display_content/lib/display_content_block.rb:43
-#, fuzzy
 msgid "Publish date"
-msgstr "Publié"
+msgstr "Date de publication"
  
 #: plugins/display_content/lib/display_content_block.rb:45
 msgid "Abstract"
 msgstr "Résumé"
  
 #: plugins/display_content/lib/display_content_block.rb:151
-#, fuzzy
 msgid "Read more"
-msgstr "plus..."
+msgstr "En lire plus"
  
 #: plugins/display_content/lib/display_content_block.rb:194
 msgid "%{month}/%{day}/%{year}"
-msgstr ""
+msgstr "%{mois}/%{jour}/%{année}"
  
 #: plugins/display_content/lib/display_content_block.rb:194
 msgid "%{month}/%{day}"
-msgstr ""
+msgstr "%{mois}/%{jour}"
  
 #: plugins/display_content/lib/display_content_block.rb:197
 msgid "%{month_name} %{day}, %{year}"
-msgstr ""
+msgstr "%{nom_du_mois} %{jour}, %{année}"
  
 #: plugins/display_content/lib/display_content_block.rb:197
 msgid "%{month_name} %{day}"
-msgstr ""
+msgstr "%{nom_du_mois} %{jour}"
  
 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:5
 msgid "Choose which attributes should be displayed and drag to reorder them:"
 msgstr ""
+"Choisissez quels attribues doivent êtres afficher et glisser/déposer pour "
+"les réorganiser:"
  
 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:21
 msgid "Choose which content should be displayed:"
-msgstr ""
+msgstr "Choisissez le contenu à afficher:"
  
 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:23
 msgid "Choose directly"
-msgstr ""
+msgstr "Choisir directement"
  
 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:24
-#, fuzzy
 msgid "Choose by Content Type"
-msgstr "Type de contenu"
+msgstr "Choisir par type de contenu"
  
 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:28
 msgid "Order by:"
-msgstr ""
+msgstr "Trier par:"
  
 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:29
 msgid "Most recent"
-msgstr ""
+msgstr "Le plus récent"
  
 #: plugins/display_content/views/box_organizer/_display_content_block.html.erb:30
 msgid "Most oldest"
-msgstr ""
+msgstr "Le plus ancien"
  
 #: plugins/display_content/views/box_organizer/_choose_by_content_type.html.erb:1
-#, fuzzy
 msgid "Display content types:"
-msgstr "Afficher un de vos contenus."
+msgstr "Afficher le types de contenue:"
  
 #: plugins/display_content/views/box_organizer/_choose_by_content_type.html.erb:7
-#, fuzzy
 msgid "more"
-msgstr "plus..."
+msgstr "plus"
  
 #: plugins/display_content/views/box_organizer/_choose_directly.html.erb:5
 msgid "Dinamically load children of selected folders"
-msgstr ""
+msgstr "Dynamiquement charger les sous répertoires des répertoires sélectionnés"
  
 #: plugins/display_content/views/box_organizer/_choose_directly.html.erb:9
 msgid "Limit:"
-msgstr ""
+msgstr "Limite:"
...	...	@@ -120,16 +120,21 @@ Diego Araujo + Rodrigo Souto + Rafael Manzo <rr.manzo@gmail.com>
120	120	Diego + Jefferson <diegoamc90@gmail.com>
121	121	Diego Martinez <diegoamc90@gmail.com>
122	122	Diego + Renan <renanteruoc@gmail.com>
	123	+DylanGuedes <djmgguedes@gmail.com>
	124	+Eduardo Passos <eduardo@risa.localdomain.localhost>
	125	+Eduardo Passos <eduardosteps@gmail.com>
123	126	Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
124	127	Evandro Jr <evandrojr@gmail.com>
125	128	Evandro Junior <evandrojr@gmail.com>
126	129	Fabio Teixeira <fabio1079@gmail.com>
	130	+FAMMA TV NOTICIAS MEDIOS DE CO <revistafammatvmusic.oficial@gmail.com>
127	131	Fernanda Lopes <nanda.listas+psl@gmail.com>
128	132	Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
129	133	Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
130	134	Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
131	135	Francisco Marcelo de Araújo Lima Júnior <maljunior@gmail.com>
132	136	Gabriela Navarro <navarro1703@gmail.com>
	137	+Gonzalo Exequiel Pedone <hipersayan.x@gmail.com>
133	138	Grazieno Pellegrino <grazieno@gmail.com>
134	139	Gust <darksshades@hotmail.com>
135	140	Hebert Douglas <hebertdougl@gmail.com>
...	...	@@ -186,18 +191,23 @@ Leandro Nunes dos Santos <81665687568@serpro-1541727.(none)>
186	191	Leandro Nunes dos Santos <leandronunes@gmail.com>
187	192	Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
188	193	LinguÁgil 2010 <linguagil.bahia@gmail.com>
	194	+Lucas Kanashiro <kanashiro.duarte@gmail.com>
189	195	Lucas Melo <lucas@colivre.coop.br>
190	196	Lucas Melo <lucaspradomelo@gmail.com>
191	197	Luciano <lucianopcbr@gmail.com>
192	198	Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
193	199	Luis David Aguilar Carlos <ludwig9003@gmail.com>
194	200	Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com>
	201	+Marcos <marcos.rpj2@gmail.com>
195	202	Marcos Ramos <ms.ramos@outlook.com>
196	203	Martín Olivera <molivera@solar.org.ar>
	204	+Maurilio Atila <cabelotaina@gmail.com>
	205	+M for Momo <mo@rtnp.org>
197	206	Michal Čihař <michal@cihar.com>
198	207	Moises Machado <moises@colivre.coop.br>
199	208	Naíla Alves <naila@colivre.coop.br>
200	209	Nanda Lopes <nanda.listas+psl@gmail.com>
	210	+Niemand Jedermann <predatorix@web.de>
201	211	Parley Martins <parleypachecomartins@gmail.com>
202	212	Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
203	213	Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
...	...	@@ -234,8 +244,11 @@ Ronny Kursawe <kursawe.ronny@googlemail.com>
234	244	root <root@debian.sdr.serpro>
235	245	Samuel R. C. Vale <srcvale@holoscopio.com>
236	246	Tallys Martins <tallysmartins@gmail.com>
	247	+Tallys Martins <tallysmartins@yahoo.com.br>
	248	+tallys <tallys@tallys>
237	249	tallys <tallys@tallys.(none)>
238	250	Thiago Zoroastro <thiago.zoroastro@bol.com.br>
	251	+Tuux <tuxa@galaxie.eu.org>
239	252	Valessio Brito <contato@valessiobrito.com.br>
240	253	Valessio Brito <contato@valessiobrito.info>
241	254	Valessio Brito <valessio@gmail.com>
...	...
...	...	@@ -2,7 +2,7 @@ source "https://rubygems.org"
2	2	gem 'rails', '~> 3.2.21'
3	3	gem 'minitest', '~> 3.2.0'
4	4	gem 'fast_gettext', '~> 0.6.8'
5		-gem 'acts-as-taggable-on', '~> 3.0.2'
	5	+gem 'acts-as-taggable-on', '~> 3.4.2'
6	6	gem 'rails_autolink', '~> 1.1.5'
7	7	gem 'pg', '~> 0.13.2'
8	8	gem 'rmagick', '~> 2.13.1'
...	...	@@ -15,10 +15,10 @@ gem 'nokogiri', '~> 1.5.5'
15	15	gem 'rake', :require => false
16	16	gem 'rest-client', '~> 1.6.7'
17	17	gem 'exception_notification', '~> 4.0.1'
18		-gem 'gettext', '~> 2.2.1', :require => false, :group => :development
	18	+gem 'gettext', '~> 2.2.1', :require => false
19	19	gem 'locale', '~> 2.0.5'
20	20	gem 'whenever', :require => false
21		-gem 'eita-jrails', :require => false
	21	+gem 'eita-jrails', '>= 0.9.5', :require => 'jrails'
22	22
23	23	group :production do
24	24	gem 'dalli', '~> 2.7.0'
...	...
...	...	@@ -0,0 +1,60 @@
	1	+Noosfero Instructions for Theme Developers
	2	+==========================================
	3	+
	4	+To build Noosfero themes you must to know HTML and CSS. You may also get some advantages with Ruby and Noosfero hacking knowledge because all customizable pieces of the theme's HTML structure are [erb](http://en.wikipedia.org/wiki/ERuby) files.
	5	+
	6	+
	7	+Organization Basics
	8	+-------------------
	9	+
	10	+A theme is a directory and must inside `noosfero/public/designs/themes`, and you will find tis themes in a fresh installation:
	11	+`noosfero`, `aluminium`, `base`, `butter`, `chameleon`, `chocolate`, `orange`, `plum`, `scarletred` and `skyblue`. The `default` is only a link to `noosfero` and you can change this link to any other.
	12	+
	13	+`noosfero` is the default theme with a big header. All other are colored themes with a thin header. That colored ones can be used as additional themes for any environment, as they will search for `/images/thin-logo.png` inside the current environment.theme, to use as top left logo.
	14	+
	15	+Inside a theme we can found:
	16	+* `theme.yml` — Theme description with some nice configuration options.
	17	+* `preview.png` — A 100x100 screenshot of this theme to the theme selection UI.
	18	+* `style.css` — The main file. The magic happens here.
	19	+* `errors.css` — Change the error page look. (only if this theme is linked by `defaut`)
	20	+* `favicon.ico` — The identifier icon for your web site.
	21	+* `images` — Another name can be found by your CSS, but will not allow to reuse the logo.
	22	+ * `thin-logo.png` — The logo to be reused by the colored themes.
	23	+ * many images...
	24	+* `site_title.html.erb` — A nice place to put your logo, any code here will be placed inside `h1#site-title`.
	25	+* `header.html.erb` — That goes inside `div#theme-header`.
	26	+* `navigation.html.erb` — That goes inside `div#navigation ul`, so use `<li>`s.
	27	+* `footer.html.erb` — That goes inside `div#theme-footer`.
	28	+
	29	+You can add more files like javascript and modularized CSS, but you must to refer that by the described files above.
	30	+
	31	+To refer one of this files trough the web the path is `<domain>/designs/themes/<thistheme>/<somefile>`.
	32	+
	33	+
	34	+theme.yml
	35	+---------
	36	+
	37	+A simple definition file. See this example:
	38	+```yml
	39	+name: "My Cool Theme"
	40	+layout: "application-ng"
	41	+jquery_theme: "smoothness"
	42	+icon_theme: [default, pidgin]
	43	+gravatar: "retro"
	44	+```
	45	+
	46	+About non obvious:
	47	+* `layout` is about the theme structure to use. The `application-ng` is enough for 99.97358% use cases. If you want to use another structure, you must add a new `*.html.erb` file at `app/views/layouts/`.
	48	+* `icon_theme` point to something inside `public/designs/icons/`.
	49	+* `gravatar` set the default gravatar (avatar picture) for people without picture.
	50	+
	51	+
	52	+Theme Intervention from Environment Theme
	53	+-----------------------------------------
	54	+
	55	+Sometimes an environment (as instace http://cirandas.net) wants to allow profiles to set its own theme, but with some environment identification or functions, like a top bar with the social network logo and a top menu (as instace http://cirandas.net/rango-vegan).
	56	+To make the magic happens you can add some files to the environment theme.
	57	+All are optional:
	58	+* `global.css` — this must be used to style all extra html added by your intervention partials. As it is a free form css file you can style anything, but this is a conflict risk.
	59	+* `global_header.html.erb` — Will add content to `#global-header`.
	60	+* `global_footer.html.erb` — Will add content to `#global-footer`.
...	...
...	...	@@ -0,0 +1,18 @@
	1	+# This Rakefile is intentionally independent from Rails to it can be used to
	2	+# handle release-related tasks without having to load the entire Rails
	3	+# environment (which is slow, requires a database connection and several other
	4	+# inconveniences).
	5	+
	6	+$: << 'lib'
	7	+require 'noosfero'
	8	+require 'noosfero/version'
	9	+
	10	+load 'lib/tasks/gettext.rake'
	11	+load 'lib/tasks/doc.rake'
	12	+load 'lib/tasks/error_messages.rake'
	13	+load 'lib/tasks/translation.rake'
	14	+
	15	+load 'lib/tasks/package.rake'
	16	+load 'lib/tasks/release.rake'
	17	+
	18	+task :default => 'noosfero:translations:compile'
...	...
...	...	@@ -179,6 +179,7 @@ class ApplicationController < ActionController::Base
179	179	include SearchTermHelper
180	180
181	181	def find_by_contents(asset, context, scope, query, paginate_options={:page => 1}, options={})
	182	+ scope = scope.with_templates(options[:template_id]) unless options[:template_id].blank?
182	183	search = plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options)
183	184	register_search_term(query, scope.count, search[:results].count, context, asset)
184	185	search
...	...
...	...	@@ -315,7 +315,11 @@ class AccountController < ApplicationController
315	315	session[:notice] = nil # consume the notice
316	316	end
317	317
318		- @plugins.each { \|plugin\| user_data.merge!(plugin.user_data_extras) }
	318	+ @plugins.each do \|plugin\|
	319	+ user_data_extras = plugin.user_data_extras
	320	+ user_data_extras = instance_exec(&user_data_extras) if user_data_extras.kind_of?(Proc)
	321	+ user_data.merge!(user_data_extras)
	322	+ end
319	323
320	324	render :text => user_data.to_json, :layout => false, :content_type => "application/javascript"
321	325	end
...	...
...	...	@@ -221,7 +221,7 @@ class ContentViewerController < ApplicationController
221	221	# relation.
222	222	posts = posts.native_translations if blog_with_translation?(@page)
223	223
224		- @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile))).to_a
	224	+ @posts = posts.display_filter(user, profile).paginate({ :page => params[:npage], :per_page => @page.posts_per_page }).to_a
225	225
226	226	if blog_with_translation?(@page)
227	227	@posts.replace @posts.map{ \|p\| p.get_translation_to(FastGettext.locale) }.compact
...	...
...	...	@@ -9,6 +9,7 @@ class SearchController < PublicController
9	9	before_filter :load_search_assets, :except => :suggestions
10	10	before_filter :load_query, :except => :suggestions
11	11	before_filter :load_order, :except => :suggestions
	12	+ before_filter :load_templates, :except => :suggestions
12	13
13	14	# Backwards compatibility with old URLs
14	15	def redirect_asset_param
...	...	@@ -61,7 +62,7 @@ class SearchController < PublicController
61	62	end
62	63
63	64	def articles
64		- @scope = @environment.articles.public
	65	+ @scope = @environment.articles.public.paginate(paginate_options)
65	66	full_text_search
66	67	end
67	68
...	...	@@ -75,7 +76,7 @@ class SearchController < PublicController
75	76	end
76	77
77	78	def products
78		- @scope = @environment.products
	79	+ @scope = @environment.products.paginate(paginate_options)
79	80	full_text_search
80	81	end
81	82
...	...	@@ -210,6 +211,11 @@ class SearchController < PublicController
210	211	end
211	212	end
212	213
	214	+ def load_templates
	215	+ @templates = {}
	216	+ @templates[@asset] = environment.send(@asset.to_s).templates if [:people, :enterprises, :communities].include?(@asset)
	217	+ end
	218	+
213	219	def limit
214	220	if map_search?(@searches)
215	221	MAP_SEARCH_LIMIT
...	...	@@ -230,7 +236,7 @@ class SearchController < PublicController
230	236	end
231	237
232	238	def full_text_search
233		- @searches[@asset] = find_by_contents(@asset, environment, @scope, @query, paginate_options, {:category => @category, :filter => @order})
	239	+ @searches[@asset] = find_by_contents(@asset, environment, @scope, @query, paginate_options, {:category => @category, :filter => @order, :template_id => params[:template_id]})
234	240	end
235	241
236	242	private
...	...	@@ -238,7 +244,7 @@ class SearchController < PublicController
238	244	def visible_profiles(klass, *extra_relations)
239	245	relations = [:image, :domains, :environment, :preferred_domain]
240	246	relations += extra_relations
241		- @environment.send(klass.name.underscore.pluralize).visible.includes(relations)
	247	+ @environment.send(klass.name.underscore.pluralize).visible.includes(relations).paginate(paginate_options)
242	248	end
243	249
244	250	def per_page
...	...
...	...	@@ -13,7 +13,7 @@ class PublicController < ApplicationController
13	13
14	14	def private_profile
15	15	private_profile_partial_parameters
16		- render :template => 'shared/access_denied.html.erb', :status => 403
	16	+ render :template => 'profile/_private_profile', :status => 403, :formats => [:html]
17	17	end
18	18
19	19	def invisible_profile
...	...
...	...	@@ -212,6 +212,7 @@ module ApplicationHelper
212	212	end
213	213
214	214	def button(type, label, url, html_options = {})
	215	+ html_options \|\|= {}
215	216	the_class = 'with-text'
216	217	if html_options.has_key?(:class)
217	218	the_class << ' ' << html_options[:class]
...	...	@@ -398,19 +399,27 @@ module ApplicationHelper
398	399	end
399	400	end
400	401
401		- def theme_view_file(template)
	402	+ def theme_view_file(template, theme=nil)
402	403	# Since we cannot control what people are doing in external themes, we
403	404	# will keep looking for the deprecated .rhtml extension here.
404		- file = Rails.root.join('public', theme_path[1..-1], template + '.html.erb')
	405	+ addr = theme ? "designs/themes/#{theme}" : theme_path[1..-1]
	406	+ file = Rails.root.join('public', addr, template + '.html.erb')
405	407	return file if File.exists?(file)
406	408	nil
407	409	end
408	410
409	411	def theme_include(template, options = {})
410		- file = theme_view_file(template)
411		- options.merge!({:file => file, :use_full_path => false})
	412	+ from_theme_include(nil, template, options)
	413	+ end
	414	+
	415	+ def env_theme_include(template, options = {})
	416	+ from_theme_include(environment.theme, template, options)
	417	+ end
	418	+
	419	+ def from_theme_include(theme, template, options = {})
	420	+ file = theme_view_file(template, theme)
412	421	if file
413		- render options
	422	+ render options.merge(file: file, use_full_path: false)
414	423	else
415	424	nil
416	425	end
...	...	@@ -446,6 +455,14 @@ module ApplicationHelper
446	455	@theme_extra_navigation \|\|= theme_include 'navigation'
447	456	end
448	457
	458	+ def global_header
	459	+ @global_header \|\|= env_theme_include 'global_header'
	460	+ end
	461	+
	462	+ def global_footer
	463	+ @global_footer \|\|= env_theme_include 'global_footer'
	464	+ end
	465	+
449	466	def is_testing_theme
450	467	!controller.session[:theme].nil?
451	468	end
...	...