Download as
Browse Code »

Commit f5a60beaa06cda7231c8ee36c8c8351e02506b39

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

Merge branch 'stable'

Showing 28 changed files with 414 additions and 289 deletions   Show diff stats
app/controllers/my_profile/cms_controller.rb
  Diff comments   View file @f5a60be
... ... @@ -212,12 +212,12 @@ class CmsController < MyProfileController
212 212 def media_listing
213 213 if params[:image_folder_id]
214 214 folder = profile.articles.find(params[:image_folder_id]) if !params[:image_folder_id].blank?
215   - @images = (folder ? folder.children : UploadedFile.find(:all, :conditions => ["profile_id = ? AND parent_id is NULL", profile ])).select { |c| c.image? }
  215 + @images = (folder ? folder.children : UploadedFile.find(:all, :order => 'created_at desc', :conditions => ["profile_id = ? AND parent_id is NULL", profile ])).select { |c| c.image? }
216 216 elsif params[:document_folder_id]
217 217 folder = profile.articles.find(params[:document_folder_id]) if !params[:document_folder_id].blank?
218   - @documents = (folder ? folder.children : UploadedFile.find(:all, :conditions => ["profile_id = ? AND parent_id is NULL", profile ])).select { |c| c.kind_of?(UploadedFile) && !c.image? }
  218 + @documents = (folder ? folder.children : UploadedFile.find(:all, :order => 'created_at desc', :conditions => ["profile_id = ? AND parent_id is NULL", profile ])).select { |c| c.kind_of?(UploadedFile) && !c.image? }
219 219 else
220   - @documents = UploadedFile.find(:all, :conditions => ["profile_id = ? AND parent_id is NULL", profile ])
  220 + @documents = UploadedFile.find(:all, :order => 'created_at desc', :conditions => ["profile_id = ? AND parent_id is NULL", profile ])
221 221 @images = @documents.select(&:image?)
222 222 @documents -= @images
223 223 end
... ...
app/controllers/public/account_controller.rb
  Diff comments   View file @f5a60be
... ... @@ -2,7 +2,7 @@ class AccountController < ApplicationController
2 2  
3 3 inverse_captcha :field => 'e_mail'
4 4  
5   - require_ssl :except => [ :login_popup, :logout_popup ]
  5 + require_ssl :except => [ :login_popup, :logout_popup, :wizard, :profile_details ]
6 6  
7 7 # say something nice, you goof! something sweet.
8 8 def index
... ...
app/helpers/application_helper.rb
  Diff comments   View file @f5a60be
... ... @@ -420,7 +420,7 @@ module ApplicationHelper
420 420 end
421 421 content_tag tag,
422 422 link_to_remote( display,
423   - :update => 'search-results',
  423 + :update => 'search-results-and-pages',
424 424 :url => {:controller => 'account', :action => 'profile_details', :profile => profile.identifier},
425 425 :onclick => 'document.location.href = this.href', # work-arround for ie.
426 426 :class => 'profile_link url',
... ... @@ -519,8 +519,8 @@ module ApplicationHelper
519 519 content_tag('div', result)
520 520 end
521 521  
522   - def select_folder(object, method, collection, html_options = {}, js_options = {})
523   - labelled_form_field(_('Folder'), select(object, method, collection.map {|f| [ profile.identifier + '/' + f.full_name, f.id ] }, html_options.merge({:include_blank => "#{profile.identifier}"}), js_options))
  522 + def select_folder(label, object, method, collection, html_options = {}, js_options = {})
  523 + labelled_form_field(label, select(object, method, collection.map {|f| [ profile.identifier + '/' + f.full_name, f.id ] }, html_options.merge({:include_blank => "#{profile.identifier}"}), js_options))
524 524 end
525 525  
526 526 def theme_option(opt = nil)
... ...
app/models/domain.rb
  Diff comments   View file @f5a60be
... ... @@ -72,6 +72,7 @@ class Domain < ActiveRecord::Base
72 72 # transfering a domain from a profile to an environment of vice-versa
73 73 # requires restarting the application.
74 74 def self.hosting_profile_at(domainname)
  75 + return false unless domainname
75 76 @hosting[domainname] ||=
76 77 begin
77 78 domain = Domain.find_by_name(domainname)
... ...
app/models/thumbnail.rb
  Diff comments   View file @f5a60be
1 1 class Thumbnail < ActiveRecord::Base
2 2 has_attachment :storage => :file_system,
3   - :content_type => :image
  3 + :content_type => :image, :max_size => 5.megabytes
4 4 validates_as_attachment
5 5 end
... ...
app/views/account/_signup_form.rhtml
  Diff comments   View file @f5a60be
... ... @@ -19,26 +19,30 @@
19 19  
20 20 <%= required_fields_message %>
21 21  
  22 +<div id='signup-email'>
  23 +<%= required f.text_field(:email,
  24 + :help => help=_('This e-mail address will be used to contact you.')) %>
  25 +<div class='help-small-msg'><%= help %></div>
  26 +</div>
  27 +
22 28 <%= required f.text_field(:login,
  29 + :help => help=_('Insert your login'),
23 30 :onchange => 'this.value = convToValidLogin( this.value )') %>
24   -<small><%= help %></small>
25   -
26   -<%= observe_field 'user_login', :url => {:action => 'check_url'}, :with => 'identifier', :update => 'url-check' %>
27   -
28 31 <div id='url-check'>
  32 +<div class='help-small-msg'><%= help %></div>
29 33 </div>
30 34  
31   -<%= required f.text_field(:email,
32   - :help => help=_('This e-mail address will be used to contact you.')) %>
33   -<small><%= help %></small>
  35 +<%= observe_field 'user_login', :url => {:action => 'check_url'}, :with => 'identifier', :update => 'url-check' %>
34 36  
  37 +<div id='signup-password'>
35 38 <%= required f.password_field(:password,
36 39 :help => help=_('Choose a password that you can remember easily.')) %>
37   -<small><%= help %></small>
  40 +<div class='help-small-msg'><%= help %></div>
  41 +</div>
38 42  
39 43 <%= required f.password_field(:password_confirmation,
40 44 :help => help=_('To confirm, repeat your password.')) %>
41   -<small><%= help %></small>
  45 +<div class='help-small-msg'><%= help %></div>
42 46  
43 47 <% labelled_fields_for :profile_data, @person do |f| %>
44 48 <%= render :partial => 'profile_editor/person_form', :locals => {:f => f} %>
... ... @@ -52,7 +56,7 @@
52 56 page['terms-of-use'].show
53 57 end %>
54 58  
55   - <div id='terms-of-use' style='max-height: 200px; overflow: auto; display:none;'>
  59 + <div id='terms-of-use' style='display: none;'>
56 60 <%= @terms_of_use %>
57 61 <%= link_to_function(_('Hide'), nil) do |page|
58 62 page['terms-of-use'].hide
... ...
app/views/account/logout_popup.rhtml
  Diff comments   View file @f5a60be
1   -<p><%= _('Are you sure you want to get out?') %></p>
2   -
  1 +<h2><%= _('Are you sure you want to get out?') %></h2>
  2 +<p>
3 3 <% button_bar do %>
4 4 <%= button :ok, _('Yes'), { :controller => 'account', :action => 'logout' } %>
5 5 <%= lightbox_close_button _('No, I want to stay.') %>
6 6 <% end %>
  7 +</p>
... ...
app/views/account/wizard.rhtml
  Diff comments   View file @f5a60be
1 1 <%= lightbox_close_button _('Close') %>
2 2  
3   -<iframe id='wizard-iframe' width=100% height='420px' src="<%= url_for(:controller => 'account', :action => 'signup', :wizard => true) %>" >
  3 +<iframe id='wizard-iframe' width='590px' height='410px' border='0' src="<%= url_for(:controller => 'account', :action => 'signup', :wizard => true) %>" >
4 4 <p><%= _('Your browser does not support iframes.') %></p>
5 5 </iframe>
... ...
app/views/cms/edit.rhtml
  Diff comments   View file @f5a60be
... ... @@ -51,3 +51,5 @@
51 51 <% if environment.enabled?('media_panel') && [TinyMceArticle, Event, EnterpriseHomepage].any?{|klass| @article.kind_of?(klass)} %>
52 52 <%= render :partial => 'media_listing' %>
53 53 <% end %>
  54 +
  55 +<br style='clear: both'/>
... ...
app/views/cms/media_listing.rhtml
  Diff comments   View file @f5a60be
... ... @@ -30,22 +30,9 @@
30 30 }
31 31 registerDocumentSize();
32 32 </script>
33   - <div id='media-listing'>
34   - <div id='media-listing-images'>
35   - <h3><%= _('Images') %></h3>
36   - <%= select_folder('folder', 'image_folder_id', @image_folders, {}, :onchange => remote_function(:with => "'image_folder_id=' + value + '&ipage=1'", :url => { :action => :media_listing, :format => 'js' }) ) %>
37   - <%= render :partial => 'image_thumb', :locals => { :images => @images } %>
38   - </div><!-- id='media-listing-images' -->
39   - <div id='media-listing-documents'>
40   - <h3><%= _('Documents') %></h3>
41   - <%= select_folder('folder', 'document_folder_id', @document_folders, {}, :onchange => remote_function(:with => "'document_folder_id=' + value + '&dpage=1'", :url => { :action => :media_listing }) ) %>
42   - <%= render :partial => 'document_link', :locals => { :documents => @documents } %>
43   - </div><!-- id='media-listing-documents' -->
44   - <br style="clear:both" />
45   - <p><big><%= _('Drag images and documents to add them to the text.') %></big></p>
46   - <br style="clear:both" />
47   - </div><!-- id='media-listing' -->
48 33 <div id='media-listing-upload'>
  34 + <p><%= _("Include files in some folder or select from the list below to add images and documents to the text editor beside (max size %s)") % UploadedFile.max_size.to_humanreadable %></p>
  35 +
49 36 <div id="notice" onclick="Element.hide('notice');" style="display:none">
50 37 <% unless flash[:notice].nil? %>
51 38 <%= flash[:notice] unless flash[:notice].nil? %>
... ... @@ -58,5 +45,22 @@
58 45 <%= render :partial => 'upload_file_form', :locals => { :size => '30' } %>
59 46 <% end %>
60 47 </div><!-- id='media-listing-upload' -->
  48 + <hr/>
  49 + <div id='media-listing'>
  50 + <h3><%= _('Folders') %></h3>
  51 + <p><%= _('Drag images and documents to add them to the text. If needed, resize images by clicking the tree icon on editor.') %></p>
  52 +
  53 + <div id='media-listing-images'>
  54 + <h4><%= _('Images') %></h4>
  55 + <%= select_folder('', 'folder', 'image_folder_id', @image_folders, {}, :onchange => remote_function(:with => "'image_folder_id=' + value + '&ipage=1'", :url => { :action => :media_listing, :format => 'js' }) ) %>
  56 + <%= render :partial => 'image_thumb', :locals => { :images => @images } %>
  57 + </div><!-- id='media-listing-images' -->
  58 + <div id='media-listing-documents'>
  59 + <h4><%= _('Documents') %></h4>
  60 + <%= select_folder('', 'folder', 'document_folder_id', @document_folders, {}, :onchange => remote_function(:with => "'document_folder_id=' + value + '&dpage=1'", :url => { :action => :media_listing }) ) %>
  61 + <%= render :partial => 'document_link', :locals => { :documents => @documents } %>
  62 + </div><!-- id='media-listing-documents' -->
  63 + <br style="clear:both" />
  64 + </div><!-- id='media-listing' -->
