Merge branch 'master' into stoa

Conflicts: app/controllers/my_profile/profile_editor_controller.rb app/helpers/search_helper.rb app/models/invitation.rb app/models/person.rb app/views/cms/view.html.erb app/views/templates/index.html.erb plugins/community_track/views/content_viewer/_step_item.html.erb test/functional/home_controller_test.rb test/unit/person_test.rb test/unit/profile_test.rb

Merge branch 'master' into stoa
Conflicts: app/controllers/my_profile/profile_editor_controller.rb app/helpers/search_helper.rb app/models/invitation.rb app/models/person.rb app/views/cms/view.html.erb app/views/templates/index.html.erb plugins/community_track/views/content_viewer/_step_item.html.erb test/functional/home_controller_test.rb test/unit/person_test.rb test/unit/profile_test.rb
Rodrigo Souto
2 parents be50abba ef453b43
Showing 630 changed files with 25805 additions and 46811 deletions Show diff stats
Gemfile
INSTALL.https.md
INSTALL.locales.md
app/controllers/admin/admin_panel_controller.rb
app/controllers/admin/plugin_admin_controller.rb
app/controllers/admin/templates_controller.rb
app/controllers/application_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/my_profile/profile_members_controller.rb
app/controllers/public/contact_controller.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/helpers/boxes_helper.rb
app/helpers/content_viewer_helper.rb
app/helpers/layout_helper.rb
app/helpers/person_notifier_helper.rb
app/helpers/search_helper.rb
app/helpers/tinymce_helper.rb
 source "https://rubygems.org"
 gem 'rails',                    '~> 3.2.19'
+gem 'minitest',                 '~> 3.2.0'
 gem 'fast_gettext',             '~> 0.6.8'
 gem 'acts-as-taggable-on',      '~> 3.0.2'
 gem 'prototype-rails',          '~> 3.2.1'
-Setup Noosfero to use HTTPS
-===========================
+# Setup Noosfero to use HTTPS
  
 This document assumes that you have a fully and clean Noosfero
 installation as explained at the `INSTALL.md` file.
  
-SSL certificate
-+++++++++++++++
+## Creating a self-signed SSL certificate
  
 You should get a valid SSL certificate, but if you want to test
 your setup before, you could generate a self-signed certificate
@@ -17,99 +15,106 @@ as below:
     # openssl req -new -x509 -nodes -sha1 -days $[10*365] -key noosfero.key > noosfero.cert
     # cat noosfero.key noosfero.cert > noosfero.pem
  
+## Web server configuration
+
 There are two ways of using SSL with Noosfero: 1) If you are not using
 Varnish; and 2) If you are using Varnish.
  
-1) If you are are not using Varnish
-+++++++++++++++++++++++++++++++++++
+### 1) If you are are not using Varnish
  
 Simply do a redirect in apache to force all connections with SSL:
  
-  <VirtualHost *:8080>
-    ServerName test.stoa.usp.br
-   
-    Redirect / https://example.com/
-  </VirtualHost>
+```
+<VirtualHost *:8080>
+  ServerName test.stoa.usp.br
+  Redirect / https://example.com/
+</VirtualHost>
+```
  
 And set a vhost to receive then:
  
-  <VirtualHost *:443>
-    ServerName example.com
-   
-    SSLEngine On
-    SSLCertificateFile    /etc/ssl/certs/cert.pem
-    SSLCertificateKeyFile /etc/ssl/private/cert.key
-   
-    Include /etc/noosfero/apache/virtualhost.conf
-  </VirtualHost>
+```
+<VirtualHost *:443>
+  ServerName example.com
+  SSLEngine On
+  SSLCertificateFile    /etc/ssl/certs/cert.pem
+  SSLCertificateKeyFile /etc/ssl/private/cert.key
+  Include /etc/noosfero/apache/virtualhost.conf
+</VirtualHost>
+```
  
 Be aware that if you had configured varnish, the requests won't reach
 it with this configuration.
  
-2) If you are using Varnish
-+++++++++++++++++++++++++++
-
-Varnish isn't able to communicate with the SSL protocol, so we will
-need some one who do this and Pound[1] can do the job. In order to
-install it in Debian based systems:
+### 2) If you are using Varnish
  
-  $ sudo apt-get install pound
+Varnish isn't able to communicate with the SSL protocol, so we will need some
+one else who do this and [Pound](http://www.apsis.ch/pound) can do the job. In
+order to install it in Debian based systems:
  
-Set Varnish to listen in other port than 80:
+```
+$ sudo apt-get install pound
+```
  
-/etc/defaults/varnish
----------------------
+Set Varnish to listen in other port than 80 in `/etc/defaults/varnish`:
  
-  DAEMON_OPTS="-a localhost:6081 \
-               -T localhost:6082 \ 
-               -f /etc/varnish/default.vcl \ 
-               -S /etc/varnish/secret \ 
-               -s file,/var/lib/varnish/$INSTANCE/varnish_storage.bin,1G"
+```
+DAEMON_OPTS="-a localhost:6081 \
+             -T localhost:6082 \
+             -f /etc/varnish/default.vcl \
+             -S /etc/varnish/secret \
+             -s file,/var/lib/varnish/$INSTANCE/varnish_storage.bin,1G"
+```
  
 Configure Pound:
  
-    # cp /usr/share/noosfero/etc/pound.cfg /etc/pound/
-
-Edit /etc/pound.cfg and set the IP and domain of your server.
+```
+# cp /usr/share/noosfero/etc/pound.cfg /etc/pound/
+```
  
-Configure Pound to start at system initialization:
+Edit `/etc/pound.cfg` and set the IP and domain of your server.
  
-/etc/default/pound
+Configure Pound to start at system initialization. At `/etc/default/pound`:
 ------------------
  
-  startup=1
+```
+startup=1
+```
  
-Set Apache to only listen to localhost:
+Set Apache to only listen to localhost, at `/etc/apache2/ports.conf`:
  
-/etc/apache2/ports.conf
------------------------
-
-  Listen 127.0.0.1:8080
+```
+Listen 127.0.0.1:8080
+```
  
 Restart the services:
  
-  $ sudo service apache2 restart
-  $ sudo service varnish restart
+```
+$ sudo service apache2 restart
+$ sudo service varnish restart
+```
  
 Start pound:
  
-  $ sudo service pound start
-
-[1] http://www.apsis.ch/pound
+```
+$ sudo service pound start
+```
  
-Noosfero XMPP chat
-++++++++++++++++++
+## Noosfero XMPP chat
  
 If you want to use chat over HTTPS, then you should add the domain
-and IP of your server in the /etc/hosts file, example:
+and IP of your server in the /etc/hosts file, example
  
-/etc/hosts
-----------
+`/etc/hosts:`
  
-  192.168.1.86	mydomain.example.com
+```
+192.168.1.86	mydomain.example.com
+```
  
-Also, it's recomended that you remove lines above from the file
+Also, it's recomended that you remove the lines below from the file
 `/etc/apache2/sites-enabled/noosfero`:
  
-    RewriteEngine On
-    Include /usr/share/noosfero/util/chat/apache/xmpp.conf
+```
+RewriteEngine On
+Include /usr/share/noosfero/util/chat/apache/xmpp.conf
+```
@@ -0,0 +1,29 @@
+Using custom locales
+====================
+
+Personalized translations go into the `config/custom_locales/` directory.
+Custom locales can be identified by the rails environment, schema name in a
+multitenancy setup or domain name until the first dot (e.g env1.coop.br for the
+example below).
+
+Currently, the only filename prefix for the localization file which is
+processed is "environment". For instance, a POT file would be called
+"environment.pot".
+
+The structure of an environment named env1 with custom translations for both
+Portuguese and Spanish and an environment named env2 with custom Russian
+translation would be:
+
+    config/
+      custom_locales/
+        env1/
+          environment.pot
+          pt/
+            environment.po
+          es/
+            environment.po
+        env2/
+          environment.pot
+          ru/
+            environment.po
+
@@ -71,4 +71,22 @@ class AdminPanelController &lt; AdminController
       end
     end
   end
+
+  def manage_organizations_status
+    scope = environment.organizations
+    @filter = params[:filter] || 'any'
+    @title = "Organization profiles"
+    @title = @title+" - "+@filter if @filter != 'any'
+
+    if @filter == 'enabled'
+      scope = scope.visible
+    elsif @filter == 'disabled'
+      scope = scope.disabled
+    end
+
+    scope = scope.order('name ASC')
+
+    @q = params[:q]
+    @collection = find_by_contents(:organizations, scope, @q, {:per_page => 10, :page => params[:npage]})[:results]
+  end
 end
@@ -0,0 +1,5 @@
+class PluginAdminController < AdminController
+
+  protect 'edit_environment_features', :environment
+
+end
@@ -40,8 +40,67 @@ class TemplatesController &lt; AdminController
     end
   end
  
+  def set_community_as_default
+    begin
+      community = environment.communities.find(params[:template_id])
+    rescue ActiveRecord::RecordNotFound
+      message = _('Community not found. The template could no be changed.')
+      community = nil
+    end
+
+    message = _('%s defined as default') % community.name if set_as_default(community)
+    session[:notice] = message
+
+    redirect_to :action => 'index'
+  end
+
+  def set_person_as_default
+    begin
+      person = environment.people.find(params[:template_id])
+    rescue ActiveRecord::RecordNotFound
+      message = _('Person not found. The template could no be changed.')
+      person = nil
+    end
+
+    message = _('%s defined as default') % person.name if set_as_default(person)
+    session[:notice] = message
+
+    redirect_to :action => 'index'
+  end
+
+  def set_enterprise_as_default
+    begin
+      enterprise = environment.enterprises.find(params[:template_id])
+    rescue ActiveRecord::RecordNotFound
+      message = _('Enterprise not found. The template could no be changed.')
+      enterprise = nil
+    end
+
+    message = _('%s defined as default') % enterprise.name if set_as_default(enterprise)
+    session[:notice] = message
+
+    redirect_to :action => 'index'
+  end
+
   private
  
+  def set_as_default(obj)
+    return nil if obj.nil?
+    case obj.class.name
+      when 'Community' then
+        environment.community_default_template = obj
+        environment.save!
+      when 'Person' then
+        environment.person_default_template = obj
+        environment.save!
+      when 'Enterprise' then
+        environment.enterprise_default_template = obj
+        environment.save!
+      else
+        nil
+    end
+  end
+
   def create_organization_template(klass)
     identifier = params[:name].to_slug
     template = klass.new(:name => params[:name], :identifier => identifier, :is_template => true)
@@ -127,6 +127,9 @@ class ApplicationController &lt; ActionController::Base
  
   # TODO: move this logic somewhere else (Domain class?)
   def detect_stuff_by_domain
+    # Sets text domain based on request host for custom internationalization
+    FastGettext.text_domain = Domain.custom_locale(request.host)
+
     @domain = Domain.find_by_name(request.host)
     if @domain.nil?
       @environment = Environment.default
@@ -180,6 +180,8 @@ class CmsController &lt; MyProfileController
  
   post_only :set_home_page
   def set_home_page
+    return render_access_denied unless user.can_change_homepage?
+
     article = params[:id].nil? ? nil : profile.articles.find(params[:id])
     profile.update_attribute(:home_page, article)
  
@@ -218,6 +220,7 @@ class CmsController &lt; MyProfileController
       if @errors.any?
         render :action => 'upload_files', :parent_id => @parent_id
       else
+        session[:notice] = _('File(s) successfully uploaded') 
         if @back_to
           redirect_to @back_to
         elsif @parent
@@ -3,7 +3,16 @@ class ProfileDesignController &lt; BoxOrganizerController
   needs_profile
  
   protect 'edit_profile_design', :profile
-  
+
+  before_filter :protect_fixed_block, :only => [:save, :move_block]
+
+  def protect_fixed_block
+    block = boxes_holder.blocks.find(params[:id].gsub(/^block-/, ''))
+    if block.fixed && !current_person.is_admin?
+      render_access_denied
+    end
+  end
+
   def available_blocks
     blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock, HighlightsBlock ]
  
@@ -78,7 +78,11 @@ class ProfileEditorController &lt; MyProfileController
     if request.post?
       if @profile.destroy
         session[:notice] = _('The profile was deleted.')
-        redirect_to :controller => 'home'
+        if(params[:return_to])
+          redirect_to params[:return_to]
+        else
+          redirect_to :controller => 'home'
+        end
       else
         session[:notice] = _('Could not delete profile')
       end
@@ -100,6 +104,45 @@ class ProfileEditorController &lt; MyProfileController
     end
   end
  
+  def deactivate_profile
+    if environment.admins.include?(current_person)
+      profile = environment.profiles.find(params[:id])
+      if profile.disable
+        profile.save
+        session[:notice] = _("The profile '#{profile.name}' was deactivated.")
+      else
+        session[:notice] = _('Could not deactivate profile.')
+      end
+    end
+
+    redirect_to_previous_location
+  end
+
+  def activate_profile
+    if environment.admins.include?(current_person)
+      profile = environment.profiles.find(params[:id])
+
+      if profile.enable
+        session[:notice] = _("The profile '#{profile.name}' was activated.")
+      else
+        session[:notice] = _('Could not activate the profile.')
+      end
+    end
+
+    redirect_to_previous_location
+  end
+
+  protected
+
+  def redirect_to_previous_location
+    redirect_to @back_to
+  end
+
+  #TODO Consider using this as a general controller feature to be available on every action.
+  def back_to
+    @back_to = params[:back_to] || request.referer || "/"
+  end
+
   private
  
   def has_welcome_page
@@ -112,8 +155,4 @@ class ProfileEditorController &lt; MyProfileController
     end
   end
  
-  #TODO Consider using this as a general controller feature to be available on every action.
-  def back_to
-    @back_to = params[:back_to] || request.referer
-  end
 end
@@ -20,7 +20,7 @@ class ProfileMembersController &lt; MyProfileController
         redirect_to :action => :last_admin
       elsif @person.define_roles(@roles, profile)
         session[:notice] = _('Roles successfuly updated')
-        redirect_to :controller => 'profile_editor'
+        redirect_to :action => 'index'
       else
         session[:notice] = _('Couldn\'t change the roles')
         redirect_to :action => 'index'
 class ContactController < PublicController
  
-  before_filter :login_required
-
   needs_profile
  
   def new
-    @contact
+    @contact = build_contact
     if request.post? && params[:confirm] == 'true'
-      @contact = user.build_contact(profile, params[:contact])
       @contact.city = (!params[:city].blank? && City.exists?(params[:city])) ? City.find(params[:city]).name : nil
       @contact.state = (!params[:state].blank? && State.exists?(params[:state])) ? State.find(params[:state]).name : nil
       if @contact.deliver
@@ -16,8 +13,17 @@ class ContactController &lt; PublicController
       else
         session[:notice] = _('Contact not sent')
       end
+    end
+  end
+
+  protected
+
+  def build_contact
+    params[:contact] ||= {}
+    if logged_in?
+      user.build_contact profile, params[:contact]
     else
-      @contact = user.build_contact(profile)
+      Contact.new params[:contact].merge(dest: profile)
     end
   end
  
@@ -433,19 +433,19 @@ module ApplicationHelper
   end
  
   def theme_site_title
-    theme_include('site_title')
+    @theme_site_title ||= theme_include 'site_title'
   end
  
   def theme_header
-    theme_include('header')
+    @theme_header ||= theme_include 'header'
   end
  
   def theme_footer
-    theme_include('footer')
+    @theme_footer ||= theme_include 'footer'
   end
  
   def theme_extra_navigation
-    theme_include('navigation')
+    @theme_extra_navigation ||= theme_include 'navigation'
   end
  
   def is_testing_theme
@@ -674,13 +674,14 @@ module ApplicationHelper
     html.join "\n"
   end
  
+  def theme_javascript_src
+    script = File.join theme_path, 'theme.js'
+    script if File.exists? File.join(Rails.root, 'public', script)
+  end
+
   def theme_javascript_ng
-    script = File.join(theme_path, 'theme.js')
-    if File.exists?(File.join(Rails.root, 'public', script))
-      javascript_include_tag script
-    else
-      nil
-    end
+    script = theme_javascript_src
+    javascript_include_tag script if script
   end
  
   def file_field_or_thumbnail(label, image, i)
@@ -861,8 +862,9 @@ module ApplicationHelper
   end
  
   def base_url
-    environment.top_url
+    environment.top_url(request.scheme)
   end
+  alias :top_url :base_url
  
   def helper_for_article(article)
     article_helper = ActionView::Base.new
@@ -944,9 +946,9 @@ module ApplicationHelper
   # from Article model for an ArticleBlock.
   def reference_to_article(text, article, anchor=nil)
     if article.profile.domains.empty?
-      href = "/#{article.url[:profile]}/"
+      href = "#{Noosfero.root}/#{article.url[:profile]}/"
     else
-      href = "http://#{article.profile.domains.first.name}/"
+      href = "http://#{article.profile.domains.first.name}#{Noosfero.root}/"
     end
     href += article.url[:page].join('/')
     href += '#' + anchor if anchor
@@ -1325,10 +1327,8 @@ module ApplicationHelper
     return '' if templates.count == 0
     return hidden_field_tag("#{field_name}[template_id]", templates.first.id) if templates.count == 1
  
-    counter = 0
     radios = templates.map do |template|
-      counter += 1
-      content_tag('li', labelled_radio_button(link_to(template.name, template.url, :target => '_blank'), "#{field_name}[template_id]", template.id, counter==1))
+      content_tag('li', labelled_radio_button(link_to(template.name, template.url, :target => '_blank'), "#{field_name}[template_id]", template.id, environment.is_default_template?(template)))
     end.join("\n")
  
     content_tag('div', content_tag('label', _('Profile organization'), :for => 'template-options', :class => 'formlabel') +
@@ -77,12 +77,59 @@ module ArticleHelper
       content_tag('div',
         radio_button(:article, :published, false) +
           content_tag('label', _('Private'), :for => 'article_published_false', :id => "label_private")
-       ) +
-      (article.profile.community? ? content_tag('div',
-        content_tag('label', _('Fill in the search field to add the exception users to see this content'), :id => "text-input-search-exception-users") +
-        token_input_field_tag(:q, 'search-article-privacy-exceptions', {:action => 'search_article_privacy_exceptions'},
-          {:focus => false, :hint_text => _('Type in a search term for a user'), :pre_populate => tokenized_children})) :
-          ''))
+      ) +
+      privacity_exceptions(article, tokenized_children)
+    )
+  end
+
+  def privacity_exceptions(article, tokenized_children)
+    content_tag('div',
+      content_tag('div',
+        (
+          if article.profile
+            add_option_to_followers(article, tokenized_children)
+          else
+            ''
+          end
+        )
+      ),
+      :style => "margin-left:10px"
+    )
+  end
+
+  def add_option_to_followers(article, tokenized_children)
+    label_message = article.profile.organization? ? _('For all community members') : _('For all your friends')
+
+    check_box(
+      :article,
+      :show_to_followers,
+      {:class => "custom_privacy_option"}
+    ) +
+    content_tag(
+      'label',
+      label_message,
+      :for => 'article_show_to_followers',
+      :id => 'label_show_to_followers'
+    ) +
+    (article.profile.community? ?
+      content_tag(
+        'div',
+        content_tag(
+          'label',
+          _('Fill in the search field to add the exception users to see this content'),
+          :id => "text-input-search-exception-users"
+        ) +
+        token_input_field_tag(
+          :q,
+          'search-article-privacy-exceptions',
+          {:action => 'search_article_privacy_exceptions'},
+          {
+            :focus => false,
+            :hint_text => _('Type in a search term for a user'),
+            :pre_populate => tokenized_children
+          }
+        )
+      ) : '')
   end
  
   def prepare_to_token_input(array)
@@ -170,49 +170,54 @@ module BoxesHelper
       else
         "before-block-#{block.id}"
       end
-
-    content_tag('div', '&nbsp;', :id => id, :class => 'block-target' ) + drop_receiving_element(id, :url => { :action => 'move_block', :target => id }, :accept => box.acceptable_blocks, :hoverclass => 'block-target-hover')
+    if block.nil? or modifiable?(block)
+      content_tag('div', '&nbsp;', :id => id, :class => 'block-target' ) + drop_receiving_element(id, :url => { :action => 'move_block', :target => id }, :accept => box.acceptable_blocks, :hoverclass => 'block-target-hover')
+    else
+      ""
+    end
   end
  
   # makes the given block draggable so it can be moved away.
   def block_handle(block)
-    draggable_element("block-#{block.id}", :revert => true)
+    modifiable?(block) ? draggable_element("block-#{block.id}", :revert => true) : ""
   end
  
   def block_edit_buttons(block)
     buttons = []
     nowhere = 'javascript: return false;'
  
-    if block.first?
-      buttons << icon_button('up-disabled', _("Can't move up anymore."), nowhere)
-    else
-      buttons << icon_button('up', _('Move block up'), { :action => 'move_block_up', :id => block.id }, { :method => 'post' })
-    end
+    if modifiable?(block)
+      if block.first?
+        buttons << icon_button('up-disabled', _("Can't move up anymore."), nowhere)
+      else
+        buttons << icon_button('up', _('Move block up'), { :action => 'move_block_up', :id => block.id }, { :method => 'post' })
+      end
  
-    if block.last?
-      buttons << icon_button('down-disabled', _("Can't move down anymore."), nowhere)
-    else
-      buttons << icon_button(:down, _('Move block down'), { :action => 'move_block_down' ,:id => block.id }, { :method => 'post'})
-    end
+      if block.last?
+        buttons << icon_button('down-disabled', _("Can't move down anymore."), nowhere)
+      else
+        buttons << icon_button(:down, _('Move block down'), { :action => 'move_block_down' ,:id => block.id }, { :method => 'post'})
+      end
  
-    holder = block.owner
-    # move to opposite side
-    # FIXME too much hardcoded stuff
-    if holder.layout_template == 'default'
-      if block.box.position == 2 # area 2, left side => move to right side
-        buttons << icon_button('right', _('Move to the opposite side'), { :action => 'move_block', :target => 'end-of-box-' + holder.boxes[2].id.to_s, :id => block.id }, :method => 'post' )
-      elsif block.box.position == 3 # area 3, right side => move to left side
-        buttons << icon_button('left', _('Move to the opposite side'), { :action => 'move_block', :target => 'end-of-box-' + holder.boxes[1].id.to_s, :id => block.id }, :method => 'post' )
+      holder = block.owner
+      # move to opposite side
+      # FIXME too much hardcoded stuff
+      if holder.layout_template == 'default'
+        if block.box.position == 2 # area 2, left side => move to right side
+          buttons << icon_button('right', _('Move to the opposite side'), { :action => 'move_block', :target => 'end-of-box-' + holder.boxes[2].id.to_s, :id => block.id }, :method => 'post' )
+        elsif block.box.position == 3 # area 3, right side => move to left side
+          buttons << icon_button('left', _('Move to the opposite side'), { :action => 'move_block', :target => 'end-of-box-' + holder.boxes[1].id.to_s, :id => block.id }, :method => 'post' )
+        end
       end
