ActionItem28: various changes due to utilization of attachment_fu plugin and ini…

…tial implementation of category view functionaluty still withou route. fixed the list_block and enterprises_block to work with the new block system git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@963 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem28: various changes due to utilization of attachment_fu plugin and ini…
…tial implementation of category view functionaluty still withou route. fixed the list_block and enterprises_block to work with the new block system git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@963 3f533792-8f58-4932-b0fe-aaf55b0a4547
MoisesMachado
1 parent e5160e47
Showing 35 changed files with 1103 additions and 767 deletions Show diff stats
app/controllers/my_profile/manage_products_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/design_blocks/enterprises_block/controllers/enterprises_block_controller.rb
app/design_blocks/enterprises_block/helpers/enterprises_block_helper.rb
app/design_blocks/enterprises_block/helpers/list_block_helper.rb
app/design_blocks/enterprises_block/models/enterprises_block.rb
app/design_blocks/enterprises_block/views/index.rhtml
app/design_blocks/list_block/controllers/list_block_controller.rb
app/design_blocks/list_block/helpers/list_block_helper.rb
app/design_blocks/list_block/models/list_block.rb
app/design_blocks/list_block/views/index.rhtml
app/helpers/application_helper.rb
app/models/enterprises_block.rb
app/models/image.rb
app/models/list_block.rb
app/models/product.rb
app/models/profile.rb
app/views/account/signup.rhtml
app/views/categories/_form.rhtml
app/views/environment_role_manager/change_role.rhtml
 class ManageProductsController < ApplicationController
   needs_profile
-  protect 'manage_products', :profile
+#  protect 'manage_products', :profile
   def index
     @products = @profile.products
@@ -13,6 +13,7 @@ class ManageProductsController &lt; ApplicationController
   def new
     @product = @profile.products.build(params[:product])
+    @product.build_image unless @product.image
     if request.post?
       if @product.save
         flash[:notice] = _('Product succesfully created')
@@ -11,6 +11,7 @@ class ProfileEditorController &lt; MyProfileController
     %w[
        FavoriteLinksProfile
        ListBlock
+       EnterprisesBlock
       ]
    end
@@ -34,5 +35,18 @@ class ProfileEditorController &lt; MyProfileController
       render :action => @info.class.name.underscore
     end
   end
+
+  def change_image
+    @image = @profile.image ? @profile.image : @profile.build_image 
+    if request.post?
+      if @profile.image.update_attributes(params[:image])
+        flash[:notice] = _('Image successfully uploaded')
+        redirect_to :action => 'index'
+      else
+        flash[:notice] = _('Could not upload image')
+        render :action => 'change_imange'
+      end
+    end
+  end
 end
@@ -0,0 +1,51 @@
+class EnterprisesBlockController < ApplicationController
+
+  # This controller always has the object @design_block available to it.
+  # The method acts_as_design_block load a before_filter that always load
+  # this object.
+
+  needs_profile
+
+  acts_as_design_block
+
+  # You must have a hash on format:
+  #  {
+  #    'action name' => 'How the action will be displayed on menu'
+  #  }
+  #
+  # EX:
+  #   CONTROL_ACTION_OPTIONS = {
+  #     'design_edit' => _('Edit'),
+  #     'manage_links' => _('Manage Links')
+  #   }
+  #
+  # This hash will define the options menu on edit mode.
+  CONTROL_ACTION_OPTIONS = {
+#    'edit' => _('Edit')
+  } 
+
+
+  ###########################
+  # Mandatory methods
+  ###########################  
+  
+  def index
+    @enterprises = Enterprise.find(:all)
+    design_render
+  end
+  
+  ###########################
+  # Other Sample of methods
+  ###########################
+  
+#  def edit
+#    design_render_on_edit
+#  end
+  
+#  def save
+#    @design_block.update_attributes(params[:design_block])
+#    design_render_on_edit :nothing => true
+#  end
+
+
+end
@@ -0,0 +1,3 @@
+module EnterprisesBlockHelper
+
+end
@@ -0,0 +1,3 @@
+module ListBlockHelper
+
+end
@@ -0,0 +1,15 @@
+class EnterprisesBlock < Design::Block
+
+  # Define an specific method using the settings hash serialized 
+  # variable to keep the value desired by method.
+  #
+  # EX: 
+  #   def max_number_of_element= value
+  #     self.settings[:limit_number] = value
+  #   end
+
+  def self.description
+    _('Enterprises Block')
+  end
+
+end
@@ -0,0 +1,5 @@
+<ul class='enterprises_list_block'>
+  <% @enterprises.each do |e| %>
+    <li> <%= link_to_homepage(content_tag('span', e.name), e.identifier) %> </li>
+  <% end %>
+</ul>
@@ -0,0 +1,51 @@
+class ListBlockController < ApplicationController
+
+  # This controller always has the object @design_block available to it.
+  # The method acts_as_design_block load a before_filter that always load
+  # this object.
+
+  needs_profile
+
+  acts_as_design_block
+
+  # You must have a hash on format:
+  #  {
+  #    'action name' => 'How the action will be displayed on menu'
+  #  }
+  #
+  # EX:
+  #   CONTROL_ACTION_OPTIONS = {
+  #     'design_edit' => _('Edit'),
+  #     'manage_links' => _('Manage Links')
+  #   }
+  #
+  # This hash will define the options menu on edit mode.
+  CONTROL_ACTION_OPTIONS = {
+#    'edit' => _('Edit')
+  } 
+
+
+  ###########################
+  # Mandatory methods
+  ###########################  
+  
+  def index
+    @people = Person.find(:all)
+    design_render
+  end
+  
+  ###########################
+  # Other Sample of methods
+  ###########################
+  
+#  def edit
+#    design_render_on_edit
+#  end
+  
+#  def save
+#    @design_block.update_attributes(params[:design_block])
+#    design_render_on_edit :nothing => true
+#  end
+
+
+end
@@ -0,0 +1,3 @@
+module ListBlockHelper
+
+end
@@ -0,0 +1,15 @@
+class ListBlock < Design::Block
+
+  # Define an specific method using the settings hash serialized 
+  # variable to keep the value desired by method.
+  #
+  # EX: 
+  #   def max_number_of_element= value
+  #     self.settings[:limit_number] = value
+  #   end
+
+  def self.description
+    _('List Block')
+  end
+
+end
@@ -0,0 +1,5 @@
+<ul class='people_list_block'>
+  <% @people.each do |p| %>
+    <li> <%= link_to_homepage(content_tag('span', p.name), p.identifier) %> </li>
+  <% end %>
+</ul>
@@ -244,7 +244,11 @@ module ApplicationHelper
   # Current implementation generates a <label> tag for +label+ and wrap the
   # label and the control with a <div> tag with class 'formfield' 
   def display_form_field(label, html_for_field)
-    content_tag('div', content_tag('div', content_tag('label', label)) +html_for_field, :class => 'formfield') 
+    content_tag('div', content_tag('div', content_tag('label', label)) + html_for_field, :class => 'formfield') 
+  end
+
+  def display_submit_tag(label)
+    content_tag('p', submit_tag( label, :class => 'submit'), :class => 'submitline') 
   end
   alias_method :labelled_form_field, :display_form_field
@@ -1,20 +0,0 @@
-class EnterprisesBlock < Design::Block
-
-  def content
-
-      lambda do
-     content_tag(
-              'ul',
-              Enterprise.find(:all).map do |p|
-                content_tag(
-                'li',
-		link_to_homepage(content_tag('span', p.name), p.identifier)
-                )
-              end.join("\n"), 
-	      :class => 'enterprises_list_block'
-            )
-    end
-
-  end
-
-end
@@ -0,0 +1,11 @@
+class Image < ActiveRecord::Base
+  belongs_to :owner, :polymorphic => true
+  
+  has_attachment :content_type => :image, 
+                 :storage => :file_system, 
+                 :max_size => 500.kilobytes,
+                 :resize_to => '320x200>',
+                 :thumbnails => { :thumb => '100x100>' }
+
+  validates_as_attachment
+end
@@ -1,20 +0,0 @@
-class ListBlock < Design::Block
-
-  def content
-
-    lambda do
-     content_tag(
-              'ul',
-              Person.find(:all).map do |p|
-                content_tag(
-                'li',
-		link_to_homepage(content_tag('span', p.name), p.identifier)
-                )
-              end.join("\n"),
-	      :class => 'people_list_block'
-            )
-    end
-
-  end
-
-end
@@ -5,4 +5,20 @@ class Product &lt; ActiveRecord::Base
   validates_presence_of :name
   validates_uniqueness_of :name, :scope => :enterprise_id
   validates_numericality_of :price, :allow_nil => true
+
+  has_one :image, :as => :owner
+
+  after_update :save_image
+
+  def image_builder=(img)
+    if image && image.id == img[:id]
+      image.attributes = img
+    else
+      build_image(img)
+    end
+  end
+
+  def save_image
+    image.save if image
+  end
 end
@@ -45,6 +45,8 @@ class Profile &lt; ActiveRecord::Base
   has_many :articles
   belongs_to :home_page, :class_name => Article.name, :foreign_key => 'home_page_id'
+  has_one :image, :as => :owner
+  
   def top_level_articles(reload = false)
     if reload
       @top_level_articles = nil
@@ -18,5 +18,5 @@
   </p>
 <% end %>
-<p class="submitline"><%= submit_tag 'Sign up', {:class => 'submit'} %></p>
+<%= display_submit_tag _('Sign up')  %></p>
 <% end -%>
@@ -13,6 +13,6 @@
   <%= select_color_for_category %>
   <%= f.text_field 'name' %>
-  <%= submit_tag _('Save') %>
+  <%= display_submit_tag _('Save') %>
   <%= link_to _('Cancel'), :action => 'index' %>
 <% end %>
@@ -8,6 +8,6 @@
   <% end %>
   <%= hidden_field_tag 'person', @admin.id %>
-  <%= submit_tag  _('Save changes') %>
+  <%= display_submit_tag  _('Save changes') %>
   <%= link_to _('Cancel'), :action => 'index' %>
 <% end %>
@@ -9,5 +9,5 @@
   <% @roles.each do |r| %>
     <%= labelled_form_field(r.name, (check_box_tag "roles[]", r.id)) %>
   <% end %>
-<%= submit_tag _('Make') %>
+<%= display_submit_tag _('Make') %>
 <% end %>
 <%= error_messages_for :product %> <br/>
-<% form_for :product, @product, :url => {:action => mode} do |f| %>
-  <%= _('Name:') %> <%= f.text_field :name %><br/>
-  <%= _('Price:') %> <%= f.text_field :price %><br/>
-  <%= _('Description:') %><br/>  <%= f.text_area :description %><br/>
-  <%= _('Category:') %> <%= f.select :product_category_id,ProductCategory.find(:all).map{|pc|[pc.name,pc.id]}, {:include_blank => true} %><br/>
-  <%= submit_tag mode == 'new' ? _('Create product') : _('Save changes')  %>
+<% form_for :product, @product, :html => {:multipart => true }, :url => {:action => mode} do |f| %>
+  <%= display_form_field( _('Name:'), f.text_field(:name) )  %>
+  <%= display_form_field( _('Price:'), f.text_field(:price) )  %>
+  <%= display_form_field( _('Description:'), f.text_area(:description) )  %>
+  <%= display_form_field( _('Image:'), file_field_tag( "product[image_builder][uploaded_data]" ) )  %>
+  <%= display_form_field( _('category:'), f.select( :product_category_id,ProductCategory.find(:all).map{|pc|[pc.name,pc.id]}, {:include_blank => true} ))  %>
+  <%= display_submit_tag(mode == 'new' ? _('Create product') : _('Save changes'))  %>
 <% end %>
 <h3> <%= @product.name %> </h3>