61 65 </body>
62 66 </html>
... ...
app/views/home/index.rhtml
  Diff comments   View file @f5a60be
1 1 <% if environment.enabled?('display_wizard_signup') && !logged_in? %>
2   - <%= lightbox_button(:new, _('Signup'), { :controller => 'account', :action => 'wizard' }, :class => 'wizard') %>
  2 + <%= lightbox_button(:new, _('Signup'), { :controller => 'account', :action => 'wizard' }, :class => 'wizard', :id => 'signup-wizard') %>
3 3 <% end %>
4 4  
5 5 <% if @has_news %>
... ...
app/views/layouts/wizard.rhtml
  Diff comments   View file @f5a60be
... ... @@ -11,9 +11,9 @@
11 11  
12 12 <%=
13 13 # Load the principal css files:
14   - stylesheet_import( %w( common button search forms)
  14 + stylesheet_import( %w( common button search forms profiles)
15 15 ) + "\n" +
16   - stylesheet_import( %w( common button search forms),
  16 + stylesheet_import( %w( common button search forms profiles),
17 17 :themed_source => true ) + "\n" +
18 18 # Load the boxes's css file if each exists:
19 19 import_blocks_stylesheets +
... ... @@ -22,13 +22,9 @@
22 22 %>
23 23 </head>
24 24  
25   - <body class='noosfero'>
26   - <div id="iframe">
27   - <div id="content">
  25 + <body class='noosfero' id='wizard'>
28 26 <div id="wizard-content">
29 27 <%= yield %>
30 28 </div><!-- id="wizard-content" -->
31   - </div><!-- id="content" -->
32   - </div><!-- id="frame" -->
33 29 </body>
34 30 </html>
... ...
app/views/memberships/new_community.rhtml
  Diff comments   View file @f5a60be
... ... @@ -17,11 +17,9 @@
17 17 <%= f.text_field('tag_list', :size => 64) %>
18 18 <%= content_tag( 'small', _('Separate tags with commas') ) %>
19 19  
20   - <div id="profile_change_picture">
21   - <% f.fields_for :image_builder, @community.image do |i| %>
22   - <%= file_field_or_thumbnail(_('Image:'), @community.image, i) %>
23   - <% end %>
24   - </div>
  20 + <% f.fields_for :image_builder, @community.image do |i| %>
  21 + <%= file_field_or_thumbnail(_('Image:'), @community.image, i) %>
  22 + <% end %>
25 23  
26 24 <div style='margin-bottom: 1em; margin-top: 1em;'>
27 25 <%= _('New members must be approved:')%>
... ...
app/views/search/communities.rhtml
  Diff comments   View file @f5a60be
... ... @@ -12,11 +12,12 @@
12 12 <div class='atention'><%= __('Choose the communities you want to join and/or create your own.') %></div>
13 13 <% end %>
14 14  
15   -<%# FIXME ARMENGUE %>
16   -<%= display_results(false) %>
17   -
18   -<%= pagination_links @results.values.first %>
  15 +<div id='search-results-and-pages'>
  16 + <%# FIXME ARMENGUE %>
  17 + <%= display_results(false) %>
19 18  
  19 + <%= pagination_links @results.values.first %>
  20 +</div>
20 21  
21 22 <% if logged_in? %>
22 23 <% button_bar do %>
... ...
app/views/tasks/_approve_article.rhtml
  Diff comments   View file @f5a60be
... ... @@ -21,7 +21,7 @@
21 21  
22 22 <%= labelled_form_field _('Name for publishing'), f.text_field(:name, :style => 'width:80%;') %>
23 23  
24   - <%= labelled_form_field(_('Select the folder where the article must be published'), select_folder('task', 'article_parent_id', task.target.folders)) %>
  24 + <%= select_folder(_('Select the folder where the article must be published'), 'task', 'article_parent_id', task.target.folders) %>
25 25 <%= labelled_form_field( _('Highlight'), check_box_tag(:highlighted, true)) %>
26 26 <%= labelled_form_field _('Comment for author'), f.text_area(:closing_statment, :style => 'height:200px; width:80%;') %>
27 27  
... ...
lib/noosfero.rb
  Diff comments   View file @f5a60be
1 1 module Noosfero
2 2 PROJECT = 'noosfero'
3   - VERSION = '0.17.0'
  3 + VERSION = '0.17.1'
4 4 SVN_ROOT = 'https://svn.colivre.coop.br/svn/noosfero'
5 5  
6 6 def self.pattern_for_controllers_in_directory(dir)
... ...
po/bg/noosfero.po
  Diff comments   View file @f5a60be
... ... @@ -6,8 +6,8 @@
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
9   -"Project-Id-Version: noosfero 0.16.0\n"
10   -"POT-Creation-Date: 2009-05-11 22:11-0300\n"
  9 +"Project-Id-Version: noosfero 0.17.0\n"
  10 +"POT-Creation-Date: 2009-05-18 19:12-0300\n"
11 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -828,11 +828,6 @@ msgstr &quot;&quot;
828 828 msgid "open"
829 829 msgstr ""
830 830  
831   -#: app/helpers/application_helper.rb:523 app/models/folder.rb:8
832   -#: app/models/folder.rb:18
833   -msgid "Folder"
834   -msgstr ""
835   -
836 831 #: app/helpers/application_helper.rb:542
837 832 msgid "Search..."
838 833 msgstr ""
... ... @@ -932,7 +927,7 @@ msgstr &quot;&quot;
932 927 #: app/views/account/accept_terms.rhtml:24 app/views/account/login.rhtml:22
933 928 #: app/views/cms/edit.rhtml:41 app/views/cms/edit.rhtml:43
934 929 #: app/views/cms/edit.rhtml:45 app/views/cms/select_article_type.rhtml:12
935   -#: app/views/memberships/new_community.rhtml:47
  930 +#: app/views/memberships/new_community.rhtml:45
936 931 #: app/views/profile_editor/header_footer.rhtml:13
937 932 #: app/views/box_organizer/edit.rhtml:11 app/views/themes/add_css.rhtml:8
938 933 #: app/views/tasks/_task.rhtml:12 app/views/tasks/_ticket.rhtml:15
... ... @@ -2161,6 +2156,10 @@ msgid &quot;&quot;
2161 2156 "friend."
2162 2157 msgstr ""
2163 2158  
  2159 +#: app/models/folder.rb:8 app/models/folder.rb:18
  2160 +msgid "Folder"
  2161 +msgstr ""
  2162 +
2164 2163 #: app/models/folder.rb:8 app/models/image_gallery.rb:4
2165 2164 msgid "Image gallery"
2166 2165 msgstr ""
... ... @@ -3052,7 +3051,7 @@ msgstr &quot;&quot;
3052 3051 #: app/views/profile_members/index.rhtml:21 app/views/role/show.rhtml:10
3053 3052 #: app/views/role/index.rhtml:12 app/views/account/_profile_details.rhtml:18
3054 3053 #: app/views/enterprise_editor/index.rhtml:20
3055   -#: app/views/memberships/new_community.rhtml:45
  3054 +#: app/views/memberships/new_community.rhtml:43
3056 3055 #: app/views/environment_role_manager/index.rhtml:13
3057 3056 #: app/views/enterprise_validation/details.rhtml:3
3058 3057 #: app/views/enterprise_validation/list_processed.rhtml:3
... ... @@ -3890,16 +3889,28 @@ msgstr &quot;&quot;
3890 3889 msgid "Are you sure that you want to remove this item?"
3891 3890 msgstr ""
3892 3891  
3893   -#: app/views/cms/media_listing.rhtml:35 app/views/themes/edit.rhtml:24
3894   -msgid "Images"
  3892 +#: app/views/cms/media_listing.rhtml:34
  3893 +msgid ""
  3894 +"Include files in some folder or select from the list below to add images and "
  3895 +"documents to the text editor beside (max size %s)"
3895 3896 msgstr ""
3896 3897  
3897   -#: app/views/cms/media_listing.rhtml:40
3898   -msgid "Documents"
  3898 +#: app/views/cms/media_listing.rhtml:50
  3899 +msgid "Folders"
  3900 +msgstr ""
  3901 +
  3902 +#: app/views/cms/media_listing.rhtml:51
  3903 +msgid ""
  3904 +"Drag images and documents to add them to the text. If needed, resize images "
  3905 +"by clicking the tree icon on editor."
3899 3906 msgstr ""
3900 3907  
3901   -#: app/views/cms/media_listing.rhtml:45
3902   -msgid "Drag images and documents to add them to the text."
  3908 +#: app/views/cms/media_listing.rhtml:54 app/views/themes/edit.rhtml:24
  3909 +msgid "Images"
  3910 +msgstr ""
  3911 +
  3912 +#: app/views/cms/media_listing.rhtml:59
  3913 +msgid "Documents"
3903 3914 msgstr ""
3904 3915  
3905 3916 #: app/views/cms/_upload_file_form.rhtml:4
... ... @@ -4074,7 +4085,7 @@ msgstr &quot;&quot;
4074 4085 msgid "Choose the communities you want to join and/or create your own."
4075 4086 msgstr ""
4076 4087  
4077   -#: app/views/search/communities.rhtml:24
  4088 +#: app/views/search/communities.rhtml:25
4078 4089 msgid "New community"
4079 4090 msgstr ""
4080 4091  
... ... @@ -4428,18 +4439,18 @@ msgstr &quot;&quot;
4428 4439 msgid "Creating new community"
4429 4440 msgstr ""
4430 4441  
4431   -#: app/views/memberships/new_community.rhtml:22
  4442 +#: app/views/memberships/new_community.rhtml:21
4432 4443 #: app/views/profile_editor/edit.rhtml:12 app/views/categories/_form.rhtml:27
4433 4444 #: app/views/manage_products/_form.rhtml:10
4434 4445 msgid "Image:"
4435 4446 msgstr ""
4436 4447  
4437   -#: app/views/memberships/new_community.rhtml:27
  4448 +#: app/views/memberships/new_community.rhtml:25
4438 4449 #: app/views/profile_editor/_organization.rhtml:26
4439 4450 msgid "New members must be approved:"
4440 4451 msgstr ""
4441 4452  
4442   -#: app/views/memberships/new_community.rhtml:32
  4453 +#: app/views/memberships/new_community.rhtml:30
4443 4454 #: app/views/profile_editor/_organization.rhtml:31
4444 4455 msgid ""
4445 4456 "<strong>Before</strong> joining this group (a moderator has to accept the "
... ... @@ -4447,14 +4458,14 @@ msgid &quot;&quot;
4447 4458 "website)."
4448 4459 msgstr ""
4449 4460  
4450   -#: app/views/memberships/new_community.rhtml:38
  4461 +#: app/views/memberships/new_community.rhtml:36
4451 4462 #: app/views/profile_editor/_organization.rhtml:37
4452 4463 msgid ""
4453 4464 "<strong>After</strong> joining this group (a moderator can always "
4454 4465 "desactivate access for users later)."
4455 4466 msgstr ""
4456 4467  
4457   -#: app/views/memberships/new_community.rhtml:43 app/views/themes/new.rhtml:8
  4468 +#: app/views/memberships/new_community.rhtml:41 app/views/themes/new.rhtml:8
4458 4469 msgid "Create"
4459 4470 msgstr ""
4460 4471  
... ...
po/de/noosfero.po
  Diff comments   View file @f5a60be
... ... @@ -6,8 +6,8 @@
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
9   -"Project-Id-Version: noosfero 0.16.0\n"
10   -"POT-Creation-Date: 2009-05-11 22:11-0300\n"
  9 +"Project-Id-Version: noosfero 0.17.0\n"
  10 +"POT-Creation-Date: 2009-05-18 19:12-0300\n"
11 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -828,11 +828,6 @@ msgstr &quot;&quot;
828 828 msgid "open"
829 829 msgstr ""
830 830  
831   -#: app/helpers/application_helper.rb:523 app/models/folder.rb:8
832   -#: app/models/folder.rb:18
833   -msgid "Folder"
834   -msgstr ""
835   -
836 831 #: app/helpers/application_helper.rb:542
837 832 msgid "Search..."
838 833 msgstr ""
... ... @@ -932,7 +927,7 @@ msgstr &quot;&quot;
932 927 #: app/views/account/accept_terms.rhtml:24 app/views/account/login.rhtml:22
933 928 #: app/views/cms/edit.rhtml:41 app/views/cms/edit.rhtml:43
934 929 #: app/views/cms/edit.rhtml:45 app/views/cms/select_article_type.rhtml:12
935   -#: app/views/memberships/new_community.rhtml:47
  930 +#: app/views/memberships/new_community.rhtml:45
936 931 #: app/views/profile_editor/header_footer.rhtml:13
937 932 #: app/views/box_organizer/edit.rhtml:11 app/views/themes/add_css.rhtml:8
938 933 #: app/views/tasks/_task.rhtml:12 app/views/tasks/_ticket.rhtml:15
... ... @@ -2161,6 +2156,10 @@ msgid &quot;&quot;
2161 2156 "friend."
2162 2157 msgstr ""
2163 2158  
  2159 +#: app/models/folder.rb:8 app/models/folder.rb:18
  2160 +msgid "Folder"
  2161 +msgstr ""
  2162 +
2164 2163 #: app/models/folder.rb:8 app/models/image_gallery.rb:4
2165 2164 msgid "Image gallery"
2166 2165 msgstr ""
... ... @@ -3052,7 +3051,7 @@ msgstr &quot;&quot;
3052 3051 #: app/views/profile_members/index.rhtml:21 app/views/role/show.rhtml:10
3053 3052 #: app/views/role/index.rhtml:12 app/views/account/_profile_details.rhtml:18
3054 3053 #: app/views/enterprise_editor/index.rhtml:20
3055   -#: app/views/memberships/new_community.rhtml:45
  3054 +#: app/views/memberships/new_community.rhtml:43
3056 3055 #: app/views/environment_role_manager/index.rhtml:13
3057 3056 #: app/views/enterprise_validation/details.rhtml:3
3058 3057 #: app/views/enterprise_validation/list_processed.rhtml:3
... ... @@ -3890,16 +3889,28 @@ msgstr &quot;&quot;
3890 3889 msgid "Are you sure that you want to remove this item?"
3891 3890 msgstr ""
3892 3891  
3893   -#: app/views/cms/media_listing.rhtml:35 app/views/themes/edit.rhtml:24
3894   -msgid "Images"
  3892 +#: app/views/cms/media_listing.rhtml:34
  3893 +msgid ""
  3894 +"Include files in some folder or select from the list below to add images and "
  3895 +"documents to the text editor beside (max size %s)"
3895 3896 msgstr ""
3896 3897  
3897   -#: app/views/cms/media_listing.rhtml:40
3898   -msgid "Documents"
  3898 +#: app/views/cms/media_listing.rhtml:50
  3899 +msgid "Folders"
  3900 +msgstr ""
  3901 +
  3902 +#: app/views/cms/media_listing.rhtml:51
  3903 +msgid ""
  3904 +"Drag images and documents to add them to the text. If needed, resize images "
  3905 +"by clicking the tree icon on editor."
3899 3906 msgstr ""
3900 3907  
3901   -#: app/views/cms/media_listing.rhtml:45
3902   -msgid "Drag images and documents to add them to the text."
  3908 +#: app/views/cms/media_listing.rhtml:54 app/views/themes/edit.rhtml:24
  3909 +msgid "Images"
  3910 +msgstr ""
  3911 +
  3912 +#: app/views/cms/media_listing.rhtml:59
  3913 +msgid "Documents"
3903 3914 msgstr ""
3904 3915  
3905 3916 #: app/views/cms/_upload_file_form.rhtml:4
... ... @@ -4074,7 +4085,7 @@ msgstr &quot;&quot;
4074 4085 msgid "Choose the communities you want to join and/or create your own."
4075 4086 msgstr ""
4076 4087  
4077   -#: app/views/search/communities.rhtml:24
  4088 +#: app/views/search/communities.rhtml:25
4078 4089 msgid "New community"
4079 4090 msgstr ""
4080 4091  
... ... @@ -4428,18 +4439,18 @@ msgstr &quot;&quot;
4428 4439 msgid "Creating new community"
4429 4440 msgstr ""
4430 4441  
4431   -#: app/views/memberships/new_community.rhtml:22
  4442 +#: app/views/memberships/new_community.rhtml:21
4432 4443 #: app/views/profile_editor/edit.rhtml:12 app/views/categories/_form.rhtml:27
4433 4444 #: app/views/manage_products/_form.rhtml:10
4434 4445 msgid "Image:"
4435 4446 msgstr ""
4436 4447  
4437   -#: app/views/memberships/new_community.rhtml:27
  4448 +#: app/views/memberships/new_community.rhtml:25
4438 4449 #: app/views/profile_editor/_organization.rhtml:26
4439 4450 msgid "New members must be approved:"
4440 4451 msgstr ""
4441 4452  
4442   -#: app/views/memberships/new_community.rhtml:32
  4453 +#: app/views/memberships/new_community.rhtml:30
4443 4454 #: app/views/profile_editor/_organization.rhtml:31
4444 4455 msgid ""
4445 4456 "<strong>Before</strong> joining this group (a moderator has to accept the "
... ... @@ -4447,14 +4458,14 @@ msgid &quot;&quot;
4447 4458 "website)."
4448 4459 msgstr ""
4449 4460  
4450   -#: app/views/memberships/new_community.rhtml:38
  4461 +#: app/views/memberships/new_community.rhtml:36
4451 4462 #: app/views/profile_editor/_organization.rhtml:37
4452 4463 msgid ""
4453 4464 "<strong>After</strong> joining this group (a moderator can always "
4454 4465 "desactivate access for users later)."
4455 4466 msgstr ""
4456 4467  
4457   -#: app/views/memberships/new_community.rhtml:43 app/views/themes/new.rhtml:8
  4468 +#: app/views/memberships/new_community.rhtml:41 app/views/themes/new.rhtml:8
4458 4469 msgid "Create"
4459 4470 msgstr ""
4460 4471  
... ...
po/es/noosfero.po
  Diff comments   View file @f5a60be
... ... @@ -6,8 +6,8 @@
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
9   -"Project-Id-Version: noosfero 0.16.0\n"
10   -"POT-Creation-Date: 2009-05-11 22:11-0300\n"
  9 +"Project-Id-Version: noosfero 0.17.0\n"
  10 +"POT-Creation-Date: 2009-05-18 19:12-0300\n"
11 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -828,11 +828,6 @@ msgstr &quot;&quot;
828 828 msgid "open"
829 829 msgstr ""
830 830  
831   -#: app/helpers/application_helper.rb:523 app/models/folder.rb:8
832   -#: app/models/folder.rb:18
833   -msgid "Folder"
834   -msgstr ""
835   -
836 831 #: app/helpers/application_helper.rb:542
837 832 msgid "Search..."
838 833 msgstr ""
... ... @@ -932,7 +927,7 @@ msgstr &quot;&quot;
932 927 #: app/views/account/accept_terms.rhtml:24 app/views/account/login.rhtml:22
933 928 #: app/views/cms/edit.rhtml:41 app/views/cms/edit.rhtml:43
934 929 #: app/views/cms/edit.rhtml:45 app/views/cms/select_article_type.rhtml:12
935   -#: app/views/memberships/new_community.rhtml:47
  930 +#: app/views/memberships/new_community.rhtml:45
936 931 #: app/views/profile_editor/header_footer.rhtml:13
937 932 #: app/views/box_organizer/edit.rhtml:11 app/views/themes/add_css.rhtml:8
938 933 #: app/views/tasks/_task.rhtml:12 app/views/tasks/_ticket.rhtml:15
... ... @@ -2161,6 +2156,10 @@ msgid &quot;&quot;
2161 2156 "friend."
2162 2157 msgstr ""
2163 2158  
  2159 +#: app/models/folder.rb:8 app/models/folder.rb:18
  2160 +msgid "Folder"
  2161 +msgstr ""
  2162 +
2164 2163 #: app/models/folder.rb:8 app/models/image_gallery.rb:4
2165 2164 msgid "Image gallery"
2166 2165 msgstr ""
... ... @@ -3052,7 +3051,7 @@ msgstr &quot;&quot;
3052 3051 #: app/views/profile_members/index.rhtml:21 app/views/role/show.rhtml:10
3053 3052 #: app/views/role/index.rhtml:12 app/views/account/_profile_details.rhtml:18
3054 3053 #: app/views/enterprise_editor/index.rhtml:20
3055   -#: app/views/memberships/new_community.rhtml:45
  3054 +#: app/views/memberships/new_community.rhtml:43
3056 3055 #: app/views/environment_role_manager/index.rhtml:13
3057 3056 #: app/views/enterprise_validation/details.rhtml:3
3058 3057 #: app/views/enterprise_validation/list_processed.rhtml:3
... ... @@ -3890,16 +3889,28 @@ msgstr &quot;&quot;
3890 3889 msgid "Are you sure that you want to remove this item?"
3891 3890 msgstr ""
3892 3891  
3893   -#: app/views/cms/media_listing.rhtml:35 app/views/themes/edit.rhtml:24
3894   -msgid "Images"
  3892 +#: app/views/cms/media_listing.rhtml:34
  3893 +msgid ""
  3894 +"Include files in some folder or select from the list below to add images and "
  3895 +"documents to the text editor beside (max size %s)"
3895 3896 msgstr ""
3896 3897  
3897   -#: app/views/cms/media_listing.rhtml:40
3898   -msgid "Documents"
  3898 +#: app/views/cms/media_listing.rhtml:50
  3899 +msgid "Folders"
  3900 +msgstr ""
  3901 +
  3902 +#: app/views/cms/media_listing.rhtml:51
  3903 +msgid ""
  3904 +"Drag images and documents to add them to the text. If needed, resize images "
  3905 +"by clicking the tree icon on editor."
3899 3906 msgstr ""
3900 3907  
3901   -#: app/views/cms/media_listing.rhtml:45
3902   -msgid "Drag images and documents to add them to the text."
  3908 +#: app/views/cms/media_listing.rhtml:54 app/views/themes/edit.rhtml:24
  3909 +msgid "Images"
  3910 +msgstr ""
  3911 +
  3912 +#: app/views/cms/media_listing.rhtml:59
  3913 +msgid "Documents"
3903 3914 msgstr ""
3904 3915  
3905 3916 #: app/views/cms/_upload_file_form.rhtml:4
... ... @@ -4074,7 +4085,7 @@ msgstr &quot;&quot;
4074 4085 msgid "Choose the communities you want to join and/or create your own."
4075 4086 msgstr ""
4076 4087  
4077   -#: app/views/search/communities.rhtml:24
  4088 +#: app/views/search/communities.rhtml:25
4078 4089 msgid "New community"
4079 4090 msgstr ""
4080 4091  
... ... @@ -4428,18 +4439,18 @@ msgstr &quot;&quot;
4428 4439 msgid "Creating new community"
4429 4440 msgstr ""
4430 4441  
4431   -#: app/views/memberships/new_community.rhtml:22
  4442 +#: app/views/memberships/new_community.rhtml:21
4432 4443 #: app/views/profile_editor/edit.rhtml:12 app/views/categories/_form.rhtml:27
4433 4444 #: app/views/manage_products/_form.rhtml:10
4434 4445 msgid "Image:"
4435 4446 msgstr ""
4436 4447  
4437   -#: app/views/memberships/new_community.rhtml:27
  4448 +#: app/views/memberships/new_community.rhtml:25
4438 4449 #: app/views/profile_editor/_organization.rhtml:26
4439 4450 msgid "New members must be approved:"
4440 4451 msgstr ""
4441 4452  
4442   -#: app/views/memberships/new_community.rhtml:32
  4453 +#: app/views/memberships/new_community.rhtml:30
4443 4454 #: app/views/profile_editor/_organization.rhtml:31
4444 4455 msgid ""
4445 4456 "<strong>Before</strong> joining this group (a moderator has to accept the "
... ... @@ -4447,14 +4458,14 @@ msgid &quot;&quot;
4447 4458 "website)."
4448 4459 msgstr ""
4449 4460  
4450   -#: app/views/memberships/new_community.rhtml:38
  4461 +#: app/views/memberships/new_community.rhtml:36
4451 4462 #: app/views/profile_editor/_organization.rhtml:37
4452 4463 msgid ""
4453 4464 "<strong>After</strong> joining this group (a moderator can always "
4454 4465 "desactivate access for users later)."
4455 4466 msgstr ""
4456 4467  
4457   -#: app/views/memberships/new_community.rhtml:43 app/views/themes/new.rhtml:8
  4468 +#: app/views/memberships/new_community.rhtml:41 app/views/themes/new.rhtml:8
4458 4469 msgid "Create"
4459 4470 msgstr ""
4460 4471  
... ...
po/fr/noosfero.po
  Diff comments   View file @f5a60be
... ... @@ -5,9 +5,9 @@
5 5 #
6 6 msgid ""
7 7 msgstr ""
8   -"Project-Id-Version: noosfero 0.16.0\n"
  8 +"Project-Id-Version: noosfero 0.17.0\n"
9 9 "Report-Msgid-Bugs-To: \n"
10   -"POT-Creation-Date: 2009-05-11 22:11-0300\n"
  10 +"POT-Creation-Date: 2009-05-18 19:12-0300\n"
11 11 "PO-Revision-Date: 2008-06-13 16:15-0300\n"
12 12 "Last-Translator: Raphael Rousseau <pootle.colivre.coop.br@r4f.org>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -846,11 +846,6 @@ msgstr &quot;Catégories&quot;
846 846 msgid "open"
847 847 msgstr "ouvrir"
848 848  
849   -#: app/helpers/application_helper.rb:523 app/models/folder.rb:8
850   -#: app/models/folder.rb:18
851   -msgid "Folder"
852   -msgstr "Dossier"
853   -
854 849 #: app/helpers/application_helper.rb:542
855 850 msgid "Search..."
856 851 msgstr "Chercher..."
... ... @@ -958,7 +953,7 @@ msgstr &quot;&quot;
958 953 #: app/views/account/accept_terms.rhtml:24 app/views/account/login.rhtml:22
959 954 #: app/views/cms/edit.rhtml:41 app/views/cms/edit.rhtml:43
960 955 #: app/views/cms/edit.rhtml:45 app/views/cms/select_article_type.rhtml:12
961   -#: app/views/memberships/new_community.rhtml:47
  956 +#: app/views/memberships/new_community.rhtml:45
962 957 #: app/views/profile_editor/header_footer.rhtml:13
963 958 #: app/views/box_organizer/edit.rhtml:11 app/views/themes/add_css.rhtml:8
964 959 #: app/views/tasks/_task.rhtml:12 app/views/tasks/_ticket.rhtml:15
... ... @@ -2270,6 +2265,10 @@ msgstr &quot;&quot;
2270 2265 "Vous devez être connect(e) à %{system} pour accepter ou refuser %{requestor} "
2271 2266 "comme contact."
2272 2267  
  2268 +#: app/models/folder.rb:8 app/models/folder.rb:18
  2269 +msgid "Folder"
  2270 +msgstr "Dossier"
  2271 +
2273 2272 #: app/models/folder.rb:8 app/models/image_gallery.rb:4
2274 2273 msgid "Image gallery"
2275 2274 msgstr "Galerie d'images"
... ... @@ -3206,7 +3205,7 @@ msgstr &quot;Ôter/effacer&quot;
3206 3205 #: app/views/profile_members/index.rhtml:21 app/views/role/show.rhtml:10
3207 3206 #: app/views/role/index.rhtml:12 app/views/account/_profile_details.rhtml:18
3208 3207 #: app/views/enterprise_editor/index.rhtml:20
3209   -#: app/views/memberships/new_community.rhtml:45
  3208 +#: app/views/memberships/new_community.rhtml:43
3210 3209 #: app/views/environment_role_manager/index.rhtml:13
3211 3210 #: app/views/enterprise_validation/details.rhtml:3
3212 3211 #: app/views/enterprise_validation/list_processed.rhtml:3
... ... @@ -4130,19 +4129,32 @@ msgstr &quot;Partager &quot;
4130 4129 msgid "Are you sure that you want to remove this item?"
4131 4130 msgstr "Êtes-vous sûr(e) de vouloir ôter cet élément ?"
4132 4131  
4133   -#: app/views/cms/media_listing.rhtml:35 app/views/themes/edit.rhtml:24
  4132 +#: app/views/cms/media_listing.rhtml:34
  4133 +msgid ""
  4134 +"Include files in some folder or select from the list below to add images and "
  4135 +"documents to the text editor beside (max size %s)"
  4136 +msgstr ""
  4137 +
  4138 +#: app/views/cms/media_listing.rhtml:50
  4139 +#, fuzzy
  4140 +msgid "Folders"
  4141 +msgstr "Dossier"
  4142 +
  4143 +#: app/views/cms/media_listing.rhtml:51
  4144 +msgid ""
  4145 +"Drag images and documents to add them to the text. If needed, resize images "
  4146 +"by clicking the tree icon on editor."
  4147 +msgstr ""
  4148 +
  4149 +#: app/views/cms/media_listing.rhtml:54 app/views/themes/edit.rhtml:24
4134 4150 msgid "Images"
4135 4151 msgstr "Images"
4136 4152  
4137   -#: app/views/cms/media_listing.rhtml:40
  4153 +#: app/views/cms/media_listing.rhtml:59
4138 4154 #, fuzzy
4139 4155 msgid "Documents"
4140 4156 msgstr "Commentaires"
4141 4157  
4142   -#: app/views/cms/media_listing.rhtml:45
4143   -msgid "Drag images and documents to add them to the text."
4144   -msgstr ""
4145   -
4146 4158 #: app/views/cms/_upload_file_form.rhtml:4
4147 4159 #, fuzzy
4148 4160 msgid "Choose folder to upload files:"
... ... @@ -4327,7 +4339,7 @@ msgstr &quot;Pas de ville&quot;
4327 4339 msgid "Choose the communities you want to join and/or create your own."
4328 4340 msgstr ""
4329 4341  
4330   -#: app/views/search/communities.rhtml:24
  4342 +#: app/views/search/communities.rhtml:25
4331 4343 msgid "New community"
4332 4344 msgstr "Nouveau groupe"
4333 4345  
... ... @@ -4713,18 +4725,18 @@ msgstr &quot;Oui, je veux le/la détruire.&quot;
4713 4725 msgid "Creating new community"
4714 4726 msgstr "Créer un nouveau groupe"
4715 4727  
4716   -#: app/views/memberships/new_community.rhtml:22
  4728 +#: app/views/memberships/new_community.rhtml:21
4717 4729 #: app/views/profile_editor/edit.rhtml:12 app/views/categories/_form.rhtml:27
4718 4730 #: app/views/manage_products/_form.rhtml:10
4719 4731 msgid "Image:"
4720 4732 msgstr "Image :"
4721 4733  
4722   -#: app/views/memberships/new_community.rhtml:27
  4734 +#: app/views/memberships/new_community.rhtml:25
4723 4735 #: app/views/profile_editor/_organization.rhtml:26
4724 4736 msgid "New members must be approved:"
4725 4737 msgstr "Les nouveaux membres doivent être approuvés : "
4726 4738  
4727   -#: app/views/memberships/new_community.rhtml:32
  4739 +#: app/views/memberships/new_community.rhtml:30
4728 4740 #: app/views/profile_editor/_organization.rhtml:31
4729 4741 msgid ""
4730 4742 "<strong>Before</strong> joining this group (a moderator has to accept the "
... ... @@ -4735,7 +4747,7 @@ msgstr &quot;&quot;
4735 4747 "la requête du nouveau membre avant que celui-ci ne puisse accéder à "
4736 4748 "l'intranet ou au site web du groupe)."
4737 4749  
4738   -#: app/views/memberships/new_community.rhtml:38
  4750 +#: app/views/memberships/new_community.rhtml:36
4739 4751 #: app/views/profile_editor/_organization.rhtml:37
4740 4752 msgid ""
4741 4753 "<strong>After</strong> joining this group (a moderator can always "
... ... @@ -4744,7 +4756,7 @@ msgstr &quot;&quot;
4744 4756 "<strong>Après</strong> avoir rejoint ce groupe (un modérateur peut toujours "
4745 4757 "désactiver l'accès des membres plus tard)."
4746 4758  
4747   -#: app/views/memberships/new_community.rhtml:43 app/views/themes/new.rhtml:8
  4759 +#: app/views/memberships/new_community.rhtml:41 app/views/themes/new.rhtml:8
4748 4760 msgid "Create"
4749 4761 msgstr "Créer"
4750 4762  
... ...
po/hy/noosfero.po
  Diff comments   View file @f5a60be
... ... @@ -6,8 +6,8 @@
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
9   -"Project-Id-Version: noosfero 0.16.0\n"
10   -"POT-Creation-Date: 2009-05-11 22:11-0300\n"
  9 +"Project-Id-Version: noosfero 0.17.0\n"
  10 +"POT-Creation-Date: 2009-05-18 19:12-0300\n"
11 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -833,11 +833,6 @@ msgstr &quot;Կատեգորիաներ&quot;
833 833 msgid "open"
834 834 msgstr "բացել"
835 835  
836   -#: app/helpers/application_helper.rb:523 app/models/folder.rb:8
837   -#: app/models/folder.rb:18
838   -msgid "Folder"
839   -msgstr "Թղթապանակ"
840   -
841 836 #: app/helpers/application_helper.rb:542
842 837 msgid "Search..."
843 838 msgstr "Որոնել..."
... ... @@ -943,7 +938,7 @@ msgstr &quot;&quot;
943 938 #: app/views/account/accept_terms.rhtml:24 app/views/account/login.rhtml:22
944 939 #: app/views/cms/edit.rhtml:41 app/views/cms/edit.rhtml:43
945 940 #: app/views/cms/edit.rhtml:45 app/views/cms/select_article_type.rhtml:12
946   -#: app/views/memberships/new_community.rhtml:47
  941 +#: app/views/memberships/new_community.rhtml:45
947 942 #: app/views/profile_editor/header_footer.rhtml:13
948 943 #: app/views/box_organizer/edit.rhtml:11 app/views/themes/add_css.rhtml:8
949 944 #: app/views/tasks/_task.rhtml:12 app/views/tasks/_ticket.rhtml:15
... ... @@ -2192,6 +2187,10 @@ msgid &quot;&quot;
2192 2187 "friend."
2193 2188 msgstr ""
2194 2189  
  2190 +#: app/models/folder.rb:8 app/models/folder.rb:18
  2191 +msgid "Folder"
  2192 +msgstr "Թղթապանակ"
  2193 +
2195 2194 #: app/models/folder.rb:8 app/models/image_gallery.rb:4
2196 2195 msgid "Image gallery"
2197 2196 msgstr "Նկարադարան"
... ... @@ -3103,7 +3102,7 @@ msgstr &quot;Հեռացնել&quot;
3103 3102 #: app/views/profile_members/index.rhtml:21 app/views/role/show.rhtml:10
3104 3103 #: app/views/role/index.rhtml:12 app/views/account/_profile_details.rhtml:18
3105 3104 #: app/views/enterprise_editor/index.rhtml:20
3106   -#: app/views/memberships/new_community.rhtml:45
  3105 +#: app/views/memberships/new_community.rhtml:43
3107 3106 #: app/views/environment_role_manager/index.rhtml:13
3108 3107 #: app/views/enterprise_validation/details.rhtml:3
3109 3108 #: app/views/enterprise_validation/list_processed.rhtml:3
... ... @@ -3976,19 +3975,32 @@ msgstr &quot;&quot;
3976 3975 msgid "Are you sure that you want to remove this item?"
3977 3976 msgstr "Վստա՞ք եք, որ ցականում եք այն հեռացնել:"
3978 3977  
3979   -#: app/views/cms/media_listing.rhtml:35 app/views/themes/edit.rhtml:24
  3978 +#: app/views/cms/media_listing.rhtml:34
  3979 +msgid ""
  3980 +"Include files in some folder or select from the list below to add images and "
  3981 +"documents to the text editor beside (max size %s)"
  3982 +msgstr ""
  3983 +
  3984 +#: app/views/cms/media_listing.rhtml:50
  3985 +#, fuzzy
  3986 +msgid "Folders"
  3987 +msgstr "Թղթապանակ"
  3988 +
  3989 +#: app/views/cms/media_listing.rhtml:51
  3990 +msgid ""
  3991 +"Drag images and documents to add them to the text. If needed, resize images "
  3992 +"by clicking the tree icon on editor."
  3993 +msgstr ""
  3994 +
  3995 +#: app/views/cms/media_listing.rhtml:54 app/views/themes/edit.rhtml:24
3980 3996 msgid "Images"
3981 3997 msgstr ""
3982 3998  
3983   -#: app/views/cms/media_listing.rhtml:40
  3999 +#: app/views/cms/media_listing.rhtml:59
3984 4000 #, fuzzy
3985 4001 msgid "Documents"
3986 4002 msgstr "մեկնաբանություն"
3987 4003  
3988   -#: app/views/cms/media_listing.rhtml:45
3989   -msgid "Drag images and documents to add them to the text."
3990   -msgstr ""
3991   -
3992 4004 #: app/views/cms/_upload_file_form.rhtml:4
3993 4005 msgid "Choose folder to upload files:"
3994 4006 msgstr ""
... ... @@ -4163,7 +4175,7 @@ msgstr &quot;Քաղաք չկա&quot;
4163 4175 msgid "Choose the communities you want to join and/or create your own."
4164 4176 msgstr ""
4165 4177  
4166   -#: app/views/search/communities.rhtml:24
  4178 +#: app/views/search/communities.rhtml:25
4167 4179 msgid "New community"
4168 4180 msgstr ""
4169 4181  
... ... @@ -4533,18 +4545,18 @@ msgstr &quot;Այո, ես ցանկանում եմ վերացնել:&quot;
4533 4545 msgid "Creating new community"
4534 4546 msgstr ""
4535 4547  
4536   -#: app/views/memberships/new_community.rhtml:22
  4548 +#: app/views/memberships/new_community.rhtml:21
4537 4549 #: app/views/profile_editor/edit.rhtml:12 app/views/categories/_form.rhtml:27
4538 4550 #: app/views/manage_products/_form.rhtml:10
4539 4551 msgid "Image:"
4540 4552 msgstr "Նկար"
4541 4553  
4542   -#: app/views/memberships/new_community.rhtml:27
  4554 +#: app/views/memberships/new_community.rhtml:25
4543 4555 #: app/views/profile_editor/_organization.rhtml:26
4544 4556 msgid "New members must be approved:"
4545 4557 msgstr ""
4546 4558  
4547   -#: app/views/memberships/new_community.rhtml:32
  4559 +#: app/views/memberships/new_community.rhtml:30
4548 4560 #: app/views/profile_editor/_organization.rhtml:31
4549 4561 msgid ""
4550 4562 "<strong>Before</strong> joining this group (a moderator has to accept the "
... ... @@ -4552,14 +4564,14 @@ msgid &quot;&quot;
4552 4564 "website)."
4553 4565 msgstr ""
4554 4566  
4555   -#: app/views/memberships/new_community.rhtml:38
  4567 +#: app/views/memberships/new_community.rhtml:36
4556 4568 #: app/views/profile_editor/_organization.rhtml:37
4557 4569 msgid ""
4558 4570 "<strong>After</strong> joining this group (a moderator can always "
4559 4571 "desactivate access for users later)."
4560 4572 msgstr ""
4561 4573  
4562   -#: app/views/memberships/new_community.rhtml:43 app/views/themes/new.rhtml:8
  4574 +#: app/views/memberships/new_community.rhtml:41 app/views/themes/new.rhtml:8
4563 4575 msgid "Create"
4564 4576 msgstr "Ստեղծել"
4565 4577  
... ...
po/it/noosfero.po
  Diff comments   View file @f5a60be
... ... @@ -6,8 +6,8 @@
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
9   -"Project-Id-Version: noosfero 0.16.0\n"
10   -"POT-Creation-Date: 2009-05-11 22:11-0300\n"
  9 +"Project-Id-Version: noosfero 0.17.0\n"
  10 +"POT-Creation-Date: 2009-05-18 19:12-0300\n"
11 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -828,11 +828,6 @@ msgstr &quot;&quot;
828 828 msgid "open"
829 829 msgstr ""
830 830  
831   -#: app/helpers/application_helper.rb:523 app/models/folder.rb:8
832   -#: app/models/folder.rb:18
833   -msgid "Folder"
834   -msgstr ""
835   -
836 831 #: app/helpers/application_helper.rb:542
837 832 msgid "Search..."
838 833 msgstr ""
... ... @@ -932,7 +927,7 @@ msgstr &quot;&quot;
932 927 #: app/views/account/accept_terms.rhtml:24 app/views/account/login.rhtml:22
933 928 #: app/views/cms/edit.rhtml:41 app/views/cms/edit.rhtml:43
934 929 #: app/views/cms/edit.rhtml:45 app/views/cms/select_article_type.rhtml:12
935   -#: app/views/memberships/new_community.rhtml:47
  930 +#: app/views/memberships/new_community.rhtml:45
936 931 #: app/views/profile_editor/header_footer.rhtml:13
937 932 #: app/views/box_organizer/edit.rhtml:11 app/views/themes/add_css.rhtml:8
938 933 #: app/views/tasks/_task.rhtml:12 app/views/tasks/_ticket.rhtml:15
... ... @@ -2161,6 +2156,10 @@ msgid &quot;&quot;
2161 2156 "friend."
2162 2157 msgstr ""
2163 2158  
  2159 +#: app/models/folder.rb:8 app/models/folder.rb:18
  2160 +msgid "Folder"
  2161 +msgstr ""
  2162 +
2164 2163 #: app/models/folder.rb:8 app/models/image_gallery.rb:4
2165 2164 msgid "Image gallery"
2166 2165 msgstr ""
... ... @@ -3052,7 +3051,7 @@ msgstr &quot;&quot;
3052 3051 #: app/views/profile_members/index.rhtml:21 app/views/role/show.rhtml:10
3053 3052 #: app/views/role/index.rhtml:12 app/views/account/_profile_details.rhtml:18
3054 3053 #: app/views/enterprise_editor/index.rhtml:20
3055   -#: app/views/memberships/new_community.rhtml:45
  3054 +#: app/views/memberships/new_community.rhtml:43
3056 3055 #: app/views/environment_role_manager/index.rhtml:13
3057 3056 #: app/views/enterprise_validation/details.rhtml:3
3058 3057 #: app/views/enterprise_validation/list_processed.rhtml:3
... ... @@ -3890,16 +3889,28 @@ msgstr &quot;&quot;
3890 3889 msgid "Are you sure that you want to remove this item?"
3891 3890 msgstr ""
3892 3891  
3893   -#: app/views/cms/media_listing.rhtml:35 app/views/themes/edit.rhtml:24
3894   -msgid "Images"
  3892 +#: app/views/cms/media_listing.rhtml:34
  3893 +msgid ""
  3894 +"Include files in some folder or select from the list below to add images and "
  3895 +"documents to the text editor beside (max size %s)"
3895 3896 msgstr ""
3896 3897  
3897   -#: app/views/cms/media_listing.rhtml:40
3898   -msgid "Documents"
  3898 +#: app/views/cms/media_listing.rhtml:50
  3899 +msgid "Folders"
  3900 +msgstr ""
  3901 +
  3902 +#: app/views/cms/media_listing.rhtml:51
  3903 +msgid ""
  3904 +"Drag images and documents to add them to the text. If needed, resize images "
  3905 +"by clicking the tree icon on editor."
3899 3906 msgstr ""
3900 3907  
3901   -#: app/views/cms/media_listing.rhtml:45
3902   -msgid "Drag images and documents to add them to the text."
  3908 +#: app/views/cms/media_listing.rhtml:54 app/views/themes/edit.rhtml:24
  3909 +msgid "Images"
  3910 +msgstr ""
  3911 +
  3912 +#: app/views/cms/media_listing.rhtml:59
  3913 +msgid "Documents"
3903 3914 msgstr ""
3904 3915  
3905 3916 #: app/views/cms/_upload_file_form.rhtml:4
... ... @@ -4074,7 +4085,7 @@ msgstr &quot;&quot;
4074 4085 msgid "Choose the communities you want to join and/or create your own."
4075 4086 msgstr ""
4076 4087  
4077   -#: app/views/search/communities.rhtml:24
  4088 +#: app/views/search/communities.rhtml:25
4078 4089 msgid "New community"
4079 4090 msgstr ""
4080 4091  
... ... @@ -4428,18 +4439,18 @@ msgstr &quot;&quot;
4428 4439 msgid "Creating new community"
4429 4440 msgstr ""
4430 4441  
4431   -#: app/views/memberships/new_community.rhtml:22
  4442 +#: app/views/memberships/new_community.rhtml:21
4432 4443 #: app/views/profile_editor/edit.rhtml:12 app/views/categories/_form.rhtml:27
4433 4444 #: app/views/manage_products/_form.rhtml:10
4434 4445 msgid "Image:"
4435 4446 msgstr ""
4436 4447  
4437   -#: app/views/memberships/new_community.rhtml:27
  4448 +#: app/views/memberships/new_community.rhtml:25
4438 4449 #: app/views/profile_editor/_organization.rhtml:26
4439 4450 msgid "New members must be approved:"
4440 4451 msgstr ""
4441 4452  
4442   -#: app/views/memberships/new_community.rhtml:32
  4453 +#: app/views/memberships/new_community.rhtml:30
4443 4454 #: app/views/profile_editor/_organization.rhtml:31
4444 4455 msgid ""
4445 4456 "<strong>Before</strong> joining this group (a moderator has to accept the "
... ... @@ -4447,14 +4458,14 @@ msgid &quot;&quot;
4447 4458 "website)."
4448 4459 msgstr ""
4449 4460  
4450   -#: app/views/memberships/new_community.rhtml:38
  4461 +#: app/views/memberships/new_community.rhtml:36
4451 4462 #: app/views/profile_editor/_organization.rhtml:37
4452 4463 msgid ""
4453 4464 "<strong>After</strong> joining this group (a moderator can always "
4454 4465 "desactivate access for users later)."
4455 4466 msgstr ""
4456 4467  
4457   -#: app/views/memberships/new_community.rhtml:43 app/views/themes/new.rhtml:8
  4468 +#: app/views/memberships/new_community.rhtml:41 app/views/themes/new.rhtml:8
4458 4469 msgid "Create"
4459 4470 msgstr ""
4460 4471  
... ...
po/nl/noosfero.po
  Diff comments   View file @f5a60be
... ... @@ -6,8 +6,8 @@
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
9   -"Project-Id-Version: noosfero 0.16.0\n"
10   -"POT-Creation-Date: 2009-05-11 22:11-0300\n"
  9 +"Project-Id-Version: noosfero 0.17.0\n"
  10 +"POT-Creation-Date: 2009-05-18 19:12-0300\n"
11 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -828,11 +828,6 @@ msgstr &quot;&quot;
828 828 msgid "open"
829 829 msgstr ""
830 830  
831   -#: app/helpers/application_helper.rb:523 app/models/folder.rb:8
832   -#: app/models/folder.rb:18
833   -msgid "Folder"
834   -msgstr ""
835   -
836 831 #: app/helpers/application_helper.rb:542
837 832 msgid "Search..."
838 833 msgstr ""
... ... @@ -932,7 +927,7 @@ msgstr &quot;&quot;
932 927 #: app/views/account/accept_terms.rhtml:24 app/views/account/login.rhtml:22
933 928 #: app/views/cms/edit.rhtml:41 app/views/cms/edit.rhtml:43
934 929 #: app/views/cms/edit.rhtml:45 app/views/cms/select_article_type.rhtml:12
935   -#: app/views/memberships/new_community.rhtml:47
  930 +#: app/views/memberships/new_community.rhtml:45
936 931 #: app/views/profile_editor/header_footer.rhtml:13
937 932 #: app/views/box_organizer/edit.rhtml:11 app/views/themes/add_css.rhtml:8
938 933 #: app/views/tasks/_task.rhtml:12 app/views/tasks/_ticket.rhtml:15
... ... @@ -2161,6 +2156,10 @@ msgid &quot;&quot;
2161 2156 "friend."
2162 2157 msgstr ""
2163 2158  
  2159 +#: app/models/folder.rb:8 app/models/folder.rb:18
  2160 +msgid "Folder"
  2161 +msgstr ""
  2162 +
2164 2163 #: app/models/folder.rb:8 app/models/image_gallery.rb:4
2165 2164 msgid "Image gallery"
2166 2165 msgstr ""
... ... @@ -3052,7 +3051,7 @@ msgstr &quot;&quot;
3052 3051 #: app/views/profile_members/index.rhtml:21 app/views/role/show.rhtml:10
3053 3052 #: app/views/role/index.rhtml:12 app/views/account/_profile_details.rhtml:18
3054 3053 #: app/views/enterprise_editor/index.rhtml:20
3055   -#: app/views/memberships/new_community.rhtml:45
  3054 +#: app/views/memberships/new_community.rhtml:43
3056 3055 #: app/views/environment_role_manager/index.rhtml:13
3057 3056 #: app/views/enterprise_validation/details.rhtml:3
3058 3057 #: app/views/enterprise_validation/list_processed.rhtml:3
... ... @@ -3890,16 +3889,28 @@ msgstr &quot;&quot;
3890 3889 msgid "Are you sure that you want to remove this item?"
3891 3890 msgstr ""
3892 3891  
3893   -#: app/views/cms/media_listing.rhtml:35 app/views/themes/edit.rhtml:24
3894   -msgid "Images"
  3892 +#: app/views/cms/media_listing.rhtml:34
  3893 +msgid ""
  3894 +"Include files in some folder or select from the list below to add images and "
  3895 +"documents to the text editor beside (max size %s)"
3895 3896 msgstr ""
3896 3897  
3897   -#: app/views/cms/media_listing.rhtml:40
3898   -msgid "Documents"
  3898 +#: app/views/cms/media_listing.rhtml:50
  3899 +msgid "Folders"
  3900 +msgstr ""
  3901 +
  3902 +#: app/views/cms/media_listing.rhtml:51
  3903 +msgid ""
  3904 +"Drag images and documents to add them to the text. If needed, resize images "
  3905 +"by clicking the tree icon on editor."
3899 3906 msgstr ""
3900 3907  
3901   -#: app/views/cms/media_listing.rhtml:45
3902   -msgid "Drag images and documents to add them to the text."
  3908 +#: app/views/cms/media_listing.rhtml:54 app/views/themes/edit.rhtml:24
  3909 +msgid "Images"
  3910 +msgstr ""
  3911 +
  3912 +#: app/views/cms/media_listing.rhtml:59
  3913 +msgid "Documents"
3903 3914 msgstr ""
3904 3915  
3905 3916 #: app/views/cms/_upload_file_form.rhtml:4
... ... @@ -4074,7 +4085,7 @@ msgstr &quot;&quot;
4074 4085 msgid "Choose the communities you want to join and/or create your own."
4075 4086 msgstr ""
4076 4087  
4077   -#: app/views/search/communities.rhtml:24
  4088 +#: app/views/search/communities.rhtml:25
4078 4089 msgid "New community"
4079 4090 msgstr ""
4080 4091  
... ... @@ -4428,18 +4439,18 @@ msgstr &quot;&quot;
4428 4439 msgid "Creating new community"
4429 4440 msgstr ""
4430 4441  
4431   -#: app/views/memberships/new_community.rhtml:22
  4442 +#: app/views/memberships/new_community.rhtml:21
4432 4443 #: app/views/profile_editor/edit.rhtml:12 app/views/categories/_form.rhtml:27
4433 4444 #: app/views/manage_products/_form.rhtml:10
4434 4445 msgid "Image:"
4435 4446 msgstr ""
4436 4447  
4437   -#: app/views/memberships/new_community.rhtml:27
  4448 +#: app/views/memberships/new_community.rhtml:25
4438 4449 #: app/views/profile_editor/_organization.rhtml:26
4439 4450 msgid "New members must be approved:"
4440 4451 msgstr ""
4441 4452  
4442   -#: app/views/memberships/new_community.rhtml:32
  4453 +#: app/views/memberships/new_community.rhtml:30
4443 4454 #: app/views/profile_editor/_organization.rhtml:31
4444 4455 msgid ""
4445 4456 "<strong>Before</strong> joining this group (a moderator has to accept the "
... ... @@ -4447,14 +4458,14 @@ msgid &quot;&quot;
4447 4458 "website)."
4448 4459 msgstr ""
4449 4460  
4450   -#: app/views/memberships/new_community.rhtml:38
  4461 +#: app/views/memberships/new_community.rhtml:36
4451 4462 #: app/views/profile_editor/_organization.rhtml:37
4452 4463 msgid ""
4453 4464 "<strong>After</strong> joining this group (a moderator can always "
4454 4465 "desactivate access for users later)."
4455 4466 msgstr ""
4456 4467  
4457   -#: app/views/memberships/new_community.rhtml:43 app/views/themes/new.rhtml:8
  4468 +#: app/views/memberships/new_community.rhtml:41 app/views/themes/new.rhtml:8
4458 4469 msgid "Create"
4459 4470 msgstr ""
4460 4471  
... ...
po/noosfero.pot
  Diff comments   View file @f5a60be
... ... @@ -6,8 +6,8 @@
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
9   -"Project-Id-Version: noosfero 0.16.0\n"
10   -"POT-Creation-Date: 2009-05-11 22:11-0300\n"
  9 +"Project-Id-Version: noosfero 0.17.0\n"
  10 +"POT-Creation-Date: 2009-05-18 19:12-0300\n"
11 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -828,11 +828,6 @@ msgstr &quot;&quot;
828 828 msgid "open"
829 829 msgstr ""
830 830  
831   -#: app/helpers/application_helper.rb:523 app/models/folder.rb:8
832   -#: app/models/folder.rb:18
833   -msgid "Folder"
834   -msgstr ""
835   -
836 831 #: app/helpers/application_helper.rb:542
837 832 msgid "Search..."
838 833 msgstr ""
... ... @@ -932,7 +927,7 @@ msgstr &quot;&quot;
932 927 #: app/views/account/accept_terms.rhtml:24 app/views/account/login.rhtml:22
933 928 #: app/views/cms/edit.rhtml:41 app/views/cms/edit.rhtml:43
934 929 #: app/views/cms/edit.rhtml:45 app/views/cms/select_article_type.rhtml:12
935   -#: app/views/memberships/new_community.rhtml:47
  930 +#: app/views/memberships/new_community.rhtml:45
936 931 #: app/views/profile_editor/header_footer.rhtml:13
937 932 #: app/views/box_organizer/edit.rhtml:11 app/views/themes/add_css.rhtml:8
938 933 #: app/views/tasks/_task.rhtml:12 app/views/tasks/_ticket.rhtml:15
... ... @@ -2161,6 +2156,10 @@ msgid &quot;&quot;
2161 2156 "friend."
2162 2157 msgstr ""
2163 2158  
  2159 +#: app/models/folder.rb:8 app/models/folder.rb:18
  2160 +msgid "Folder"
  2161 +msgstr ""
  2162 +
2164 2163 #: app/models/folder.rb:8 app/models/image_gallery.rb:4
2165 2164 msgid "Image gallery"
2166 2165 msgstr ""
... ... @@ -3052,7 +3051,7 @@ msgstr &quot;&quot;
3052 3051 #: app/views/profile_members/index.rhtml:21 app/views/role/show.rhtml:10
3053 3052 #: app/views/role/index.rhtml:12 app/views/account/_profile_details.rhtml:18
3054 3053 #: app/views/enterprise_editor/index.rhtml:20
3055   -#: app/views/memberships/new_community.rhtml:45
  3054 +#: app/views/memberships/new_community.rhtml:43
3056 3055 #: app/views/environment_role_manager/index.rhtml:13
3057 3056 #: app/views/enterprise_validation/details.rhtml:3
3058 3057 #: app/views/enterprise_validation/list_processed.rhtml:3
... ... @@ -3890,16 +3889,28 @@ msgstr &quot;&quot;
3890 3889 msgid "Are you sure that you want to remove this item?"
3891 3890 msgstr ""
3892 3891  
3893   -#: app/views/cms/media_listing.rhtml:35 app/views/themes/edit.rhtml:24
3894   -msgid "Images"
  3892 +#: app/views/cms/media_listing.rhtml:34
  3893 +msgid ""
  3894 +"Include files in some folder or select from the list below to add images and "
  3895 +"documents to the text editor beside (max size %s)"
3895 3896 msgstr ""
3896 3897  
3897   -#: app/views/cms/media_listing.rhtml:40
3898   -msgid "Documents"
  3898 +#: app/views/cms/media_listing.rhtml:50
  3899 +msgid "Folders"
  3900 +msgstr ""
  3901 +
  3902 +#: app/views/cms/media_listing.rhtml:51
  3903 +msgid ""
  3904 +"Drag images and documents to add them to the text. If needed, resize images "
  3905 +"by clicking the tree icon on editor."
3899 3906 msgstr ""
3900 3907  
3901   -#: app/views/cms/media_listing.rhtml:45
3902   -msgid "Drag images and documents to add them to the text."
  3908 +#: app/views/cms/media_listing.rhtml:54 app/views/themes/edit.rhtml:24
  3909 +msgid "Images"
  3910 +msgstr ""
  3911 +
  3912 +#: app/views/cms/media_listing.rhtml:59
  3913 +msgid "Documents"
3903 3914 msgstr ""
3904 3915  
3905 3916 #: app/views/cms/_upload_file_form.rhtml:4
... ... @@ -4074,7 +4085,7 @@ msgstr &quot;&quot;
4074 4085 msgid "Choose the communities you want to join and/or create your own."
4075 4086 msgstr ""
4076 4087  
4077   -#: app/views/search/communities.rhtml:24
  4088 +#: app/views/search/communities.rhtml:25
4078 4089 msgid "New community"
4079 4090 msgstr ""
4080 4091  
... ... @@ -4428,18 +4439,18 @@ msgstr &quot;&quot;
4428 4439 msgid "Creating new community"
4429 4440 msgstr ""
4430 4441  
4431   -#: app/views/memberships/new_community.rhtml:22
  4442 +#: app/views/memberships/new_community.rhtml:21
4432 4443 #: app/views/profile_editor/edit.rhtml:12 app/views/categories/_form.rhtml:27
4433 4444 #: app/views/manage_products/_form.rhtml:10
4434 4445 msgid "Image:"
4435 4446 msgstr ""
4436 4447  
4437   -#: app/views/memberships/new_community.rhtml:27
  4448 +#: app/views/memberships/new_community.rhtml:25
4438 4449 #: app/views/profile_editor/_organization.rhtml:26
4439 4450 msgid "New members must be approved:"
4440 4451 msgstr ""
4441 4452  
4442   -#: app/views/memberships/new_community.rhtml:32
  4453 +#: app/views/memberships/new_community.rhtml:30
4443 4454 #: app/views/profile_editor/_organization.rhtml:31
4444 4455 msgid ""
4445 4456 "<strong>Before</strong> joining this group (a moderator has to accept the "
... ... @@ -4447,14 +4458,14 @@ msgid &quot;&quot;
4447 4458 "website)."
4448 4459 msgstr ""
4449 4460  
4450   -#: app/views/memberships/new_community.rhtml:38
  4461 +#: app/views/memberships/new_community.rhtml:36
4451 4462 #: app/views/profile_editor/_organization.rhtml:37
4452 4463 msgid ""
4453 4464 "<strong>After</strong> joining this group (a moderator can always "
4454 4465 "desactivate access for users later)."
4455 4466 msgstr ""
4456 4467  
4457   -#: app/views/memberships/new_community.rhtml:43 app/views/themes/new.rhtml:8
  4468 +#: app/views/memberships/new_community.rhtml:41 app/views/themes/new.rhtml:8
4458 4469 msgid "Create"
4459 4470 msgstr ""
4460 4471  
... ...
po/pt_BR/noosfero.po
  Diff comments   View file @f5a60be
... ... @@ -11,9 +11,9 @@
11 11 #
12 12 msgid ""
13 13 msgstr ""
14   -"Project-Id-Version: noosfero 0.16.0\n"
15   -"POT-Creation-Date: 2009-05-11 22:11-0300\n"
16   -"PO-Revision-Date: 2009-05-11 22:48-0300\n"
  14 +"Project-Id-Version: noosfero 0.17.0\n"
  15 +"POT-Creation-Date: 2009-05-18 19:12-0300\n"
  16 +"PO-Revision-Date: 2009-05-18 19:49-0300\n"
17 17 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
18 18 "Language-Team: LANGUAGE <LL@li.org>\n"
19 19 "MIME-Version: 1.0\n"
... ... @@ -834,11 +834,6 @@ msgstr &quot;Categorias&quot;
834 834 msgid "open"
835 835 msgstr "aberto"
836 836  
837   -#: app/helpers/application_helper.rb:523 app/models/folder.rb:8
838   -#: app/models/folder.rb:18
839   -msgid "Folder"
840   -msgstr "Pasta"
841   -
842 837 #: app/helpers/application_helper.rb:542
843 838 msgid "Search..."
844 839 msgstr "Busca..."
... ... @@ -942,7 +937,7 @@ msgstr &quot;&quot;
942 937 #: app/views/account/accept_terms.rhtml:24 app/views/account/login.rhtml:22
943 938 #: app/views/cms/edit.rhtml:41 app/views/cms/edit.rhtml:43
944 939 #: app/views/cms/edit.rhtml:45 app/views/cms/select_article_type.rhtml:12
945   -#: app/views/memberships/new_community.rhtml:47
  940 +#: app/views/memberships/new_community.rhtml:45
946 941 #: app/views/profile_editor/header_footer.rhtml:13
947 942 #: app/views/box_organizer/edit.rhtml:11 app/views/themes/add_css.rhtml:8
948 943 #: app/views/tasks/_task.rhtml:12 app/views/tasks/_ticket.rhtml:15
... ... @@ -2209,6 +2204,10 @@ msgstr &quot;&quot;
2209 2204 "Você precisa entrar no %{system} para poder aceitar %{requestor} como seu"
2210 2205 "(sua) amigo(a)."
2211 2206  
  2207 +#: app/models/folder.rb:8 app/models/folder.rb:18
  2208 +msgid "Folder"
  2209 +msgstr "Pasta"
  2210 +
2212 2211 #: app/models/folder.rb:8 app/models/image_gallery.rb:4
2213 2212 msgid "Image gallery"
2214 2213 msgstr "Galeria de Imagens"
... ... @@ -3124,7 +3123,7 @@ msgstr &quot;Remover&quot;
3124 3123 #: app/views/profile_members/index.rhtml:21 app/views/role/show.rhtml:10
3125 3124 #: app/views/role/index.rhtml:12 app/views/account/_profile_details.rhtml:18
3126 3125 #: app/views/enterprise_editor/index.rhtml:20
3127   -#: app/views/memberships/new_community.rhtml:45
  3126 +#: app/views/memberships/new_community.rhtml:43
3128 3127 #: app/views/environment_role_manager/index.rhtml:13
3129 3128 #: app/views/enterprise_validation/details.rhtml:3
3130 3129 #: app/views/enterprise_validation/list_processed.rhtml:3
... ... @@ -4027,18 +4026,33 @@ msgstr &quot;Divulgar&quot;
4027 4026 msgid "Are you sure that you want to remove this item?"
4028 4027 msgstr "Tem certeza que quer excluir este ítem?"
4029 4028  
4030   -#: app/views/cms/media_listing.rhtml:35 app/views/themes/edit.rhtml:24
  4029 +#: app/views/cms/media_listing.rhtml:34
  4030 +msgid ""
  4031 +"Include files in some folder or select from the list below to add images and "
  4032 +"documents to the text editor beside (max size %s)"
  4033 +msgstr ""
  4034 +"Inclua arquivos em alguma pasta ou selecione da lista abaixo para adicionar "
  4035 +"images e documentos ao editor de texto ao lado (tamanho máximo %s)"
  4036 +
  4037 +#: app/views/cms/media_listing.rhtml:50
  4038 +msgid "Folders"
  4039 +msgstr "Pastas"
  4040 +
  4041 +#: app/views/cms/media_listing.rhtml:51
  4042 +msgid ""
  4043 +"Drag images and documents to add them to the text. If needed, resize images "
  4044 +"by clicking the tree icon on editor."
  4045 +msgstr "Arraste imagens e documentos para adicioná-los ao texto. Se necessário, "
  4046 +"redimensione as imagens clicando no ícone da árvore no editor."
  4047 +
  4048 +#: app/views/cms/media_listing.rhtml:54 app/views/themes/edit.rhtml:24
4031 4049 msgid "Images"
4032 4050 msgstr "Imagens"
4033 4051  
4034   -#: app/views/cms/media_listing.rhtml:40
  4052 +#: app/views/cms/media_listing.rhtml:59
4035 4053 msgid "Documents"
4036 4054 msgstr "Documentos"
4037 4055  
4038   -#: app/views/cms/media_listing.rhtml:45
4039   -msgid "Drag images and documents to add them to the text."
4040   -msgstr "Arraste imagens e documentos para adicioná-los ao texto."
4041   -
4042 4056 #: app/views/cms/_upload_file_form.rhtml:4
4043 4057 msgid "Choose folder to upload files:"
4044 4058 msgstr "Escolha uma pasta para incluir arquivos:"
... ... @@ -4216,7 +4230,7 @@ msgid &quot;Choose the communities you want to join and/or create your own.&quot;
4216 4230 msgstr ""
4217 4231 "Escolha as comunidades que você deseja participar e/ou crie a sua própria."
4218 4232  
4219   -#: app/views/search/communities.rhtml:24
  4233 +#: app/views/search/communities.rhtml:25
4220 4234 msgid "New community"
4221 4235 msgstr "Uma comunidade"
4222 4236  
... ... @@ -4581,18 +4595,18 @@ msgstr &quot;Sim, quero remover.&quot;
4581 4595 msgid "Creating new community"
4582 4596 msgstr "Criando nova comunidade"
4583 4597  
4584   -#: app/views/memberships/new_community.rhtml:22
  4598 +#: app/views/memberships/new_community.rhtml:21
4585 4599 #: app/views/profile_editor/edit.rhtml:12 app/views/categories/_form.rhtml:27
4586 4600 #: app/views/manage_products/_form.rhtml:10
4587 4601 msgid "Image:"
4588 4602 msgstr "Imagem:"
4589 4603  
4590   -#: app/views/memberships/new_community.rhtml:27
  4604 +#: app/views/memberships/new_community.rhtml:25
4591 4605 #: app/views/profile_editor/_organization.rhtml:26
4592 4606 msgid "New members must be approved:"
4593 4607 msgstr "Novos membros devem ser aprovados:"
4594 4608  
4595   -#: app/views/memberships/new_community.rhtml:32
  4609 +#: app/views/memberships/new_community.rhtml:30
4596 4610 #: app/views/profile_editor/_organization.rhtml:31
4597 4611 msgid ""
4598 4612 "<strong>Before</strong> joining this group (a moderator has to accept the "
... ... @@ -4602,7 +4616,7 @@ msgstr &quot;&quot;
4602 4616 "<strong>Antes</strong> de entrar no grupo (um moderador precisa aceitar uma "
4603 4617 "solicitação pendente antes do membro poder acessar a intranet e/ou o website."
4604 4618  
4605   -#: app/views/memberships/new_community.rhtml:38
  4619 +#: app/views/memberships/new_community.rhtml:36
4606 4620 #: app/views/profile_editor/_organization.rhtml:37
4607 4621 msgid ""
4608 4622 "<strong>After</strong> joining this group (a moderator can always "
... ... @@ -4611,7 +4625,7 @@ msgstr &quot;&quot;
4611 4625 "<strong>Depois</strong> de entrar no grupo (um moderador sempre pode "
4612 4626 "desativar acesso dos usuários depois)."
4613 4627  
4614   -#: app/views/memberships/new_community.rhtml:43 app/views/themes/new.rhtml:8
  4628 +#: app/views/memberships/new_community.rhtml:41 app/views/themes/new.rhtml:8
4615 4629 msgid "Create"
4616 4630 msgstr "Criar"
4617 4631  
... ...
public/javascripts/lightbox.js
  Diff comments   View file @f5a60be
... ... @@ -64,6 +64,9 @@ lightbox.prototype = {
64 64  
65 65 initialize: function(ctrl) {
66 66 this.content = ctrl.href;
  67 + if (ctrl.id != '') {
  68 + this.lightbox_className = ctrl.id;
  69 + }
67 70 Event.observe(ctrl, 'click', this.activate.bindAsEventListener(this), false);
68 71 ctrl.onclick = function(){return false;};
69 72 },
... ... @@ -144,9 +147,13 @@ lightbox.prototype = {
144 147  
145 148 // Display Ajax response
146 149 processInfo: function(response){
147   - info = "<div id='lbContent'>" + response.responseText + "</div>";
  150 + info = "<div id='lbContent'><div id='lbBottomBG'><div id='lbTopBG'>" + response.responseText + "</div></div></div>";
148 151 new Insertion.Before($('lbLoadMessage'), info)
149   - $('lightbox').className = "done";
  152 + if (this.lightbox_className) {
  153 + $('lightbox').className = "done " + this.lightbox_className;
  154 + } else {
  155 + $('lightbox').className = "done";
  156 + }
150 157 this.actions();
151 158 },
152 159  
... ...
public/stylesheets/media_listing.css
  Diff comments   View file @f5a60be
... ... @@ -5,12 +5,11 @@ body {
5 5 font-size: 14px;
6 6 color: #444;
7 7 background-color: #F0F0EE;
8   - border: 1px solid #CCC;
9 8 overflow: hidden;
10 9 }
11 10  
12 11 h3, h4, h5 {
13   - margin: 10px 0px;
  12 + margin: 5px 0px;
14 13 }
15 14  
16 15 h3 {
... ... @@ -23,14 +22,16 @@ h4 {
23 22  
24 23 #media-listing {
25 24 width: 100%;
26   - height: 65%;
  25 + height: 48%;
27 26 margin: 0px;
28 27 padding: 0px;
29   - border-bottom: 2px solid #444;
  28 + padding-bottom: 5px;
30 29 }
31 30  
  31 +#media-listing-upload p,
32 32 #media-listing p {
33   - font-size: 14px;
  33 + font-size: 13px;
  34 + font-weight: bold;
34 35 margin: 5px 5px;
35 36 }
36 37  
... ... @@ -48,9 +49,7 @@ h4 {
48 49 }
49 50  
50 51 #media-listing-images {
51   - margin-top: 2px;
52 52 width: 46%;
53   - height: 80%;
54 53 float: left;
55 54 text-align: center;
56 55 }
... ... @@ -66,40 +65,43 @@ h4 {
66 65 height: 60px;
67 66 }
68 67  
69   -#media-listing-folder-images {
70   - height: 75%;
  68 +#media-listing-folder-images,
  69 +#media-listing-folder-documents {
  70 + height: 80%;
71 71 }
72 72  
73 73 #media-listing ul {
74 74 padding: 0px;
75 75 margin: 5px;
76   - height: 65%;
  76 + height: 40%;
77 77 overflow: auto;
78 78 width: 98%;
79 79 }
80 80  
  81 +#media-listing ul {
  82 + height: 85%;
  83 +}
  84 +
  85 +#media-listing-images,
  86 +#media-listing-documents {
  87 + height: 55%;
  88 +}
  89 +