-    end
  
-    if block.editable?
-      buttons << colorbox_icon_button(:edit, _('Edit'), { :action => 'edit', :id => block.id })
-    end
+      if block.editable?
+        buttons << colorbox_icon_button(:edit, _('Edit'), { :action => 'edit', :id => block.id })
+      end
  
-    if !block.main?
-      buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')})
-      buttons << icon_button(:clone, _('Clone'), { :action => 'clone_block', :id => block.id }, { :method => 'post' })
+      if !block.main?
+        buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')})
+        buttons << icon_button(:clone, _('Clone'), { :action => 'clone_block', :id => block.id }, { :method => 'post' })
+      end
     end
  
     if block.respond_to?(:help)
@@ -248,5 +253,7 @@ module BoxesHelper
     classes
   end
  
-
+  def modifiable?(block)
+    return !block.fixed || environment.admins.include?(user)
+  end
 end
@@ -45,7 +45,7 @@ module ContentViewerHelper
         { article.environment.locales[translation.language] => { :href => url_for(translation.url) } }
       end
       content_tag(:div, link_to(_('Translations'), '#',
-                                :onmouseover => "toggleSubmenu(this, '#{_('Translations')}', #{links.to_json}); return false",
+                                :onmouseover => "toggleSubmenu(this, '#{_('Translations')}', #{CGI::escape_html(links.to_json)}); return false",
                                 :class => 'article-translations-menu simplemenu-trigger up'),
                   :class => 'article-translations')
     end
@@ -2,12 +2,31 @@ module LayoutHelper
  
   def body_classes
     # Identify the current controller and action for the CSS:
+    (logged_in? ? " logged-in" : "") +
     " controller-#{controller.controller_name}" +
     " action-#{controller.controller_name}-#{controller.action_name}" +
     " template-#{@layout_template || if profile.blank? then 'default' else profile.layout_template end}" +
     (!profile.nil? && profile.is_on_homepage?(request.path,@page) ? " profile-homepage" : "")
   end
  
+  def html_tag_classes
+    [
+      body_classes, (
+        profile.blank? ? nil : [
+          'profile-type-is-' + profile.class.name.downcase,
+          'profile-name-is-' + profile.identifier,
+        ]
+      ), 'theme-' + current_theme,
+      @plugins.dispatch(:html_tag_classes).map do |content|
+        if content.respond_to?(:call)
+          instance_exec(&content)
+        else
+          content.html_safe
+        end
+      end
+    ].flatten.compact.join(' ')
+  end
+
   def noosfero_javascript
     plugins_javascripts = @plugins.map { |plugin| [plugin.js_files].flatten.map { |js| plugin.class.public_path(js) } }.flatten
  
@@ -17,6 +36,8 @@ module LayoutHelper
     unless plugins_javascripts.empty?
       output += javascript_include_tag plugins_javascripts, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_javascripts.to_s}"
     end
+    output += theme_javascript_ng.to_s
+
     output
   end
  
@@ -85,6 +106,10 @@ module LayoutHelper
     theme_path + '/style.css'
   end
  
+  def layout_template
+    if profile then profile.layout_template else environment.layout_template end
+  end
+
   def addthis_javascript
     if NOOSFERO_CONF['addthis_enabled']
       '<script src="https://s7.addthis.com/js/152/addthis_widget.js"></script>'
@@ -1,15 +0,0 @@
-module PersonNotifierHelper
-
-  include ApplicationHelper
-
-  private
-
-  def path_to_image(source)
-    top_url + source
-  end
-
-  def top_url
-    top_url = @profile.environment ? @profile.environment.top_url : ''
-  end
-
-end
@@ -24,6 +24,12 @@ module SearchHelper
     }
   }
  
+  COMMON_PROFILE_LIST_BLOCK = [
+    :enterprises,
+    :people,
+    :communities
+  ]
+
   # FIXME remove it after search_controler refactored
   include EventsHelper
  
@@ -100,6 +106,20 @@ module SearchHelper
     end
   end
  
+  def display_selector(asset, display, float = 'right')
+    display = nil if display.blank?
+    display ||= asset_class(asset).default_search_display
+    if [display?(asset, :map), display?(asset, :compact), display?(asset, :full)].select {|option| option}.count > 1
+      compact_link = display?(asset, :compact) ? (display == 'compact' ? _('Compact') : link_to(_('Compact'), params.merge(:display => 'compact'))) : nil
+      map_link = display?(asset, :map) ? (display == 'map' ? _('Map') : link_to(_('Map'), params.merge(:display => 'map'))) : nil
+      full_link = display?(asset, :full) ? (display == 'full' ? _('Full') : link_to(_('Full'), params.merge(:display => 'full'))) : nil
+      content_tag('div',
+        content_tag('strong', _('Display')) + ': ' + [compact_link, map_link, full_link].compact.join(' | ').html_safe,
+        :class => 'search-customize-options'
+      )
+    end
+  end
+
   def filters(asset)
     return if !asset
     klass = asset_class(asset)
@@ -11,7 +11,7 @@ module TinymceHelper
   end
  
   def tinymce_init_js options = {}
-    options.merge! :document_base_url => environment.top_url,
+    options.merge! :document_base_url => top_url,
       :content_css => "/stylesheets/tinymce.css,#{macro_css_files}",
       :plugins => %w[compat3x advlist autolink lists link image charmap print preview hr anchor pagebreak
         searchreplace wordcount visualblocks visualchars code fullscreen
@@ -22,6 +22,7 @@ class ApproveArticle &lt; Task
   end
  
   settings_items :closing_statment, :article_parent_id, :highlighted
+  settings_items :create_link, :type => :boolean, :default => false
  
   def article_parent
     Article.find_by_id article_parent_id.to_i
@@ -48,7 +49,11 @@ class ApproveArticle &lt; Task
   end
  
   def perform
-    article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source, :last_changed_by_id => article.last_changed_by_id, :created_by_id => article.created_by_id)
+    if create_link
+      LinkArticle.create!(:reference_article => article, :profile => target, :parent => article_parent, :highlighted => highlighted)
+    else
+      article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source, :last_changed_by_id => article.last_changed_by_id, :created_by_id => article.created_by_id)
+    end
   end
  
   def title
@@ -2,7 +2,14 @@ require &#39;hpricot&#39;
  
 class Article < ActiveRecord::Base
  
-  attr_accessible :name, :body, :abstract, :profile, :tag_list, :parent, :allow_members_to_edit, :translation_of_id, :language, :license_id, :parent_id, :display_posts_in_current_language, :category_ids, :posts_per_page, :moderate_comments, :accept_comments, :feed, :published, :source, :highlighted, :notify_comments, :display_hits, :slug, :external_feed_builder, :display_versions, :external_link, :image_builder
+  attr_accessible :name, :body, :abstract, :profile, :tag_list, :parent,
+                  :allow_members_to_edit, :translation_of_id, :language,
+                  :license_id, :parent_id, :display_posts_in_current_language,
+                  :category_ids, :posts_per_page, :moderate_comments,
+                  :accept_comments, :feed, :published, :source,
+                  :highlighted, :notify_comments, :display_hits, :slug,
+                  :external_feed_builder, :display_versions, :external_link,
+                  :image_builder, :show_to_followers
  
   acts_as_having_image
  
@@ -100,6 +107,11 @@ class Article &lt; ActiveRecord::Base
     self.activity.destroy if self.activity
   end
  
+  after_destroy :destroy_link_article
+  def destroy_link_article
+    Article.where(:reference_article_id => self.id, :type => LinkArticle).destroy_all
+  end
+
   xss_terminate :only => [ :name ], :on => 'validation', :with => 'white_list'
  
   scope :in_category, lambda { |category|
@@ -330,7 +342,7 @@ class Article &lt; ActiveRecord::Base
   def belongs_to_blog?
     self.parent and self.parent.blog?
   end
-  
+
   def belongs_to_forum?
     self.parent and self.parent.forum?
   end
@@ -442,6 +454,7 @@ class Article &lt; ActiveRecord::Base
       if self.parent && !self.parent.published?
         return false
       end
+
       true
     else
       false
@@ -475,14 +488,17 @@ class Article &lt; ActiveRecord::Base
     {:conditions => ["  articles.published = ? OR
                         articles.last_changed_by_id = ? OR
                         articles.profile_id = ? OR
-                        ?",
-                        true, user.id, user.id, user.has_permission?(:view_private_content, profile)] }
+                        ? OR  articles.show_to_followers = ? AND ?",
+                        true, user.id, user.id, user.has_permission?(:view_private_content, profile),
+                        true, user.follows?(profile)]}
   end
  
+
   def display_unpublished_article_to?(user)
     user == author || allow_view_private_content?(user) || user == profile ||
     user.is_admin?(profile.environment) || user.is_admin?(profile) ||
-    article_privacy_exceptions.include?(user)
+    article_privacy_exceptions.include?(user) ||
+    (self.show_to_followers && user.follows?(profile))
   end
  
   def display_to?(user = nil)
 class Block < ActiveRecord::Base
  
-  attr_accessible :title, :display, :limit, :box_id, :posts_per_page, :visualization_format, :language, :display_user, :box
+  attr_accessible :title, :display, :limit, :box_id, :posts_per_page, :visualization_format, :language, :display_user, :box, :fixed
  
   # to be able to generate HTML
   include ActionView::Helpers::UrlHelper
@@ -64,7 +64,7 @@ class Block &lt; ActiveRecord::Base
   end
  
   def display_to_user?(user)
-    display_user == 'all' || (user.nil? && display_user == 'not_logged') || (user && display_user == 'logged')
+    display_user == 'all' || (user.nil? && display_user == 'not_logged') || (user && display_user == 'logged') || (user && display_user == 'followers' && user.follows?(owner))
   end
  
   def display_always(context)
@@ -75,7 +75,7 @@ class Block &lt; ActiveRecord::Base
     if context[:article]
       return context[:article] == owner.home_page
     else
-      return context[:request_path] == '/'
+      return home_page_path?(context[:request_path])
     end
   end
  
@@ -83,7 +83,7 @@ class Block &lt; ActiveRecord::Base
     if context[:article]
       return context[:article] != owner.home_page
     else
-      return context[:request_path] != '/' + (owner.kind_of?(Profile) ? owner.identifier : '')
+      return !home_page_path?(context[:request_path])
     end
   end
  
@@ -110,11 +110,14 @@ class Block &lt; ActiveRecord::Base
   # * <tt>'all'</tt>: the block is always displayed
   settings_items :language, :type => :string, :default => 'all'
  
+  # The block can be configured to be fixed. Only can be edited by environment admins
+  settings_items :fixed, :type => :boolean, :default => false
+
   # returns the description of the block, used when the user sees a list of
   # blocks to choose one to include in the design.
   #
   # Must be redefined in subclasses to match the description of each block
-  # type. 
+  # type.
   def self.description
     '(dummy)'
   end
@@ -124,13 +127,13 @@ class Block &lt; ActiveRecord::Base
   # This method can return several types of objects:
   #
   # * <tt>String</tt>: if the string starts with <tt>http://</tt> or <tt>https://</tt>, then it is assumed to be address of an IFRAME. Otherwise it's is used as regular HTML.
-  # * <tt>Hash</tt>: the hash is used to build an URL that is used as the address for a IFRAME. 
+  # * <tt>Hash</tt>: the hash is used to build an URL that is used as the address for a IFRAME.
   # * <tt>Proc</tt>: the Proc is evaluated in the scope of BoxesHelper. The
   # block can then use <tt>render</tt>, <tt>link_to</tt>, etc.
   #
   # The method can also return <tt>nil</tt>, which means "no content".
   #
-  # See BoxesHelper#extract_block_content for implementation details. 
+  # See BoxesHelper#extract_block_content for implementation details.
   def content(args={})
     "This is block number %d" % self.id
   end
@@ -221,6 +224,7 @@ class Block &lt; ActiveRecord::Base
       'all'            => _('All users'),
       'logged'         => _('Logged'),
       'not_logged'     => _('Not logged'),
+      'followers'      => owner.class != Environment && owner.organization? ? _('Members') : _('Friends')
     }
   end
  
@@ -239,4 +243,21 @@ class Block &lt; ActiveRecord::Base
     self.position = block.position
   end
  
+  private
+
+  def home_page_path
+    home_page_url = Noosfero.root('/')
+
+    if owner.kind_of?(Profile)
+      home_page_url += "profile/" if owner.home_page.nil?
+      home_page_url += owner.identifier
+    end
+
+    return home_page_url
+  end
+
+  def home_page_path? path
+    return path == home_page_path || path == (home_page_path + '/')
+  end
+
 end
@@ -53,7 +53,7 @@ class Blog &lt; Folder
   def prepare_external_feed
     unless self.external_feed_data.nil?
       if self.external_feed(true) && self.external_feed.id == self.external_feed_data[:id].to_i
-        self.external_feed.attributes = self.external_feed_data
+        self.external_feed.attributes = self.external_feed_data.except(:id)
       else
         self.build_external_feed(self.external_feed_data, :without_protection => true)
       end
@@ -68,7 +68,7 @@ class Community &lt; Organization
   end
  
   def default_template
-    environment.community_template
+    environment.community_default_template
   end
  
   def news(limit = 30, highlight = false)
@@ -92,4 +92,11 @@ class Domain &lt; ActiveRecord::Base
     @hosting = {}
   end
  
+  # Detects a domain's custom text domain chain if available based on a domain
+  # served on multitenancy configuration or a registered domain.
+  def self.custom_locale(domainname)
+    domain = Noosfero::MultiTenancy.mapping[domainname] || domainname[/(.*?)\./,1]
+    FastGettext.translation_repositories.keys.include?(domain) ? domain : FastGettext.default_text_domain
+  end
+
 end
@@ -100,7 +100,12 @@ class Enterprise &lt; Organization
     self.tasks.where(:type => 'EnterpriseActivation').first
   end
  
-  def enable(owner)
+  def enable(owner = nil)
+    if owner.nil?
+      self.visible = true
+      return self.save
+    end
+
     return if enabled
     # must be set first for the following to work
     self.enabled = true
@@ -162,7 +167,7 @@ class Enterprise &lt; Organization
   end
  
   def default_template
-    environment.enterprise_template
+    environment.enterprise_default_template
   end
  
   def template_with_inactive_enterprise
@@ -285,6 +285,7 @@ class Environment &lt; ActiveRecord::Base
     www.flickr.com
     www.gmodules.com
     www.youtube.com
+    openstreetmap.org
   ] + ('a' .. 'z').map{|i| "#{i}.yimg.com"}
  
   settings_items :enabled_plugins, :type => Array, :default => Noosfero::Plugin.available_plugin_names
@@ -658,8 +659,8 @@ class Environment &lt; ActiveRecord::Base
     { :controller => 'admin_panel', :action => 'index' }
   end
  
-  def top_url
-    url = 'http://'
+  def top_url(scheme = 'http')
+    url = scheme + '://'
     url << (Noosfero.url_options.key?(:host) ? Noosfero.url_options[:host] : default_hostname)
     url << ':' << Noosfero.url_options[:port].to_s if Noosfero.url_options.key?(:port)
     url << Noosfero.root('')
@@ -730,31 +731,50 @@ class Environment &lt; ActiveRecord::Base
     ]
   end
  
-  def community_template
+  def is_default_template?(template)
+    is_default = template == community_default_template 
+    is_default = is_default || template == person_default_template 
+    is_default = is_default || template == enterprise_default_template
+    is_default
+  end
+
+  def community_templates
+    self.communities.templates
+  end
+
+  def community_default_template
     template = Community.find_by_id settings[:community_template_id]
-    template if template && template.is_template
+    template if template && template.is_template?
+  end
+
+  def community_default_template=(value)
+    settings[:community_template_id] = value.kind_of?(Community) ? value.id : value
   end
  
-  def community_template=(value)
-    settings[:community_template_id] = value.id
+  def person_templates
+    self.people.templates
   end
  
-  def person_template
+  def person_default_template
     template = Person.find_by_id settings[:person_template_id]
-    template if template && template.is_template
+    template if template && template.is_template?
+  end
+
+  def person_default_template=(value)
+    settings[:person_template_id] = value.kind_of?(Person) ? value.id : value
   end
  
-  def person_template=(value)
-    settings[:person_template_id] = value.id
+  def enterprise_templates
+    self.enterprises.templates
   end
  
-  def enterprise_template
+  def enterprise_default_template
     template = Enterprise.find_by_id settings[:enterprise_template_id]
-    template if template && template.is_template
+    template if template && template.is_template?
   end
  
-  def enterprise_template=(value)
-    settings[:enterprise_template_id] = value.id
+  def enterprise_default_template=(value)
+    settings[:enterprise_template_id] = value.kind_of?(Enterprise) ? value.id : value
   end
  
   def inactive_enterprise_template
@@ -856,10 +876,10 @@ class Environment &lt; ActiveRecord::Base
     person_template.visible = false
     person_template.save!
  
-    self.enterprise_template = enterprise_template
+    self.enterprise_default_template = enterprise_template
     self.inactive_enterprise_template = inactive_enterprise_template
-    self.community_template = community_template
-    self.person_template = person_template
+    self.community_default_template = community_template
+    self.person_default_template = person_template
     self.save!
   end
  
@@ -923,6 +943,10 @@ class Environment &lt; ActiveRecord::Base
     locales_list
   end
  
+  def has_license?
+    self.licenses.any?
+  end
+
   private
  
   def default_language_available
@@ -19,7 +19,7 @@ class Event &lt; Article
     maybe_add_http(self.setting[:link])
   end
  
-  xss_terminate :only => [ :body, :link, :address ], :with => 'white_list', :on => 'validation'
+  xss_terminate :only => [ :name, :body, :link, :address ], :with => 'white_list', :on => 'validation'
  
   def initialize(*args)
     super(*args)
@@ -10,7 +10,7 @@ class ExternalFeed &lt; ActiveRecord::Base
     { :conditions => ['(fetched_at is NULL) OR (fetched_at < ?)', Time.now - FeedUpdater.update_interval] }
   }
  
-  attr_accessible :address, :enabled
+  attr_accessible :address, :enabled, :only_once
  
   def add_item(title, link, date, content)
     return if content.blank?
@@ -12,7 +12,7 @@ class Folder &lt; Article
  
   acts_as_having_settings :field => :setting
  
-  xss_terminate :only => [ :body ], :with => 'white_list', :on => 'validation'
+  xss_terminate :only => [ :name, :body ], :with => 'white_list', :on => 'validation'
  
   include WhiteListFilter
   filter_iframes :body
@@ -76,14 +76,12 @@ class Invitation &lt; Task
         {:person => person, :target => user.person}
       end
  
-      if !task_args.nil?
-        if profile.person?
-          InviteFriend.create(task_args)
-        elsif profile.community?
-          InviteMember.create(task_args.merge(:community_id => profile.id))
-        else
-          raise NotImplementedError, 'Don\'t know how to invite people to a %s' % profile.class.to_s
-        end
+      if profile.person?
+        InviteFriend.create(task_args) if user.nil? || !user.person.is_a_friend?(person)
+      elsif profile.community?
+        InviteMember.create(task_args.merge(:community_id => profile.id)) if user.nil? || !user.person.is_member_of?(profile)
+      else
+        raise NotImplementedError, 'Don\'t know how to invite people to a %s' % profile.class.to_s
       end
     end
   end
@@ -0,0 +1,14 @@
+class LinkArticle < Article
+
+  attr_accessible :reference_article
+
+  def self.short_description
+    "Article link"
+  end
+
+  delegate :name, :to => :reference_article
+  delegate :body, :to => :reference_article
+  delegate :abstract, :to => :reference_article
+  delegate :url, :to => :reference_article
+
+end
@@ -25,7 +25,13 @@ class Person &lt; Profile
   scope :not_members_of, lambda { |resources|
     resources = [resources] if !resources.kind_of?(Array)
     conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ')
-    { :select => 'DISTINCT profiles.*', :conditions => ['"profiles"."id" NOT IN (SELECT DISTINCT profiles.id FROM "profiles" INNER JOIN "role_assignments" ON "role_assignments"."accessor_id" = "profiles"."id" AND "role_assignments"."accessor_type" = (\'Profile\') WHERE "profiles"."type" IN (\'Person\') AND (%s))' % conditions] }
+    { :select => 'DISTINCT profiles.*', :conditions => ['"profiles"."id" NOT IN (SELECT DISTINCT profiles.id FROM "profiles" INNER JOIN "role_assignments" ON "role_assignments"."accessor_id" = "profiles"."id" AND "role_assignments"."accessor_type" = (\'Profile\') WHERE "profiles"."type" IN (\'Person\') AND (%s))' % conditions]
+  }
+
+  scope :by_role, lambda { |roles|
+    roles = [roles] unless roles.kind_of?(Array)
+    { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => ['role_assignments.role_id IN (?)',
+roles] }
   }
  
   def has_permission_with_plugins?(permission, profile)
@@ -85,6 +91,10 @@ class Person &lt; Profile
  
   belongs_to :user, :dependent => :delete
  
+  def can_change_homepage?
+    !environment.enabled?('cant_change_homepage') || is_admin?
+  end
+
   def can_control_scrap?(scrap)
     begin
       !self.scraps(scrap).nil?
@@ -311,7 +321,7 @@ class Person &lt; Profile
   end
  
   def default_template
-    environment.person_template
+    environment.person_default_template
   end
  
   def apply_type_specific_template(template)
@@ -67,7 +67,7 @@ class PersonNotifier
  
   class Mailer < ActionMailer::Base
  
-    add_template_helper(PersonNotifierHelper)
+    add_template_helper(ApplicationHelper)
  
     def session
       {:theme => nil}
@@ -10,7 +10,7 @@ class Product &lt; ActiveRecord::Base
     :display => %w[full map]
   }
  