+<p> <%= image_tag @product.image.public_filename %> </p>
 <p> <%= _('Price: ') %> <%= @product.price %> </p>
 <p> <%= _('Description: ') %> <%= @product.description %> </p>
 <p> <%= _('Category: ') %> <%= @product.product_category ? @product.product_category.name : _('Uncategorized product')  %> </p>
@@ -0,0 +1,4 @@
+<% form_for :image, @image, :html => { :multipart => true }, :url => { :action => 'change_image'} do |f| %>
+  <%= display_form_field(_('Image'), f.file_field( :uploaded_data ) ) %>
+  <%= display_submit_tag(_('Upload')) %>
+<% end %>
 <h2><%= _('My profile') %></h2>
+<%= link_to (@profile.image ? image_tag( @profile.image.public_filename(:thumb)) : _('Put image')), :action => 'change_image'  %>
+
 <%= display_profile_info(profile) %>
@@ -9,6 +9,6 @@
   <% end %>
   <%= hidden_field_tag 'person', @member.id %>
-  <%= submit_tag  _('Save changes') %>
+  <%= display_submit_tag  _('Save changes') %>
   <%= link_to _('Cancel'), :action => 'index' %>
 <% end %>
@@ -9,6 +9,6 @@
     <%= labelled_form_field(permission_name(p), (check_box_tag "role[permissions][]", p, @role.has_permission?(p))) %>
   <% end %>
-  <%= submit_tag (mode == :edit) ? _('Save changes') : _('Create role')%>
+  <%= display_submit_tag (mode == :edit) ? _('Save changes') : _('Create role')%>
   <%= link_to _('Cancel'), :action => 'index' %>
 <% end %>
@@ -67,7 +67,7 @@ ActionController::Routing::Routes.draw do |map|
   ## Test controllers.
   ## FIXME: this should not be needed
   ######################################################
-  map.connect 'test/:controller/:action/:id', :controller => /.*test.*/
+  map.connect 'test/:controller/:action/:id'  #, :controller => /.*test.*/
   # *content viewing*
   # XXX this route must come last so other routes have priority over it.
@@ -6,6 +6,7 @@ class CreateProducts &lt; ActiveRecord::Migration
       t.column :name,                 :string
       t.column :price,                :decimal
       t.column :description,          :text
+      t.column :image,                :string
     end
   end
@@ -0,0 +1,20 @@
+class CreateImages < ActiveRecord::Migration
+  def self.up
+    create_table :images do |t|
+      t.column :owner_type,    :string
+      t.column :owner_id,      :integer
+      
+      t.column :parent_id,     :integer
+      t.column :content_type,  :string
+      t.column :filename,      :string    
+      t.column :thumbnail,     :string 
+      t.column :size,          :integer
+      t.column :width,         :integer
+      t.column :height,        :integer
+    end
+  end
+
+  def self.down
+    drop_table :images
+  end
+end
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.3.0\n"
-"POT-Creation-Date: 2007-11-09 19:03-0300\n"
+"Project-Id-Version: noosfero 0.4.0\n"
+"POT-Creation-Date: 2007-11-27 13:39-0300\n"
 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,94 +16,121 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: app/design_blocks/favourite_links/controllers/favourite_links_controller.rb:22
-msgid "Manage Links"
+#: app/design_blocks/enterprises_block/models/enterprises_block.rb:12
+msgid "Enterprises Block"
+msgstr ""
+
+#: app/design_blocks/list_block/models/list_block.rb:12
+msgid "List Block"
 msgstr ""
-#: app/design_blocks/favourite_links/controllers/favourite_links_controller.rb:23
+#: app/design_blocks/favorite_links/controllers/favorite_links_controller.rb:4
 #: app/views/role/index.rhtml:6 app/views/content_viewer/view_page.rhtml:7
-#: app/views/manage_tags/_a_tag.rhtml:3 app/views/profile_editor/index.rhtml:6
-#: app/views/profile_editor/index.rhtml:8
-#: app/views/categories/_category.rhtml:8
+#: app/views/manage_tags/_a_tag.rhtml:3 app/views/categories/_category.rhtml:8
 msgid "Edit"
 msgstr ""
-#: app/design_blocks/favourite_links/models/favourite_links.rb:4
-#: app/design_blocks/favourite_links/views/manage_links.rhtml:3
-msgid "Favourite Links"
+#: app/design_blocks/favorite_links/controllers/favorite_links_controller.rb:5
+msgid "Manage Links"
 msgstr ""
-#: app/controllers/environment_admin/manage_tags_controller.rb:26
+#: app/design_blocks/favorite_links/models/favorite_links.rb:4
+#: app/design_blocks/favorite_links_profile/models/favorite_links_profile.rb:4
+#: app/design_blocks/favorite_links/views/manage_links.rhtml:3
+msgid "Favorite Links"
+msgstr ""
+
+#: app/controllers/admin/manage_tags_controller.rb:26
 msgid "Tag was successfully created."
 msgstr ""
-#: app/controllers/environment_admin/manage_tags_controller.rb:44
+#: app/controllers/admin/manage_tags_controller.rb:44
 msgid "Tag was successfully updated."
 msgstr ""
-#: app/controllers/environment_admin/manage_tags_controller.rb:56
+#: app/controllers/admin/manage_tags_controller.rb:56
 msgid "Tag was successfuly destroyed"
 msgstr ""
-#: app/controllers/environment_admin/manage_tags_controller.rb:65
+#: app/controllers/admin/manage_tags_controller.rb:65
 msgid "Tag was successfuly approved"
 msgstr ""
-#: app/controllers/environment_admin/role_controller.rb:21
+#: app/controllers/admin/role_controller.rb:21
 msgid "Failed to create role"
 msgstr ""
-#: app/controllers/environment_admin/role_controller.rb:35
-#: app/controllers/environment_admin/role_controller.rb:45
+#: app/controllers/admin/role_controller.rb:35
+#: app/controllers/admin/role_controller.rb:45
 msgid "Failed to edit role"
 msgstr ""
-#: app/controllers/environment_admin/features_controller.rb:13
+#: app/controllers/admin/features_controller.rb:13
 msgid "Features updated successfully."
 msgstr ""
-#: app/controllers/environment_admin/environment_role_manager_controller.rb:17
-#: app/controllers/profile_admin/profile_members_controller.rb:17
+#: app/controllers/admin/environment_role_manager_controller.rb:17
+#: app/controllers/my_profile/profile_members_controller.rb:17
 msgid "Roles successfuly updated"
 msgstr ""
-#: app/controllers/environment_admin/environment_role_manager_controller.rb:19
-#: app/controllers/profile_admin/profile_members_controller.rb:19
+#: app/controllers/admin/environment_role_manager_controller.rb:19
+#: app/controllers/my_profile/profile_members_controller.rb:19
 msgid "Couldn't change the roles"
 msgstr ""
-#: app/controllers/environment_admin/environment_role_manager_controller.rb:45
-#: app/controllers/environment_admin/environment_role_manager_controller.rb:55
+#: app/controllers/admin/environment_role_manager_controller.rb:45
+#: app/controllers/admin/environment_role_manager_controller.rb:55
 msgid "Member succefully unassociated"
 msgstr ""
-#: app/controllers/environment_admin/environment_role_manager_controller.rb:47
-#: app/controllers/environment_admin/environment_role_manager_controller.rb:57
+#: app/controllers/admin/environment_role_manager_controller.rb:47
+#: app/controllers/admin/environment_role_manager_controller.rb:57
 msgid "Failed to unassociate member"
 msgstr ""
-#: app/controllers/profile_admin_controller.rb:17
-msgid "This action is not available for \"%s\"."
-msgstr ""
-
-#: app/controllers/profile_admin/enterprise_editor_controller.rb:21
+#: app/controllers/my_profile/enterprise_editor_controller.rb:21
 msgid "Could not update the enterprise"
 msgstr ""
-#: app/controllers/profile_admin/enterprise_editor_controller.rb:31
+#: app/controllers/my_profile/enterprise_editor_controller.rb:31
 msgid "Enterprise sucessfully erased from the system"
 msgstr ""
-#: app/controllers/profile_admin/membership_editor_controller.rb:25
+#: app/controllers/my_profile/membership_editor_controller.rb:25
 msgid ""
 "The enterprise was successfully created, the validation entity will cotact "
 "you as soon as your enterprise is approved"
 msgstr ""
-#: app/controllers/profile_admin/membership_editor_controller.rb:28
+#: app/controllers/my_profile/membership_editor_controller.rb:28
 msgid "Enterprise was not created"
 msgstr ""
+#: app/controllers/my_profile/manage_products_controller.rb:19
+msgid "Product succesfully created"
+msgstr ""
+
+#: app/controllers/my_profile/manage_products_controller.rb:22
+msgid "Could not create the product"
+msgstr ""
+
+#: app/controllers/my_profile/manage_products_controller.rb:31
+msgid "Product succesfully updated"
+msgstr ""
+
+#: app/controllers/my_profile/manage_products_controller.rb:34
+msgid "Could not update the product"
+msgstr ""
+
+#: app/controllers/my_profile/manage_products_controller.rb:42
+msgid "Product succesfully removed"
+msgstr ""
+
+#: app/controllers/my_profile/manage_products_controller.rb:45
+msgid "Could not remove the product"
+msgstr ""
+
 #: app/controllers/public/account_controller.rb:25
 msgid "Logged in successfully"
 msgstr ""
@@ -128,6 +155,38 @@ msgstr &quot;&quot;
 msgid "The supplied current password is incorrect."
 msgstr ""
+#: app/controllers/my_profile_controller.rb:17
+msgid "This action is not available for \"%s\"."
+msgstr ""
+
+#: app/models/product.rb:-
+msgid "product"
+msgstr ""
+
+#: app/models/product.rb:-
+msgid "Product|Enterprise"
+msgstr ""
+
+#: app/models/product.rb:-
+msgid "Product|Product category"
+msgstr ""
+
+#: app/models/product.rb:-
+msgid "Product|Name"
+msgstr ""
+
+#: app/models/product.rb:-
+msgid "Product|Price"
+msgstr ""
+
+#: app/models/product.rb:-
+msgid "Product|Description"
+msgstr ""
+
+#: app/models/product.rb:-
+msgid "Product|Image"
+msgstr ""
+
 #: app/models/validation_info.rb:-
 msgid "validation info"
 msgstr ""
@@ -231,7 +290,51 @@ msgstr &quot;&quot;
 msgid "Profile|Region"
 msgstr ""
-#: app/models/profile.rb:7 app/helpers/application_helper.rb:199
+#: app/models/profile.rb:-
+msgid "article"
+msgstr ""
+
+#: app/models/profile.rb:-
+msgid "Article|Name"
+msgstr ""
+
+#: app/models/profile.rb:-
+msgid "Article|Slug"
+msgstr ""
+
+#: app/models/profile.rb:-
+msgid "Article|Path"
+msgstr ""
+
+#: app/models/profile.rb:-
+msgid "Article|Parent"
+msgstr ""
+
+#: app/models/profile.rb:-
+msgid "Article|Body"
+msgstr ""
+
+#: app/models/profile.rb:-
+msgid "Article|Profile"
+msgstr ""
+
+#: app/models/profile.rb:-
+msgid "Article|Updated on"
+msgstr ""
+
+#: app/models/profile.rb:-
+msgid "Article|Created on"
+msgstr ""
+
+#: app/models/profile.rb:-
+msgid "Article|Version"
+msgstr ""
+
+#: app/models/profile.rb:-
+msgid "Article|Lock version"
+msgstr ""
+
+#: app/models/profile.rb:7 app/helpers/application_helper.rb:188
 msgid "Edit profile"
 msgstr ""