81 90 #media-listing-documents ul {
82 91 text-align: left;
83 92 }
84 93  
85 94 #media-listing-documents {
86   - margin: 2px 0px 0px 2px;
87 95 width: 52%;
88   - height: 80%;
89 96 float: left;
90 97 text-align: center;
91 98 }
92 99  
93   -#media-listing-folder-documents {
94   - height: 75%;
95   -}
96   -
97 100 #media-listing-folder-documents img {
98 101 border: none;
99 102 }
100 103  
101 104 #media-listing-upload {
102   - height: 38%;
103 105 width: 98%;
104 106 padding: 3px;
105 107 }
... ... @@ -116,6 +118,7 @@ h4 {
116 118 overflow-x: hidden;
117 119 overflow-y: scroll;
118 120 height: 100px;
  121 + margin-top: 5px;
119 122 }
120 123  
121 124 .msie #uploaded_files {
... ... @@ -133,7 +136,7 @@ h4 {
133 136 div#notice {
134 137 background: #fee;
135 138 border: 1px solid #933;
136   - bottom: 150px;
  139 + top: 150px;
137 140 color: black;
138 141 cursor: pointer;
139 142 font-weight: bold;
... ...
script/import-cooperation.net
  Diff comments   View file @f5a60be
... ... @@ -47,27 +47,30 @@ class FileData &lt; StringIO
47 47 end
48 48  
49 49 class Progress
50   - def self.instance
51   - @instance ||= self.new
52   - end
53   - def start(n)
54   - @total = n
55   - @current = 0
56   - end
57   - def step
58   - @current += 1
59   - end
60   - def puts(msg)
61   - Kernel.puts("[%d/%d] %s" % [@current, @total, msg])
  50 + DEBUG = false
  51 + class << self
  52 + def start(n)
  53 + @total = n
  54 + @current = 0
  55 + end
  56 + def step
  57 + @current += 1
  58 + end
  59 + def step_done
  60 + say('=> done', true)
  61 + end
  62 + def say(msg, force = Progress::DEBUG)
  63 + puts("[%d/%d] %s" % [@current, @total, msg]) if force
  64 + end
62 65 end
63 66 end
64 67  
65 68 FORBIDDEN_LOGINS = %w[
66 69 info
67 70 ]
68   -Progress.instance.start(ARGV.size)
  71 +Progress.start(ARGV.size)
69 72 for username in ARGV
70   - Progress.instance.step
  73 + Progress.step
71 74 begin
72 75 User.transaction do
73 76 # guess environment
... ... @@ -89,17 +92,17 @@ for username in ARGV
89 92 person.from_xml(File.read(File.join(IMPORT_DIR, username + '.xml')))
90 93 person.preferred_domain = get_domain(domain_name)
91 94 user.save!
92   - Progress.instance.puts "I: #{username} data imported"
  95 + Progress.say "I: #{username} data imported"
93 96  
94 97 # import articles
95 98 Dir.glob(File.join(IMPORT_DIR, username, 'articles', '*.xml')) do |xml|
96   - Progress.instance.puts "I: Trying to import #{username}'s article in #{xml} ..."
  99 + Progress.say "I: Trying to import #{username}'s article in #{xml} ..."
97 100 article = TinyMceArticle.new
98 101 article.from_xml(File.read(xml))
99 102 article.profile = person
100 103 if article.valid?
101 104 article.save!
102   - Progress.instance.puts "I: #{username}'s article #{article.name.inspect} imported"
  105 + Progress.say "I: #{username}'s article #{article.name.inspect} imported"
103 106 else
104 107 $stderr.puts "W: #{username}'s article #{article.name.inspect} cannot be saved. Errors: #{article.errors.full_messages.join(', ')}"
105 108 next
... ... @@ -108,12 +111,12 @@ for username in ARGV
108 111 if article.is_homepage
109 112 person.home_page = article
110 113 person.save!
111   - Progress.instance.puts "I: Article #{article.name.inspect} is #{username}'s homepage!"
  114 + Progress.say "I: Article #{article.name.inspect} is #{username}'s homepage!"
112 115 end
113 116  
114 117 File.open("tmp/rewrite.txt", 'w+') do |file|
115 118 file.puts("#{article.id} #{url_for(article.url)}")
116   - Progress.instance.puts "I: Article with id = #{article.id} redirected to #{url_for(article.url)}"
  119 + Progress.say "I: Article with id = #{article.id} redirected to #{url_for(article.url)}"
117 120 end
118 121  
119 122 # import attachments
... ... @@ -122,16 +125,16 @@ for username in ARGV
122 125 file = UploadedFile.new
123 126 file.from_xml(File.read(attachment_xml))
124 127 if !File.exist?(file.filesystem_location)
125   - Progress.instance.puts "W: skipping attachment pointing to unexisting file"
  128 + Progress.say "W: skipping attachment pointing to unexisting file"
126 129 next
127 130 end
128   - Progress.instance.puts "I: about to read data from #{file.filesystem_location} (xml: #{attachment_xml})"
  131 + Progress.say "I: about to read data from #{file.filesystem_location} (xml: #{attachment_xml})"
129 132 file.uploaded_data = FileData.new(file.filesystem_location, file.filename, file.content_type)
130 133 file.parent = article
131 134 file.profile = person
132   - Progress.instance.puts "I: Trying to save attachment \"#{file.filename}/#{file.slug}\""
  135 + Progress.say "I: Trying to save attachment \"#{file.filename}/#{file.slug}\""
133 136 file.save!
134   - Progress.instance.puts "I: attachment added to article #{article.id}"
  137 + Progress.say "I: attachment added to article #{article.id}"
135 138  
136 139 file.reload
137 140 if file.image?
... ... @@ -158,7 +161,7 @@ for username in ARGV
158 161 block.title = data['menu']['title']
159 162 block.links = links
160 163 block.save!
161   - Progress.instance.puts "imported links: #{links.inspect}"
  164 + Progress.say "imported links: #{links.inspect}"
162 165 end
163 166  
164 167 end
... ... @@ -170,4 +173,5 @@ for username in ARGV
170 173 $stderr.puts "=================================="
171 174 $stderr.puts "E: Note that ALL operations above relative to <#{username}> were CANCELLED due to these errors."
172 175 end
  176 + Progress.step_done
173 177 end
... ...