-  attr_accessible :name, :product_category, :highlighted, :price, :enterprise, :image_builder, :description, :available, :qualifiers, :unit_id, :discount, :inputs
+  attr_accessible :name, :product_category, :highlighted, :price, :enterprise, :image_builder, :description, :available, :qualifiers, :unit_id, :discount, :inputs, :qualifiers_list
  
   def self.default_search_display
     'full'
@@ -107,8 +107,8 @@ class Profile &lt; ActiveRecord::Base
     alias_method_chain :count, :distinct
   end
  
-  def members_by_role(role)
-    Person.members_of(self).all(:conditions => ['role_assignments.role_id = ?', role.id])
+  def members_by_role(roles)
+    Person.members_of(self).by_role(roles)
   end
  
   acts_as_having_boxes
@@ -120,7 +120,9 @@ class Profile &lt; ActiveRecord::Base
   end
  
   scope :visible, :conditions => { :visible => true }
+  scope :disabled, :conditions => { :visible => false }
   scope :public, :conditions => { :visible => true, :public_profile => true }
+  scope :enabled, :conditions => { :enabled => true }
  
   # Subclasses must override this method
   scope :more_popular
@@ -404,7 +406,7 @@ class Profile &lt; ActiveRecord::Base
   end
  
   xss_terminate :only => [ :name, :nickname, :address, :contact_phone, :description ], :on => 'validation'
-  xss_terminate :only => [ :custom_footer, :custom_header ], :with => 'white_list', :on => 'validation'
+  xss_terminate :only => [ :custom_footer, :custom_header ], :with => 'white_list'
  
   include WhiteListFilter
   filter_iframes :custom_header, :custom_footer
@@ -803,7 +805,7 @@ private :generate_url, :url_options
   end
  
   include Noosfero::Plugin::HotSpot
-  
+
   def folder_types
     types = Article.folder_types
     plugins.dispatch(:content_types).each {|type|
@@ -927,6 +929,13 @@ private :generate_url, :url_options
   end
  
   def disable
+    self.visible = false
+    self.save
+  end
+
+  def enable
+    self.visible = true
+    self.save
   end
  
   def control_panel_settings_button
@@ -20,6 +20,7 @@
   <tr><td><%= link_to _('Users'), :controller => 'users' %></td></tr>
   <tr><td><%= link_to _('Profile templates'), :controller => 'templates' %></td></tr>
   <tr><td><%= link_to _('Fields'), :controller => 'features', :action => 'manage_fields' %></td></tr>
+  <tr><td><%= link_to _('Manage organizations status'), :action => 'manage_organizations_status' %></td></tr>
 </table>
  
  
@@ -0,0 +1,69 @@
+<h1><%= _('Manage organizations') %></h1>
+
+<%= form_tag( { :action => 'manage_organizations_status' }, :method => 'get', :class => 'users-search' ) do %>
+
+  <div class="search-field">
+    <span class="formfield">
+      <%= text_field_tag 'q', @q, :title => _("Find profiles"), :style=>"width:85%" %>
+    </span>
+
+    <%= submit_button(:search, _('Search')) %>
+  </div>
+
+  <div class="environment-users-results-header">
+    <div id='environment-users-filter-title'><%= @title %></div>
+
+    <div id="environment-users-filter-filter">
+      <strong><%= _("Filter by: ") %></strong>
+
+      <select id="profile_filter_select">
+        <%= options_for_select([['Any', 'any'],["Disabled profiles", "disabled"], ["Enabled profiles", "enabled"]], @filter) %>
+      </select>
+    </div>
+    <div style="clear: both"></div>
+  </div>
+
+  <table>
+    <colgroup>
+      <col width="80%">
+      <col width="20%">
+    </colgroup>
+
+    <tr>
+      <th><%= _('Member') %></th>
+      <th><%= _('Actions') %></th>
+    </tr>
+
+    <% @collection.each do |p| %>
+      <tr title="<%= p.name %>">
+        <td><%= link_to_profile p.short_name, p.identifier, :title => p.name %> </td>
+
+        <td class='actions'>
+          <div class="members-buttons-cell">
+            <% if p.visible %>
+              <%= button_without_text :'deactivate-user', _('Deactivate'), {:controller => "profile_editor", :action => 'deactivate_profile', :profile => p.identifier, :id => p.id}, :confirm => _("Do you want to deactivate this profile ?") %>
+            <% else %>
+              <%= button_without_text :'activate-user', _('Activate'), {:controller => "profile_editor", :action => 'activate_profile', :profile => p.identifier, :id => p.id}, :confirm => _("Do you want to activate this profile ?") %>
+            <% end %>
+              <%= button_without_text :'delete', _('Remove'), {:controller => "profile_editor", :action => 'destroy_profile', :profile => p.identifier, :id => p.id, :return_to => "/admin/admin_panel/manage_organizations_status"}, :method => :post, :confirm => _("Do you want to deactivate this profile ?") %>
+         </div>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+
+<% end %>
+
+<%= pagination_links @collection, {:param_name => 'npage', :page_links => true} %>
+
+<% button_bar do %>
+  <%= button :back, _('Back'), :controller => 'admin_panel' %>
+<% end %>
+
+<script type="text/javascript">
+  jQuery(document).ready(function(){
+    jQuery("#profile_filter_select").change(function(){
+      document.location.href = '/admin/admin_panel/manage_organizations_status?filter='+this.value;
+    });
+  });
+</script>
 \ No newline at end of file
@@ -5,6 +5,12 @@
  
     <%= labelled_form_field(_('Custom title for this block: '), text_field(:block, :title, :maxlength => 20)) %>
  
+    <% if environment.admins.include?(user) %>
+      <div class="fixed_block">
+        <%= labelled_check_box(_("Fixed"), "block[fixed]", value = "1", checked = @block.fixed) %>
+      </div>
+    <% end %>
+
     <%= render :partial => partial_for_class(@block.class) %>
  
     <div class="display">
 <%= select_profile_folder(_('Parent folder:'), 'article[parent_id]', profile, @article.parent_id) %>
-<%= labelled_form_field(_('License'), select(:article, :license_id, options_for_select_with_title([[_('None'), nil]] + profile.environment.licenses.map {|license| [license.name, license.id]}, @article.license ? @article.license.id : nil))) %>
+<% if profile.environment.has_license? %>
+  <%= labelled_form_field(_('License'), select(:article, :license_id, options_for_select_with_title([[_('None'), nil]] + profile.environment.licenses.map {|license| [license.name, license.id]}, @article.license ? @article.license.id : nil))) %>
+<% end %>
@@ -0,0 +1,6 @@
+<div>
+  <%= labelled_form_field(_('Title'), @article.name) %>
+  <%= labelled_form_field(_('Reference'), link_to(url_for @article.view_url)) %>
+
+  <%= render :partial => 'general_fields' %>
+</div>
@@ -20,5 +20,10 @@
 <h5><%= _('Uploading files to %s') % content_tag('code', @target) %></h5>
  
 <%= form_for('uploaded_file', :url => { :action => 'upload_files' }, :html => {:multipart => true}) do |f| %>
+
+  <%= @plugins.dispatch(:upload_files_extra_fields, params[:parent_id]).collect { |content| instance_exec(&content) }.join("") %>
+
   <%= render :partial => 'upload_file_form', :locals => { :size => '45'} %>
-<% end %>
+
+<% end %> 
+
@@ -2,7 +2,7 @@
   <%= _('Content management') %>
 </h1>
  
-<% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home, profile.home_page) %>
+<% if user.can_change_homepage? && !remove_content_button(:home, profile.home_page) %>
   <div class="cms-homepage">
     <%= _('Profile homepage:') %>
     <% if profile.home_page %>
@@ -69,7 +69,7 @@
         <%= expirable_button article, :edit, _('Edit'), {:action => 'edit', :id => article.id} if !remove_content_button(:edit, article) %>
         <%= button_without_text :eyes, _('Public view'), article.view_url %>
         <%= display_spread_button(article) unless remove_content_button(:spread, article) %>
-        <% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home, article) %>
+        <% if user.can_change_homepage? && !remove_content_button(:home, article) %>
           <% if profile.home_page != article %>
             <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
           <% else %>
@@ -13,11 +13,16 @@
  
   <%= required_fields_message %>
  
-  <% location_fields = select_city(true) %>
+  <% unless logged_in? %>
+    <%= required f.text_field(:name) %>
+    <%= required f.text_field(:email) %>
+  <% end %>
  
+  <% location_fields = select_city(true) %>
   <% unless environment.enabled?('disable_select_city_for_contact') || location_fields.blank? %>
     <%= labelled_form_field _('City and state'), location_fields %>
   <% end %>
+
   <%= required f.text_field(:subject) %>
  
   <%= render :file => 'shared/tiny_mce' %>
@@ -25,5 +30,9 @@
  
   <%= labelled_form_field check_box(:contact, :receive_a_copy) + _('I want to receive a copy of the message in my e-mail.'), '' %>
  
-  <%= submit_button(:send, _('Send'), :onclick => "$('confirm').value = 'true'") %>
+  <% unless logged_in? %>
+    <%= recaptcha_tags :ajax => true, :display => {:theme => 'clean'} %>
+  <% end %>
+
+  <%= submit_button(:send, _('Send'), :onclick => "jQuery('#confirm').val('true')") %>
 <% end %>
@@ -70,37 +70,36 @@
  
 <%= @plugins.dispatch(:article_extra_contents, @page).collect { |content| instance_exec(&content) }.join("") %>
  
-<div class="comments" id="comments_list">
-
-  <% if @page.accept_comments? || @comments_count > 0 %>
+<% if @page.accept_comments? || @comments_count > 0 %>
+  <div class="comments" id="comments_list">
     <h3 <%= 'class="no-comments-yet"' if @comments_count == 0 %>>
       <%= display_number_of_comments(@comments_count) %>
     </h3>
-  <% end %>
  
-  <% if @comments.present? && @comments.count > 1 %>
-    <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form', :id => 'top-post-comment-button', :onclick => "jQuery('#page-comment-form .display-comment-form').first().click();") if @page.accept_comments? %>
+    <% if @comments.present? && @comments.count > 1 %>
+      <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form', :id => 'top-post-comment-button', :onclick => "jQuery('#page-comment-form .display-comment-form').first().click();") if @page.accept_comments? %>
+
+      <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier, :page => @page.explode_path)) %>
+      <%= javascript_include_tag "comment_order.js" %>
+      <div class="comment-order">
+        <%= form_tag({:controller=>'content_viewer' , :action=>'view_page'}, {:method=>'get', :id=>"form_order"}) do %>
+          <%= select_tag 'comment_order', options_for_select({_('Oldest first')=>'oldest', _('Newest first')=>'newest'}, @comment_order) %>
+        <% end %>
+      </div>
+    <% end %>
  
-    <%= hidden_field_tag("page_url", url_for(:controller=>'content_viewer', :action=>'view_page', :profile=>profile.identifier, :page => @page.explode_path)) %>
-    <%= javascript_include_tag "comment_order.js" %>
-    <div class="comment-order">
-      <%= form_tag({:controller=>'content_viewer' , :action=>'view_page'}, {:method=>'get', :id=>"form_order"}) do %>
-        <%= select_tag 'comment_order', options_for_select({_('Oldest first')=>'oldest', _('Newest first')=>'newest'}, @comment_order) %>
+    <ul class="article-comments-list">
+      <% if @comments.present? %>
+        <%= render :partial => 'comment/comment', :collection => @comments %>
+        <%= pagination_links @comments, :param_name => 'comment_page' %>
       <% end %>
-    </div>
-  <% end %>
+    </ul>
  
-  <ul class="article-comments-list">
-    <% if @comments.present? %>
-      <%= render :partial => 'comment/comment', :collection => @comments %>
-      <%= pagination_links @comments, :param_name => 'comment_page' %>
+    <% if @page.accept_comments? %>
+      <div id='page-comment-form' class='page-comment-form'><%= render :partial => 'comment/comment_form', :locals =>{:url => {:controller => :comment, :action => :create}, :display_link => true, :cancel_triggers_hide => true}%></div>
     <% end %>
-  </ul>
-
-  <% if @page.accept_comments? %>
-    <div id='page-comment-form' class='page-comment-form'><%= render :partial => 'comment/comment_form', :locals =>{:url => {:controller => :comment, :action => :create}, :display_link => true, :cancel_triggers_hide => true}%></div>
-  <% end %>
-</div><!-- end class="comments" -->
+  </div><!-- end class="comments" -->
+<% end %>
  
 </div><!-- end id="article" -->
 <%= add_zoom_to_article_images %>
@@ -20,7 +20,7 @@
  
   <%= labelled_form_for :create_enterprise do |f| %>
     <%= required f.text_field 'name', :onchange => "updateUrlField(this, 'create_enterprise_identifier')", :size => 40 %>
-    <%= required labelled_form_field(_('Address'), content_tag('code', environment.top_url + "/" + text_field(:create_enterprise, 'identifier', :size => 26))) %>
+    <%= required labelled_form_field(_('Address'), content_tag('code', top_url + "/" + text_field(:create_enterprise, 'identifier', :size => 26))) %>
     <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise } %>
     <%= required labelled_form_field(_('Region'), f.select('region_id', @regions)) if @validation == :region %>
  
@@ -3,7 +3,7 @@
 <div id='agenda-toolbar'>
   <%= button :back, _('Back to %s') % profile.name, profile.url %>
   <% if user && user.has_permission?('post_content', profile) %>
-    <%= button :new, _('New event'), myprofile_url(:controller => 'cms', :action => 'new', :type => 'Event') %>
+    <%= button :new, _('New event'), myprofile_path(:controller => 'cms', :action => 'new', :type => 'Event') %>
   <% end %>
 </div>
  
@@ -0,0 +1,4 @@
+<div id="content-inner">
+  <%= insert_boxes(yield) %>
+  <br style='clear: both'/>
+</div><!-- end id="content-inner" -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= html_language %>" lang="<%= html_language %>">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= html_language %>" lang="<%= html_language %>" class="<%= h html_tag_classes %>">
   <head>
     <title><%= h page_title %></title>
     <%= yield(:feeds) %>
@@ -12,24 +12,9 @@
     <meta name="twitter:title" content="<%= h page_title %>">
     <meta name="twitter:description" content="<%= meta_description_tag(@page) %>">
  
-    <!-- Open Graph -->
-    <meta property="og:type" content="<%= @page ? 'article' : 'website' %>">
-    <meta property="og:url" content="<%= @page ? url_for(@page.url) : @environment.top_url %>">
-    <meta property="og:title" content="<%= h page_title %>">
-    <meta property="og:site_name" content="<%= profile ? profile.name : @environment.name %>">
-    <meta property="og:description" content="<%= meta_description_tag(@page) %>">
-
     <!-- site root -->
     <meta property="noosfero:root" content="<%= Noosfero.root %>"/>
  
-    <% if @page %>
-      <meta property="article:published_time" content="<%= show_date(@page.published_at) %>">
-      <% @page.body_images_paths.each do |img| %>
-        <meta name="twitter:image" content="<%= img.to_s %>">
-        <meta property="og:image" content="<%= img.to_s %>">
-      <% end %>
-    <% end %>
-
     <link rel="shortcut icon" href="<%= image_path(theme_favicon) %>" type="image/x-icon" />
     <%= noosfero_javascript %>
     <%= noosfero_stylesheets %>
@@ -72,10 +57,7 @@
           <div id="navigation-end"></div>
         </div><!-- end id="navigation" -->
         <div id="content">
-          <div id="content-inner">
-            <%= insert_boxes(yield) %>
-            <br style='clear: both'/>
-          </div><!-- end id="content-inner" -->
+          <%= render 'layouts/content' %>
         </div><!-- end id="content" -->
       </div><!-- end id="wrap-2" -->
     </div><!-- end id="wrap-1" -->
@@ -84,7 +66,6 @@
       <%= theme_footer %>
     </div><!-- end id="theme-footer" -->
     <%= noosfero_layout_features %>
-    <%= theme_javascript_ng %>
     <%= addthis_javascript %>
     <%=
       @plugins.dispatch(:body_ending).map do |content|
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= html_language %>" lang="<%= html_language %>">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= html_language %>" lang="<%= html_language %>" class="<%= h html_tag_classes %>">
   <head>
     <title><%= h page_title %></title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -68,7 +68,7 @@
  
         <div id="navigation_bar">
           <%= link_to "<span>"+ @environment.name() +"</span>",
-                      @environment.top_url,
+                        top_url,
                         :id=>"menu_link_to_envhome",
                         :title=>@environment.name  %>
           <% unless environment.enabled?(:disable_categories) %>
@@ -47,7 +47,7 @@
     <%= button_to_function(
       :add,
       _('Add new qualifier'),
-      "new_qualifier_row('#product-qualifiers-list', '#{escape_javascript(select_qualifiers(@product))}', '#{escape_javascript(remove_qualifier_button)}')"
+      "new_qualifier_row('#product-qualifiers-list', '#{escape_javascript(CGI::escape_html(select_qualifiers(@product)))}', '#{escape_javascript(CGI::escape_html(remove_qualifier_button))}')"
     ) %>
     <%= hidden_field_tag "product[qualifiers_list][nil]" %>
   <% end %>
 <h1><%= _('Profile settings for %s') % profile.name %></h1>
  
+<%= javascript_include_tag 'deactivate_profile' %>
 <%= error_messages_for :profile_data %>
  
 <%= labelled_form_for :profile_data, :html => { :id => 'profile-data', :multipart => true } do |f| %>
@@ -73,6 +74,15 @@
   <% if user && user.has_permission?('destroy_profile', profile) %>
     <% button_bar(:id => 'delete-profile') do %>
       <%= button(:remove, _('Delete profile'), {:action => :destroy_profile}) %>
+
+      <% if environment.admins.include?(current_person) %>
+
+        <% if profile.visible? %>
+          <%= button(:remove, _('Deactivate profile'), {:action => :deactivate_profile, :id=>profile.id}, :id=>'deactivate_profile_button', :data => {:confirm=>_("Are you sure you want to deactivate this profile?")}) %>
+        <% else %>
+          <%= button(:add, _('Activate profile'), {:action => :activate_profile, :id=>profile.id}, :data => {:confirm=>_("Are you sure you want to deactivate this profile?")}) %>
+        <% end %>
+      <% end %>
     <% end %>
   <% end %>
 -<% end %>
+<% end %>
 \ No newline at end of file
@@ -14,7 +14,7 @@
  
         <% display = display_filter(name, params[:display]) %>
  
-        <div class="search-results-innerbox search-results-type-<%= name.to_s.singularize %> <%= 'common-profile-list-block' if [:enterprises, :people, :communities].include?(name) %>">
+        <div class="search-results-innerbox search-results-type-<%= name.to_s.singularize %> <%= 'common-profile-list-block' if SearchHelper::COMMON_PROFILE_LIST_BLOCK.include?(name) %>">
           <ul>
             <% search[:results].each do |hit| %>
               <% partial = partial_for_class(hit.class, display) %>
 <%= render :file => 'shared/tiny_mce' %>
  
+<%= labelled_form_field(_('Create a link'), f.check_box(:create_link)) %>
+
 <%= labelled_form_field(_('Name for publishing'), f.text_field(:name)) %>
 <%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task][article_parent_id]", task.target) %>
 <%= labelled_form_field(_('Highlight this article'), f.check_box(:highlighted)) %>
@@ -2,10 +2,11 @@
  
 <%= _('Manage the templates used on creation of profiles') %>
  
-<% list_of_templates = [[_('Person')    , environment.people.templates     , 'person'    ],
+<% list_of_templates = [[_('Person')    , environment.person_templates     , 'person'    ],
                         [_('Community') , environment.communities.templates, 'community' ],
                         [_('Enterprise'), environment.enterprises.templates, 'enterprise']] %>
  
+
 <% list_of_templates.each do |title, templates, kind|%>
   <div class='template-kind'>
     <h2><%= title %></h2>
@@ -20,6 +21,11 @@
           <td>
             <%#= image_tag "icons-app/#{kind}-icon.png" %>
             <%= link_to(template.name, {:controller => 'profile_editor', :profile => template.identifier}, :title => _('Edit template "%s"') % template.name ) %>
+            <% if environment.is_default_template?(template) %>
+              <%= _('is the default template') %>
+            <% else %>
+              <%= link_to(_('Set as default'), {:action => "set_#{kind}_as_default", :template_id => template.id}, :title => _('Set %s template as default') % template.name ) %>
+            <% end %>
           </td>
           <td>
             <%= button_without_text 'edit', _('Edit settings'), {:controller => 'profile_editor', :profile => template.identifier, :action => 'edit'} %>
@@ -111,12 +111,7 @@ module Noosfero
     # Make sure the secret is at least 30 characters and all random,
     # no regular words or you'll be exposed to dictionary attacks.
     config.secret_token = noosfero_session_secret
-    config.action_dispatch.session = {
-      :key    => '_noosfero_session',
-    }
-
-    config.time_zone = File.read('/etc/timezone').split("\n").first
-    config.active_record.default_timezone = :local
+    config.session_store :cookie_store, :key => '_noosfero_session'
  
     config.paths['db/migrate'] += Dir.glob "#{Rails.root}/{baseplugins,config/plugins}/*/db/migrate"
     config.i18n.load_path += Dir.glob "#{Rails.root}/{baseplugins,config/plugins}/*/locales/*.{rb,yml}"
@@ -0,0 +1,13 @@
+if Rails.env == 'development'
+  ActionController::Base.send(:prepend_before_filter) do |controller|
+    # XXX note that this is not thread-safe! Accessing a Noosfero instance in
+    # development mode under different ports concurrently _will_ lead to weird
+    # things happening.
+    if [80,443].include?(controller.request.port)
+      url_options = {}
+    else
+      url_options = { :port => controller.request.port }
+    end
+    Noosfero.instance_variable_set('@development_url_options', url_options)
+  end
+end
@@ -3,7 +3,7 @@ if defined? PhusionPassenger
   # from http://russbrooks.com/2010/10/20/rails-cache-memcache-on-passenger-with-smart-spawning
   PhusionPassenger.on_event :starting_worker_process do |forked|
     if forked
-      Rails.cache.instance_variable_get(:@data).reset if Rails.cache.class == ActiveSupport::Cache::MemCacheStore
+      Rails.cache.instance_variable_get(:@data).reset if Rails.cache.class.name == 'ActiveSupport::Cache::MemCacheStore'
     end
   end
 end
@@ -0,0 +1,9 @@
+class RemoveEnvironmentStatisticsBlockSooner < ActiveRecord::Migration
+  def self.up
+    update("UPDATE blocks SET type = 'StatisticsBlock' WHERE type = 'EnvironmentStatisticsBlock'")
+  end
+
+  def self.down
+    say("Nothing to undo (cannot recover the data)")
+  end
+end
@@ -0,0 +1,9 @@
+class AddShowToFollowersForArticle < ActiveRecord::Migration
+  def up
+    add_column :articles, :show_to_followers, :boolean, :default => false
+  end
+
+  def down
+    remove_column :articles, :show_to_followers
+  end
+end
@@ -0,0 +1,9 @@
+class ChangeAddressTypeToTextInExternalFeed < ActiveRecord::Migration
+  def up
+    change_column :external_feeds, :address, :text
+  end
+
+  def down
+    change_column :external_feeds, :address, :string
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20140827191326) do
+ActiveRecord::Schema.define(:version => 20150122165042) do
  
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -149,6 +149,7 @@ ActiveRecord::Schema.define(:version =&gt; 20140827191326) do
     t.integer  "spam_comments_count",  :default => 0
     t.integer  "author_id"
     t.integer  "created_by_id"