@@ -251,7 +354,7 @@ msgstr &quot;&quot;
 msgid "Edit profile design"
 msgstr ""
-#: app/models/profile.rb:63
+#: app/models/profile.rb:59
 msgid "An existing profile cannot be renamed."
 msgstr ""
@@ -389,6 +492,10 @@ msgstr &quot;&quot;
 msgid "%{fn} must not start with www."
 msgstr ""
+#: app/models/image.rb:-
+msgid "image"
+msgstr ""
+
 #: app/models/friendship.rb:-
 msgid "friendship"
 msgstr ""
@@ -757,369 +864,108 @@ msgstr &quot;&quot;
 msgid "Close"
 msgstr ""
-#: app/helpers/application_helper.rb:117 app/helpers/application_helper.rb:134
-msgid "My account"
+#: app/helpers/application_helper.rb:117 app/helpers/application_helper.rb:127
+#: app/views/profile_editor/index.rhtml:1
+msgid "My profile"
 msgstr ""
 #: app/helpers/application_helper.rb:118
 msgid "My Enterprises"
 msgstr ""
-#: app/helpers/application_helper.rb:119 app/helpers/application_helper.rb:137
+#: app/helpers/application_helper.rb:119 app/helpers/application_helper.rb:130
 #: app/views/environment_role_manager/make_admin.rhtml:4
 msgid "Admin"
 msgstr ""
-#: app/helpers/application_helper.rb:120
-msgid "About"
-msgstr ""
-
-#: app/helpers/application_helper.rb:126
-msgid "about"
-msgstr ""
-
-#: app/helpers/application_helper.rb:138 app/helpers/application_helper.rb:168
+#: app/helpers/application_helper.rb:131 app/helpers/application_helper.rb:157
 msgid "Logout"
 msgstr ""
-#: app/helpers/application_helper.rb:142 app/helpers/application_helper.rb:160
+#: app/helpers/application_helper.rb:135 app/helpers/application_helper.rb:149
 #: app/views/account/login.rhtml:1
 msgid "Login"
 msgstr ""
-#: app/helpers/application_helper.rb:164
+#: app/helpers/application_helper.rb:153
 msgid "Not a user yet? Register now!"
 msgstr ""
-#: app/helpers/application_helper.rb:182
+#: app/helpers/application_helper.rb:171
 msgid "Features"
 msgstr ""
-#: app/helpers/application_helper.rb:183
+#: app/helpers/application_helper.rb:172
 msgid "Edit visual"
 msgstr ""
-#: app/helpers/application_helper.rb:184
+#: app/helpers/application_helper.rb:173
 msgid "Manage categories"
 msgstr ""
-#: app/helpers/application_helper.rb:185
+#: app/helpers/application_helper.rb:174
 msgid "Manage permissions"
 msgstr ""
-#: app/helpers/application_helper.rb:186
+#: app/helpers/application_helper.rb:175
 msgid "Manage validators"
 msgstr ""
-#: app/helpers/application_helper.rb:192
+#: app/helpers/application_helper.rb:181
 msgid "New enterprise"
 msgstr ""
-#: app/helpers/application_helper.rb:198 app/helpers/application_helper.rb:207
+#: app/helpers/application_helper.rb:187 app/helpers/application_helper.rb:196
 msgid "Edit visual design"
 msgstr ""
-#: app/helpers/application_helper.rb:200 app/helpers/application_helper.rb:209
+#: app/helpers/application_helper.rb:189 app/helpers/application_helper.rb:198
 msgid "Manage content"
 msgstr ""
-#: app/helpers/application_helper.rb:208
+#: app/helpers/application_helper.rb:197
 msgid "Edit informations"
 msgstr ""
-#: app/helpers/application_helper.rb:216
+#: app/helpers/application_helper.rb:205
 #: app/views/account/new_password.rhtml:13
 #: app/views/account/change_password.rhtml:1
 #: app/views/account/change_password.rhtml:14
 msgid "Change password"
 msgstr ""
-#: app/helpers/application_helper.rb:222
-msgid "Report bug"
-msgstr ""
-
-#: app/helpers/application_helper.rb:228
+#: app/helpers/application_helper.rb:211
 msgid "Change template"
 msgstr ""
-#: app/helpers/application_helper.rb:229
+#: app/helpers/application_helper.rb:212
 msgid "Change block theme"
 msgstr ""
-#: app/helpers/application_helper.rb:230
+#: app/helpers/application_helper.rb:213
 msgid "Change icon theme"
 msgstr ""
-#: app/helpers/application_helper.rb:268
-msgid "accessibility"
-msgstr ""
-
-#: app/helpers/application_helper.rb:271
-msgid "Accessibility"
-msgstr ""
-
-#: app/helpers/application_helper.rb:276
+#: app/helpers/application_helper.rb:219
 #: app/views/region_validators/region.rhtml:22
 #: app/views/manage_tags/_search_box.rhtml:4
 #: app/views/membership_editor/index.rhtml:4
 msgid "Search"
 msgstr ""
-#: app/helpers/application_helper.rb:277
+#: app/helpers/application_helper.rb:220
 msgid "  "
 msgstr ""
-#: app/helpers/application_helper.rb:287
+#: app/helpers/application_helper.rb:230
 msgid "%s, version %s"
 msgstr ""
-#: app/helpers/application_helper.rb:365
-msgid "No Filter at all"
-msgstr ""
-
-#: app/helpers/application_helper.rb:366
-msgid "RDoc filter"
-msgstr ""
-
-#: app/helpers/application_helper.rb:367
-msgid "Simple"
-msgstr ""
-
-#: app/helpers/application_helper.rb:368
-msgid "Textile"
-msgstr ""
-
-#: app/views/cms/new.rhtml:2
-msgid "New Page"
-msgstr ""
-
-#: app/views/cms/_page_list_item.rhtml:6
-msgid "%d revision"
-msgstr ""
-
-#: app/views/cms/_page_list_item.rhtml:6
-msgid "%d revisions"
-msgstr ""
-
-#: app/views/cms/_page_list_item.rhtml:7
-msgid "add child document"
-msgstr ""
-
-#: app/views/cms/_page_list_item.rhtml:7
-msgid "Add a child to '%s'"
-msgstr ""
-
-#: app/views/cms/_page_list_item.rhtml:8
-msgid "reorder children"
-msgstr ""
-
-#: app/views/cms/_page_list_item.rhtml:8
-msgid "finished reordering"
-msgstr ""
-
-#: app/views/cms/_page_list_item.rhtml:8
-msgid "Reorder children of '%s'"
-msgstr ""
-
-#: app/views/cms/_page_list_item.rhtml:9
-msgid "delete"
-msgstr ""
-
-#: app/views/cms/_page_list_item.rhtml:9
-msgid "This will delete this page, and any children. Are you sure?"
-msgstr ""
-
-#: app/views/cms/_page_list_item.rhtml:9
-msgid "Delete page '%s' and all it's children"
-msgstr ""
-
-#: app/views/cms/_page_list_item.rhtml:26
-msgid "DRAG"
-msgstr ""
-
-#: app/views/cms/_form.rhtml:27
-#: app/design_blocks/favourite_links/views/add_link.rhtml:6
-#: app/design_blocks/favourite_links/views/edit.rhtml:7
-msgid "Title"
-msgstr ""
-
-#: app/views/cms/_form.rhtml:28
-msgid "More..."
-msgstr ""
-
-#: app/views/cms/_form.rhtml:28
-msgid "Less..."
-msgstr ""
-
-#: app/views/cms/_form.rhtml:32
-msgid "Slug"
-msgstr ""
-
-#: app/views/cms/_form.rhtml:38
-msgid "Keywords"
-msgstr ""
-
-#: app/views/cms/_form.rhtml:45
-msgid "Parent"
-msgstr ""
-
-#: app/views/cms/_form.rhtml:47
-msgid "%s is a root page"
-msgstr ""
-
-#: app/views/cms/_form.rhtml:55
-msgid "Content"
-msgstr ""
-
-#: app/views/cms/_form.rhtml:61
-msgid "Filter"
+#: app/views/cms/view.rhtml:23
+msgid "New subitem"
 msgstr ""
-#: app/views/cms/_form.rhtml:63
-msgid "Converts plain text into HTML"
-msgstr ""
-
-#: app/views/cms/_form.rhtml:69
-msgid "Created"
-msgstr ""
-
-#: app/views/cms/_form.rhtml:78
-msgid "One revision"
-msgid_plural "%d revisions"
-msgstr[0] ""
-msgstr[1] ""
-
-#: app/views/cms/_form.rhtml:84
-msgid "Loading preview ..."
-msgstr ""
-
-#: app/views/cms/_form.rhtml:85
-msgid "Save Changes"
-msgstr ""
-
-#: app/views/cms/_form.rhtml:85
-msgid "Create Page"
-msgstr ""
-
-#: app/views/cms/_form.rhtml:87
-msgid "Revert"
-msgstr ""
-
-#: app/views/cms/_form.rhtml:90
-msgid ""
-"Changes detected. You will lose all the updates you have made if you "
-"proceed..."
-msgstr ""
-
-#: app/views/cms/_form.rhtml:90 app/views/cms/delete.rhtml:16
-#: app/views/cms/versions.rhtml:25 app/views/role/_form.rhtml:13
-#: app/views/profile_members/change_role.rhtml:13
-#: app/views/enterprise_editor/edit.rhtml:8 app/views/manage_tags/new.rhtml:6
-#: app/views/manage_tags/edit.rhtml:6
-#: app/views/membership_editor/new_enterprise.rhtml:13
-#: app/views/enterprise_registration/basic_information.rhtml:33
-#: app/views/environment_role_manager/change_role.rhtml:12
-#: app/views/categories/_form.rhtml:17
-msgid "Cancel"
-msgstr ""
-
-#: app/views/cms/_form.rhtml:96
-msgid "Page Preview"
-msgstr ""
-
-#: app/views/cms/_form.rhtml:98
-msgid "Loading Preview..."
-msgstr ""
-
-#: app/views/cms/_form.rhtml:103
-msgid "Close Preview"
-msgstr ""
-
-#: app/views/cms/_form.rhtml:103 app/views/cms/versions.rhtml:24
-msgid "or"
-msgstr ""
-
-#: app/views/cms/_form.rhtml:103
-msgid "Back to top"
-msgstr ""
-
-#: app/views/cms/reorder.rhtml:1
-msgid "Reorder Pages"
-msgstr ""
-
-#: app/views/cms/reorder.rhtml:3
-msgid "\"%s\" child pages:"
-msgstr ""
-
-#: app/views/cms/reorder.rhtml:19
-msgid "Move Up"
-msgstr ""
-
-#: app/views/cms/reorder.rhtml:20
-msgid "Move Down"
-msgstr ""
-
-#: app/views/cms/reorder.rhtml:29
-msgid "Finished"
-msgstr ""
-
-#: app/views/cms/delete.rhtml:6
-msgid "Are you sure you want to delete the page titled \"%s\"?"
-msgstr ""
-
-#: app/views/cms/delete.rhtml:8
-msgid "It has %s child pages that will also be deleted..."
-msgstr ""
-
-#: app/views/cms/delete.rhtml:14
-msgid "Yes, Delete The Page"
-msgstr ""
-
-#: app/views/cms/versions.rhtml:1
-msgid "Page Revisions"
-msgstr ""
-
-#: app/views/cms/versions.rhtml:7
-msgid "View Version:"
-msgstr ""
-
-#: app/views/cms/versions.rhtml:11
-msgid "Version %s"
-msgstr ""
-
-#: app/views/cms/versions.rhtml:14 app/views/cms/versions.rhtml:35
-msgid "Title:"
-msgstr ""
-
-#: app/views/cms/versions.rhtml:15 app/views/cms/versions.rhtml:36
-msgid "Slug:"
-msgstr ""
-
-#: app/views/cms/versions.rhtml:17 app/views/cms/versions.rhtml:38
-msgid "Keywords:"
-msgstr ""
-
-#: app/views/cms/versions.rhtml:23
-msgid "Set As Current Version"
-msgstr ""
-
-#: app/views/cms/versions.rhtml:32
-msgid "Current Version"
-msgstr ""
-
-#: app/views/cms/edit.rhtml:2
-msgid "Edit Page"
-msgstr ""
-
-#: app/views/cms/index.rhtml:2
-msgid "Clear Page Cache"
-msgstr ""
-
-#: app/views/cms/index.rhtml:6
-msgid "Articles"
-msgstr ""
-
-#: app/views/cms/index.rhtml:17
+#: app/views/cms/view.rhtml:25
 msgid "New article"
 msgstr ""
@@ -1133,6 +979,7 @@ msgstr &quot;&quot;
 #: app/views/role/_form.rhtml:12
 #: app/views/profile_members/change_role.rhtml:12
+#: app/views/manage_products/_form.rhtml:11
 #: app/views/features/_features_table.rhtml:15
 #: app/views/environment_role_manager/change_role.rhtml:11
 msgid "Save changes"
@@ -1142,6 +989,17 @@ msgstr &quot;&quot;
 msgid "Create role"
 msgstr ""
+#: app/views/role/_form.rhtml:13
+#: app/views/profile_members/change_role.rhtml:13
+#: app/views/enterprise_editor/edit.rhtml:8 app/views/manage_tags/new.rhtml:6
+#: app/views/manage_tags/edit.rhtml:6
+#: app/views/membership_editor/new_enterprise.rhtml:13
+#: app/views/enterprise_registration/basic_information.rhtml:33
+#: app/views/environment_role_manager/change_role.rhtml:12
+#: app/views/categories/_form.rhtml:17
+msgid "Cancel"
+msgstr ""
+
 #: app/views/role/show.rhtml:3
 msgid "Permissions"
 msgstr ""
@@ -1250,6 +1108,74 @@ msgstr[1] &quot;&quot;
 msgid "Validators by Region"
 msgstr ""
+#: app/views/manage_products/new.rhtml:1
+#: app/views/manage_products/index.rhtml:3
+msgid "New product"
+msgstr ""
+
+#: app/views/manage_products/_form.rhtml:4
+msgid "Name:"
+msgstr ""
+
+#: app/views/manage_products/_form.rhtml:5
+msgid "Price:"
+msgstr ""
+
+#: app/views/manage_products/_form.rhtml:6
+msgid "Description:"
+msgstr ""
+
+#: app/views/manage_products/_form.rhtml:7
+msgid "Category:"
+msgstr ""
+
+#: app/views/manage_products/_form.rhtml:9
+msgid "Image:"
+msgstr ""
+
+#: app/views/manage_products/_form.rhtml:11
+msgid "Create product"
+msgstr ""
+
+#: app/views/manage_products/show.rhtml:4
+#: app/views/manage_products/index.rhtml:7
+msgid "Price: "
+msgstr ""
+
+#: app/views/manage_products/show.rhtml:5
+msgid "Description: "
+msgstr ""
+
+#: app/views/manage_products/show.rhtml:6
+msgid "Category: "
+msgstr ""
+
+#: app/views/manage_products/show.rhtml:6
+msgid "Uncategorized product"
+msgstr ""
+
+#: app/views/manage_products/show.rhtml:8
+#: app/views/manage_products/index.rhtml:8
+msgid "edit"
+msgstr ""
+
+#: app/views/manage_products/show.rhtml:9
+#: app/views/manage_products/index.rhtml:9
+msgid "destroy"
+msgstr ""
+
+#: app/views/manage_products/show.rhtml:11
+msgid "back"
+msgstr ""
+
+#: app/views/manage_products/edit.rhtml:1
+msgid "Editing"
+msgstr ""
+
+#: app/views/manage_products/index.rhtml:1
+msgid "Listing products"
+msgstr ""
+
 #: app/views/content_viewer/view_page.rhtml:4
 #: app/views/manage_tags/list.rhtml:17
 msgid "Up"
@@ -1260,14 +1186,14 @@ msgstr &quot;&quot;
 msgid "There is no such page: %s"
 msgstr ""
-#: app/views/layouts/application.rhtml:29
-#: app/views/layouts/comatose_admin.rhtml:29
+#: app/views/layouts/application.rhtml:33
+#: app/views/layouts/comatose_admin.rhtml:33
 msgid "Image for Loading..."
 msgstr ""
-#: app/views/layouts/application.rhtml:34
-#: app/views/layouts/comatose_admin.rhtml:34
-msgid "Go Content"
+#: app/views/layouts/application.rhtml:39
+#: app/views/layouts/comatose_admin.rhtml:39
+msgid "Go to content"
 msgstr ""
 #: app/views/layouts/not_found.rhtml:5
@@ -1664,7 +1590,11 @@ msgid &quot;Password&quot;
 msgstr ""
 #: app/views/account/login.rhtml:20
-msgid "I forgot my password"
+msgid "I forgot my password!"
+msgstr ""
+
+#: app/views/account/login.rhtml:24
+msgid "I want to be an user!"
 msgstr ""
 #: app/views/account/password_recovery_sent.rhtml:1
@@ -1842,10 +1772,6 @@ msgstr &quot;&quot;
 msgid "Access denied"
 msgstr ""
-#: app/views/shared/categories_menu.rhtml:5
-msgid "Home"
-msgstr ""
-
 #: app/views/profile_editor/person_info.rhtml:1
 msgid "Edit person info"
 msgstr ""
@@ -1856,23 +1782,40 @@ msgstr &quot;&quot;
 #: app/views/profile_editor/person_info.rhtml:11
 #: app/views/categories/_form.rhtml:16
-#: app/design_blocks/favourite_links/views/add_link.rhtml:10
-#: app/design_blocks/favourite_links/views/edit.rhtml:26
+#: app/design_blocks/favorite_links/views/add_link.rhtml:10
+#: app/design_blocks/favorite_links/views/edit.rhtml:26
 msgid "Save"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:1
-msgid "My profile"
+#: app/views/profile_editor/index.rhtml:8
+msgid "Edit Profile"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:13
+#: app/views/profile_editor/index.rhtml:10
+#: app/views/profile_editor/index.rhtml:21
 msgid "Edit Visual Design"
 msgstr ""
-#: app/views/profile_editor/index.rhtml:15
+#: app/views/profile_editor/index.rhtml:12
+msgid "Manage Content"
+msgstr ""
+
+#: app/views/profile_editor/index.rhtml:14
+msgid "Change Password"
+msgstr ""
+
+#: app/views/profile_editor/index.rhtml:16
+msgid "Manage Products"
+msgstr ""
+
+#: app/views/profile_editor/index.rhtml:22
 msgid "Menage content"
 msgstr ""
+#: app/views/profile_editor/index.rhtml:25
+msgid "My organizations"
+msgstr ""
+
 #: app/views/enterprise_registration/basic_information.rhtml:27
 msgid "Management information"
 msgstr ""
@@ -1937,7 +1880,7 @@ msgid &quot;Add subcategory&quot;
 msgstr ""
 #: app/views/categories/_category.rhtml:9
-#: app/design_blocks/favourite_links/views/manage_links.rhtml:18
+#: app/design_blocks/favorite_links/views/manage_links.rhtml:18
 msgid "Remove"
 msgstr ""
@@ -1957,33 +1900,38 @@ msgstr &quot;&quot;
 msgid "Categories"
 msgstr ""
-#: app/design_blocks/favourite_links/views/add_link.rhtml:1
-#: app/design_blocks/favourite_links/views/edit.rhtml:2
-msgid "Editing Favourite Links"
+#: app/design_blocks/favorite_links/views/add_link.rhtml:1
+#: app/design_blocks/favorite_links/views/edit.rhtml:2
+msgid "Editing Favorite Links"
+msgstr ""
+
+#: app/design_blocks/favorite_links/views/add_link.rhtml:6
+#: app/design_blocks/favorite_links/views/edit.rhtml:7
+msgid "Title"
 msgstr ""
-#: app/design_blocks/favourite_links/views/manage_links.rhtml:4
+#: app/design_blocks/favorite_links/views/manage_links.rhtml:4
 msgid "Add Link"
 msgstr ""
-#: app/design_blocks/favourite_links/views/manage_links.rhtml:8
-#: app/design_blocks/favourite_links/views/index.rhtml:3
+#: app/design_blocks/favorite_links/views/manage_links.rhtml:8
+#: app/design_blocks/favorite_links/views/index.rhtml:4
 msgid "Previous"
 msgstr ""
-#: app/design_blocks/favourite_links/views/manage_links.rhtml:11
-#: app/design_blocks/favourite_links/views/index.rhtml:6
+#: app/design_blocks/favorite_links/views/manage_links.rhtml:11
+#: app/design_blocks/favorite_links/views/index.rhtml:7
 msgid "Next"
 msgstr ""
-#: app/design_blocks/favourite_links/views/edit.rhtml:12
+#: app/design_blocks/favorite_links/views/edit.rhtml:12
 msgid "Display header?"
 msgstr ""
-#: app/design_blocks/favourite_links/views/edit.rhtml:17
+#: app/design_blocks/favorite_links/views/edit.rhtml:17
 msgid "Display title?"
 msgstr ""
-#: app/design_blocks/favourite_links/views/edit.rhtml:22
+#: app/design_blocks/favorite_links/views/edit.rhtml:22
 msgid "Max number of links"
 msgstr ""
@@ -8,8 +8,8 @@
 # This file is distributed under the same license as noosfero itself.
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.3.0\n"
-"POT-Creation-Date: 2007-11-09 19:03-0300\n"
+"Project-Id-Version: noosfero 0.4.0\n"
+"POT-Creation-Date: 2007-11-27 13:39-0300\n"
 "PO-Revision-Date: 2007-11-09 19:17-0300\n"
 "Last-Translator: Rafael Tavares Bomfim <rafael@colivre.coop.br>\n"
 "Language-Team: \n"
@@ -19,85 +19,90 @@ msgstr &quot;&quot;
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 1.0.2\n"
-#: app/design_blocks/favourite_links/controllers/favourite_links_controller.rb:22
-msgid "Manage Links"
-msgstr "Gerenciar Links"
+#: app/design_blocks/enterprises_block/models/enterprises_block.rb:12
+#, fuzzy
+msgid "Enterprises Block"
+msgstr "Meus Empreendimentos"
+
+#: app/design_blocks/list_block/models/list_block.rb:12
+msgid "List Block"
+msgstr "Bloco de Lista"
-#: app/design_blocks/favourite_links/controllers/favourite_links_controller.rb:23
+#: app/design_blocks/favorite_links/controllers/favorite_links_controller.rb:4
 #: app/views/role/index.rhtml:6 app/views/content_viewer/view_page.rhtml:7
-#: app/views/manage_tags/_a_tag.rhtml:3 app/views/profile_editor/index.rhtml:6
-#: app/views/profile_editor/index.rhtml:8
-#: app/views/categories/_category.rhtml:8
+#: app/views/manage_tags/_a_tag.rhtml:3 app/views/categories/_category.rhtml:8
 msgid "Edit"
 msgstr "Editar"