+    t.boolean  "show_to_followers",    :default => false
   end
  
   add_index "articles", ["comments_count"], :name => "index_articles_on_comments_count"
@@ -315,7 +316,7 @@ ActiveRecord::Schema.define(:version =&gt; 20140827191326) do
   create_table "external_feeds", :force => true do |t|
     t.string   "feed_title"
     t.datetime "fetched_at"
-    t.string   "address"
+    t.text     "address"
     t.integer  "blog_id",                         :null => false
     t.boolean  "enabled",       :default => true, :null => false
     t.boolean  "only_once",     :default => true, :null => false
@@ -61,6 +61,12 @@ Depends:
  dbconfig-common,
  adduser,
  exim4 | mail-transport-agent,
+# to minimize upgrade issues:
+ ruby-feedparser (>= 0.7-3~),
+ ruby-eventmachine (>= 0.12.10-4~),
+ ruby-rack (>= 1.4.5-2~),
+ ruby-tzinfo (>= 1.1.0-2~),
+ ruby-minitest,
  ${misc:Depends}
 Recommends:
  postgresql,
@@ -115,8 +115,11 @@ do_stop() {
 }
  
 do_restart() {
-  do_stop
-  do_start
+  if running; then
+    main_script restart
+  else
+    do_start
+  fi
 }
  
 running(){
@@ -10,6 +10,13 @@ sub vcl_recv {
   }
 }
  
+sub vcl_deliver {
+  # Force clients to aways hit the server again for HTML pages
+  if (resp.http.Content-Type ~ "^text/html") {
+    set resp.http.Cache-Control = "no-cache";
+  }
+}
+
 sub vcl_error {
     set obj.http.Content-Type = "text/html; charset=utf-8";
  
@@ -5,7 +5,7 @@ TimeOut  300
 Control  "/var/run/pound/poundctl.socket"
  
 ListenHTTP
-  Address  192.168.1.86
+  Address  0.0.0.0
   Port     80
   xHTTP    1
   # uncomment code above if you are using chat
@@ -22,7 +22,8 @@ ListenHTTP
 End
  
 ListenHTTPS
-  Address    192.168.1.86
+  Address    0.0.0.0
+  AddHeader  "X-Forwarded-Proto: https"
   Port       443
   Cert       "/etc/noosfero/ssl/noosfero.pem"
   Ciphers    "ECDHE-RSA-AES256-SHA384:AES256-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH:!AESGCM"
@@ -47,6 +47,28 @@ Feature: edit article
     Then I should see "Access denied"
  
   @selenium
+  Scenario: Hide token field when show to members is activated
+    Given the following communities
+      | name           | identifier    | owner     |
+      | Free Software  | freesoftware  | joaosilva |
+    And the following users
+      | login | name        |
+      | mario | Mario Souto |
+      | maria | Maria Silva |
+    And "Mario Souto" is a member of "Free Software"
+    And "Maria Silva" is a member of "Free Software"
+    And I am on freesoftware's control panel
+    And I follow "Manage Content"
+    And I should see "New content"
+    And I follow "New content"
+    And I should see "Folder"
+    When I follow "Folder"
+    And I fill in "Title" with "My Folder"
+    And I choose "article_published_false"
+    And I check "article_show_to_followers"
+    Then I should not see "Fill in the search"
+
+  @selenium
   Scenario: show exception users field when you choose the private option
     Given the following communities
       | name           | identifier    | owner     |
@@ -19,7 +19,7 @@ Given /^&quot;([^\&quot;]*)&quot; is the active enterprise template$/ do |enterprise|
   template.save!
  
   e = Environment.default
-  e.enterprise_template = template
+  e.enterprise_default_template = template
   e.save
 end
  
@@ -70,16 +70,6 @@ module Noosfero
     end
   end
  
-  def self.term(t)
-    self.terminology.get(t)
-  end
-  def self.terminology
-    @terminology ||= Noosfero::Terminology::Default.instance
-  end
-  def self.terminology=(term)
-    @terminology = term
-  end
-
   def self.url_options
     case Rails.env
     when 'development'
@@ -4,15 +4,23 @@ class Object
   include FastGettext::Translation
   alias :gettext :_
   alias :ngettext :n_
+  alias :c_ :_
+  alias :cN_ :N_
 end
  
  
-custom_locale_dir = Rails.root.join('custom_locales', Rails.env)
+# Adds custom locales for a whole environment
+custom_locale_dir = Rails.root.join('config', 'custom_locales', Rails.env)
 repos = []
 if File.exists?(custom_locale_dir)
   repos << FastGettext::TranslationRepository.build('environment', :type => 'po', :path => custom_locale_dir)
 end
  
+Dir.glob('{baseplugins,config/plugins}/*/locale') do |plugin_locale_dir|
+  plugin = File.basename(File.dirname(plugin_locale_dir))
+  repos << FastGettext::TranslationRepository.build(plugin, :type => 'mo', :path => plugin_locale_dir)
+end
+
 # translations in place?
 locale_dir = Rails.root.join('locale')
 if File.exists?(locale_dir)
@@ -22,3 +30,15 @@ end
  
 FastGettext.add_text_domain 'noosfero', :type => :chain, :chain => repos
 FastGettext.default_text_domain = 'noosfero'
+
+# Adds custom locales for specific domains; Domains are identified by the
+# sequence before the first dot, while tenants are identified by schema name
+hosted_environments = Noosfero::MultiTenancy.mapping.values
+hosted_environments += Domain.all.map { |domain| domain.name[/(.*?)\./,1] } if Domain.table_exists?
+
+hosted_environments.uniq.each do |env|
+  custom_locale_dir = Rails.root.join('config', 'custom_locales', env)
+  if File.exists?(custom_locale_dir)
+    FastGettext.add_text_domain(env, :type => :chain, :chain => [FastGettext::TranslationRepository.build('environment', :type => 'po', :path => custom_locale_dir)] + repos)
+  end
+end
@@ -88,18 +88,29 @@ class Noosfero::Plugin
     # This is a generic method that initialize any possible filter defined by a
     # plugin to a specific controller
     def load_plugin_filters(plugin)
-      plugin_methods = plugin.instance_methods.select {|m| m.to_s.end_with?('_filters')}
-      plugin_methods.each do |plugin_method|
-        controller_class = plugin_method.to_s.gsub('_filters', '').camelize.constantize
-        filters = plugin.new.send(plugin_method)
-        filters = [filters] if !filters.kind_of?(Array)
-
-        filters.each do |plugin_filter|
-          filter_method = (plugin.name.underscore.gsub('/','_') + '_' + plugin_filter[:method_name]).to_sym
-          controller_class.send(plugin_filter[:type], filter_method, (plugin_filter[:options] || {}))
-          controller_class.send(:define_method, filter_method) do
-            instance_eval(&plugin_filter[:block]) if environment.plugin_enabled?(plugin)
-          end
+      Rails.configuration.to_prepare do
+        filters = plugin.new.send 'application_controller_filters' rescue []
+        Noosfero::Plugin.add_controller_filters ApplicationController, plugin, filters
+
+        plugin_methods = plugin.instance_methods.select {|m| m.to_s.end_with?('_filters')}
+        plugin_methods.each do |plugin_method|
+          controller_class = plugin_method.to_s.gsub('_filters', '').camelize.constantize
+
+          filters = plugin.new.send(plugin_method)
+          Noosfero::Plugin.add_controller_filters controller_class, plugin, filters
+        end
+      end
+    end
+
+    def add_controller_filters(controller_class, plugin, filters)
+      unless filters.is_a?(Array)
+        filters = [filters]
+      end
+      filters.each do |plugin_filter|
+        filter_method = (plugin.name.underscore.gsub('/','_') + '_' + plugin_filter[:method_name]).to_sym
+        controller_class.send(plugin_filter[:type], filter_method, (plugin_filter[:options] || {}))
+        controller_class.send(:define_method, filter_method) do
+          instance_exec(&plugin_filter[:block]) if environment.plugin_enabled?(plugin)
         end
       end
     end
@@ -406,6 +417,12 @@ class Noosfero::Plugin
     nil
   end
  
+  # -> Adds adicional fields to a view
+  # returns = proc block that creates html code
+  def upload_files_extra_fields(article)
+    nil
+  end
+  
   # -> Adds fields to the signup form
   # returns = proc that creates html code
   def signup_extra_contents
@@ -557,6 +574,12 @@ class Noosfero::Plugin
     []
   end
  
+  # -> Adds css class to <html> tag
+  # returns = ['class1', 'class2']
+  def html_tag_classes
+    nil
+  end
+
   # -> Adds additional blocks to profiles and environments.
   # Your plugin must implements a class method called 'extra_blocks'
   # that returns a hash with the following syntax.
@@ -2,3 +2,7 @@ module Noosfero
   PROJECT = 'noosfero'
   VERSION = '1.0'
 end
+
+if File.exist?(File.join(Rails.root, '.git'))
+  Noosfero::VERSION.clear << Dir.chdir(Rails.root) { `git describe --tags`.strip }
+end
@@ -5,7 +5,13 @@ namespace :ci do
  
     current_branch = `git rev-parse --abbrev-ref HEAD`.strip
     from = ENV['PREV_HEAD'] || "origin/#{current_branch}"
+    if !system("git show-ref --verify --quiet refs/remotes/#{from}")
+      from = 'origin/master'
+    end
     to = ENV['HEAD'] || current_branch
+
+    puts "Testing changes between #{from} and #{to} ..."
+
     changed_files = `git diff --name-only #{from}..#{to}`.split.select do |f|
       File.exist?(f) && f.split(File::SEPARATOR).first != 'vendor'
     end
@@ -33,14 +39,23 @@ namespace :ci do
       end
     end
  
+    if tests.empty? && features.empty? && changed_plugins.empty?
+      puts "Could not figure out specific changes to be tested in isolation!"
+    end
+    puts
+
     sh 'testrb', '-Itest', *tests unless tests.empty?
     sh 'cucumber', *features unless features.empty?
     sh 'xvfb-run', 'cucumber', '-p', 'selenium', *features unless features.empty?
  
     changed_plugins.each do |plugin|
-      task = "test:noosfero_plugins:#{plugin}"
-      puts "Running #{task}"
-      Rake::Task[task].execute
+      if $broken_plugins.include?(plugin)
+        puts "Skipping plugins/#{plugin}: marked as broken"
+      else
+        task = "test:noosfero_plugins:#{plugin}"
+        puts "Running #{task}"
+        Rake::Task[task].execute
+      end
     end
  
   end
@@ -16,6 +16,14 @@ file makemo_stamp =&gt; Dir.glob(&#39;po/*/noosfero.po&#39;) do
     mo_root: 'locale',
   )
  
+  Dir.glob('plugins/*').each do |plugindir|
+    GetText.create_mofiles(
+      verbose: true,
+      po_root: File.join(plugindir, 'po'),
+      mo_root: File.join(plugindir, 'locale'),
+    )
+  end
+
   FileUtils.mkdir_p 'tmp'
   FileUtils.touch makemo_stamp
 end
@@ -54,7 +62,6 @@ task :updatepo do
     'config/initializers/*.rb',
     'public/*.html.erb',
     'public/designs/themes/{base,noosfero,profile-base}/*.{rhtml,html.erb}',
-    'plugins/**/{controllers,models,lib,views}/**/*.{rhtml,html.erb,rb}',
   ].map { |pattern| Dir.glob(pattern) }.flatten
  
   require 'gettext'
@@ -67,7 +74,33 @@ task :updatepo do
       po_root: 'po',
     }
   )
+end
  
+Dir.glob('plugins/*').each do |plugindir|
+  plugin = File.basename(plugindir)
+  task :updatepo => "updatepo:plugin:#{plugin}"
+
+  desc "Extract strings from #{plugin} plugin"
+  task "updatepo:plugin:#{plugin}" do
+    files = Dir.glob("#{plugindir}/**/*.{rb,html.erb}")
+    po_root = File.join(plugindir, 'po')
+    require 'gettext'
+    require 'gettext/tools'
+    GetText.update_pofiles(
+      plugin,
+      files,
+      Noosfero::VERSION,
+      {
+        po_root: po_root,
+      }
+    )
+    plugin_pot = File.join(po_root, "#{plugin}.pot")
+    if File.exists?(plugin_pot) && system("LANG=C msgfmt --statistics --output /dev/null #{plugin_pot} 2>&1 | grep -q '^0 translated messages.'")
+      rm_f plugin_pot
+    end
+    sh 'find', po_root, '-type', 'd', '-empty', '-delete'
+    puts
+  end
 end
  
 task :checkpo do