-#: app/design_blocks/favourite_links/models/favourite_links.rb:4
-#: app/design_blocks/favourite_links/views/manage_links.rhtml:3
-msgid "Favourite Links"
+#: app/design_blocks/favorite_links/controllers/favorite_links_controller.rb:5
+msgid "Manage Links"
+msgstr "Gerenciar Links"
+
+#: app/design_blocks/favorite_links/models/favorite_links.rb:4
+#: app/design_blocks/favorite_links_profile/models/favorite_links_profile.rb:4
+#: app/design_blocks/favorite_links/views/manage_links.rhtml:3
+#, fuzzy
+msgid "Favorite Links"
 msgstr "Links Favoritos"
-#: app/controllers/environment_admin/manage_tags_controller.rb:26
+#: app/controllers/admin/manage_tags_controller.rb:26
 msgid "Tag was successfully created."
 msgstr "Marcador criado com sucesso."
-#: app/controllers/environment_admin/manage_tags_controller.rb:44
+#: app/controllers/admin/manage_tags_controller.rb:44
 msgid "Tag was successfully updated."
 msgstr "Marcador alterado com sucesso"
-#: app/controllers/environment_admin/manage_tags_controller.rb:56
+#: app/controllers/admin/manage_tags_controller.rb:56
 msgid "Tag was successfuly destroyed"
 msgstr "Marcador removido com sucesso"
-#: app/controllers/environment_admin/manage_tags_controller.rb:65
+#: app/controllers/admin/manage_tags_controller.rb:65
 msgid "Tag was successfuly approved"
 msgstr "Marcador aprovado com sucesso"
-#: app/controllers/environment_admin/role_controller.rb:21
+#: app/controllers/admin/role_controller.rb:21
 msgid "Failed to create role"
 msgstr "Falhou em criar papel"
-#: app/controllers/environment_admin/role_controller.rb:35
-#: app/controllers/environment_admin/role_controller.rb:45
+#: app/controllers/admin/role_controller.rb:35
+#: app/controllers/admin/role_controller.rb:45
 msgid "Failed to edit role"
 msgstr "Falhou em editar papel"
-#: app/controllers/environment_admin/features_controller.rb:13
+#: app/controllers/admin/features_controller.rb:13
 msgid "Features updated successfully."
 msgstr "Funcionalidades alterada com sucesso"
-#: app/controllers/environment_admin/environment_role_manager_controller.rb:17
-#: app/controllers/profile_admin/profile_members_controller.rb:17
+#: app/controllers/admin/environment_role_manager_controller.rb:17
+#: app/controllers/my_profile/profile_members_controller.rb:17
 msgid "Roles successfuly updated"
 msgstr "Papéis alterado com sucesso"
-#: app/controllers/environment_admin/environment_role_manager_controller.rb:19
-#: app/controllers/profile_admin/profile_members_controller.rb:19
+#: app/controllers/admin/environment_role_manager_controller.rb:19
+#: app/controllers/my_profile/profile_members_controller.rb:19
 msgid "Couldn't change the roles"
 msgstr "Não pôde modificar os papéis"
-#: app/controllers/environment_admin/environment_role_manager_controller.rb:45
-#: app/controllers/environment_admin/environment_role_manager_controller.rb:55
+#: app/controllers/admin/environment_role_manager_controller.rb:45
+#: app/controllers/admin/environment_role_manager_controller.rb:55
 msgid "Member succefully unassociated"
 msgstr "Membro desassociado com sucesso"
-#: app/controllers/environment_admin/environment_role_manager_controller.rb:47
-#: app/controllers/environment_admin/environment_role_manager_controller.rb:57
+#: app/controllers/admin/environment_role_manager_controller.rb:47
+#: app/controllers/admin/environment_role_manager_controller.rb:57
 msgid "Failed to unassociate member"
 msgstr "Falhou em desassociar membro"
-#: app/controllers/profile_admin_controller.rb:17
-msgid "This action is not available for \"%s\"."
-msgstr "Esta ação não está disponível para \"%s\"."
-
-#: app/controllers/profile_admin/enterprise_editor_controller.rb:21
+#: app/controllers/my_profile/enterprise_editor_controller.rb:21
 msgid "Could not update the enterprise"
 msgstr "Não pôde modificar o empreendimento"
-#: app/controllers/profile_admin/enterprise_editor_controller.rb:31
+#: app/controllers/my_profile/enterprise_editor_controller.rb:31
 msgid "Enterprise sucessfully erased from the system"
 msgstr "Empreendimento ativado com sucesso"
-#: app/controllers/profile_admin/membership_editor_controller.rb:25
+#: app/controllers/my_profile/membership_editor_controller.rb:25
 msgid ""
 "The enterprise was successfully created, the validation entity will cotact "
 "you as soon as your enterprise is approved"
@@ -105,10 +110,40 @@ msgstr &quot;&quot;
 "O empreendimento foi criado com sucesso, a entidade de validação irá entrar "
 "em contato com você assim que seu empreendimento for aprovado"
-#: app/controllers/profile_admin/membership_editor_controller.rb:28
+#: app/controllers/my_profile/membership_editor_controller.rb:28
 msgid "Enterprise was not created"
 msgstr "Empreendimento não foi criado"
+#: app/controllers/my_profile/manage_products_controller.rb:19
+#, fuzzy
+msgid "Product succesfully created"
+msgstr "Marcador criado com sucesso."
+
+#: app/controllers/my_profile/manage_products_controller.rb:22
+#, fuzzy
+msgid "Could not create the product"
+msgstr "Não pôde modificar os papéis"
+
+#: app/controllers/my_profile/manage_products_controller.rb:31
+#, fuzzy
+msgid "Product succesfully updated"
+msgstr "Papéis alterado com sucesso"
+
+#: app/controllers/my_profile/manage_products_controller.rb:34
+#, fuzzy
+msgid "Could not update the product"
+msgstr "Não pôde modificar o empreendimento"
+
+#: app/controllers/my_profile/manage_products_controller.rb:42
+#, fuzzy
+msgid "Product succesfully removed"
+msgstr "Marcador aprovado com sucesso"
+
+#: app/controllers/my_profile/manage_products_controller.rb:45
+#, fuzzy
+msgid "Could not remove the product"
+msgstr "Não pôde modificar o empreendimento"
+
 #: app/controllers/public/account_controller.rb:25
 msgid "Logged in successfully"
 msgstr "Login bem sucedido"
@@ -133,6 +168,42 @@ msgstr &quot;Sua senha foi alterada com sucesso!&quot;
 msgid "The supplied current password is incorrect."
 msgstr "A senha informada está incorreta"
+#: app/controllers/my_profile_controller.rb:17
+msgid "This action is not available for \"%s\"."
+msgstr "Esta ação não está disponível para \"%s\"."
+
+#: app/models/product.rb:-
+msgid "product"
+msgstr ""
+
+#: app/models/product.rb:-
+#, fuzzy
+msgid "Product|Enterprise"
+msgstr "Editar empreendimento"
+
+#: app/models/product.rb:-
+#, fuzzy
+msgid "Product|Product category"
+msgstr "Categoria do Produto"
+
+#: app/models/product.rb:-
+#, fuzzy
+msgid "Product|Name"
+msgstr "Nome"
+
+#: app/models/product.rb:-
+msgid "Product|Price"
+msgstr ""
+
+#: app/models/product.rb:-
+msgid "Product|Description"
+msgstr ""
+
+#: app/models/product.rb:-
+#, fuzzy
+msgid "Product|Image"
+msgstr "Categoria do Produto"
+
 #: app/models/validation_info.rb:-
 msgid "validation info"
 msgstr "informação de validação"
@@ -239,7 +310,61 @@ msgstr &quot;Usuário&quot;
 msgid "Profile|Region"
 msgstr "Região"
-#: app/models/profile.rb:7 app/helpers/application_helper.rb:199
+#: app/models/profile.rb:-
+#, fuzzy
+msgid "article"
+msgstr "Artigos"
+
+#: app/models/profile.rb:-
+#, fuzzy
+msgid "Article|Name"
+msgstr "Nome"
+
+#: app/models/profile.rb:-
+#, fuzzy
+msgid "Article|Slug"
+msgstr "Artigos"
+
+#: app/models/profile.rb:-
+#, fuzzy
+msgid "Article|Path"
+msgstr "Artigos"
+
+#: app/models/profile.rb:-
+#, fuzzy
+msgid "Article|Parent"
+msgstr "Artigos"
+
+#: app/models/profile.rb:-
+#, fuzzy
+msgid "Article|Body"
+msgstr "Artigos"
+
+#: app/models/profile.rb:-
+#, fuzzy
+msgid "Article|Profile"
+msgstr "Artigos"
+
+#: app/models/profile.rb:-
+#, fuzzy
+msgid "Article|Updated on"
+msgstr "Atualizado em"
+
+#: app/models/profile.rb:-
+#, fuzzy
+msgid "Article|Created on"
+msgstr "Criado em"
+
+#: app/models/profile.rb:-
+#, fuzzy
+msgid "Article|Version"
+msgstr "Artigos"
+
+#: app/models/profile.rb:-
+msgid "Article|Lock version"
+msgstr ""
+
+#: app/models/profile.rb:7 app/helpers/application_helper.rb:188
 msgid "Edit profile"
 msgstr "perfil"
@@ -259,7 +384,7 @@ msgstr &quot;Conteúdo da postagem&quot;
 msgid "Edit profile design"
 msgstr "Editar design de perfil"
-#: app/models/profile.rb:63
+#: app/models/profile.rb:59
 msgid "An existing profile cannot be renamed."
 msgstr "Um perfil existente não pode ser renomeado"
@@ -399,6 +524,10 @@ msgstr &quot;&quot;
 msgid "%{fn} must not start with www."
 msgstr "%{fn} não pode iniciar com www"
+#: app/models/image.rb:-
+msgid "image"
+msgstr ""
+
 #: app/models/friendship.rb:-
 msgid "friendship"
 msgstr "amizade"
@@ -783,371 +912,108 @@ msgstr &quot;Ajuda&quot;
 msgid "Close"
 msgstr "Fechar"
-#: app/helpers/application_helper.rb:117 app/helpers/application_helper.rb:134
-msgid "My account"
-msgstr "Minha conta"
+#: app/helpers/application_helper.rb:117 app/helpers/application_helper.rb:127
+#: app/views/profile_editor/index.rhtml:1
+msgid "My profile"
+msgstr "Meu perfil"
 #: app/helpers/application_helper.rb:118
 msgid "My Enterprises"
 msgstr "Meus Empreendimentos"
-#: app/helpers/application_helper.rb:119 app/helpers/application_helper.rb:137
+#: app/helpers/application_helper.rb:119 app/helpers/application_helper.rb:130
 #: app/views/environment_role_manager/make_admin.rhtml:4
 msgid "Admin"
 msgstr "Administrador"
-#: app/helpers/application_helper.rb:120
-msgid "About"
-msgstr "Sobre"
-
-#: app/helpers/application_helper.rb:126
-msgid "about"
-msgstr "sobre"
-
-#: app/helpers/application_helper.rb:138 app/helpers/application_helper.rb:168
+#: app/helpers/application_helper.rb:131 app/helpers/application_helper.rb:157
 msgid "Logout"
 msgstr "Sair"
-#: app/helpers/application_helper.rb:142 app/helpers/application_helper.rb:160
+#: app/helpers/application_helper.rb:135 app/helpers/application_helper.rb:149
 #: app/views/account/login.rhtml:1
 msgid "Login"
 msgstr "Entrar"
-#: app/helpers/application_helper.rb:164
+#: app/helpers/application_helper.rb:153
 msgid "Not a user yet? Register now!"
 msgstr "Ainda não é usuário? Registre-se agora!"
-#: app/helpers/application_helper.rb:182
+#: app/helpers/application_helper.rb:171
 msgid "Features"
 msgstr "Funcionalidades"
-#: app/helpers/application_helper.rb:183
+#: app/helpers/application_helper.rb:172
 msgid "Edit visual"
 msgstr "Editar visual"
-#: app/helpers/application_helper.rb:184
+#: app/helpers/application_helper.rb:173
 msgid "Manage categories"
 msgstr "Gerenciar categorias"
-#: app/helpers/application_helper.rb:185
+#: app/helpers/application_helper.rb:174
 msgid "Manage permissions"
 msgstr "Gerenciar permissões"
-#: app/helpers/application_helper.rb:186
+#: app/helpers/application_helper.rb:175
 msgid "Manage validators"
 msgstr "Gerenciar validadores"
-#: app/helpers/application_helper.rb:192
+#: app/helpers/application_helper.rb:181
 msgid "New enterprise"
 msgstr "Novo empreendimento"
-#: app/helpers/application_helper.rb:198 app/helpers/application_helper.rb:207
+#: app/helpers/application_helper.rb:187 app/helpers/application_helper.rb:196
 msgid "Edit visual design"
 msgstr "Editar aparência"
-#: app/helpers/application_helper.rb:200 app/helpers/application_helper.rb:209
+#: app/helpers/application_helper.rb:189 app/helpers/application_helper.rb:198
 msgid "Manage content"
 msgstr "Gerenciar conteúdo"
-#: app/helpers/application_helper.rb:208
+#: app/helpers/application_helper.rb:197
 msgid "Edit informations"
 msgstr "Editar informações"
-#: app/helpers/application_helper.rb:216
+#: app/helpers/application_helper.rb:205
 #: app/views/account/new_password.rhtml:13
 #: app/views/account/change_password.rhtml:1
 #: app/views/account/change_password.rhtml:14
 msgid "Change password"
 msgstr "Alterar senha"
-#: app/helpers/application_helper.rb:222
-msgid "Report bug"
-msgstr "Reportar bug"
-
-#: app/helpers/application_helper.rb:228
+#: app/helpers/application_helper.rb:211
 msgid "Change template"
 msgstr "Mudar template"
-#: app/helpers/application_helper.rb:229
+#: app/helpers/application_helper.rb:212
 msgid "Change block theme"
 msgstr "Mude o tema de bloco"
-#: app/helpers/application_helper.rb:230
+#: app/helpers/application_helper.rb:213
 msgid "Change icon theme"
 msgstr "Mudar tema do ícone"
-#: app/helpers/application_helper.rb:268
-msgid "accessibility"
-msgstr "acessibilidade"
-
-#: app/helpers/application_helper.rb:271
-msgid "Accessibility"
-msgstr "Acessibilidade"
-
-#: app/helpers/application_helper.rb:276
+#: app/helpers/application_helper.rb:219
 #: app/views/region_validators/region.rhtml:22
 #: app/views/manage_tags/_search_box.rhtml:4
 #: app/views/membership_editor/index.rhtml:4
 msgid "Search"
 msgstr "Busca"
-#: app/helpers/application_helper.rb:277
+#: app/helpers/application_helper.rb:220
 msgid "  "
 msgstr "  "
-#: app/helpers/application_helper.rb:287
+#: app/helpers/application_helper.rb:230
 msgid "%s, version %s"
 msgstr "%s, versão %s"
-#: app/helpers/application_helper.rb:365
-msgid "No Filter at all"
-msgstr "Sem qualquer filtro"
-
-#: app/helpers/application_helper.rb:366
-msgid "RDoc filter"
-msgstr "Filtro RDoc"
-
-#: app/helpers/application_helper.rb:367
-msgid "Simple"
-msgstr "Simples"
-
-#: app/helpers/application_helper.rb:368
-msgid "Textile"
-msgstr "Textile"
-
-#: app/views/cms/new.rhtml:2
-msgid "New Page"
-msgstr "Nova Página"
-
-#: app/views/cms/_page_list_item.rhtml:6
-msgid "%d revision"
-msgstr "%d revisão"
-
-#: app/views/cms/_page_list_item.rhtml:6
-msgid "%d revisions"
-msgstr "%d revisões"
-
-#: app/views/cms/_page_list_item.rhtml:7
-msgid "add child document"
-msgstr "adicionar document filho"
-
-#: app/views/cms/_page_list_item.rhtml:7
-msgid "Add a child to '%s'"
-msgstr "Adicionar um filho a '%s'"
-
-#: app/views/cms/_page_list_item.rhtml:8
-msgid "reorder children"
-msgstr "reordenar filhos"
-
-#: app/views/cms/_page_list_item.rhtml:8
-msgid "finished reordering"
-msgstr "ordenação terminada"
-
-#: app/views/cms/_page_list_item.rhtml:8
-msgid "Reorder children of '%s'"
-msgstr "Reordenar filhos de '%s'"
-
-#: app/views/cms/_page_list_item.rhtml:9
-msgid "delete"
-msgstr "excluir"
-
-#: app/views/cms/_page_list_item.rhtml:9
-msgid "This will delete this page, and any children. Are you sure?"
-msgstr "Isto vai excluir esta página, e qualquer filho. Tem certeza?"
-
-#: app/views/cms/_page_list_item.rhtml:9
-msgid "Delete page '%s' and all it's children"
-msgstr "Excluir página '%s' e todos seus filhos"
-
-#: app/views/cms/_page_list_item.rhtml:26
-msgid "DRAG"
-msgstr "ARRASTE"
-
-#: app/views/cms/_form.rhtml:27
-#: app/design_blocks/favourite_links/views/add_link.rhtml:6
-#: app/design_blocks/favourite_links/views/edit.rhtml:7
-msgid "Title"
-msgstr "Título"
-
-#: app/views/cms/_form.rhtml:28
-msgid "More..."
-msgstr "Mais..."
-
-#: app/views/cms/_form.rhtml:28
-msgid "Less..."
-msgstr "Menos..."
-
-#: app/views/cms/_form.rhtml:32
-msgid "Slug"
-msgstr "Atalho"
-
-#: app/views/cms/_form.rhtml:38
-msgid "Keywords"
-msgstr "Palvras-chave"
-
-#: app/views/cms/_form.rhtml:45
-msgid "Parent"
-msgstr "Pai"
-
-#: app/views/cms/_form.rhtml:47
-msgid "%s is a root page"
-msgstr "%s é uma página raiz"
-
-#: app/views/cms/_form.rhtml:55
-msgid "Content"
-msgstr "Conteúdo"
-
-#: app/views/cms/_form.rhtml:61
-msgid "Filter"
-msgstr "Filtro"
-
-#: app/views/cms/_form.rhtml:63
-msgid "Converts plain text into HTML"
-msgstr "Converte texto plano em HTML"
-
-#: app/views/cms/_form.rhtml:69
-msgid "Created"
-msgstr "Criado"
-
-#: app/views/cms/_form.rhtml:78
-msgid "One revision"
-msgid_plural "%d revisions"
-msgstr[0] "Uma revisão"
-msgstr[1] "%d revisões"
-
-#: app/views/cms/_form.rhtml:84
-msgid "Loading preview ..."
-msgstr "Carregando pré-visualização ..."
-
-#: app/views/cms/_form.rhtml:85
-msgid "Save Changes"
-msgstr "Salvar Mudanças"
-
-#: app/views/cms/_form.rhtml:85
-msgid "Create Page"
-msgstr "Criar Página"
-
-#: app/views/cms/_form.rhtml:87
-msgid "Revert"
-msgstr "Reverter"
-
-#: app/views/cms/_form.rhtml:90
-msgid ""
-"Changes detected. You will lose all the updates you have made if you "
-"proceed..."
+#: app/views/cms/view.rhtml:23
+msgid "New subitem"
 msgstr ""
-"Mudanças detectadas. Você vai perder todas as atualizações que você fez se "
-"continuar..."
-
-#: app/views/cms/_form.rhtml:90 app/views/cms/delete.rhtml:16
-#: app/views/cms/versions.rhtml:25 app/views/role/_form.rhtml:13
-#: app/views/profile_members/change_role.rhtml:13
-#: app/views/enterprise_editor/edit.rhtml:8 app/views/manage_tags/new.rhtml:6
-#: app/views/manage_tags/edit.rhtml:6
-#: app/views/membership_editor/new_enterprise.rhtml:13
-#: app/views/enterprise_registration/basic_information.rhtml:33
-#: app/views/environment_role_manager/change_role.rhtml:12
-#: app/views/categories/_form.rhtml:17
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: app/views/cms/_form.rhtml:96
-msgid "Page Preview"
-msgstr "Pré-visualização da página"
-
-#: app/views/cms/_form.rhtml:98
-msgid "Loading Preview..."
-msgstr "Carregando Pré-visualzação..."
-
-#: app/views/cms/_form.rhtml:103
-msgid "Close Preview"
-msgstr "Fechar Pré-visualzação"
-
-#: app/views/cms/_form.rhtml:103 app/views/cms/versions.rhtml:24
-msgid "or"
-msgstr "ou"
-
-#: app/views/cms/_form.rhtml:103
-msgid "Back to top"
-msgstr "Voltar ao topo"
-
-#: app/views/cms/reorder.rhtml:1
-msgid "Reorder Pages"
-msgstr "Rordenar Páginas"
-
-#: app/views/cms/reorder.rhtml:3
-msgid "\"%s\" child pages:"
-msgstr "\"%s\" páginas filhas:"
-
-#: app/views/cms/reorder.rhtml:19
-msgid "Move Up"
-msgstr "Mover para cima"
-#: app/views/cms/reorder.rhtml:20
-msgid "Move Down"
-msgstr "Mover para baixo"
-
-#: app/views/cms/reorder.rhtml:29
-msgid "Finished"
-msgstr "Terminado"
-
-#: app/views/cms/delete.rhtml:6
-msgid "Are you sure you want to delete the page titled \"%s\"?"
-msgstr "Tem certeza que quer excluir a página intitulada \"%s\"?"
-
-#: app/views/cms/delete.rhtml:8
-msgid "It has %s child pages that will also be deleted..."
-msgstr "Existem %s páginas filhas que também serão excluídas..."
-
-#: app/views/cms/delete.rhtml:14
-msgid "Yes, Delete The Page"
-msgstr "Sim, Excluir A Página"
-
-#: app/views/cms/versions.rhtml:1
-msgid "Page Revisions"
-msgstr "Revisões da Página"
-
-#: app/views/cms/versions.rhtml:7
-msgid "View Version:"
-msgstr "Ver Versão:"
-
-#: app/views/cms/versions.rhtml:11
-msgid "Version %s"
-msgstr "Versão %s"
-
-#: app/views/cms/versions.rhtml:14 app/views/cms/versions.rhtml:35
-msgid "Title:"
-msgstr "Título:"
-
-#: app/views/cms/versions.rhtml:15 app/views/cms/versions.rhtml:36
-msgid "Slug:"
-msgstr "Atalho:"
-
-#: app/views/cms/versions.rhtml:17 app/views/cms/versions.rhtml:38
-msgid "Keywords:"
-msgstr "Palavras-chaves"
-
-#: app/views/cms/versions.rhtml:23
-msgid "Set As Current Version"
-msgstr "Tornar versão atual"
-
-#: app/views/cms/versions.rhtml:32
-msgid "Current Version"
-msgstr "Versão Atual"
-
-#: app/views/cms/edit.rhtml:2
-msgid "Edit Page"
-msgstr "Editar Página"
-
-#: app/views/cms/index.rhtml:2
-msgid "Clear Page Cache"
-msgstr "Limpar cache de páginas"
-
-#: app/views/cms/index.rhtml:6
-msgid "Articles"
-msgstr "Artigos"
-
-#: app/views/cms/index.rhtml:17
+#: app/views/cms/view.rhtml:25
 msgid "New article"
 msgstr "Novo artigo"