-@broken_plugins = %w[
+$broken_plugins = %w[
   anti_spam
   bsc
   comment_classification
   ldap
   solr
+  stoa
 ]
  
 @all_plugins = Dir.glob('plugins/*').map { |f| File.basename(f) } - ['template']
@@ -204,14 +205,14 @@ namespace :test do
     @all_tasks.each do |taskname|
       desc "Run #{taskname} tests for all plugins"
       task taskname do
-        test_sequence(@all_plugins - @broken_plugins, taskname)
+        test_sequence(@all_plugins - $broken_plugins, taskname)
       end
     end
   end
  
   desc "Run all tests for all plugins"
   task :noosfero_plugins do
-    test_sequence(@all_plugins - @broken_plugins, @all_tasks) do |failed|
+    test_sequence(@all_plugins - $broken_plugins, @all_tasks) do |failed|
       plugins_status_report(failed)
     end
   end
@@ -228,7 +229,7 @@ def plugins_status_report(failed)
   printf ('-' * w) + ' ' + ('-' * 20) + "\n"
  
   @all_plugins.each do |plugin|
-    if @broken_plugins.include?(plugin)
+    if $broken_plugins.include?(plugin)
       status = "SKIP"
     elsif !failed[plugin] || failed[plugin].empty?
       status = "PASS"
@@ -137,7 +137,17 @@ EOF
         new_version += '~rc1'
       end
     else
-      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
+          components << 1
+        else
+          components[-1] += 1
+        end
+        new_version = components.join('.')
+      end
     end
  
     puts "Current version: #{$version}"
@@ -1,44 +0,0 @@
-require 'noosfero/terminology'
-
-class UnifreireTerminology < Noosfero::Terminology::Custom
-
-  def initialize
-    # NOTE: the hash values must be marked for translation!! 
-    super({
-      'Enterprises' => N_('Institutions'),
-      'enterprises' => N_('institutions'),
-      'The enterprises where this user works.' => N_('The institution where this user belongs.'),
-      'A block that displays your enterprises' => N_('A block that displays your institutions.'),
-      'All enterprises' => N_('All institutions'),
-      'Disable search for enterprises' => N_('Disable search for institutions'),
-      'One enterprise' => N_('One institution'),
-      '%{num} enterprises' => N_('%{num} institutions'),
-      'Favorite Enterprises' => N_('Favorite Institutions'),
-      'This user\'s favorite enterprises.' => N_('This user\'s favorite institutions'),
-      'A block that displays your favorite enterprises' => N_('A block that displays your favorite institutions'),
-      'All favorite enterprises' => N_('All favorite institutions'),
-      'A search for enterprises by products selled and local' => N_('A search for institutions by products selled and local'),
-      'Edit message for disabled enterprises' => N_('Edit message for disabled institutions'),
-      'Add favorite enterprise' => N_('Add favorite institution'),
-      'Validation info is the information the enterprises will see about how your organization processes the enterprises validations it receives: validation methodology, restrictions to the types of enterprises the organization validates etc.' => N_('Validation info is the information the institutions will see about how your organization processes the institutions validations it receives: validation methodology, restrictions to the types of institutions the organization validates etc.'),
-      'Here are all <b>%s</b>\'s enterprises.' => N_('Here are all <b>%s</b>\'s institutions.'),
-      'Here are all <b>%s</b>\'s favorite enterprises.' => N_('Here are all <b>%s</b>\'s favorite institutions.'),
-      'Favorite Enterprises' => N_('Favorite Institutions'),
-      'Enterprises in "%s"' => N_('Institutions in "%s"'),
-      'Register a new Enterprise' => N_('Register a new Institution'),
-      'Events' => N_('Schedule'),
-      'Manage enterprise fields' => N_('Manage institutions fields'),
-      "%s's enterprises" => N_("%s's institutions"),
-      'Activate your enterprise' => N_('Activate your institution'),
-      'Enterprise activation code' => N_('Institution activation code'),
-      'Disable activation of enterprises' => N_('Disable activation of institutions'),
-      "%s's favorite enterprises" => N_("%s's favorite institutions"),
-      'Disable Enterprise' => N_('Disable Institution'),
-      'Enable Enterprise' => N_('Enable Institution'),
-      'Enterprise Validation' => N_('Institution Validation'),
-      'Enterprise Info and settings' => N_('Institution Info and settings'),
-      'Enterprises are disabled when created' => N_('Institutions are disabled when created'),
-    })
-  end
-
-end
@@ -1,88 +0,0 @@
-require 'noosfero/terminology'
-
-class Zen3Terminology < Noosfero::Terminology::Custom
-
-  def initialize
-    # NOTE: the hash values must be marked for translation!! 
-    super({
-      'My Home Page' => N_('My ePortfolio'),
-      'Homepage' => N_('ePortfolio'),
-      'Communities' => N_('Groups'),
-      'communities' => N_('groups'),
-      'A block that displays your communities' => N_('A block that displays your groups'),
-      'A block that displays your friends' => N_('A block that displays your contacts'),
-      'The communities in which the user is a member' => N_('The groups in which the user is a member'),
-      'All communities' => N_('All groups'),
-      'Community' => N_('Group'),
-      'One community' => N_('One group'),
-      '%{num} communities' => N_('%{num} groups'),
-      'Disable search for communities' => N_('Disable search for groups'),
-      'Enterprises' => N_('Organizations'),
-      'enterprises' => N_('organizations'),
-      'The enterprises where this user works.' => N_('The organizations where this user works.'),
-      'A block that displays your enterprises' => N_('A block that displays your organizations.'),
-      'All enterprises' => N_('All organizations'),
-      'Disable search for enterprises' => N_('Disable search for organizations'),
-      'One enterprise' => N_('One organization'),
-      '%{num} enterprises' => N_('%{num} organizations'),
-      'Favorite Enterprises' => N_('Favorite Organizations'),
-      'This user\'s favorite enterprises.' => N_('This user\'s favorite organizations'),
-      'A block that displays your favorite enterprises' => N_('A block that displays your favorite organizations'),
-      'All favorite enterprises' => N_('All favorite organizations'),
-      'A search for enterprises by products selled and local' => N_('A search for organizations by products selled and local'),
-      'Edit message for disabled enterprises' => N_('Edit message for disabled organizations'),
-      'Add enterprise as favorite' => N_('Add organization as favorite'),
-      'Validation info is the information the enterprises will see about how your organization processes the enterprises validations it receives: validation methodology, restrictions to the types of enterprises the organization validates etc.' => N_('Validation info is the information the organizations will see about how your organization processes the organizations validations it receives: validation methodology, restrictions to the types of organizations the organization validates etc.'),
-      'Here are all <b>%s</b>\'s enterprises.' => N_('Here all all <b>%s</b>\'s organizations.'),
-      'Here are all <b>%s</b>\'s favorite enterprises.' => N_('Here are all <b>%s</b>\'s favorite organizations.'),
-      'Favorite Enterprises' => N_('Favorite Organizations'),
-      'Enterprises in "%s"' => N_('Organizations in "%s"'),
-      'Register a new Enterprise' => N_('Register a new organization'),
-      'One friend' => N_('One contact'),
-      '%s friends' => N_('%s contacts'),
-      '%s communities' => N_('%s groups'),
-      'Are you sure you want to remove %s from your friends list?' => N_('Are you sure you want to remove %s from your contacts list?'),
-      'Note that %s will still have you as a friend, unless he/she also wants to remove you from his/her friend list.' => N_('Note that %s will still have you as a contact, unless he/she also wants to remove you from his/her contact list.'),
-      'Yes, I want to remove %s from my friend list' => N_('Yes, I want to remove %s from my contact list'),
-      'Adding %s as a friend' => N_('Adding %s as a contact'),
-      'Are you sure you want to add %s as your friend?' => N_('Are you sure you want to add %s as your contact?'),
-      'Note that %s will need to accept being added as your friend.' => N_('Note that %s will need to accept being added as your contact.'),
-      'Classify your new friend %s: ' => N_('Classify your new contact %s: '),
-      'Yes, I want to add %s as my friend' => N_('Yes, I want to add %s as my contact'),
-      'Manage friends' => N_('Manage contacts'),
-      'Add friend' => N_('Add contact'),
-      'Removing friend: %s' => N_('Removing friend: %s'),
-      'Clicking on this button will remove your friend relation with %s.' => N_('Clicking on this button will remove your contact relation with %s.'),
-      'You have no friends yet.' => N_('You have no contacts yet.'),
-      '%s\'s friends' => N_('%s\'s contacts'),
-      'Here are all <b>%s</b>\'s friends.' => N_('Here are all <b>%s</b>\'s contacts.'),
-      'Friends' => N_('Contacts'),
-      'Creating new community' => N_('Creating new group'),
-      'Do you want to join this community?' => N_('Do you want to join this group?'),
-      'Activate your enterprise' => N_('Activate your organization'),
-      'Enterprise activation code' => N_('Organization activation code'),
-      'Disable activation of enterprises' => N_('Disable activation of organizations'),
-      'Manage community fields' => N_('Manage group fields'),
-      'Create a new community' => N_('Create a new group'),
-      'Preferred domain name:' => N_('Choose your host community:'),
-      'My communities' => N_('My groups'),
-      'Community Info and settings' => N_('Group Info and Settings'),
-      '{#} community' => N_('{#} group'),
-      '{#} communities' => N_('{#} groups'),
-      '{#} enterprise' => N_('{#} organization'),
-      '{#} enterprises' => N_('{#} organizations'),
-      '{#} friend' => N_('{#} contact'),
-      '{#} friends' => N_('{#} contacts'),
-      "%s's favorite enterprises" => N_("%s's favorite organizations"),
-      'Disable Enterprise' => N_('Disable Organization'),
-      'Enable Enterprise' => N_('Enable Organization'),
-      'Enterprise Validation' => N_('Organization Validation'),
-      'Enterprise Info and settings' => N_('Organization Info and settings'),
-      'Choose the communities you want to join and/or create your own.' => N_('Choose the groups you want to join and/or create your own.'),
-      'New community' => N_('New group'),
-      "Tags are important to new users, they'll be able to find your new community more easily." => N_("Tags are important to new users, they'll be able to find your new group more easily."),
-      'Enterprises are disabled when created' => N_('Organizations are disabled when created'),
-    })
-  end
-
-end
-class AntiSpamPluginAdminController < AdminController
+class AntiSpamPluginAdminController < PluginAdminController
   append_view_path File.join(File.dirname(__FILE__) + '/../views')
  
   def index
@@ -0,0 +1,41 @@
+# German translation of noosfero.
+# Copyright (C) 2009-2013 Josef Spillner
+# Copyright (C) 2009, 2011 Ronny Kursawe
+# This file is distributed under the same license as the noosfero package.
+# Josef Spillner <josef.spillner@tu-dresden.de>, 2009.
+#
+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"
+"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/noosfero/noosfero/"
+"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"
+
+#: plugins/anti_spam/lib/anti_spam_plugin.rb:8
+#, fuzzy
+msgid ""
+"Tests comments and suggested articles against a spam checking service "
+"compatible with the Akismet API"
+msgstr ""
+"Prüft Kommentare gegen einen Spam-Prüfdienst, welcher kompatibel mit der "
+"Akismet-API ist"
+
+#: plugins/anti_spam/views/anti_spam_plugin_admin/index.html.erb:1
+msgid "AntiSpam settings"
+msgstr "Anti-Spam-Einstellungen"
+
+#: plugins/anti_spam/views/anti_spam_plugin_admin/index.html.erb:5
+msgid "Host"
+msgstr "Rechner"
+
+#: plugins/anti_spam/views/anti_spam_plugin_admin/index.html.erb:7
+msgid "API key"
+msgstr "API-Schlüssel"
@@ -0,0 +1,45 @@
+# translation of noosfero.po to
+# Krishnamurti Lelis Lima Vieira Nunes <krishna@colivre.coop.br>, 2007.
+# noosfero - Brazilian Portuguese translation
+# Copyright (C) 2007,
+# Forum Brasileiro de Economia Solidaria <http://www.fbes.org.br/>
+# Copyright (C) 2007,
+# Ynternet.org Foundation <http://www.ynternet.org/>
+# This file is distributed under the same license as noosfero itself.
+# Joenio Costa <joenio@colivre.coop.br>, 2008.
+#
+#
+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"
+"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"
+
+#: plugins/anti_spam/lib/anti_spam_plugin.rb:8
+msgid ""
+"Tests comments and suggested articles against a spam checking service "
+"compatible with the Akismet API"
+msgstr ""
+"Testa comentários e sugestões de artigo contra um serviço de verificação de "
+"spams compatível com a API Akismet"
+
+#: plugins/anti_spam/views/anti_spam_plugin_admin/index.html.erb:1
+msgid "AntiSpam settings"
+msgstr "Configurações de AntiSpam"
+
+#: plugins/anti_spam/views/anti_spam_plugin_admin/index.html.erb:5
+msgid "Host"
+msgstr "Host"
+
+#: plugins/anti_spam/views/anti_spam_plugin_admin/index.html.erb:7
+msgid "API key"
+msgstr "Chave da API"
@@ -7,7 +7,7 @@
   <%= labelled_form_field _('API key'), f.text_field(:api_key, :size => 40) %>
  
   <% button_bar do %>
-    <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
+    <%= submit_button(:save, c_('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
   <% end %>
  
 <% end %>
@@ -53,7 +53,7 @@ class BreadcrumbsPlugin::ContentBreadcrumbsBlock &lt; Block
  
   protected
  
-  CMS_ACTIONS = {:edit => _('Edit'), :upload_files => _('Upload Files'), :new => _('New')}
+  CMS_ACTIONS = {:edit => c_('Edit'), :upload_files => _('Upload Files'), :new => c_('New')}
  
   def cms_action(action)
     CMS_ACTIONS[action.to_sym] || action
@@ -0,0 +1,49 @@
+# translation of noosfero.po to
+# Krishnamurti Lelis Lima Vieira Nunes <krishna@colivre.coop.br>, 2007.
+# noosfero - Brazilian Portuguese translation
+# Copyright (C) 2007,
+# Forum Brasileiro de Economia Solidaria <http://www.fbes.org.br/>
+# Copyright (C) 2007,
+# Ynternet.org Foundation <http://www.ynternet.org/>
+# This file is distributed under the same license as noosfero itself.
+# Joenio Costa <joenio@colivre.coop.br>, 2008.
+#
+#
+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"
+"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"
+
+#: plugins/breadcrumbs/lib/breadcrumbs_plugin.rb:8
+msgid "A plugin that add a block to display breadcrumbs."
+msgstr "Um plugin que adiciona um bloco que mostra caminhos de pão."
+
+#: plugins/breadcrumbs/lib/breadcrumbs_plugin/content_breadcrumbs_block.rb:9
+msgid "Content Breadcrumbs"
+msgstr "Conteúdo de Caminho de Pão"
+
+#: plugins/breadcrumbs/lib/breadcrumbs_plugin/content_breadcrumbs_block.rb:13
+msgid "This block displays breadcrumb trail."
+msgstr "Esse bloco mostra o rastro de caminho de pão."
+
+#: plugins/breadcrumbs/lib/breadcrumbs_plugin/content_breadcrumbs_block.rb:56
+msgid "Upload Files"
+msgstr "Enviar Arquivos"
+
+#: plugins/breadcrumbs/views/box_organizer/breadcrumbs_plugin/_content_breadcrumbs_block.html.erb:2
+msgid "Show cms action"
+msgstr "Mostrar cms"
+
+#: plugins/breadcrumbs/views/box_organizer/breadcrumbs_plugin/_content_breadcrumbs_block.html.erb:3
+msgid "Show profile"
+msgstr "Mostrar perfil"
@@ -101,7 +101,7 @@ class BscPlugin &lt; Noosfero::Plugin
     else
       content = lambda { product.enterprise.name }
     end
-    properties << { :name => _('Supplier'), :content => content }
+    properties << { :name => c_('Supplier'), :content => content }
   end
  
   def profile_tabs
@@ -4,9 +4,9 @@ module BscPlugin::BscHelper
  
   def token_input_field_tag(name, element_id, search_action, options = {}, text_field_options = {}, html_options = {})
     options[:min_chars] ||= 3
-    options[:hint_text] ||= _("Type in a search term")
-    options[:no_results_text] ||= _("No results")
-    options[:searching_text] ||= _("Searching...")
+    options[:hint_text] ||= c_("Type in a search term")
+    options[:no_results_text] ||= c_("No results")
+    options[:searching_text] ||= c_("Searching...")
     options[:search_delay] ||= 1000
     options[:prevent_duplicates] ||=  true
     options[:backspace_delete_item] ||= false
@@ -43,7 +43,7 @@ class BscPlugin::Contract &lt; Noosfero::Plugin::ActiveRecord
     end
  
     def self.names
-      [_('State'), _('Federal')]
+      [c_('State'), _('Federal')]
     end
   end
  
@@ -0,0 +1,370 @@
+# German translation of noosfero.
+# Copyright (C) 2009-2013 Josef Spillner
+# Copyright (C) 2009, 2011 Ronny Kursawe
+# This file is distributed under the same license as the noosfero package.
+# Josef Spillner <josef.spillner@tu-dresden.de>, 2009.
+#
+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"
+"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/noosfero/noosfero/"
+"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"
+
+#: plugins/bsc/lib/bsc_plugin.rb:10
+msgid "Adds the Bsc feature"
+msgstr "Fügt Unterstützung für Bsc hinzu"
+
+#: plugins/bsc/lib/bsc_plugin.rb:14
+msgid "Create Bsc"
+msgstr "Bsc erstellen"
+
+#: plugins/bsc/lib/bsc_plugin.rb:15
+msgid "Validate Enterprises"
+msgstr "Unternehmen bestätigen"
+
+#: plugins/bsc/lib/bsc_plugin.rb:20
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:1
+msgid "Manage associated enterprises"
+msgstr "Verwalte verbundene Unternehmen"
+
+#: plugins/bsc/lib/bsc_plugin.rb:21 plugins/bsc/lib/bsc_plugin.rb:27
+msgid "Transfer ownership"
+msgstr "Eigentümerschaft übertragen"
+
+#: plugins/bsc/lib/bsc_plugin.rb:22
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:1
+msgid "Manage contracts"
+msgstr "Verträge verwalten"
+
+#: plugins/bsc/lib/bsc_plugin.rb:98
+msgid "Bsc"
+msgstr "Bsc"
+
+#: plugins/bsc/lib/bsc_plugin.rb:109
+#: plugins/bsc/views/shared/_fields.html.erb:53
+msgid "Contact"
+msgstr "Kontakt"
+
+#: plugins/bsc/lib/bsc_plugin/bsc.rb:28
+msgid "Bsc info and settings"
+msgstr "Bsc-Informationen und -Einstellungen"
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:10
+msgid "BSC association"
+msgstr "BSC-Zusammenschluss"
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:18
+msgid "%{requestor} wants to associate this enterprise with %{linked_subject}."
+msgstr ""
+"%{requestor} möchte das Unternehmen %{linked_subject} mit %{linked_subject} "
+"verknüpfen."
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:35
+msgid "%{enterprise} accepted your request to associate it with %{bsc}."
+msgstr "%{enterprise} hat Ihre Anfrage zur Verbindung mit %{bsc} akzeptiert."
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:39
+msgid "%{enterprise} rejected your request to associate it with %{bsc}."
+msgstr "%{enterprise} hat Ihre Anfrage zur Verbindung mit %{bsc} abgelehnt."
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:41
+msgid ""
+"Here is the reject explanation left by the administrator:\n"
+"\n"
+"%{reject_explanation}"
+msgstr ""
+"Hier ist der vom Administrator angegebene Grund der Ablehnung:\n"
+"\n"
+"%{reject_explanation}"
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:46
+msgid "%{requestor} wants assoaciate %{bsc} as your BSC."
+msgstr "%{requestor} möchte %{bsc} als Ihr BSC verknüpfen."
+
+#: plugins/bsc/lib/bsc_plugin/mailer.rb:7
+msgid "[%s] Bsc management transferred to you."
+msgstr "[%s] Die Verwaltung von Bsc wurde Ihnen übertragen."
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+msgid "Opened"
+msgstr "Geöffnet"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+msgid "Negotiating"
+msgstr "Aushandlung"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+msgid "Executing"
+msgstr "Ausführung"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+msgid "Closed"
+msgstr "Geschlossen"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:46
+msgid "Federal"
+msgstr "Föderal"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:59
+msgid "ProjectA"
+msgstr "ProjektA"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:59
+msgid "ProjectB"
+msgstr "ProjektB"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:38
+msgid "This Bsc associations were saved successfully."
+msgstr "Diese Bsc-Verknüpfungen wurden erfolgreich gespeichert."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:42
+msgid "This Bsc associations couldn't be saved."
+msgstr "Diese Bsc-Verknüpfung konnte nicht gespeichert werden."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:71
+msgid "Enterprise ownership transferred."
+msgstr "Eigentümerschaft des Unternehmens übertragen."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:85
+msgid "Enterprise was created in association with %s."
+msgstr "Das Unternehmen wurde in Zusammenhang mit %s angelegt."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:117
+msgid "Contract created."
+msgstr "Vertrag erstellt."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:120
+msgid "Contract created but some products could not be added."
+msgstr ""
+"Der Vertrag wurde erstellt, aber einige Produkte konnten nicht hinzugefügt "
+"werden."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:131
+msgid "Contract doesn't exists! Maybe it was already removed."
+msgstr "Der Vertrag existiert nicht! Vielleicht wurde er bereits entfernt."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:140
+msgid "Could not edit such contract."
+msgstr "Kann den Vertrag nicht verändern."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:170
+msgid "Contract edited."
+msgstr "Vertrag geändert."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:173
+msgid "Contract edited but some products could not be added."
+msgstr ""
+"Vertrag geändert, aber einige Produkte konnten nicht hinzugefügt werden."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:183
+msgid "Contract removed."
+msgstr "Vertrag entfernt."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:185
+msgid "Contract could not be removed. Sorry! ^^"
+msgstr "Vertrag konnte nicht entfernt werden. Entschuldigung! ^^"
+
+#: plugins/bsc/controllers/bsc_plugin_admin_controller.rb:11
+msgid "Your Bsc was created."
+msgstr "Ihr Bsc wurde erstellt."
+
+#: plugins/bsc/controllers/bsc_plugin_admin_controller.rb:21
+msgid "Enterprises validated."
+msgstr "Unternehmen validiert."
+
+#: plugins/bsc/controllers/bsc_plugin_admin_controller.rb:24
+msgid "Enterprise validations couldn't be saved."
+msgstr "Die Unternehmensvalidierungen konnten nicht gespeichert werden."
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:4
+msgid "Associations awaiting approval:"
+msgstr "Assoziierungen, welche noch bestätigt werden müssen:"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:16
+#: plugins/bsc/views/bsc_plugin_admin/validate_enterprises.html.erb:5
+msgid "Type in a search term for enterprise"
+msgstr "Geben Sie einen Suchbegriff für Unternehmen ein"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:19
+msgid "Add new enterprise"
+msgstr "Neues Unternehmen hinzufügen"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/new_contract.html.erb:1
+#: plugins/bsc/views/bsc_plugin_myprofile/edit_contract.html.erb:1
+msgid "New contract"
+msgstr "Neuer Vertrag"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:6
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:7
+msgid "Client type"
+msgstr "Typ des Kunden"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:7
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:8
+msgid "Business type"
+msgstr "Typ des Geschäfts"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:10
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:11
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:5
+msgid "Status"
+msgstr "Status"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:18
+msgid "Type in search term for enterprise"
+msgstr "Geben Sie den Suchbegriff für das Unternehmen ein"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:23
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:27
+msgid "Quantity"
+msgstr "Anzahl"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:24
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:28
+msgid "Unit price"
+msgstr "Stückpreis"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:27
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:38
+msgid "Total"
+msgstr "Gesamt"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:31
+msgid "Add new product"
+msgstr "Neues Produkt hinzufügen"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:35
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:13
+msgid "Supply period"
+msgstr "Zulieferungszeitabschnitt"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:57
+msgid "Type in a search term for product"
+msgstr "Geben Sie einen Suchbegriff für das Produkt ein"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:5
+#: plugins/bsc/views/shared/_fields.html.erb:5
+msgid "Basic information"
+msgstr "Basisinformationen"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:12
+msgid "Number of producers"
+msgstr "Anzahl der Produzenten"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:48
+msgid "Annotations"
+msgstr "Anmerkungen"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:17
+msgid "Sort by"
+msgstr "Sortieren nach"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:18
+msgid "Date(newest first)"
+msgstr "Datum (neueste zuerst)"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:18
+msgid "Date(oldest first)"
+msgstr "Datum (älteste zuerst)"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:19
+msgid "Client name(A-Z)"
+msgstr "Kundenname (A-Z)"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:19
+msgid "Client name(Z-A)"
+msgstr "Kundenname (Z-A)"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:24
+msgid "There are no contracts at all."
+msgstr "Sie haben noch keine Verträge."
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:35
+msgid "Are you sure?"
+msgstr "Sind Sie sicher?"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:45
+msgid "Create new contract"
+msgstr "Einen neuen Vertrag erstellen"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_similar_enterprises.html.erb:2
+msgid "Existing enterprises:"
+msgstr "Existierende Unternehmen:"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_similar_enterprises.html.erb:3
+msgid ""
+"Were found %{count} enterprises with similar names on the same city, you can "
+"decide to associate one of them or create the new enterprise confirming the "
+"informations you typed in."
+msgstr ""
+"Wir haben %{count} Firmen mit ähnlichen Namen in der gleichen Stadt "
+"gefunden. Sie können sich mit einer von diesen assoziieren oder eine neue "
+"Firma unter Bestätigung der von Ihnen getätigten Angaben gründen."
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_similar_enterprises.html.erb:20
+msgid "Associate"
+msgstr "Verknüpfen"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:1
+msgid "Transfer Ownership"
+msgstr "Eigentümerschaft übertragen"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:4
+msgid ""
+"This option allows you to transfer this enterprise's management to another "
+"user. This action will remove all the current administrators. Be careful "
+"when confirming this procedure."
+msgstr ""
+"Diese Option erlaubt Ihnen, die Verwaltung dieses Unternehmens an einen "
+"anderen Benutzer zu übertragen. Diese Aktion wird alle derzeitigen "
+"Administratoren entfernen. Seien Sie vorsichtig, bevor Sie diese Prozedur "
+"ausführen."
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:8
+msgid "Current administrators:"
+msgstr "Aktuelle Administratoren:"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:19
+msgid "Administrator:"
+msgstr "Administrator:"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:22
+msgid "Type in a search term for the new administrator"
+msgstr "Geben Sie einen Suchbegriff für den neuen Administrator ein"
+
+#: plugins/bsc/views/shared/_fields.html.erb:39
+msgid ""
+"You are about to change the address, and this will break external links to "
+"this bsc or to posts inside it. Do you really want to change?"
+msgstr ""
+"Sie sind dabei die Adresse zu ändern. Das unterbricht externe Verweise zum "
+"Bsc und zu deren Inhalten. Wollen Sie wirklich die Adresse ändern?"
+
+#: plugins/bsc/views/bsc_plugin/mailer/admin_notification.html.erb:1
+msgid "The management of %{bsc} was transferred to you."
+msgstr "Die Verwaltung des %{bsc} wurde zu Ihnen transferiert."
+
+#: plugins/bsc/views/profile/_profile_tab.html.erb:2
+msgid "Contact phone: "
+msgstr "Kontakttelefonnummer: "
+
+#: plugins/bsc/views/profile/_profile_tab.html.erb:3
+msgid "Email: "
+msgstr "E-Mail: "
+
+#: plugins/bsc/views/bsc_plugin_admin/new.html.erb:2
+msgid "BSC registration"
+msgstr "BSC-Registrierung"
+
+#: plugins/bsc/views/bsc_plugin_admin/validate_enterprises.html.erb:1
+msgid "Validate enterprises"
+msgstr "Unternehmen validieren"
@@ -0,0 +1,364 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+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"
+"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"
+
+#: plugins/bsc/lib/bsc_plugin.rb:10
+msgid "Adds the Bsc feature"
+msgstr "Añade la característica Bsc"
+
+#: plugins/bsc/lib/bsc_plugin.rb:14
+msgid "Create Bsc"
+msgstr "Crear Bsc"
+
+#: plugins/bsc/lib/bsc_plugin.rb:15
+msgid "Validate Enterprises"
+msgstr "Validar empresas"
+
+#: plugins/bsc/lib/bsc_plugin.rb:20
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:1
+msgid "Manage associated enterprises"
+msgstr "Administrar empresas asociadas"
+
+#: plugins/bsc/lib/bsc_plugin.rb:21 plugins/bsc/lib/bsc_plugin.rb:27
+msgid "Transfer ownership"
+msgstr "Transferir propiedad"
+
+#: plugins/bsc/lib/bsc_plugin.rb:22
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:1
+msgid "Manage contracts"
+msgstr "Administrar contratos"
+
+#: plugins/bsc/lib/bsc_plugin.rb:98
+msgid "Bsc"
+msgstr "Bsc"
+
+#: plugins/bsc/lib/bsc_plugin.rb:109
+#: plugins/bsc/views/shared/_fields.html.erb:53
+msgid "Contact"
+msgstr "Contacto"
+
+#: plugins/bsc/lib/bsc_plugin/bsc.rb:28
+msgid "Bsc info and settings"
+msgstr "Información y configuración de Bsc"
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:10
+msgid "BSC association"
+msgstr "Asociación BSC"
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:18
+msgid "%{requestor} wants to associate this enterprise with %{linked_subject}."
+msgstr "%{requestor} quiere asociar esta empresa con %{linked_subject}."
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:35
+msgid "%{enterprise} accepted your request to associate it with %{bsc}."
+msgstr "%{enterprrise} aceptó tu solicitud para asociarse con %{bsc}."
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:39
+msgid "%{enterprise} rejected your request to associate it with %{bsc}."
+msgstr "%{enterprise} rechazó tu solicitud para asociarse con %{bsc}."
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:41
+msgid ""
+"Here is the reject explanation left by the administrator:\n"
+"\n"
+"%{reject_explanation}"
+msgstr ""
+"Aquí está la explicación del rechazo dejada por el administrador:\n"
+"\n"
+"%{reject_explanation}"
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:46
+msgid "%{requestor} wants assoaciate %{bsc} as your BSC."
+msgstr "%{requestor} quire asociar %{bsc} como tu BSC."
+
+#: plugins/bsc/lib/bsc_plugin/mailer.rb:7
+msgid "[%s] Bsc management transferred to you."
+msgstr "[%s] administración de bsc transferida a ti"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+msgid "Opened"
+msgstr "Abierto"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+msgid "Negotiating"
+msgstr "Negociando"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+msgid "Executing"
+msgstr "Ejecutando"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+msgid "Closed"
+msgstr "Cerrado"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:46
+msgid "Federal"
+msgstr "Federal"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:59
+msgid "ProjectA"
+msgstr "Proyecto A"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:59
+msgid "ProjectB"
+msgstr "Proyecto B"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:38
+msgid "This Bsc associations were saved successfully."
+msgstr "Estas asociaciones Bsc fueron guardadas correctamente."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:42
+msgid "This Bsc associations couldn't be saved."
+msgstr "Estas asociaciones Bsc no pudieron ser guardadas."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:71
+msgid "Enterprise ownership transferred."
+msgstr "Propiedad de la empresa transferida."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:85
+msgid "Enterprise was created in association with %s."
+msgstr "La empresa fue creada en asociación con %s."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:117
+msgid "Contract created."
+msgstr "Contrato creado."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:120
+msgid "Contract created but some products could not be added."
+msgstr "Contrato creado pero algunos productos no pudieron agregarse."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:131
+msgid "Contract doesn't exists! Maybe it was already removed."
+msgstr "¡El contrato no existe! Quizás ya fue eliminado."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:140
+msgid "Could not edit such contract."
+msgstr "No se puede editar tal contrato."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:170
+msgid "Contract edited."
+msgstr "contrato editado."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:173
+msgid "Contract edited but some products could not be added."
+msgstr "Contrato editado pero algunos productos no pueden ser agregados."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:183
+msgid "Contract removed."
+msgstr "Contrato eliminado."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:185
+msgid "Contract could not be removed. Sorry! ^^"
+msgstr "El contrato no puede ser eliminado. ¡Perdón! ^^"
+
+#: plugins/bsc/controllers/bsc_plugin_admin_controller.rb:11
+msgid "Your Bsc was created."
+msgstr "Tu Bsc fue creado."
+
+#: plugins/bsc/controllers/bsc_plugin_admin_controller.rb:21
+msgid "Enterprises validated."
+msgstr "Empresas validadas."
+
+#: plugins/bsc/controllers/bsc_plugin_admin_controller.rb:24
+msgid "Enterprise validations couldn't be saved."
+msgstr "Las validaciones de la empresa no pudieron guardarse."
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:4
+msgid "Associations awaiting approval:"
+msgstr "Asociaciones de espera de aprobación:"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:16
+#: plugins/bsc/views/bsc_plugin_admin/validate_enterprises.html.erb:5
+msgid "Type in a search term for enterprise"
+msgstr "Ingresa un término de búsqueda para la empresa"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:19
+msgid "Add new enterprise"
+msgstr "Añadir nueva empresa"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/new_contract.html.erb:1
+#: plugins/bsc/views/bsc_plugin_myprofile/edit_contract.html.erb:1
+msgid "New contract"
+msgstr "Nuevo contrato"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:6
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:7
+msgid "Client type"
+msgstr "Tipo de cliente"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:7
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:8
+msgid "Business type"
+msgstr "Tipo de negocio"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:10
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:11
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:5
+msgid "Status"
+msgstr "Estado"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:18
+msgid "Type in search term for enterprise"
+msgstr "Ingresa un término de búsqueda para la empresa"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:23
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:27
+msgid "Quantity"
+msgstr "Cantidad"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:24
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:28
+msgid "Unit price"
+msgstr "Precio unitario"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:27
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:38
+msgid "Total"
+msgstr "Total"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:31
+msgid "Add new product"
+msgstr "Añadir nuevo producto"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:35
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:13
+msgid "Supply period"
+msgstr "Período de suministro"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:57
+msgid "Type in a search term for product"
+msgstr "Ingresa un término de búsqueda para el producto"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:5
+#: plugins/bsc/views/shared/_fields.html.erb:5
+msgid "Basic information"
+msgstr "Información básica"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:12
+msgid "Number of producers"
+msgstr "Número de productores"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:48
+msgid "Annotations"
+msgstr "Anotaciones"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:17
+msgid "Sort by"
+msgstr "Ordenar por"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:18
+msgid "Date(newest first)"
+msgstr "Fecha (más reciente primero)"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:18
+msgid "Date(oldest first)"
+msgstr "Fecha (más antiguo primero)"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:19
+msgid "Client name(A-Z)"
+msgstr "Nombre del cliente (A-Z)"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:19
+msgid "Client name(Z-A)"
+msgstr "Nombre del cliente (Z-A)"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:24
+msgid "There are no contracts at all."
+msgstr "No hay ningún contrato."
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:35
+msgid "Are you sure?"
+msgstr "¿Estás seguro?"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:45
+msgid "Create new contract"
+msgstr "Crear nuevo contrato"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_similar_enterprises.html.erb:2
+msgid "Existing enterprises:"
+msgstr "Empresas existentes:"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_similar_enterprises.html.erb:3
+msgid ""
+"Were found %{count} enterprises with similar names on the same city, you can "
+"decide to associate one of them or create the new enterprise confirming the "
+"informations you typed in."
+msgstr ""
+"Fueron encontrados %{count} empresas con nombres similares en la misma "
+"ciudad, puedes decidir asociar una de ellos o crear la nueva empresa "
+"confirmando la información que escribiste."
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_similar_enterprises.html.erb:20
+msgid "Associate"
+msgstr "Asociar"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:1
+msgid "Transfer Ownership"
+msgstr "Transferir propiedad"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:4
+msgid ""
+"This option allows you to transfer this enterprise's management to another "
+"user. This action will remove all the current administrators. Be careful "
+"when confirming this procedure."
+msgstr ""
+"Esta opción te permite transferir la administración de esta empresa a otro "
+"usuario. Esta acción eliminará a todos los administradores actuales. Ten "
+"cuidado cuando confirmes este proceso."
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:8
+msgid "Current administrators:"
+msgstr "Administradores actuales:"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:19
+msgid "Administrator:"
+msgstr "Administrador:"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:22
+msgid "Type in a search term for the new administrator"
+msgstr "Ingresa un término de búsqueda para el nuevo administrador"
+
+#: plugins/bsc/views/shared/_fields.html.erb:39
+msgid ""
+"You are about to change the address, and this will break external links to "
+"this bsc or to posts inside it. Do you really want to change?"
+msgstr ""
+"Estás a punto de cambiar la dirección, y esto romperá los enlaces externos a "
+"este bsc o a las publicaciones su interior. ¿Estás seguro que quieres "
+"cambiarla?"
+
+#: plugins/bsc/views/bsc_plugin/mailer/admin_notification.html.erb:1
+msgid "The management of %{bsc} was transferred to you."
+msgstr "La administración de %{bsc} te fue transferido."
+
+#: plugins/bsc/views/profile/_profile_tab.html.erb:2
+msgid "Contact phone: "
+msgstr "Teléfono de contacto: "
+
+#: plugins/bsc/views/profile/_profile_tab.html.erb:3
+msgid "Email: "
+msgstr "Correo electrónico: "
+
+#: plugins/bsc/views/bsc_plugin_admin/new.html.erb:2
+msgid "BSC registration"
+msgstr "Registro de BSC"
+
+#: plugins/bsc/views/bsc_plugin_admin/validate_enterprises.html.erb:1
+msgid "Validate enterprises"
+msgstr "Validar empresas"
@@ -0,0 +1,412 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# , 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.0\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"
+"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"
+
+#: plugins/bsc/lib/bsc_plugin.rb:10
+#, fuzzy
+msgid "Adds the Bsc feature"
+msgstr "Autres fonctionnalités"
+
+#: plugins/bsc/lib/bsc_plugin.rb:14
+#, fuzzy
+msgid "Create Bsc"
+msgstr "Créer"
+
+#: plugins/bsc/lib/bsc_plugin.rb:15
+#, fuzzy
+msgid "Validate Enterprises"
+msgstr "Valider l'entreprise"
+
+#: plugins/bsc/lib/bsc_plugin.rb:20
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:1
+#, fuzzy
+msgid "Manage associated enterprises"
+msgstr "Gérer les entreprises"
+
+#: plugins/bsc/lib/bsc_plugin.rb:21 plugins/bsc/lib/bsc_plugin.rb:27
+msgid "Transfer ownership"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin.rb:22
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:1
+#, fuzzy
+msgid "Manage contracts"
+msgstr "Gérer les contacts."
+
+#: plugins/bsc/lib/bsc_plugin.rb:98
+msgid "Bsc"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin.rb:109
+#: plugins/bsc/views/shared/_fields.html.erb:53
+msgid "Contact"
+msgstr "Contact "
+
+#: plugins/bsc/lib/bsc_plugin/bsc.rb:28
+#, fuzzy
+msgid "Bsc info and settings"
+msgstr "Informations et paramètres"
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:10
+#, fuzzy
+msgid "BSC association"
+msgstr "Informations de contact"
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:18
+#, fuzzy
+msgid "%{requestor} wants to associate this enterprise with %{linked_subject}."
+msgstr "L'utilisateur «%{user}» veut activer l'adresse «%{email}»"
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:35
+msgid "%{enterprise} accepted your request to associate it with %{bsc}."
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:39
+msgid "%{enterprise} rejected your request to associate it with %{bsc}."
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:41
+msgid ""
+"Here is the reject explanation left by the administrator:\n"
+"\n"
+"%{reject_explanation}"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:46
+#, fuzzy
+msgid "%{requestor} wants assoaciate %{bsc} as your BSC."
+msgstr "%s veut être votre contact."
+
+#: plugins/bsc/lib/bsc_plugin/mailer.rb:7
+msgid "[%s] Bsc management transferred to you."
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+#, fuzzy
+msgid "Opened"
+msgstr "ouvrir"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+#, fuzzy
+msgid "Negotiating"
+msgstr "Paramètres"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+#, fuzzy
+msgid "Executing"
+msgstr "Édition"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+#, fuzzy
+msgid "Closed"
+msgstr "Fermer"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:46
+#, fuzzy
+msgid "Federal"
+msgstr "Tâche générique"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:59
+#, fuzzy
+msgid "ProjectA"
+msgstr "Produit"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:59
+#, fuzzy
+msgid "ProjectB"
+msgstr "Produit"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:38
+#, fuzzy
+msgid "This Bsc associations were saved successfully."
+msgstr "Fonctionnalités mises à jour avec succès."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:42
+#, fuzzy
+msgid "This Bsc associations couldn't be saved."
+msgstr "Ce fichier n'a pas pu être sauvegardé"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:71
+#, fuzzy
+msgid "Enterprise ownership transferred."
+msgstr "Page d'accueil de l'entreprise"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:85
+#, fuzzy
+msgid "Enterprise was created in association with %s."
+msgstr "Enregistrement de l'enterprise : \"%s\""
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:117
+#, fuzzy
+msgid "Contract created."
+msgstr "Adresse électronique de contact"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:120
+msgid "Contract created but some products could not be added."
+msgstr ""
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:131
+msgid "Contract doesn't exists! Maybe it was already removed."
+msgstr ""
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:140
+#, fuzzy
+msgid "Could not edit such contract."
+msgstr "Impossible de mettre à jour le produit"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:170
+#, fuzzy
+msgid "Contract edited."
+msgstr "Adresse électronique de contact"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:173
+#, fuzzy
+msgid "Contract edited but some products could not be added."
+msgstr "Bloc d'information de profil"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:183
+#, fuzzy
+msgid "Contract removed."
+msgstr "Corps de l'article"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:185
+#, fuzzy
+msgid "Contract could not be removed. Sorry! ^^"
+msgstr "Bloc d'information de profil"
+
+#: plugins/bsc/controllers/bsc_plugin_admin_controller.rb:11
+#, fuzzy
+msgid "Your Bsc was created."
+msgstr "Votre adresse e-mail %s vient d'être activée"
+
+#: plugins/bsc/controllers/bsc_plugin_admin_controller.rb:21
+#, fuzzy
+msgid "Enterprises validated."
+msgstr "Validations d'entreprises"
+
+#: plugins/bsc/controllers/bsc_plugin_admin_controller.rb:24
+#, fuzzy
+msgid "Enterprise validations couldn't be saved."
+msgstr "Validations d'entreprises"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:4
+msgid "Associations awaiting approval:"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:16
+#: plugins/bsc/views/bsc_plugin_admin/validate_enterprises.html.erb:5
+#, fuzzy
+msgid "Type in a search term for enterprise"
+msgstr "Désactiver la recherche d'entreprises"
+
+# (second try of this knid of contents)
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:19
+#, fuzzy
+msgid "Add new enterprise"
+msgstr "Une entreprise"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/new_contract.html.erb:1
+#: plugins/bsc/views/bsc_plugin_myprofile/edit_contract.html.erb:1
+#, fuzzy
+msgid "New contract"
+msgstr "Tout le contenu"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:6
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:7
+#, fuzzy
+msgid "Client type"
+msgstr "Type de contenu"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:7
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:8
+#, fuzzy
+msgid "Business type"
+msgstr "Nom de fichier"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:10
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:11
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:5
+msgid "Status"
+msgstr "Statut"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:18
+#, fuzzy
+msgid "Type in search term for enterprise"
+msgstr "Désactiver la recherche d'entreprises"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:23
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:27
+#, fuzzy
+msgid "Quantity"
+msgstr "Qualité"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:24
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:28
+#, fuzzy
+msgid "Unit price"
+msgstr "Distance :"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:27
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:38
+#, fuzzy
+msgid "Total"
+msgstr "Pour : "
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:31
+#, fuzzy
+msgid "Add new product"
+msgstr "Ajouter un produit"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:35
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:13
+#, fuzzy
+msgid "Supply period"
+msgstr "Fournisseur : %s"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:57
+#, fuzzy
+msgid "Type in a search term for product"
+msgstr "Désactiver la recherche d'entreprises"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:5
+#: plugins/bsc/views/shared/_fields.html.erb:5
+#, fuzzy
+msgid "Basic information"
+msgstr "Informations de contact"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:12
+#, fuzzy
+msgid "Number of producers"
+msgstr "Pas de produit"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:48
+#, fuzzy
+msgid "Annotations"
+msgstr "Message d'invitation :"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:17
+#, fuzzy
+msgid "Sort by"
+msgstr "Nouveau groupe"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:18
+msgid "Date(newest first)"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:18
+msgid "Date(oldest first)"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:19
+msgid "Client name(A-Z)"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:19
+msgid "Client name(Z-A)"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:24
+#, fuzzy
+msgid "There are no contracts at all."
+msgstr "Vous n'avez pas encore de contact."
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:35
+msgid "Are you sure?"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:45
+#, fuzzy
+msgid "Create new contract"
+msgstr "Créer un nouveau groupe"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_similar_enterprises.html.erb:2
+#, fuzzy
+msgid "Existing enterprises:"
+msgstr "Éditer l'entreprise"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_similar_enterprises.html.erb:3
+msgid ""
+"Were found %{count} enterprises with similar names on the same city, you can "
+"decide to associate one of them or create the new enterprise confirming the "
+"informations you typed in."
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_similar_enterprises.html.erb:20
+#, fuzzy
+msgid "Associate"
+msgstr "Activer"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:1
+msgid "Transfer Ownership"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:4
+msgid ""
+"This option allows you to transfer this enterprise's management to another "
+"user. This action will remove all the current administrators. Be careful "
+"when confirming this procedure."
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:8
+#, fuzzy
+msgid "Current administrators:"
+msgstr "Membres"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:19
+#, fuzzy
+msgid "Administrator:"
+msgstr "Interface d'administration"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:22
+msgid "Type in a search term for the new administrator"
+msgstr ""
+
+#: plugins/bsc/views/shared/_fields.html.erb:39
+#, fuzzy
+msgid ""
+"You are about to change the address, and this will break external links to "
+"this bsc or to posts inside it. Do you really want to change?"
+msgstr ""
+"Vous êtes sur le point de modifier cette adresse, et cela risque de briser "
+"les liens extérieurs menant à la page d'accueil ou le contenu du site lui-"
+"même. Voulez-vous vraiment la modifier ?"
+
+#: plugins/bsc/views/bsc_plugin/mailer/admin_notification.html.erb:1
+msgid "The management of %{bsc} was transferred to you."
+msgstr ""
+
+#: plugins/bsc/views/profile/_profile_tab.html.erb:2
+#, fuzzy
+msgid "Contact phone: "
+msgstr "Téléphone de contact :"
+
+#: plugins/bsc/views/profile/_profile_tab.html.erb:3
+#, fuzzy
+msgid "Email: "
+msgstr "Courrier électronique : %s"
+
+#: plugins/bsc/views/bsc_plugin_admin/new.html.erb:2
+#, fuzzy
+msgid "BSC registration"
+msgstr "Enregistrement de l'enterprise : \"%s\""
+
+#: plugins/bsc/views/bsc_plugin_admin/validate_enterprises.html.erb:1
+#, fuzzy
+msgid "Validate enterprises"
+msgstr "Valider l'entreprise"
@@ -0,0 +1,404 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+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"
+"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"
+
+#: plugins/bsc/lib/bsc_plugin.rb:10
+#, fuzzy
+msgid "Adds the Bsc feature"
+msgstr "Այլ առանձնահատկություն"
+
+#: plugins/bsc/lib/bsc_plugin.rb:14
+#, fuzzy
+msgid "Create Bsc"
+msgstr "Ստեղծել"
+
+#: plugins/bsc/lib/bsc_plugin.rb:15
+#, fuzzy
+msgid "Validate Enterprises"
+msgstr "Վավերացնել ձեռնարկությունը"
+
+#: plugins/bsc/lib/bsc_plugin.rb:20
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:1
+#, fuzzy
+msgid "Manage associated enterprises"
+msgstr "Մեկ ձեռնարկություն"
+
+#: plugins/bsc/lib/bsc_plugin.rb:21 plugins/bsc/lib/bsc_plugin.rb:27
+msgid "Transfer ownership"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin.rb:22
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:1
+#, fuzzy
+msgid "Manage contracts"
+msgstr "Կառավարել բովանդակությունը:"
+
+#: plugins/bsc/lib/bsc_plugin.rb:98
+msgid "Bsc"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin.rb:109
+#: plugins/bsc/views/shared/_fields.html.erb:53
+msgid "Contact"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/bsc.rb:28
+#, fuzzy
+msgid "Bsc info and settings"
+msgstr "Անհանատական էջի տվյալների բաժին"
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:10
+#, fuzzy
+msgid "BSC association"
+msgstr "Էլ. հասցե"
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:18
+#, fuzzy
+msgid "%{requestor} wants to associate this enterprise with %{linked_subject}."
+msgstr "%s-ը ցանկանում է %s-ի անդամ դառնալ:"
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:35
+msgid "%{enterprise} accepted your request to associate it with %{bsc}."
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:39
+msgid "%{enterprise} rejected your request to associate it with %{bsc}."
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:41
+msgid ""
+"Here is the reject explanation left by the administrator:\n"
+"\n"
+"%{reject_explanation}"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:46
+#, fuzzy
+msgid "%{requestor} wants assoaciate %{bsc} as your BSC."
+msgstr "%s ցանկանում է Ձեր ընկերը դառնալ"
+
+#: plugins/bsc/lib/bsc_plugin/mailer.rb:7
+msgid "[%s] Bsc management transferred to you."
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+#, fuzzy
+msgid "Opened"
+msgstr "բացել"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+#, fuzzy
+msgid "Negotiating"
+msgstr "Պարամետրեր"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+#, fuzzy
+msgid "Executing"
+msgstr "Փոփոխում"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+#, fuzzy
+msgid "Closed"
+msgstr "Փակել"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:46
+#, fuzzy
+msgid "Federal"
+msgstr "Ընդհանուր առաջադրանք"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:59
+#, fuzzy
+msgid "ProjectA"
+msgstr "Արտադրանք"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:59
+#, fuzzy
+msgid "ProjectB"
+msgstr "Արտադրանք"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:38
+#, fuzzy
+msgid "This Bsc associations were saved successfully."
+msgstr "Առանձնահատկությունները հաջողությամբ թարմացված են:"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:42
+#, fuzzy
+msgid "This Bsc associations couldn't be saved."
+msgstr "Անհանատական էջի տվյալների բաժին"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:71
+#, fuzzy
+msgid "Enterprise ownership transferred."
+msgstr "Ձեռնարկության գլխավոր էջ"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:85
+#, fuzzy
+msgid "Enterprise was created in association with %s."
+msgstr "Ձեռնարկության գրանցում «%s»"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:117
+#, fuzzy
+msgid "Contract created."
+msgstr "էլ. հասցե"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:120
+msgid "Contract created but some products could not be added."
+msgstr ""
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:131
+msgid "Contract doesn't exists! Maybe it was already removed."
+msgstr ""
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:140
+#, fuzzy
+msgid "Could not edit such contract."
+msgstr "Արտադրանք թարմացնելն անհնար է"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:170
+#, fuzzy
+msgid "Contract edited."
+msgstr "էլ. հասցե"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:173
+#, fuzzy
+msgid "Contract edited but some products could not be added."
+msgstr "Անհանատական էջի տվյալների բաժին"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:183
+#, fuzzy
+msgid "Contract removed."
+msgstr "Բուն հոդված"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:185
+#, fuzzy
+msgid "Contract could not be removed. Sorry! ^^"
+msgstr "Անհանատական էջի տվյալների բաժին"
+
+#: plugins/bsc/controllers/bsc_plugin_admin_controller.rb:11
+#, fuzzy
+msgid "Your Bsc was created."
+msgstr "%s վերացված է"
+
+#: plugins/bsc/controllers/bsc_plugin_admin_controller.rb:21
+#, fuzzy
+msgid "Enterprises validated."
+msgstr "Ձեռնարկությունների վավերացում"
+
+#: plugins/bsc/controllers/bsc_plugin_admin_controller.rb:24
+#, fuzzy
+msgid "Enterprise validations couldn't be saved."
+msgstr "Ձեռնարկությունների վավերացում"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:4
+msgid "Associations awaiting approval:"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:16
+#: plugins/bsc/views/bsc_plugin_admin/validate_enterprises.html.erb:5
+#, fuzzy
+msgid "Type in a search term for enterprise"
+msgstr "Դիզակտիվացնել ձեռնարկությունների որոնումը"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:19
+#, fuzzy
+msgid "Add new enterprise"
+msgstr "Մեկ ձեռնարկություն"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/new_contract.html.erb:1
+#: plugins/bsc/views/bsc_plugin_myprofile/edit_contract.html.erb:1
+#, fuzzy
+msgid "New contract"
+msgstr "Ամբողջ բովանդակությունը"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:6
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:7
+#, fuzzy
+msgid "Client type"
+msgstr "Բովանդակության տեսակ"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:7
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:8
+#, fuzzy
+msgid "Business type"
+msgstr "Սեփականատիրոջ տեսակ"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:10
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:11
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:5
+msgid "Status"
+msgstr "Կարգավիճակ"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:18
+#, fuzzy
+msgid "Type in search term for enterprise"
+msgstr "Դիզակտիվացնել ձեռնարկությունների որոնումը"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:23
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:27
+#, fuzzy
+msgid "Quantity"
+msgstr "Որակ"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:24
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:28
+#, fuzzy
+msgid "Unit price"
+msgstr "Հեռավորություն"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:27
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:38
+msgid "Total"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:31
+#, fuzzy
+msgid "Add new product"
+msgstr "Կառավարել արտադրանքը"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:35
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:13
+#, fuzzy
+msgid "Supply period"
+msgstr "Առաքիչ %s"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:57
+#, fuzzy
+msgid "Type in a search term for product"
+msgstr "Դիզակտիվացնել ձեռնարկությունների որոնումը"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:5
+#: plugins/bsc/views/shared/_fields.html.erb:5
+#, fuzzy
+msgid "Basic information"
+msgstr "Էլ. հասցե"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:12
+#, fuzzy
+msgid "Number of producers"
+msgstr "Արտադրանք չկա"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:48
+#, fuzzy
+msgid "Annotations"
+msgstr "Կառավարման վահանակ"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:17
+#, fuzzy
+msgid "Sort by"
+msgstr "Մեկ համայնք"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:18
+msgid "Date(newest first)"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:18
+msgid "Date(oldest first)"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:19
+msgid "Client name(A-Z)"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:19
+msgid "Client name(Z-A)"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:24
+msgid "There are no contracts at all."
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:35
+msgid "Are you sure?"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:45
+#, fuzzy
+msgid "Create new contract"
+msgstr "Ստեղծել նոր համայնք"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_similar_enterprises.html.erb:2
+#, fuzzy
+msgid "Existing enterprises:"
+msgstr "Մեկ ձեռնարկություն"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_similar_enterprises.html.erb:3
+msgid ""
+"Were found %{count} enterprises with similar names on the same city, you can "
+"decide to associate one of them or create the new enterprise confirming the "
+"informations you typed in."
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_similar_enterprises.html.erb:20
+#, fuzzy
+msgid "Associate"
+msgstr "Ակտիվացնել"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:1
+msgid "Transfer Ownership"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:4
+msgid ""
+"This option allows you to transfer this enterprise's management to another "
+"user. This action will remove all the current administrators. Be careful "
+"when confirming this procedure."
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:8
+#, fuzzy
+msgid "Current administrators:"
+msgstr "Անդամներ"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:19
+#, fuzzy
+msgid "Administrator:"
+msgstr "Կառավարման վահանակ"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:22
+msgid "Type in a search term for the new administrator"
+msgstr ""
+
+#: plugins/bsc/views/shared/_fields.html.erb:39
+msgid ""
+"You are about to change the address, and this will break external links to "
+"this bsc or to posts inside it. Do you really want to change?"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin/mailer/admin_notification.html.erb:1
+msgid "The management of %{bsc} was transferred to you."
+msgstr ""
+
+#: plugins/bsc/views/profile/_profile_tab.html.erb:2
+#, fuzzy
+msgid "Contact phone: "
+msgstr "Հեռախոս"
+
+#: plugins/bsc/views/profile/_profile_tab.html.erb:3
+#, fuzzy
+msgid "Email: "
+msgstr "Էլ. հասցե"
+
+#: plugins/bsc/views/bsc_plugin_admin/new.html.erb:2
+#, fuzzy
+msgid "BSC registration"
+msgstr "Ձեռնարկության գրանցում «%s»"
+
+#: plugins/bsc/views/bsc_plugin_admin/validate_enterprises.html.erb:1
+#, fuzzy
+msgid "Validate enterprises"
+msgstr "Վավերացնել ձեռնարկությունը"
@@ -0,0 +1,370 @@
+# translation of noosfero.po to
+# Krishnamurti Lelis Lima Vieira Nunes <krishna@colivre.coop.br>, 2007.
+# noosfero - Brazilian Portuguese translation
+# Copyright (C) 2007,
+# Forum Brasileiro de Economia Solidaria <http://www.fbes.org.br/>
+# Copyright (C) 2007,
+# Ynternet.org Foundation <http://www.ynternet.org/>
+# This file is distributed under the same license as noosfero itself.
+# Joenio Costa <joenio@colivre.coop.br>, 2008.
+#
+#
+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"
+"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"
+
+#: plugins/bsc/lib/bsc_plugin.rb:10
+msgid "Adds the Bsc feature"
+msgstr "Adiciona a funcionalidades Bsc"
+
+#: plugins/bsc/lib/bsc_plugin.rb:14
+msgid "Create Bsc"
+msgstr "Criar Bsc"
+
+#: plugins/bsc/lib/bsc_plugin.rb:15
+msgid "Validate Enterprises"
+msgstr "Validar empreendimentos"
+
+#: plugins/bsc/lib/bsc_plugin.rb:20
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:1
+msgid "Manage associated enterprises"
+msgstr "Gerenciar empreendimentos associados"
+
+#: plugins/bsc/lib/bsc_plugin.rb:21 plugins/bsc/lib/bsc_plugin.rb:27
+msgid "Transfer ownership"
+msgstr "Transferir administração"
+
+#: plugins/bsc/lib/bsc_plugin.rb:22
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:1
+msgid "Manage contracts"
+msgstr "Gerenciar contratos"
+
+#: plugins/bsc/lib/bsc_plugin.rb:98
+msgid "Bsc"
+msgstr "Bsc"
+
+#: plugins/bsc/lib/bsc_plugin.rb:109
+#: plugins/bsc/views/shared/_fields.html.erb:53
+msgid "Contact"
+msgstr "Contato"
+
+#: plugins/bsc/lib/bsc_plugin/bsc.rb:28
+msgid "Bsc info and settings"
+msgstr "Informações e Configurações do Bsc"
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:10
+msgid "BSC association"
+msgstr "Associação de BSC"
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:18
+msgid "%{requestor} wants to associate this enterprise with %{linked_subject}."
+msgstr "%{requestor} quer associar este empreendimento com %{linked_subject}."
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:35
+msgid "%{enterprise} accepted your request to associate it with %{bsc}."
+msgstr "%{enterprise} aceitou seu pedido para associá-lo com %{bsc}."
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:39
+msgid "%{enterprise} rejected your request to associate it with %{bsc}."
+msgstr "%{enterprise} rejeitou seu pedido para associá-lo com %{bsc}."
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:41
+msgid ""
+"Here is the reject explanation left by the administrator:\n"
+"\n"
+"%{reject_explanation}"
+msgstr ""
+"Segue a explicação de rejeição deixada pelo administrador:\n"
+"\n"
+"%{reject_explanation}"
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:46
+msgid "%{requestor} wants assoaciate %{bsc} as your BSC."
+msgstr "%{requestor} quer associar %{bsc} como seu BSC."
+
+#: plugins/bsc/lib/bsc_plugin/mailer.rb:7
+msgid "[%s] Bsc management transferred to you."
+msgstr "[%s] Administração de Bsc transferida para você."
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+msgid "Opened"
+msgstr "Aberto"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+msgid "Negotiating"
+msgstr "Em negociação"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+msgid "Executing"
+msgstr "Executando"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+msgid "Closed"
+msgstr "Fechado"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:46
+msgid "Federal"
+msgstr "Federal"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:59
+msgid "ProjectA"
+msgstr "ProjetoA"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:59
+msgid "ProjectB"
+msgstr "ProjetoB"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:38
+msgid "This Bsc associations were saved successfully."
+msgstr "As associações deste Bsc foram salvas com sucesso."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:42
+msgid "This Bsc associations couldn't be saved."
+msgstr "As associações deste Bsc não puderam ser salvas."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:71
+msgid "Enterprise ownership transferred."
+msgstr "A administração do empreendimento foi transferida."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:85
+msgid "Enterprise was created in association with %s."
+msgstr "O empreendimento foi criado em associação com %s."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:117
+msgid "Contract created."
+msgstr "O contrato foi criado."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:120
+msgid "Contract created but some products could not be added."
+msgstr "O contrato foi criado mas alguns produtos não puderam ser adicionados."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:131
+msgid "Contract doesn't exists! Maybe it was already removed."
+msgstr "O contrato não existe! Talvez ele já tenha sido removido."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:140
+msgid "Could not edit such contract."
+msgstr "Não foi possível editar o contrato."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:170
+msgid "Contract edited."
+msgstr "Contrato editado."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:173
+msgid "Contract edited but some products could not be added."
+msgstr ""
+"O contrato foi editado mas alguns produtos não puderam ser adicionados."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:183
+msgid "Contract removed."
+msgstr "Contrato removido."
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:185
+msgid "Contract could not be removed. Sorry! ^^"
+msgstr "O contrato não pôde ser removido. Desculpa!"
+
+#: plugins/bsc/controllers/bsc_plugin_admin_controller.rb:11
+msgid "Your Bsc was created."
+msgstr "Seu Bsc foi criado."
+
+#: plugins/bsc/controllers/bsc_plugin_admin_controller.rb:21
+msgid "Enterprises validated."
+msgstr "Empreendimento validados."
+
+#: plugins/bsc/controllers/bsc_plugin_admin_controller.rb:24
+msgid "Enterprise validations couldn't be saved."
+msgstr "As validações de empreendimento não puderam ser salvas."
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:4
+msgid "Associations awaiting approval:"
+msgstr "Associações aguardando aprovação:"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:16
+#: plugins/bsc/views/bsc_plugin_admin/validate_enterprises.html.erb:5
+msgid "Type in a search term for enterprise"
+msgstr "Digite um termo de pesquisa para empreendimentos"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:19
+msgid "Add new enterprise"
+msgstr "Adicionar novo empreendimento"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/new_contract.html.erb:1
+#: plugins/bsc/views/bsc_plugin_myprofile/edit_contract.html.erb:1
+msgid "New contract"
+msgstr "Novo contrato"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:6
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:7
+msgid "Client type"
+msgstr "Tipo de cliente"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:7
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:8
+msgid "Business type"
+msgstr "Tipo de negócio"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:10
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:11
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:5
+msgid "Status"
+msgstr "Estado"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:18
+msgid "Type in search term for enterprise"
+msgstr "Digite um termo de pesquisa para empreendimentos"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:23
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:27
+msgid "Quantity"
+msgstr "Quantidade"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:24
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:28
+msgid "Unit price"
+msgstr "Preço unitário"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:27
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:38
+msgid "Total"
+msgstr "Total"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:31
+msgid "Add new product"
+msgstr "Adicionar novo produto"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:35
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:13
+msgid "Supply period"
+msgstr "Período de fornecimento"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:57
+msgid "Type in a search term for product"
+msgstr "Digite um termo de pesquisa para produto"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:5
+#: plugins/bsc/views/shared/_fields.html.erb:5
+msgid "Basic information"
+msgstr "Informações Básicas"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:12
+msgid "Number of producers"
+msgstr "Número de produtores"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:48
+msgid "Annotations"
+msgstr "Anotações"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:17
+msgid "Sort by"
+msgstr "Ordenar por"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:18
+msgid "Date(newest first)"
+msgstr "Data(mais recentes primeiro)"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:18
+msgid "Date(oldest first)"
+msgstr "Data(mais antigos primeiro)"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:19
+msgid "Client name(A-Z)"
+msgstr "Nome do cliente(A-Z)"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:19
+msgid "Client name(Z-A)"
+msgstr "Nome do cliente(Z-A)"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:24
+msgid "There are no contracts at all."
+msgstr "Não há contratos."
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:35
+msgid "Are you sure?"
+msgstr "Você tem certeza?"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:45
+msgid "Create new contract"
+msgstr "Criar novo contrato"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_similar_enterprises.html.erb:2
+msgid "Existing enterprises:"
+msgstr "Empreendimentos existentes:"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_similar_enterprises.html.erb:3
+msgid ""
+"Were found %{count} enterprises with similar names on the same city, you can "
+"decide to associate one of them or create the new enterprise confirming the "
+"informations you typed in."
+msgstr ""
+"Foram encontrados %{count} empreendimentos com nomes similares na mesma "
+"cidade, você pode decidir associar um deles ou criar um novo empreendimento "
+"confirmando as informações que você digitou."
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_similar_enterprises.html.erb:20
+msgid "Associate"
+msgstr "Associar"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:1
+msgid "Transfer Ownership"
+msgstr "Transferir administração"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:4
+msgid ""
+"This option allows you to transfer this enterprise's management to another "
+"user. This action will remove all the current administrators. Be careful "
+"when confirming this procedure."
+msgstr ""
+"Esta opção permite transferir a administração do empreendimento para outro "
+"usuário. Esta ação removerá todos os administradores atuais. Seja cuidadoso "
+"ao confirmar este procedimento."
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:8
+msgid "Current administrators:"
+msgstr "Administradores atuais:"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:19
+msgid "Administrator:"
+msgstr "Administradores:"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:22
+msgid "Type in a search term for the new administrator"
+msgstr "Digite um termo de pesquisa para o novo adiministrador"
+
+#: plugins/bsc/views/shared/_fields.html.erb:39
+msgid ""
+"You are about to change the address, and this will break external links to "
+"this bsc or to posts inside it. Do you really want to change?"
+msgstr ""
+"Você está prestes a alterar o endereço, e isto vai quebrar links externos "
+"para esse bsc ou para artigos dentro dele. Você realmente deseja mudar?"
+
+#: plugins/bsc/views/bsc_plugin/mailer/admin_notification.html.erb:1
+msgid "The management of %{bsc} was transferred to you."
+msgstr "A adminstração de %{bsc} foi transferida para você."
+
+#: plugins/bsc/views/profile/_profile_tab.html.erb:2
+msgid "Contact phone: "
+msgstr "Telefone de contato: "
+
+#: plugins/bsc/views/profile/_profile_tab.html.erb:3
+msgid "Email: "
+msgstr "Email: "
+
+#: plugins/bsc/views/bsc_plugin_admin/new.html.erb:2
+msgid "BSC registration"
+msgstr "Registro de BSC"
+
+#: plugins/bsc/views/bsc_plugin_admin/validate_enterprises.html.erb:1
+msgid "Validate enterprises"
+msgstr "Validar empreendimentos"
@@ -0,0 +1,410 @@
+# Russian translation of noosfero.
+# Copyright (C) 2009 Anton Caceres
+# This file is distributed under the same license as the noosfero package.
+# Josef Spillner <josef.spillner@tu-dresden.de>, 2009.
+#
+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"
+"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"Language-Team: Russian <https://hosted.weblate.org/projects/noosfero/"
+"noosfero/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"
+
+#: plugins/bsc/lib/bsc_plugin.rb:10
+#, fuzzy
+msgid "Adds the Bsc feature"
+msgstr "Системные возможности"
+
+#: plugins/bsc/lib/bsc_plugin.rb:14
+#, fuzzy
+msgid "Create Bsc"
+msgstr "Создать"
+
+#: plugins/bsc/lib/bsc_plugin.rb:15
+#, fuzzy
+msgid "Validate Enterprises"
+msgstr "Подтвердить компанию"
+
+#: plugins/bsc/lib/bsc_plugin.rb:20
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:1
+#, fuzzy
+msgid "Manage associated enterprises"
+msgstr "Verwalte Unternehmensfelder"
+
+#: plugins/bsc/lib/bsc_plugin.rb:21 plugins/bsc/lib/bsc_plugin.rb:27
+msgid "Transfer ownership"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin.rb:22
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:1
+#, fuzzy
+msgid "Manage contracts"
+msgstr "Управлять контактами"
+
+#: plugins/bsc/lib/bsc_plugin.rb:98
+msgid "Bsc"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin.rb:109
+#: plugins/bsc/views/shared/_fields.html.erb:53
+msgid "Contact"
+msgstr "Контакт"
+
+#: plugins/bsc/lib/bsc_plugin/bsc.rb:28
+#, fuzzy
+msgid "Bsc info and settings"
+msgstr "Инфо профиля и настройки"
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:10
+#, fuzzy
+msgid "BSC association"
+msgstr "Основная информация"
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:18
+#, fuzzy
+msgid "%{requestor} wants to associate this enterprise with %{linked_subject}."
+msgstr "'%{user} хочет активировать E-Mail '%{email}' "
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:35
+msgid "%{enterprise} accepted your request to associate it with %{bsc}."
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:39
+msgid "%{enterprise} rejected your request to associate it with %{bsc}."
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:41
+msgid ""
+"Here is the reject explanation left by the administrator:\n"
+"\n"
+"%{reject_explanation}"
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/associate_enterprise.rb:46
+#, fuzzy
+msgid "%{requestor} wants assoaciate %{bsc} as your BSC."
+msgstr "%s хочет быть вашим другом"
+
+#: plugins/bsc/lib/bsc_plugin/mailer.rb:7
+msgid "[%s] Bsc management transferred to you."
+msgstr ""
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+#, fuzzy
+msgid "Opened"
+msgstr "открыть"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+#, fuzzy
+msgid "Negotiating"
+msgstr "Настройки"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+#, fuzzy
+msgid "Executing"
+msgstr "Редактирование"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:33
+#, fuzzy
+msgid "Closed"
+msgstr "Закрыть"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:46
+#, fuzzy
+msgid "Federal"
+msgstr "Основная задача"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:59
+#, fuzzy
+msgid "ProjectA"
+msgstr "Продукт"
+
+#: plugins/bsc/lib/bsc_plugin/contract.rb:59
+#, fuzzy
+msgid "ProjectB"
+msgstr "Продукт"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:38
+#, fuzzy
+msgid "This Bsc associations were saved successfully."
+msgstr "Все файлы успешно обновлены"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:42
+#, fuzzy
+msgid "This Bsc associations couldn't be saved."
+msgstr "Файл не может быть сохранен"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:71
+#, fuzzy
+msgid "Enterprise ownership transferred."
+msgstr "Домашняя страница компании"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:85
+#, fuzzy
+msgid "Enterprise was created in association with %s."
+msgstr "Регистрация предприятия: \"%s\""
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:117
+#, fuzzy
+msgid "Contract created."
+msgstr "Контактный email"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:120
+msgid "Contract created but some products could not be added."
+msgstr ""
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:131
+msgid "Contract doesn't exists! Maybe it was already removed."
+msgstr ""
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:140
+#, fuzzy
+msgid "Could not edit such contract."
+msgstr "Невозможно обновить продукт"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:170
+#, fuzzy
+msgid "Contract edited."
+msgstr "Контактный email"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:173
+#, fuzzy
+msgid "Contract edited but some products could not be added."
+msgstr "Блок персональной информации"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:183
+#, fuzzy
+msgid "Contract removed."
+msgstr "Тело статьи"
+
+#: plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb:185
+#, fuzzy
+msgid "Contract could not be removed. Sorry! ^^"
+msgstr "Блок персональной информации"
+
+#: plugins/bsc/controllers/bsc_plugin_admin_controller.rb:11
+#, fuzzy
+msgid "Your Bsc was created."
+msgstr "Ваш E-Mail %s активирован"
+
+#: plugins/bsc/controllers/bsc_plugin_admin_controller.rb:21
+#, fuzzy
+msgid "Enterprises validated."
+msgstr "Утвердители компаний"
+
+#: plugins/bsc/controllers/bsc_plugin_admin_controller.rb:24
+#, fuzzy
+msgid "Enterprise validations couldn't be saved."
+msgstr "Утвердители компаний"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:4
+msgid "Associations awaiting approval:"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:16
+#: plugins/bsc/views/bsc_plugin_admin/validate_enterprises.html.erb:5
+#, fuzzy
+msgid "Type in a search term for enterprise"
+msgstr "Отключить поиск по компаниям"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb:19
+#, fuzzy
+msgid "Add new enterprise"
+msgstr "Одна компания"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/new_contract.html.erb:1
+#: plugins/bsc/views/bsc_plugin_myprofile/edit_contract.html.erb:1
+#, fuzzy
+msgid "New contract"
+msgstr "Весь контент"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:6
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:7
+#, fuzzy
+msgid "Client type"
+msgstr "Тип контента"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:7
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:8
+#, fuzzy
+msgid "Business type"
+msgstr "Название работы"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:10
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:11
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:5
+msgid "Status"
+msgstr "Статус"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:18
+#, fuzzy
+msgid "Type in search term for enterprise"
+msgstr "Отключить поиск по компаниям"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:23
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:27
+#, fuzzy
+msgid "Quantity"
+msgstr "Качество"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:24
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:28
+#, fuzzy
+msgid "Unit price"
+msgstr "Прайс:"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:27
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:38
+#, fuzzy
+msgid "Total"
+msgstr "Получатель:"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:31
+#, fuzzy
+msgid "Add new product"
+msgstr "Управление продуктами"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:35
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:13
+#, fuzzy
+msgid "Supply period"
+msgstr "Поставщик: %s"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:57
+#, fuzzy
+msgid "Type in a search term for product"
+msgstr "Отключить поиск по компаниям"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:5
+#: plugins/bsc/views/shared/_fields.html.erb:5
+msgid "Basic information"
+msgstr "Основная информация"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:12
+#, fuzzy
+msgid "Number of producers"
+msgstr "Количество новостей"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:48
+#, fuzzy
+msgid "Annotations"
+msgstr "Текст приглашения"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:17
+#, fuzzy
+msgid "Sort by"
+msgstr "Отправлено %s."
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:18
+msgid "Date(newest first)"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:18
+msgid "Date(oldest first)"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:19
+msgid "Client name(A-Z)"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:19
+msgid "Client name(Z-A)"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:24
+#, fuzzy
+msgid "There are no contracts at all."
+msgstr "У вас еще нет контактов"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:35
+msgid "Are you sure?"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb:45
+#, fuzzy
+msgid "Create new contract"
+msgstr "Создать новое сообщество"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_similar_enterprises.html.erb:2
+#, fuzzy
+msgid "Existing enterprises:"
+msgstr "Unternehmen ändern"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_similar_enterprises.html.erb:3
+msgid ""
+"Were found %{count} enterprises with similar names on the same city, you can "
+"decide to associate one of them or create the new enterprise confirming the "
+"informations you typed in."
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/_similar_enterprises.html.erb:20
+#, fuzzy
+msgid "Associate"
+msgstr "Активировать"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:1
+msgid "Transfer Ownership"
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:4
+msgid ""
+"This option allows you to transfer this enterprise's management to another "
+"user. This action will remove all the current administrators. Be careful "
+"when confirming this procedure."
+msgstr ""
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:8
+#, fuzzy
+msgid "Current administrators:"
+msgstr "Текущие участники"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:19
+#, fuzzy
+msgid "Administrator:"
+msgstr "Администраторы:"
+
+#: plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb:22
+msgid "Type in a search term for the new administrator"
+msgstr ""
+
+#: plugins/bsc/views/shared/_fields.html.erb:39
+#, fuzzy
+msgid ""
+"You are about to change the address, and this will break external links to "
+"this bsc or to posts inside it. Do you really want to change?"
+msgstr ""
+"Вы собираетесь сменить адрес, это приведет к разрыву всех внешних ссылок, "
+"ведущих на вашу страницу. Вы уверены?"
+
+#: plugins/bsc/views/bsc_plugin/mailer/admin_notification.html.erb:1
+msgid "The management of %{bsc} was transferred to you."
+msgstr ""
+
+#: plugins/bsc/views/profile/_profile_tab.html.erb:2
+#, fuzzy
+msgid "Contact phone: "
+msgstr "Kontakttelefon:"
+
+#: plugins/bsc/views/profile/_profile_tab.html.erb:3
+#, fuzzy
+msgid "Email: "
+msgstr "E-Mail: %s"
+
+#: plugins/bsc/views/bsc_plugin_admin/new.html.erb:2
+#, fuzzy
+msgid "BSC registration"
+msgstr "Регистрация предприятия"
+
+#: plugins/bsc/views/bsc_plugin_admin/validate_enterprises.html.erb:1
+#, fuzzy
+msgid "Validate enterprises"
+msgstr "Подтвердить компанию"
@@ -5,7 +5,7 @@
   <%= render :partial => 'shared/fields', :locals => {:f => f, :profile => @bsc} %>
  
   <% button_bar do %>
-    <%= submit_button('save', _('Save')) %>
-    <%= button('cancel', _('Cancel'), {:controller => 'admin_panel'}) %>
+    <%= submit_button('save', c_('Save')) %>
+    <%= button('cancel', c_('Cancel'), {:controller => 'admin_panel'}) %>
   <% end %>
 <% end %>
@@ -6,7 +6,7 @@
                                 :focus => true }) %>
  
   <% button_bar do %>
-    <%= submit_button('save', _('Save'))%>
-    <%= button('cancel', _('Cancel'), {:controller => 'admin_panel'})%>
+    <%= submit_button('save', c_('Save'))%>
+    <%= button('cancel', c_('Cancel'), {:controller => 'admin_panel'})%>
   <% end %>
 <% end %>
@@ -10,7 +10,7 @@
   <%= labelled_form_field(_('Status'), f.select(:status, BscPlugin::Contract::Status.types.
         map { |s| [BscPlugin::Contract::Status.names[s], s] })) %>
   <%= f.text_field(:number_of_producers, :size => 8, :id => 'bsc-plugin-contract-spinner') %>
-  <%= _('Enterprises')+':' %>
+  <%= c_('Enterprises')+':' %>
  
   <% search_action = {:action => 'search_contract_enterprises', :profile => profile.identifier} %>
   <%= token_input_field_tag(:enterprises, 'involved-enterprises', search_action, 
@@ -19,7 +19,7 @@
  
   <table id="bsc-plugin-sales-table" class="alternate-colors">
     <tr>
-      <th class="bsc-plugin-sales-products-column"><%= _('Products') %></th>
+      <th class="bsc-plugin-sales-products-column"><%= c_('Products') %></th>
       <th class="bsc-plugin-sales-quantity-column" ><%= _('Quantity') %></th>
       <th class="bsc-plugin-sales-price-column" ><%= _('Unit price') %></th>
     </tr>
@@ -34,13 +34,13 @@
  
   <%= labelled_form_field( _('Supply period'), 
     text_field_tag('contract[supply_start]', (@contract.supply_start ? @contract.supply_start.strftime("%Y-%m-%d") : nil), :id => 'from', :size => 9) + 
-    _(' to ') +
+    c_(' to ') +
     text_field_tag('contract[supply_end]', (@contract.supply_end ? @contract.supply_end.strftime("%Y-%m-%d") : nil), :id => 'to', :size => 9) )
   %>
  
   <%= f.text_area(:annotations, :rows => 5, :cols => 68) %>
   <% button_bar do%>
-    <%= submit_button(:save, _('Save'), :cancel => {:action => 'manage_contracts'})%>
+    <%= submit_button(:save, c_('Save'), :cancel => {:action => 'manage_contracts'})%>
   <% end %>
 <% end %>
  
@@ -55,8 +55,8 @@
   BSCContracts.tokenInputOptions = {
     minChars: 3,
     hintText: <%= _('Type in a search term for product').to_json %>,
-    noResultsText: <%= _("No results").to_json %>,
-    searchingText: <%= _("Searching...").to_json %>,
+    noResultsText: <%= c_("No results").to_json %>,
+    searchingText: <%= c_("Searching...").to_json %>,
     searchDelay: 1000,
     preventDuplicates: true,
     backspaceDeleteItem: false,
@@ -9,12 +9,12 @@
   <%= required f.text_field 'name', :onchange => "updateUrlField(this, 'create_enterprise_identifier')", :size => 40 %>
   <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise } %>
   <p style="border-bottom: 2px solid #babdb6"></p>
-  <%= required labelled_form_field(_('Address'), content_tag('code', environment.top_url + "/" + text_field(:create_enterprise, 'identifier', :size => 26))) %>
+  <%= required labelled_form_field(c_('Address'), content_tag('code', environment.top_url + "/" + text_field(:create_enterprise, 'identifier', :size => 26))) %>
   <p style="border-bottom: 2px solid #babdb6"></p>
   <%= render :partial => 'similar_enterprises', :locals => {:bsc => profile}%>
  
   <% button_bar do %>
-    <%= submit_button('save', _('Save'), :cancel => {:controller => 'profile_editor', :profile => profile.identifier}) %>
+    <%= submit_button('save', c_('Save'), :cancel => {:controller => 'profile_editor', :profile => profile.identifier}) %>
   <% end %>
 <% end %>
  
@@ -19,8 +19,8 @@
   <%= button('add', _('Add new enterprise'), {:action => 'create_enterprise'}) %>
  
   <% button_bar do %>
-    <%= submit_button('save', _('Save'))%>
-    <%= button('cancel', _('Cancel'), {:controller => 'profile_editor'})%>
+    <%= submit_button('save', c_('Save'))%>
+    <%= button('cancel', c_('Cancel'), {:controller => 'profile_editor'})%>
   <% end %>
  
 <% end %>
@@ -9,7 +9,7 @@
       <br style="clear:both" />
     <% end %>
     <br style="clear:both" />
-    <%= submit_button(:save, _('Filter')) %>
+    <%= submit_button(:save, c_('Filter')) %>
   </div>
  
   <div id='bsc-plugin-contracts-results'>
@@ -31,8 +31,8 @@
               <%= content_tag('i', show_date(contract.created_at)) %>
             </td>
             <td class="links">
-              <%= link_to(_('Edit'), :action => 'edit_contract', :contract_id => contract.id)%>
-              <%= link_to(_('Remove'), {:action => 'destroy_contract', :contract_id => contract.id}, :confirm => _('Are you sure?'))%>
+              <%= link_to(c_('Edit'), :action => 'edit_contract', :contract_id => contract.id)%>
+              <%= link_to(c_('Remove'), {:action => 'destroy_contract', :contract_id => contract.id}, :confirm => _('Are you sure?'))%>
             </td>
           </tr>
         <% end %>
@@ -41,7 +41,7 @@
     <% end %>
  
     <% button_bar do %>
-      <%= button(:back, _('Go back'), :controller => 'profile_editor') %>
+      <%= button(:back, c_('Go back'), :controller => 'profile_editor') %>
       <%= button(:new, _('Create new contract'), :action => 'new_contract')%>
     <% end %>
   </div>
1	1	source "https://rubygems.org"
2	2	gem 'rails', '~> 3.2.19'
	3	+gem 'minitest', '~> 3.2.0'
3	4	gem 'fast_gettext', '~> 0.6.8'
4	5	gem 'acts-as-taggable-on', '~> 3.0.2'
5	6	gem 'prototype-rails', '~> 3.2.1'
...	...
1		-Setup Noosfero to use HTTPS
2		-===========================
	1	+# Setup Noosfero to use HTTPS
3	2
4	3	This document assumes that you have a fully and clean Noosfero
5	4	installation as explained at the `INSTALL.md` file.
6	5
7		-SSL certificate
8		-+++++++++++++++
	6	+## Creating a self-signed SSL certificate
9	7
10	8	You should get a valid SSL certificate, but if you want to test
11	9	your setup before, you could generate a self-signed certificate
...	...	@@ -17,99 +15,106 @@ as below:
17	15	# openssl req -new -x509 -nodes -sha1 -days $[10*365] -key noosfero.key > noosfero.cert
18	16	# cat noosfero.key noosfero.cert > noosfero.pem
19	17
	18	+## Web server configuration
	19	+
20	20	There are two ways of using SSL with Noosfero: 1) If you are not using
21	21	Varnish; and 2) If you are using Varnish.
22	22
23		-1) If you are are not using Varnish
24		-+++++++++++++++++++++++++++++++++++
	23	+### 1) If you are are not using Varnish