@@ -1161,6 +1027,7 @@ msgstr &quot;Permissões: &quot;
 #: app/views/role/_form.rhtml:12
 #: app/views/profile_members/change_role.rhtml:12
+#: app/views/manage_products/_form.rhtml:11
 #: app/views/features/_features_table.rhtml:15
 #: app/views/environment_role_manager/change_role.rhtml:11
 msgid "Save changes"
@@ -1170,6 +1037,17 @@ msgstr &quot;Salvar alterações&quot;
 msgid "Create role"
 msgstr "Criar papel"
+#: app/views/role/_form.rhtml:13
+#: app/views/profile_members/change_role.rhtml:13
+#: app/views/enterprise_editor/edit.rhtml:8 app/views/manage_tags/new.rhtml:6
+#: app/views/manage_tags/edit.rhtml:6
+#: app/views/membership_editor/new_enterprise.rhtml:13
+#: app/views/enterprise_registration/basic_information.rhtml:33
+#: app/views/environment_role_manager/change_role.rhtml:12
+#: app/views/categories/_form.rhtml:17
+msgid "Cancel"
+msgstr "Cancelar"
+
 #: app/views/role/show.rhtml:3
 msgid "Permissions"
 msgstr "Permissões"
@@ -1280,6 +1158,85 @@ msgstr[1] &quot;%{num} validadores.&quot;
 msgid "Validators by Region"
 msgstr "Validadores por região"
+#: app/views/manage_products/new.rhtml:1
+#: app/views/manage_products/index.rhtml:3
+#, fuzzy
+msgid "New product"
+msgstr "Novo papel"
+
+#: app/views/manage_products/_form.rhtml:4
+#, fuzzy
+msgid "Name:"
+msgstr "Nome"
+
+#: app/views/manage_products/_form.rhtml:5
+msgid "Price:"
+msgstr ""
+
+#: app/views/manage_products/_form.rhtml:6
+msgid "Description:"
+msgstr ""
+
+#: app/views/manage_products/_form.rhtml:7
+#, fuzzy
+msgid "Category:"
+msgstr "Categoria: %s"
+
+#: app/views/manage_products/_form.rhtml:9
+msgid "Image:"
+msgstr ""
+
+#: app/views/manage_products/_form.rhtml:11
+#, fuzzy
+msgid "Create product"
+msgstr "Criar papel"
+
+#: app/views/manage_products/show.rhtml:4
+#: app/views/manage_products/index.rhtml:7
+msgid "Price: "
+msgstr ""
+
+#: app/views/manage_products/show.rhtml:5
+#, fuzzy
+msgid "Description: "
+msgstr "Permissões: "
+
+#: app/views/manage_products/show.rhtml:6
+#, fuzzy
+msgid "Category: "
+msgstr "Categoria: %s"
+
+#: app/views/manage_products/show.rhtml:6
+msgid "Uncategorized product"
+msgstr ""
+
+#: app/views/manage_products/show.rhtml:8
+#: app/views/manage_products/index.rhtml:8
+#, fuzzy
+msgid "edit"
+msgstr "Editar"
+
+#: app/views/manage_products/show.rhtml:9
+#: app/views/manage_products/index.rhtml:9
+#, fuzzy
+msgid "destroy"
+msgstr "Destruir"
+
+#: app/views/manage_products/show.rhtml:11
+#, fuzzy
+msgid "back"
+msgstr "Voltar"
+
+#: app/views/manage_products/edit.rhtml:1
+#, fuzzy
+msgid "Editing"
+msgstr "Editando %s"
+
+#: app/views/manage_products/index.rhtml:1
+#, fuzzy
+msgid "Listing products"
+msgstr "Listando tags"
+
 #: app/views/content_viewer/view_page.rhtml:4
 #: app/views/manage_tags/list.rhtml:17
 msgid "Up"
@@ -1290,15 +1247,16 @@ msgstr &quot;Acima&quot;
 msgid "There is no such page: %s"
 msgstr "Não há página: %s"
-#: app/views/layouts/application.rhtml:29
-#: app/views/layouts/comatose_admin.rhtml:29
+#: app/views/layouts/application.rhtml:33
+#: app/views/layouts/comatose_admin.rhtml:33
 msgid "Image for Loading..."
 msgstr "Imagem para Carregamento..."
-#: app/views/layouts/application.rhtml:34
-#: app/views/layouts/comatose_admin.rhtml:34
-msgid "Go Content"
-msgstr "Conteúdo"
+#: app/views/layouts/application.rhtml:39
+#: app/views/layouts/comatose_admin.rhtml:39
+#, fuzzy
+msgid "Go to content"
+msgstr "Conteúdo da postagem"
 #: app/views/layouts/not_found.rhtml:5
 msgid "Page not found"
@@ -1711,9 +1669,14 @@ msgid &quot;Password&quot;
 msgstr "Senha"
 #: app/views/account/login.rhtml:20
-msgid "I forgot my password"
+#, fuzzy
+msgid "I forgot my password!"
 msgstr "Eu esqueci a minha senha"
+#: app/views/account/login.rhtml:24
+msgid "I want to be an user!"
+msgstr ""
+
 #: app/views/account/password_recovery_sent.rhtml:1
 #: app/views/account/forgot_password.rhtml:1
 msgid "Password recovery"
@@ -1907,10 +1870,6 @@ msgstr &quot;&quot;
 msgid "Access denied"
 msgstr "Acesso negado"
-#: app/views/shared/categories_menu.rhtml:5
-msgid "Home"
-msgstr "Início"
-
 #: app/views/profile_editor/person_info.rhtml:1
 msgid "Edit person info"
 msgstr "Editar dados pessoais"
@@ -1921,23 +1880,45 @@ msgstr &quot;Informação de contato&quot;
 #: app/views/profile_editor/person_info.rhtml:11
 #: app/views/categories/_form.rhtml:16
-#: app/design_blocks/favourite_links/views/add_link.rhtml:10
-#: app/design_blocks/favourite_links/views/edit.rhtml:26
+#: app/design_blocks/favorite_links/views/add_link.rhtml:10
+#: app/design_blocks/favorite_links/views/edit.rhtml:26
 msgid "Save"
 msgstr "Salvar"
-#: app/views/profile_editor/index.rhtml:1
-msgid "My profile"
-msgstr "Meu perfil"
+#: app/views/profile_editor/index.rhtml:8
+#, fuzzy
+msgid "Edit Profile"
+msgstr "perfil"
-#: app/views/profile_editor/index.rhtml:13
+#: app/views/profile_editor/index.rhtml:10
+#: app/views/profile_editor/index.rhtml:21
 msgid "Edit Visual Design"
 msgstr "Editar Aparência"
-#: app/views/profile_editor/index.rhtml:15
+#: app/views/profile_editor/index.rhtml:12
+#, fuzzy
+msgid "Manage Content"
+msgstr "Gerenciar conteúdo"
+
+#: app/views/profile_editor/index.rhtml:14
+#, fuzzy
+msgid "Change Password"
+msgstr "Alterar senha"
+
+#: app/views/profile_editor/index.rhtml:16
+#, fuzzy
+msgid "Manage Products"
+msgstr "Gerenciar o seu conteúdo"
+
+#: app/views/profile_editor/index.rhtml:22
 msgid "Menage content"
 msgstr "Garenciar conteúdo"
+#: app/views/profile_editor/index.rhtml:25
+#, fuzzy
+msgid "My organizations"
+msgstr "informação da organização"
+
 #: app/views/enterprise_registration/basic_information.rhtml:27
 msgid "Management information"
 msgstr "Gerenciamento de informação"
@@ -2008,7 +1989,7 @@ msgid &quot;Add subcategory&quot;
 msgstr "Adicionar subcategoria"
 #: app/views/categories/_category.rhtml:9
-#: app/design_blocks/favourite_links/views/manage_links.rhtml:18
+#: app/design_blocks/favorite_links/views/manage_links.rhtml:18
 msgid "Remove"
 msgstr "Remover"
@@ -2028,39 +2009,237 @@ msgstr &quot;Editando %s&quot;
 msgid "Categories"
 msgstr "Categorias"
-#: app/design_blocks/favourite_links/views/add_link.rhtml:1
-#: app/design_blocks/favourite_links/views/edit.rhtml:2
-msgid "Editing Favourite Links"
+#: app/design_blocks/favorite_links/views/add_link.rhtml:1
+#: app/design_blocks/favorite_links/views/edit.rhtml:2
+#, fuzzy
+msgid "Editing Favorite Links"
 msgstr "Editar Links Favoritos"
-#: app/design_blocks/favourite_links/views/manage_links.rhtml:4
+#: app/design_blocks/favorite_links/views/add_link.rhtml:6
+#: app/design_blocks/favorite_links/views/edit.rhtml:7
+msgid "Title"
+msgstr "Título"
+
+#: app/design_blocks/favorite_links/views/manage_links.rhtml:4
 msgid "Add Link"
 msgstr "Adicionar Link"
-#: app/design_blocks/favourite_links/views/manage_links.rhtml:8
-#: app/design_blocks/favourite_links/views/index.rhtml:3
+#: app/design_blocks/favorite_links/views/manage_links.rhtml:8
+#: app/design_blocks/favorite_links/views/index.rhtml:4
 msgid "Previous"
 msgstr "Anterior"
-#: app/design_blocks/favourite_links/views/manage_links.rhtml:11
-#: app/design_blocks/favourite_links/views/index.rhtml:6
+#: app/design_blocks/favorite_links/views/manage_links.rhtml:11
+#: app/design_blocks/favorite_links/views/index.rhtml:7
 msgid "Next"
 msgstr "Próximo"
-#: app/design_blocks/favourite_links/views/edit.rhtml:12
+#: app/design_blocks/favorite_links/views/edit.rhtml:12
 msgid "Display header?"
 msgstr "Mostrar menu?"
-#: app/design_blocks/favourite_links/views/edit.rhtml:17
+#: app/design_blocks/favorite_links/views/edit.rhtml:17
 msgid "Display title?"
 msgstr "Mostrar título?"
-#: app/design_blocks/favourite_links/views/edit.rhtml:22
+#: app/design_blocks/favorite_links/views/edit.rhtml:22
 msgid "Max number of links"
 msgstr "Número máximo de links"
-#~ msgid "List Block"
-#~ msgstr "Bloco de Lista"
+#~ msgid "My account"
+#~ msgstr "Minha conta"
+
+#~ msgid "About"
+#~ msgstr "Sobre"
+
+#~ msgid "about"
+#~ msgstr "sobre"
+
+#~ msgid "Report bug"
+#~ msgstr "Reportar bug"
+
+#~ msgid "accessibility"
+#~ msgstr "acessibilidade"
+
+#~ msgid "Accessibility"
+#~ msgstr "Acessibilidade"
+
+#~ msgid "No Filter at all"
+#~ msgstr "Sem qualquer filtro"
+
+#~ msgid "RDoc filter"
+#~ msgstr "Filtro RDoc"
+
+#~ msgid "Simple"
+#~ msgstr "Simples"
+
+#~ msgid "Textile"
+#~ msgstr "Textile"
+
+#~ msgid "New Page"
+#~ msgstr "Nova Página"
+
+#~ msgid "%d revision"
+#~ msgstr "%d revisão"
+
+#~ msgid "%d revisions"
+#~ msgstr "%d revisões"
+
+#~ msgid "add child document"
+#~ msgstr "adicionar document filho"
+
+#~ msgid "Add a child to '%s'"
+#~ msgstr "Adicionar um filho a '%s'"
+
+#~ msgid "reorder children"
+#~ msgstr "reordenar filhos"
+
+#~ msgid "finished reordering"
+#~ msgstr "ordenação terminada"
+
+#~ msgid "Reorder children of '%s'"
+#~ msgstr "Reordenar filhos de '%s'"
+
+#~ msgid "delete"
+#~ msgstr "excluir"
+
+#~ msgid "This will delete this page, and any children. Are you sure?"
+#~ msgstr "Isto vai excluir esta página, e qualquer filho. Tem certeza?"
+
+#~ msgid "Delete page '%s' and all it's children"
+#~ msgstr "Excluir página '%s' e todos seus filhos"
+
+#~ msgid "DRAG"
+#~ msgstr "ARRASTE"
+
+#~ msgid "More..."
+#~ msgstr "Mais..."
+
+#~ msgid "Less..."
+#~ msgstr "Menos..."
+
+#~ msgid "Slug"
+#~ msgstr "Atalho"
+
+#~ msgid "Keywords"
+#~ msgstr "Palvras-chave"
+
+#~ msgid "Parent"
+#~ msgstr "Pai"
+
+#~ msgid "%s is a root page"
+#~ msgstr "%s é uma página raiz"
+
+#~ msgid "Content"
+#~ msgstr "Conteúdo"
+
+#~ msgid "Filter"
+#~ msgstr "Filtro"
+
+#~ msgid "Converts plain text into HTML"
+#~ msgstr "Converte texto plano em HTML"
+
+#~ msgid "Created"
+#~ msgstr "Criado"
+
+#~ msgid "One revision"
+#~ msgid_plural "%d revisions"
+#~ msgstr[0] "Uma revisão"
+#~ msgstr[1] "%d revisões"
+
+#~ msgid "Loading preview ..."
+#~ msgstr "Carregando pré-visualização ..."
+
+#~ msgid "Save Changes"
+#~ msgstr "Salvar Mudanças"
+
+#~ msgid "Create Page"
+#~ msgstr "Criar Página"
+
+#~ msgid "Revert"
+#~ msgstr "Reverter"
+
+#~ msgid ""
+#~ "Changes detected. You will lose all the updates you have made if you "
+#~ "proceed..."
+#~ msgstr ""
+#~ "Mudanças detectadas. Você vai perder todas as atualizações que você fez "
+#~ "se continuar..."
+
+#~ msgid "Page Preview"
+#~ msgstr "Pré-visualização da página"
+
+#~ msgid "Loading Preview..."
+#~ msgstr "Carregando Pré-visualzação..."
+
+#~ msgid "Close Preview"
+#~ msgstr "Fechar Pré-visualzação"
+
+#~ msgid "or"
+#~ msgstr "ou"
+
+#~ msgid "Back to top"
+#~ msgstr "Voltar ao topo"
+
+#~ msgid "Reorder Pages"
+#~ msgstr "Rordenar Páginas"
+
+#~ msgid "\"%s\" child pages:"
+#~ msgstr "\"%s\" páginas filhas:"
+
+#~ msgid "Move Up"
+#~ msgstr "Mover para cima"
+
+#~ msgid "Move Down"
+#~ msgstr "Mover para baixo"
+
+#~ msgid "Finished"
+#~ msgstr "Terminado"
+
+#~ msgid "Are you sure you want to delete the page titled \"%s\"?"
+#~ msgstr "Tem certeza que quer excluir a página intitulada \"%s\"?"
+
+#~ msgid "It has %s child pages that will also be deleted..."
+#~ msgstr "Existem %s páginas filhas que também serão excluídas..."
+
+#~ msgid "Yes, Delete The Page"
+#~ msgstr "Sim, Excluir A Página"
+
+#~ msgid "Page Revisions"
+#~ msgstr "Revisões da Página"
+
+#~ msgid "View Version:"
+#~ msgstr "Ver Versão:"
+
+#~ msgid "Version %s"
+#~ msgstr "Versão %s"
+
+#~ msgid "Title:"
+#~ msgstr "Título:"
+
+#~ msgid "Slug:"
+#~ msgstr "Atalho:"
+
+#~ msgid "Keywords:"
+#~ msgstr "Palavras-chaves"
+
+#~ msgid "Set As Current Version"
+#~ msgstr "Tornar versão atual"
+
+#~ msgid "Current Version"
+#~ msgstr "Versão Atual"
+
+#~ msgid "Edit Page"
+#~ msgstr "Editar Página"
+
+#~ msgid "Clear Page Cache"
+#~ msgstr "Limpar cache de páginas"
+
+#~ msgid "Go Content"
+#~ msgstr "Conteúdo"
+
+#~ msgid "Home"
+#~ msgstr "Início"
 #~ msgid "Link Block"
 #~ msgstr "Bloco de Link"
@@ -111,3 +111,9 @@ div#notice .button a {
 div#notice .button a:hover {
   background-color: #ffd;
 }
+
+
+#design_editor .design_box{
+  border: 1px solid black;
+  height: 400px;
+}
@@ -0,0 +1,5 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+one:
+  id: 1
+two:
+  id: 2
@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ImageTest < Test::Unit::TestCase
+  fixtures :images
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end
	@@ -11,6 +11,7 @@ class ProfileEditorController < MyProfileController		@@ -11,6 +11,7 @@ class ProfileEditorController < MyProfileController
11	%w[	11	%w[
12	FavoriteLinksProfile	12	FavoriteLinksProfile
13	ListBlock	13	ListBlock
		14	+ EnterprisesBlock
14	]	15	]
15	end	16	end
16		17
	@@ -34,5 +35,18 @@ class ProfileEditorController < MyProfileController		@@ -34,5 +35,18 @@ class ProfileEditorController < MyProfileController
34	render :action => @info.class.name.underscore	35	render :action => @info.class.name.underscore
35	end	36	end
36	end	37	end
		38	+
		39	+ def change_image
		40	+ @image = @profile.image ? @profile.image : @profile.build_image
		41	+ if request.post?
		42	+ if @profile.image.update_attributes(params[:image])
		43	+ flash[:notice] = _('Image successfully uploaded')
		44	+ redirect_to :action => 'index'
		45	+ else
		46	+ flash[:notice] = _('Could not upload image')
		47	+ render :action => 'change_imange'
		48	+ end
		49	+ end
		50	+ end
37	end	51	end
38		52
@@ -0,0 +1,51 @@		@@ -0,0 +1,51 @@
	1	+class EnterprisesBlockController < ApplicationController
	2	+
	3	+ # This controller always has the object @design_block available to it.
	4	+ # The method acts_as_design_block load a before_filter that always load
	5	+ # this object.
	6	+
	7	+ needs_profile
	8	+
	9	+ acts_as_design_block
	10	+
	11	+ # You must have a hash on format:
	12	+ # {
	13	+ # 'action name' => 'How the action will be displayed on menu'
	14	+ # }
	15	+ #
	16	+ # EX:
	17	+ # CONTROL_ACTION_OPTIONS = {
	18	+ # 'design_edit' => _('Edit'),
	19	+ # 'manage_links' => _('Manage Links')
	20	+ # }
	21	+ #
	22	+ # This hash will define the options menu on edit mode.
	23	+ CONTROL_ACTION_OPTIONS = {
	24	+# 'edit' => _('Edit')
	25	+ }
	26	+
	27	+
	28	+ ###########################
	29	+ # Mandatory methods
	30	+ ###########################
	31	+
	32	+ def index
	33	+ @enterprises = Enterprise.find(:all)
	34	+ design_render
	35	+ end
	36	+
	37	+ ###########################
	38	+ # Other Sample of methods
	39	+ ###########################
	40	+
	41	+# def edit
	42	+# design_render_on_edit
	43	+# end
	44	+
	45	+# def save
	46	+# @design_block.update_attributes(params[:design_block])
	47	+# design_render_on_edit :nothing => true
	48	+# end
	49	+
	50	+
	51	+end
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+module EnterprisesBlockHelper
	2	+
	3	+end
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+module ListBlockHelper
	2	+
	3	+end
@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
	1	+class EnterprisesBlock < Design::Block
	2	+
	3	+ # Define an specific method using the settings hash serialized
	4	+ # variable to keep the value desired by method.
	5	+ #
	6	+ # EX:
	7	+ # def max_number_of_element= value
	8	+ # self.settings[:limit_number] = value
	9	+ # end
	10	+
	11	+ def self.description
	12	+ _('Enterprises Block')
	13	+ end
	14	+
	15	+end
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+<ul class='enterprises_list_block'>
	2	+ <% @enterprises.each do \|e\| %>
	3	+ <li> <%= link_to_homepage(content_tag('span', e.name), e.identifier) %> </li>
	4	+ <% end %>
	5	+</ul>
@@ -0,0 +1,51 @@		@@ -0,0 +1,51 @@
	1	+class ListBlockController < ApplicationController
	2	+
	3	+ # This controller always has the object @design_block available to it.
	4	+ # The method acts_as_design_block load a before_filter that always load
	5	+ # this object.
	6	+
	7	+ needs_profile
	8	+
	9	+ acts_as_design_block
	10	+
	11	+ # You must have a hash on format:
	12	+ # {
	13	+ # 'action name' => 'How the action will be displayed on menu'
	14	+ # }
	15	+ #
	16	+ # EX:
	17	+ # CONTROL_ACTION_OPTIONS = {
	18	+ # 'design_edit' => _('Edit'),
	19	+ # 'manage_links' => _('Manage Links')
	20	+ # }
	21	+ #
	22	+ # This hash will define the options menu on edit mode.
	23	+ CONTROL_ACTION_OPTIONS = {
	24	+# 'edit' => _('Edit')
	25	+ }
	26	+
	27	+
	28	+ ###########################
	29	+ # Mandatory methods
	30	+ ###########################
	31	+
	32	+ def index
	33	+ @people = Person.find(:all)
	34	+ design_render
	35	+ end
	36	+
	37	+ ###########################
	38	+ # Other Sample of methods
	39	+ ###########################
	40	+
	41	+# def edit
	42	+# design_render_on_edit
	43	+# end
	44	+
	45	+# def save
	46	+# @design_block.update_attributes(params[:design_block])
	47	+# design_render_on_edit :nothing => true
	48	+# end
	49	+
	50	+
	51	+end
@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
	1	+class ListBlock < Design::Block
	2	+
	3	+ # Define an specific method using the settings hash serialized
	4	+ # variable to keep the value desired by method.
	5	+ #
	6	+ # EX:
	7	+ # def max_number_of_element= value
	8	+ # self.settings[:limit_number] = value
	9	+ # end
	10	+
	11	+ def self.description
	12	+ _('List Block')
	13	+ end
	14	+
	15	+end
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+<ul class='people_list_block'>
	2	+ <% @people.each do \|p\| %>
	3	+ <li> <%= link_to_homepage(content_tag('span', p.name), p.identifier) %> </li>
	4	+ <% end %>
	5	+</ul>
	@@ -1,20 +0,0 @@	@@ -1,20 +0,0 @@
1	-class EnterprisesBlock < Design::Block
2	-
3	- def content
4	-
5	- lambda do
6	- content_tag(
7	- 'ul',
8	- Enterprise.find(:all).map do \|p\|
9	- content_tag(
10	- 'li',
11	- link_to_homepage(content_tag('span', p.name), p.identifier)
12	- )
13	- end.join("\n"),
14	- :class => 'enterprises_list_block'
15	- )
16	- end
17	-
18	- end
19	-
20	-end