25	24
26	25	Simply do a redirect in apache to force all connections with SSL:
27	26
28		- <VirtualHost *:8080>
29		- ServerName test.stoa.usp.br
30		-
31		- Redirect / https://example.com/
32		- </VirtualHost>
	27	+```
	28	+<VirtualHost *:8080>
	29	+ ServerName test.stoa.usp.br
	30	+ Redirect / https://example.com/
	31	+</VirtualHost>
	32	+```
33	33
34	34	And set a vhost to receive then:
35	35
36		- <VirtualHost *:443>
37		- ServerName example.com
38		-
39		- SSLEngine On
40		- SSLCertificateFile /etc/ssl/certs/cert.pem
41		- SSLCertificateKeyFile /etc/ssl/private/cert.key
42		-
43		- Include /etc/noosfero/apache/virtualhost.conf
44		- </VirtualHost>
	36	+```
	37	+<VirtualHost *:443>
	38	+ ServerName example.com
	39	+ SSLEngine On
	40	+ SSLCertificateFile /etc/ssl/certs/cert.pem
	41	+ SSLCertificateKeyFile /etc/ssl/private/cert.key
	42	+ Include /etc/noosfero/apache/virtualhost.conf
	43	+</VirtualHost>
	44	+```
45	45
46	46	Be aware that if you had configured varnish, the requests won't reach
47	47	it with this configuration.
48	48
49		-2) If you are using Varnish
50		-+++++++++++++++++++++++++++
51		-
52		-Varnish isn't able to communicate with the SSL protocol, so we will
53		-need some one who do this and Pound[1] can do the job. In order to
54		-install it in Debian based systems:
	49	+### 2) If you are using Varnish
55	50
56		- $ sudo apt-get install pound
	51	+Varnish isn't able to communicate with the SSL protocol, so we will need some
	52	+one else who do this and [Pound](http://www.apsis.ch/pound) can do the job. In
	53	+order to install it in Debian based systems:
57	54
58		-Set Varnish to listen in other port than 80:
	55	+```
	56	+$ sudo apt-get install pound
	57	+```
59	58
60		-/etc/defaults/varnish
61		----------------------
	59	+Set Varnish to listen in other port than 80 in `/etc/defaults/varnish`:
62	60
63		- DAEMON_OPTS="-a localhost:6081 \
64		- -T localhost:6082 \
65		- -f /etc/varnish/default.vcl \
66		- -S /etc/varnish/secret \
67		- -s file,/var/lib/varnish/$INSTANCE/varnish_storage.bin,1G"
	61	+```
	62	+DAEMON_OPTS="-a localhost:6081 \
	63	+ -T localhost:6082 \
	64	+ -f /etc/varnish/default.vcl \
	65	+ -S /etc/varnish/secret \
	66	+ -s file,/var/lib/varnish/$INSTANCE/varnish_storage.bin,1G"
	67	+```
68	68
69	69	Configure Pound:
70	70
71		- # cp /usr/share/noosfero/etc/pound.cfg /etc/pound/
72		-
73		-Edit /etc/pound.cfg and set the IP and domain of your server.
	71	+```
	72	+# cp /usr/share/noosfero/etc/pound.cfg /etc/pound/
	73	+```
74	74
75		-Configure Pound to start at system initialization:
	75	+Edit `/etc/pound.cfg` and set the IP and domain of your server.
76	76
77		-/etc/default/pound
	77	+Configure Pound to start at system initialization. At `/etc/default/pound`:
78	78	------------------
79	79
80		- startup=1
	80	+```
	81	+startup=1
	82	+```
81	83
82		-Set Apache to only listen to localhost:
	84	+Set Apache to only listen to localhost, at `/etc/apache2/ports.conf`:
83	85
84		-/etc/apache2/ports.conf
85		------------------------
86		-
87		- Listen 127.0.0.1:8080
	86	+```
	87	+Listen 127.0.0.1:8080
	88	+```
88	89
89	90	Restart the services:
90	91
91		- $ sudo service apache2 restart
92		- $ sudo service varnish restart
	92	+```
	93	+$ sudo service apache2 restart
	94	+$ sudo service varnish restart
	95	+```
93	96
94	97	Start pound:
95	98
96		- $ sudo service pound start
97		-
98		-[1] http://www.apsis.ch/pound
	99	+```
	100	+$ sudo service pound start
	101	+```
99	102
100		-Noosfero XMPP chat
101		-++++++++++++++++++
	103	+## Noosfero XMPP chat
102	104
103	105	If you want to use chat over HTTPS, then you should add the domain
104		-and IP of your server in the /etc/hosts file, example:
	106	+and IP of your server in the /etc/hosts file, example
105	107
106		-/etc/hosts
107		-----------
	108	+`/etc/hosts:`
108	109
109		- 192.168.1.86 mydomain.example.com
	110	+```
	111	+192.168.1.86 mydomain.example.com
	112	+```
110	113
111		-Also, it's recomended that you remove lines above from the file
	114	+Also, it's recomended that you remove the lines below from the file
112	115	`/etc/apache2/sites-enabled/noosfero`:
113	116
114		- RewriteEngine On
115		- Include /usr/share/noosfero/util/chat/apache/xmpp.conf
	117	+```
	118	+RewriteEngine On
	119	+Include /usr/share/noosfero/util/chat/apache/xmpp.conf
	120	+```
...	...
...	...	@@ -0,0 +1,29 @@
	1	+Using custom locales
	2	+====================
	3	+
	4	+Personalized translations go into the `config/custom_locales/` directory.
	5	+Custom locales can be identified by the rails environment, schema name in a
	6	+multitenancy setup or domain name until the first dot (e.g env1.coop.br for the
	7	+example below).
	8	+
	9	+Currently, the only filename prefix for the localization file which is
	10	+processed is "environment". For instance, a POT file would be called
	11	+"environment.pot".
	12	+
	13	+The structure of an environment named env1 with custom translations for both
	14	+Portuguese and Spanish and an environment named env2 with custom Russian
	15	+translation would be:
	16	+
	17	+ config/
	18	+ custom_locales/
	19	+ env1/
	20	+ environment.pot
	21	+ pt/
	22	+ environment.po
	23	+ es/
	24	+ environment.po
	25	+ env2/
	26	+ environment.pot
	27	+ ru/
	28	+ environment.po
	29	+
...	...
...	...	@@ -71,4 +71,22 @@ class AdminPanelController < AdminController
71	71	end
72	72	end
73	73	end
	74	+
	75	+ def manage_organizations_status
	76	+ scope = environment.organizations
	77	+ @filter = params[:filter] \|\| 'any'
	78	+ @title = "Organization profiles"
	79	+ @title = @title+" - "+@filter if @filter != 'any'
	80	+
	81	+ if @filter == 'enabled'
	82	+ scope = scope.visible
	83	+ elsif @filter == 'disabled'
	84	+ scope = scope.disabled
	85	+ end
	86	+
	87	+ scope = scope.order('name ASC')
	88	+
	89	+ @q = params[:q]
	90	+ @collection = find_by_contents(:organizations, scope, @q, {:per_page => 10, :page => params[:npage]})[:results]
	91	+ end
74	92	end
...	...
...	...	@@ -0,0 +1,5 @@
	1	+class PluginAdminController < AdminController
	2	+
	3	+ protect 'edit_environment_features', :environment
	4	+
	5	+end
...	...
...	...	@@ -40,8 +40,67 @@ class TemplatesController < AdminController
40	40	end
41	41	end
42	42
	43	+ def set_community_as_default
	44	+ begin
	45	+ community = environment.communities.find(params[:template_id])
	46	+ rescue ActiveRecord::RecordNotFound
	47	+ message = _('Community not found. The template could no be changed.')
	48	+ community = nil
	49	+ end
	50	+
	51	+ message = _('%s defined as default') % community.name if set_as_default(community)
	52	+ session[:notice] = message
	53	+
	54	+ redirect_to :action => 'index'
	55	+ end
	56	+
	57	+ def set_person_as_default
	58	+ begin
	59	+ person = environment.people.find(params[:template_id])
	60	+ rescue ActiveRecord::RecordNotFound
	61	+ message = _('Person not found. The template could no be changed.')
	62	+ person = nil
	63	+ end
	64	+
	65	+ message = _('%s defined as default') % person.name if set_as_default(person)
	66	+ session[:notice] = message
	67	+
	68	+ redirect_to :action => 'index'
	69	+ end
	70	+
	71	+ def set_enterprise_as_default
	72	+ begin
	73	+ enterprise = environment.enterprises.find(params[:template_id])
	74	+ rescue ActiveRecord::RecordNotFound
	75	+ message = _('Enterprise not found. The template could no be changed.')
	76	+ enterprise = nil
	77	+ end
	78	+
	79	+ message = _('%s defined as default') % enterprise.name if set_as_default(enterprise)
	80	+ session[:notice] = message
	81	+
	82	+ redirect_to :action => 'index'
	83	+ end
	84	+
43	85	private
44	86
	87	+ def set_as_default(obj)
	88	+ return nil if obj.nil?
	89	+ case obj.class.name
	90	+ when 'Community' then
	91	+ environment.community_default_template = obj
	92	+ environment.save!
	93	+ when 'Person' then
	94	+ environment.person_default_template = obj
	95	+ environment.save!
	96	+ when 'Enterprise' then
	97	+ environment.enterprise_default_template = obj
	98	+ environment.save!
	99	+ else
	100	+ nil
	101	+ end
	102	+ end
	103	+
45	104	def create_organization_template(klass)
46	105	identifier = params[:name].to_slug
47	106	template = klass.new(:name => params[:name], :identifier => identifier, :is_template => true)
...	...
...	...	@@ -127,6 +127,9 @@ class ApplicationController < ActionController::Base
127	127
128	128	# TODO: move this logic somewhere else (Domain class?)
129	129	def detect_stuff_by_domain
	130	+ # Sets text domain based on request host for custom internationalization
	131	+ FastGettext.text_domain = Domain.custom_locale(request.host)
	132	+
130	133	@domain = Domain.find_by_name(request.host)
131	134	if @domain.nil?
132	135	@environment = Environment.default
...	...
...	...	@@ -180,6 +180,8 @@ class CmsController < MyProfileController
180	180
181	181	post_only :set_home_page
182	182	def set_home_page
	183	+ return render_access_denied unless user.can_change_homepage?
	184	+
183	185	article = params[:id].nil? ? nil : profile.articles.find(params[:id])
184	186	profile.update_attribute(:home_page, article)
185	187
...	...	@@ -218,6 +220,7 @@ class CmsController < MyProfileController
218	220	if @errors.any?
219	221	render :action => 'upload_files', :parent_id => @parent_id
220	222	else
	223	+ session[:notice] = _('File(s) successfully uploaded')
221	224	if @back_to
222	225	redirect_to @back_to
223	226	elsif @parent
...	...
...	...	@@ -3,7 +3,16 @@ class ProfileDesignController < BoxOrganizerController
3	3	needs_profile
4	4
5	5	protect 'edit_profile_design', :profile
6		-
	6	+
	7	+ before_filter :protect_fixed_block, :only => [:save, :move_block]
	8	+
	9	+ def protect_fixed_block
	10	+ block = boxes_holder.blocks.find(params[:id].gsub(/^block-/, ''))
	11	+ if block.fixed && !current_person.is_admin?
	12	+ render_access_denied
	13	+ end
	14	+ end
	15	+
7	16	def available_blocks
8	17	blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock, HighlightsBlock ]
9	18
...	...
...	...	@@ -78,7 +78,11 @@ class ProfileEditorController < MyProfileController
78	78	if request.post?
79	79	if @profile.destroy
80	80	session[:notice] = _('The profile was deleted.')
81		- redirect_to :controller => 'home'
	81	+ if(params[:return_to])
	82	+ redirect_to params[:return_to]
	83	+ else
	84	+ redirect_to :controller => 'home'
	85	+ end
82	86	else
83	87	session[:notice] = _('Could not delete profile')
84	88	end
...	...	@@ -100,6 +104,45 @@ class ProfileEditorController < MyProfileController
100	104	end
101	105	end
102	106
	107	+ def deactivate_profile
	108	+ if environment.admins.include?(current_person)
	109	+ profile = environment.profiles.find(params[:id])
	110	+ if profile.disable
	111	+ profile.save
	112	+ session[:notice] = _("The profile '#{profile.name}' was deactivated.")
	113	+ else
	114	+ session[:notice] = _('Could not deactivate profile.')
	115	+ end
	116	+ end
	117	+
	118	+ redirect_to_previous_location
	119	+ end
	120	+
	121	+ def activate_profile
	122	+ if environment.admins.include?(current_person)
	123	+ profile = environment.profiles.find(params[:id])
	124	+
	125	+ if profile.enable
	126	+ session[:notice] = _("The profile '#{profile.name}' was activated.")
	127	+ else
	128	+ session[:notice] = _('Could not activate the profile.')
	129	+ end
	130	+ end
	131	+
	132	+ redirect_to_previous_location
	133	+ end
	134	+
	135	+ protected
	136	+
	137	+ def redirect_to_previous_location
	138	+ redirect_to @back_to
	139	+ end
	140	+
	141	+ #TODO Consider using this as a general controller feature to be available on every action.
	142	+ def back_to
	143	+ @back_to = params[:back_to] \|\| request.referer \|\| "/"
	144	+ end
	145	+
103	146	private
104	147
105	148	def has_welcome_page
...	...	@@ -112,8 +155,4 @@ class ProfileEditorController < MyProfileController
112	155	end
113	156	end
114	157
115		- #TODO Consider using this as a general controller feature to be available on every action.
116		- def back_to
117		- @back_to = params[:back_to] \|\| request.referer
118		- end
119	158	end
...	...