ActionItem1050: changes need for a nice formatting of the news portal

Antonio Terceiro
1 parent f8821f28
Showing 10 changed files with 238 additions and 184 deletions Show diff stats
app/views/home/index.rhtml
po/bg/noosfero.po
po/de/noosfero.po
po/es/noosfero.po
po/fr/noosfero.po
po/hy/noosfero.po
po/it/noosfero.po
po/nl/noosfero.po
po/noosfero.pot
po/pt_BR/noosfero.po
@@ -3,31 +3,43 @@
 <% end %>
  
 <% if @has_news %>
-  <h3><%= _('News') %></h3>
+  <h1><%= _('News') %></h1>
   <% cache @news_cache_key do %>
     <div id='highlighted-news'>
       <% @highlighted_news.each do |highlighted| %>
-        <p><%= link_to(highlighted.title, highlighted.url) %><br/>
-        <span class="post-date"><%= show_date(highlighted.published_at, true) %> </span></p>
-	<div class='headline'><%= highlighted.first_paragraph %></div>
-        <br style='clear:both' />
+        <div class='highlighted-news-item'>
+          <h2><%= link_to(highlighted.title, highlighted.url, :class => 'post-title') %></h2>
+          <span class="post-date"><%= show_date(highlighted.published_at, true) %> </span></p>
+          <p class='headline'><%= highlighted.first_paragraph %></p>
+          <br style='clear:both' />
+        </div>
       <% end%>
     </div>
  
+    <div class='sep'></div>
+
     <div id='portal-news'>
-      <% @portal_news.each do |news| %>
-        <p><span class="post-date"><%= show_date(news.published_at, true) %> </span><%= link_to(news.title, news.url) %></p>
-      <% end%>
+      <ul>
+        <% @portal_news.each do |news| %>
+          <li>
+          <span class="post-date"><%= show_date(news.published_at, true) %> </span>
+          <%= link_to(news.title, news.url, :class =>  'post-title' ) %>
+          </li>
+        <% end%>
+      </ul>
     </div>
  
+    <div class='sep'></div>
+
     <% @area_news.each_with_index do |folder, i| %>
       <% content_tag(:div, :class => ["news-area", ['even', 'odd'][i%2]].join(' ')) do %>
         <h3><%= link_to folder.title, folder.url %></h3>
           <ul>
-          <% folder.news(3).each do |news| %>
-            <li><span class='news-symbol'>&gt;</span> <%= link_to(news.title, news.url) %></li>
+          <% folder.news(4).each do |news| %>
+            <li> <%= link_to(news.title, news.url) %></li>
           <% end%>
           </ul>
+        <%= link_to _('View more'), folder.url, :class => 'news-see-more'  %>
       <%end %>
     <% end %>
   <% end %>
@@ -47,16 +59,20 @@
  
 <% end %>
  
-<div id='home-search' style='text-align: center'>
-  <% form_tag :controller => 'search', :action => 'index' do %>
+<% if environment.enabled?('search_in_home') %>
+  <div id='home-search' style='text-align: center'>
+    <% form_tag :controller => 'search', :action => 'index' do %>
  
-    <div id='search-field' style='text-align: center;'>
-      <%= text_field_tag('query', '', :size => 50) %>
-      <%= submit_button(:search, _('Search')) %>
-    </div>
+      <div id='search-field' style='text-align: center;'>
+        <%= text_field_tag('query', '', :size => 50) %>
+        <%= submit_button(:search, _('Search')) %>
+      </div>
  
-    <div>
-      <%= lightbox_link_to _('More options'), :controller => 'search', :action => 'popup' %>
-    </div>
-  <% end %>
-</div>
+      <div>
+        <%= lightbox_link_to _('More options'), :controller => 'search', :action => 'popup' %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
+<br style='clear: both'/>
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.17.1\n"
-"POT-Creation-Date: 2009-05-25 20:58-0300\n"
+"Project-Id-Version: noosfero 0.18.0\n"
+"POT-Creation-Date: 2009-05-25 22:58-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"
@@ -843,56 +843,56 @@ msgid_plural &quot;%s members&quot;
 msgstr[0] ""
 msgstr[1] ""
  
-#: app/helpers/application_helper.rb:508
+#: app/helpers/application_helper.rb:509
 #: app/views/content_viewer/view_page.rhtml:92
 #: app/views/categories/index.rhtml:1
 msgid "Categories"
 msgstr ""
  
-#: app/helpers/application_helper.rb:531
+#: app/helpers/application_helper.rb:532
 msgid "open"
 msgstr ""
  
-#: app/helpers/application_helper.rb:570
+#: app/helpers/application_helper.rb:571
 #: app/views/layouts/application-ng.rhtml:70
 #: app/views/layouts/application-ng.rhtml:72
 #: app/views/layouts/application-ng.rhtml:75
 msgid "Search..."
 msgstr ""
  
-#: app/helpers/application_helper.rb:572
+#: app/helpers/application_helper.rb:573
 msgid "This is a search box. Click, write your query, and press enter to find"
 msgstr ""
  
-#: app/helpers/application_helper.rb:573
+#: app/helpers/application_helper.rb:574
 msgid "Click, write and press enter to find"
 msgstr ""
  
-#: app/helpers/application_helper.rb:579 app/models/link_list_block.rb:19
+#: app/helpers/application_helper.rb:580 app/models/link_list_block.rb:19
 #: app/views/search/_sellers_form.rhtml:21
 #: app/views/search/_search_form.rhtml:19 app/views/search/communities.rhtml:9
 #: app/views/search/articles.rhtml:10 app/views/search/people.rhtml:10
-#: app/views/home/index.rhtml:55 app/views/region_validators/region.rhtml:23
+#: app/views/home/index.rhtml:57 app/views/region_validators/region.rhtml:23
 msgid "Search"
 msgstr ""
  
-#: app/helpers/application_helper.rb:759
+#: app/helpers/application_helper.rb:760
 msgid "Searched for '%s'"
 msgstr ""
  
-#: app/helpers/application_helper.rb:760
+#: app/helpers/application_helper.rb:761
 msgid "In category %s"
 msgstr ""
  
-#: app/helpers/application_helper.rb:761
+#: app/helpers/application_helper.rb:762
 msgid "within %d km from %s"
 msgstr ""
  
-#: app/helpers/application_helper.rb:762
+#: app/helpers/application_helper.rb:763
 msgid "%d results found"
 msgstr ""
  
-#: app/helpers/application_helper.rb:768
+#: app/helpers/application_helper.rb:769
 msgid "In all categories"
 msgstr ""
  
@@ -4153,7 +4153,7 @@ msgstr &quot;&quot;
 msgid "Search for:"
 msgstr ""
  
-#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:59
+#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:61
 msgid "More options"
 msgstr ""
  
@@ -4353,15 +4353,19 @@ msgstr &quot;&quot;
 msgid "News"
 msgstr ""
  
-#: app/views/home/index.rhtml:42
-msgid "Activate your enterprise"
+#: app/views/home/index.rhtml:31
+msgid "View more"
 msgstr ""
  
 #: app/views/home/index.rhtml:43
+msgid "Activate your enterprise"
+msgstr ""
+
+#: app/views/home/index.rhtml:44
 msgid "Enterprise activation code"
 msgstr ""
  
-#: app/views/home/index.rhtml:44 app/views/enterprise_editor/index.rhtml:17
+#: app/views/home/index.rhtml:45 app/views/enterprise_editor/index.rhtml:17
 msgid "Activate"
 msgstr ""
  
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.17.1\n"
-"POT-Creation-Date: 2009-05-25 20:58-0300\n"
+"Project-Id-Version: noosfero 0.18.0\n"
+"POT-Creation-Date: 2009-05-25 22:58-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"
@@ -843,56 +843,56 @@ msgid_plural &quot;%s members&quot;
 msgstr[0] ""
 msgstr[1] ""
  
-#: app/helpers/application_helper.rb:508
+#: app/helpers/application_helper.rb:509
 #: app/views/content_viewer/view_page.rhtml:92
 #: app/views/categories/index.rhtml:1
 msgid "Categories"
 msgstr ""
  
-#: app/helpers/application_helper.rb:531
+#: app/helpers/application_helper.rb:532
 msgid "open"
 msgstr ""
  
-#: app/helpers/application_helper.rb:570
+#: app/helpers/application_helper.rb:571
 #: app/views/layouts/application-ng.rhtml:70
 #: app/views/layouts/application-ng.rhtml:72
 #: app/views/layouts/application-ng.rhtml:75
 msgid "Search..."
 msgstr ""
  
-#: app/helpers/application_helper.rb:572
+#: app/helpers/application_helper.rb:573
 msgid "This is a search box. Click, write your query, and press enter to find"
 msgstr ""
  
-#: app/helpers/application_helper.rb:573
+#: app/helpers/application_helper.rb:574
 msgid "Click, write and press enter to find"
 msgstr ""
  
-#: app/helpers/application_helper.rb:579 app/models/link_list_block.rb:19
+#: app/helpers/application_helper.rb:580 app/models/link_list_block.rb:19
 #: app/views/search/_sellers_form.rhtml:21
 #: app/views/search/_search_form.rhtml:19 app/views/search/communities.rhtml:9
 #: app/views/search/articles.rhtml:10 app/views/search/people.rhtml:10
-#: app/views/home/index.rhtml:55 app/views/region_validators/region.rhtml:23
+#: app/views/home/index.rhtml:57 app/views/region_validators/region.rhtml:23
 msgid "Search"
 msgstr ""
  
-#: app/helpers/application_helper.rb:759
+#: app/helpers/application_helper.rb:760
 msgid "Searched for '%s'"
 msgstr ""
  
-#: app/helpers/application_helper.rb:760
+#: app/helpers/application_helper.rb:761
 msgid "In category %s"
 msgstr ""
  
-#: app/helpers/application_helper.rb:761
+#: app/helpers/application_helper.rb:762
 msgid "within %d km from %s"
 msgstr ""
  
-#: app/helpers/application_helper.rb:762
+#: app/helpers/application_helper.rb:763
 msgid "%d results found"
 msgstr ""
  
-#: app/helpers/application_helper.rb:768
+#: app/helpers/application_helper.rb:769
 msgid "In all categories"
 msgstr ""
  
@@ -4153,7 +4153,7 @@ msgstr &quot;&quot;
 msgid "Search for:"
 msgstr ""
  
-#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:59
+#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:61
 msgid "More options"
 msgstr ""
  
@@ -4353,15 +4353,19 @@ msgstr &quot;&quot;
 msgid "News"
 msgstr ""
  
-#: app/views/home/index.rhtml:42
-msgid "Activate your enterprise"
+#: app/views/home/index.rhtml:31
+msgid "View more"
 msgstr ""
  
 #: app/views/home/index.rhtml:43
+msgid "Activate your enterprise"
+msgstr ""
+
+#: app/views/home/index.rhtml:44
 msgid "Enterprise activation code"
 msgstr ""
  
-#: app/views/home/index.rhtml:44 app/views/enterprise_editor/index.rhtml:17
+#: app/views/home/index.rhtml:45 app/views/enterprise_editor/index.rhtml:17
 msgid "Activate"
 msgstr ""
  
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.17.1\n"
-"POT-Creation-Date: 2009-05-25 20:58-0300\n"
+"Project-Id-Version: noosfero 0.18.0\n"
+"POT-Creation-Date: 2009-05-25 22:58-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"
@@ -843,56 +843,56 @@ msgid_plural &quot;%s members&quot;
 msgstr[0] ""
 msgstr[1] ""
  
-#: app/helpers/application_helper.rb:508
+#: app/helpers/application_helper.rb:509
 #: app/views/content_viewer/view_page.rhtml:92
 #: app/views/categories/index.rhtml:1
 msgid "Categories"
 msgstr ""
  
-#: app/helpers/application_helper.rb:531
+#: app/helpers/application_helper.rb:532
 msgid "open"
 msgstr ""
  
-#: app/helpers/application_helper.rb:570
+#: app/helpers/application_helper.rb:571
 #: app/views/layouts/application-ng.rhtml:70
 #: app/views/layouts/application-ng.rhtml:72
 #: app/views/layouts/application-ng.rhtml:75
 msgid "Search..."
 msgstr ""
  
-#: app/helpers/application_helper.rb:572
+#: app/helpers/application_helper.rb:573
 msgid "This is a search box. Click, write your query, and press enter to find"
 msgstr ""
  
-#: app/helpers/application_helper.rb:573
+#: app/helpers/application_helper.rb:574
 msgid "Click, write and press enter to find"
 msgstr ""
  
-#: app/helpers/application_helper.rb:579 app/models/link_list_block.rb:19
+#: app/helpers/application_helper.rb:580 app/models/link_list_block.rb:19
 #: app/views/search/_sellers_form.rhtml:21
 #: app/views/search/_search_form.rhtml:19 app/views/search/communities.rhtml:9
 #: app/views/search/articles.rhtml:10 app/views/search/people.rhtml:10
-#: app/views/home/index.rhtml:55 app/views/region_validators/region.rhtml:23
+#: app/views/home/index.rhtml:57 app/views/region_validators/region.rhtml:23
 msgid "Search"
 msgstr ""
  
-#: app/helpers/application_helper.rb:759
+#: app/helpers/application_helper.rb:760
 msgid "Searched for '%s'"
 msgstr ""
  
-#: app/helpers/application_helper.rb:760
+#: app/helpers/application_helper.rb:761
 msgid "In category %s"
 msgstr ""
  
-#: app/helpers/application_helper.rb:761
+#: app/helpers/application_helper.rb:762
 msgid "within %d km from %s"
 msgstr ""
  
-#: app/helpers/application_helper.rb:762
+#: app/helpers/application_helper.rb:763
 msgid "%d results found"
 msgstr ""
  
-#: app/helpers/application_helper.rb:768
+#: app/helpers/application_helper.rb:769
 msgid "In all categories"
 msgstr ""
  
@@ -4153,7 +4153,7 @@ msgstr &quot;&quot;
 msgid "Search for:"
 msgstr ""
  
-#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:59
+#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:61
 msgid "More options"
 msgstr ""
  
@@ -4353,15 +4353,19 @@ msgstr &quot;&quot;
 msgid "News"
 msgstr ""
  
-#: app/views/home/index.rhtml:42
-msgid "Activate your enterprise"
+#: app/views/home/index.rhtml:31
+msgid "View more"
 msgstr ""
  
 #: app/views/home/index.rhtml:43
+msgid "Activate your enterprise"
+msgstr ""
+
+#: app/views/home/index.rhtml:44
 msgid "Enterprise activation code"
 msgstr ""
  
-#: app/views/home/index.rhtml:44 app/views/enterprise_editor/index.rhtml:17
+#: app/views/home/index.rhtml:45 app/views/enterprise_editor/index.rhtml:17
 msgid "Activate"
 msgstr ""
  
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.17.1\n"
+"Project-Id-Version: noosfero 0.18.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-25 20:58-0300\n"
+"POT-Creation-Date: 2009-05-25 22:58-0300\n"
 "PO-Revision-Date: 2008-06-13 16:15-0300\n"
 "Last-Translator: Raphael Rousseau <pootle.colivre.coop.br@r4f.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -860,58 +860,58 @@ msgid_plural &quot;%s members&quot;
 msgstr[0] "Ôter le membre"
 msgstr[1] "Ôter le membre"
  
-#: app/helpers/application_helper.rb:508
+#: app/helpers/application_helper.rb:509
 #: app/views/content_viewer/view_page.rhtml:92
 #: app/views/categories/index.rhtml:1
 msgid "Categories"
 msgstr "Catégories"
  
-#: app/helpers/application_helper.rb:531
+#: app/helpers/application_helper.rb:532
 msgid "open"
 msgstr "ouvrir"
  
-#: app/helpers/application_helper.rb:570
+#: app/helpers/application_helper.rb:571
 #: app/views/layouts/application-ng.rhtml:70
 #: app/views/layouts/application-ng.rhtml:72
 #: app/views/layouts/application-ng.rhtml:75
 msgid "Search..."
 msgstr "Chercher..."
  
-#: app/helpers/application_helper.rb:572
+#: app/helpers/application_helper.rb:573
 msgid "This is a search box. Click, write your query, and press enter to find"
 msgstr ""
 "Ceci est une boîte de recherche. Cliquez, entrez votre requête et appuyez "
 "sur Entrée pour trouver."
  
-#: app/helpers/application_helper.rb:573
+#: app/helpers/application_helper.rb:574
 msgid "Click, write and press enter to find"
 msgstr "Cliquez, écrivez et appuyez sur Entrée pour trouver."
  
-#: app/helpers/application_helper.rb:579 app/models/link_list_block.rb:19
+#: app/helpers/application_helper.rb:580 app/models/link_list_block.rb:19
 #: app/views/search/_sellers_form.rhtml:21
 #: app/views/search/_search_form.rhtml:19 app/views/search/communities.rhtml:9
 #: app/views/search/articles.rhtml:10 app/views/search/people.rhtml:10
-#: app/views/home/index.rhtml:55 app/views/region_validators/region.rhtml:23
+#: app/views/home/index.rhtml:57 app/views/region_validators/region.rhtml:23
 msgid "Search"
 msgstr "Chercher"
  
-#: app/helpers/application_helper.rb:759
+#: app/helpers/application_helper.rb:760
 msgid "Searched for '%s'"
 msgstr "Recherche de «%s»"
  
-#: app/helpers/application_helper.rb:760
+#: app/helpers/application_helper.rb:761
 msgid "In category %s"
 msgstr "Dans la catégorie %s"
  
-#: app/helpers/application_helper.rb:761
+#: app/helpers/application_helper.rb:762
 msgid "within %d km from %s"
 msgstr "dans les %d km de %s"
  
-#: app/helpers/application_helper.rb:762
+#: app/helpers/application_helper.rb:763
 msgid "%d results found"
 msgstr "%d resultats trouvés"
  
-#: app/helpers/application_helper.rb:768
+#: app/helpers/application_helper.rb:769
 #, fuzzy
 msgid "In all categories"
 msgstr "Désactiver les catégories"
@@ -4420,7 +4420,7 @@ msgstr &quot;Recherche dans :&quot;
 msgid "Search for:"
 msgstr "Rechercher :"
  
-#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:59
+#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:61
 msgid "More options"
 msgstr "Plus d'options"
  
@@ -4633,17 +4633,22 @@ msgstr &quot;Toutes les entreprises&quot;
 msgid "News"
 msgstr "Nouveau %s"
  
-#: app/views/home/index.rhtml:42
+#: app/views/home/index.rhtml:31
+#, fuzzy
+msgid "View more"
+msgstr "Voir le profil"
+
+#: app/views/home/index.rhtml:43
 #, fuzzy
 msgid "Activate your enterprise"
 msgstr "Activer une entreprise approuvée"
  
-#: app/views/home/index.rhtml:43
+#: app/views/home/index.rhtml:44
 #, fuzzy
 msgid "Enterprise activation code"
 msgstr "Validation d'entreprises"
  
-#: app/views/home/index.rhtml:44 app/views/enterprise_editor/index.rhtml:17
+#: app/views/home/index.rhtml:45 app/views/enterprise_editor/index.rhtml:17
 msgid "Activate"
 msgstr "Activer"
  
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.17.1\n"
-"POT-Creation-Date: 2009-05-25 20:58-0300\n"
+"Project-Id-Version: noosfero 0.18.0\n"
+"POT-Creation-Date: 2009-05-25 22:58-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"
@@ -849,58 +849,58 @@ msgid_plural &quot;%s members&quot;
 msgstr[0] "Նոր անդամ"
 msgstr[1] "Նոր անդամ"
  
-#: app/helpers/application_helper.rb:508
+#: app/helpers/application_helper.rb:509
 #: app/views/content_viewer/view_page.rhtml:92
 #: app/views/categories/index.rhtml:1
 msgid "Categories"
 msgstr "Կատեգորիաներ"
  
-#: app/helpers/application_helper.rb:531
+#: app/helpers/application_helper.rb:532
 msgid "open"
 msgstr "բացել"
  
-#: app/helpers/application_helper.rb:570
+#: app/helpers/application_helper.rb:571
 #: app/views/layouts/application-ng.rhtml:70
 #: app/views/layouts/application-ng.rhtml:72
 #: app/views/layouts/application-ng.rhtml:75
 msgid "Search..."
 msgstr "Որոնել..."
  
-#: app/helpers/application_helper.rb:572
+#: app/helpers/application_helper.rb:573
 msgid "This is a search box. Click, write your query, and press enter to find"
 msgstr ""
 "Այստեղ կարող եք որոնում կատարել: Մուտքագրեք Ձեր հարցումն ու սեղմեք «Enter» "
 "կոճակը:"
  
-#: app/helpers/application_helper.rb:573
+#: app/helpers/application_helper.rb:574
 msgid "Click, write and press enter to find"
 msgstr "Մուտքագրեք և սեղմեք «Enter» կոճակը"
  
-#: app/helpers/application_helper.rb:579 app/models/link_list_block.rb:19
+#: app/helpers/application_helper.rb:580 app/models/link_list_block.rb:19
 #: app/views/search/_sellers_form.rhtml:21
 #: app/views/search/_search_form.rhtml:19 app/views/search/communities.rhtml:9
 #: app/views/search/articles.rhtml:10 app/views/search/people.rhtml:10
-#: app/views/home/index.rhtml:55 app/views/region_validators/region.rhtml:23
+#: app/views/home/index.rhtml:57 app/views/region_validators/region.rhtml:23
 msgid "Search"
 msgstr "Որոնում"
  
-#: app/helpers/application_helper.rb:759
+#: app/helpers/application_helper.rb:760
 msgid "Searched for '%s'"
 msgstr "«%s»-ի որոնում"
  
-#: app/helpers/application_helper.rb:760
+#: app/helpers/application_helper.rb:761
 msgid "In category %s"
 msgstr "%s կատեգորիայում"
  
-#: app/helpers/application_helper.rb:761
+#: app/helpers/application_helper.rb:762
 msgid "within %d km from %s"
 msgstr "%s-ից %d կմ հեռավորության վրա"
  
-#: app/helpers/application_helper.rb:762
+#: app/helpers/application_helper.rb:763
 msgid "%d results found"
 msgstr "Գտնված արդյունքներ %d"
  
-#: app/helpers/application_helper.rb:768
+#: app/helpers/application_helper.rb:769
 #, fuzzy
 msgid "In all categories"
 msgstr "%s կատեգորիայում"
@@ -4258,7 +4258,7 @@ msgstr &quot;Որոնել&quot;
 msgid "Search for:"
 msgstr "Որոնել"
  
-#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:59
+#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:61
 msgid "More options"
 msgstr ""
  
@@ -4465,17 +4465,22 @@ msgstr &quot;&quot;
 msgid "News"
 msgstr "Նորություններ"
  
-#: app/views/home/index.rhtml:42
+#: app/views/home/index.rhtml:31
+#, fuzzy
+msgid "View more"
+msgstr "Նայել անհատական էջը"
+
+#: app/views/home/index.rhtml:43
 #, fuzzy
 msgid "Activate your enterprise"
 msgstr "Ակտիվացնել հաստատված ձեռնարկությունը"
  
-#: app/views/home/index.rhtml:43
+#: app/views/home/index.rhtml:44
 #, fuzzy
 msgid "Enterprise activation code"
 msgstr "Ձեռնարկության հաստատում"
  
-#: app/views/home/index.rhtml:44 app/views/enterprise_editor/index.rhtml:17
+#: app/views/home/index.rhtml:45 app/views/enterprise_editor/index.rhtml:17
 msgid "Activate"
 msgstr "Ակտիվացնել"
  
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.17.1\n"
-"POT-Creation-Date: 2009-05-25 20:58-0300\n"
+"Project-Id-Version: noosfero 0.18.0\n"
+"POT-Creation-Date: 2009-05-25 22:58-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"
@@ -843,56 +843,56 @@ msgid_plural &quot;%s members&quot;
 msgstr[0] ""
 msgstr[1] ""
  
-#: app/helpers/application_helper.rb:508
+#: app/helpers/application_helper.rb:509
 #: app/views/content_viewer/view_page.rhtml:92
 #: app/views/categories/index.rhtml:1
 msgid "Categories"
 msgstr ""
  
-#: app/helpers/application_helper.rb:531
+#: app/helpers/application_helper.rb:532
 msgid "open"
 msgstr ""
  
-#: app/helpers/application_helper.rb:570
+#: app/helpers/application_helper.rb:571
 #: app/views/layouts/application-ng.rhtml:70
 #: app/views/layouts/application-ng.rhtml:72
 #: app/views/layouts/application-ng.rhtml:75
 msgid "Search..."
 msgstr ""
  
-#: app/helpers/application_helper.rb:572
+#: app/helpers/application_helper.rb:573
 msgid "This is a search box. Click, write your query, and press enter to find"
 msgstr ""
  
-#: app/helpers/application_helper.rb:573
+#: app/helpers/application_helper.rb:574
 msgid "Click, write and press enter to find"
 msgstr ""
  
-#: app/helpers/application_helper.rb:579 app/models/link_list_block.rb:19
+#: app/helpers/application_helper.rb:580 app/models/link_list_block.rb:19
 #: app/views/search/_sellers_form.rhtml:21
 #: app/views/search/_search_form.rhtml:19 app/views/search/communities.rhtml:9
 #: app/views/search/articles.rhtml:10 app/views/search/people.rhtml:10
-#: app/views/home/index.rhtml:55 app/views/region_validators/region.rhtml:23
+#: app/views/home/index.rhtml:57 app/views/region_validators/region.rhtml:23
 msgid "Search"
 msgstr ""
  
-#: app/helpers/application_helper.rb:759
+#: app/helpers/application_helper.rb:760
 msgid "Searched for '%s'"
 msgstr ""
  
-#: app/helpers/application_helper.rb:760
+#: app/helpers/application_helper.rb:761
 msgid "In category %s"
 msgstr ""
  
-#: app/helpers/application_helper.rb:761
+#: app/helpers/application_helper.rb:762
 msgid "within %d km from %s"
 msgstr ""
  
-#: app/helpers/application_helper.rb:762
+#: app/helpers/application_helper.rb:763
 msgid "%d results found"
 msgstr ""
  
-#: app/helpers/application_helper.rb:768
+#: app/helpers/application_helper.rb:769
 msgid "In all categories"
 msgstr ""
  
@@ -4153,7 +4153,7 @@ msgstr &quot;&quot;
 msgid "Search for:"
 msgstr ""
  
-#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:59
+#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:61
 msgid "More options"
 msgstr ""
  
@@ -4353,15 +4353,19 @@ msgstr &quot;&quot;
 msgid "News"
 msgstr ""
  
-#: app/views/home/index.rhtml:42
-msgid "Activate your enterprise"
+#: app/views/home/index.rhtml:31
+msgid "View more"
 msgstr ""
  
 #: app/views/home/index.rhtml:43
+msgid "Activate your enterprise"
+msgstr ""
+
+#: app/views/home/index.rhtml:44
 msgid "Enterprise activation code"
 msgstr ""
  
-#: app/views/home/index.rhtml:44 app/views/enterprise_editor/index.rhtml:17
+#: app/views/home/index.rhtml:45 app/views/enterprise_editor/index.rhtml:17
 msgid "Activate"
 msgstr ""
  
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.17.1\n"
-"POT-Creation-Date: 2009-05-25 20:58-0300\n"
+"Project-Id-Version: noosfero 0.18.0\n"
+"POT-Creation-Date: 2009-05-25 22:58-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"
@@ -843,56 +843,56 @@ msgid_plural &quot;%s members&quot;
 msgstr[0] ""
 msgstr[1] ""
  
-#: app/helpers/application_helper.rb:508
+#: app/helpers/application_helper.rb:509
 #: app/views/content_viewer/view_page.rhtml:92
 #: app/views/categories/index.rhtml:1
 msgid "Categories"
 msgstr ""
  
-#: app/helpers/application_helper.rb:531
+#: app/helpers/application_helper.rb:532
 msgid "open"
 msgstr ""
  
-#: app/helpers/application_helper.rb:570
+#: app/helpers/application_helper.rb:571
 #: app/views/layouts/application-ng.rhtml:70
 #: app/views/layouts/application-ng.rhtml:72
 #: app/views/layouts/application-ng.rhtml:75
 msgid "Search..."
 msgstr ""
  
-#: app/helpers/application_helper.rb:572
+#: app/helpers/application_helper.rb:573
 msgid "This is a search box. Click, write your query, and press enter to find"
 msgstr ""
  
-#: app/helpers/application_helper.rb:573
+#: app/helpers/application_helper.rb:574
 msgid "Click, write and press enter to find"
 msgstr ""
  
-#: app/helpers/application_helper.rb:579 app/models/link_list_block.rb:19
+#: app/helpers/application_helper.rb:580 app/models/link_list_block.rb:19
 #: app/views/search/_sellers_form.rhtml:21
 #: app/views/search/_search_form.rhtml:19 app/views/search/communities.rhtml:9
 #: app/views/search/articles.rhtml:10 app/views/search/people.rhtml:10
-#: app/views/home/index.rhtml:55 app/views/region_validators/region.rhtml:23
+#: app/views/home/index.rhtml:57 app/views/region_validators/region.rhtml:23
 msgid "Search"
 msgstr ""
  
-#: app/helpers/application_helper.rb:759
+#: app/helpers/application_helper.rb:760
 msgid "Searched for '%s'"
 msgstr ""
  
-#: app/helpers/application_helper.rb:760
+#: app/helpers/application_helper.rb:761
 msgid "In category %s"
 msgstr ""
  
-#: app/helpers/application_helper.rb:761
+#: app/helpers/application_helper.rb:762
 msgid "within %d km from %s"
 msgstr ""
  
-#: app/helpers/application_helper.rb:762
+#: app/helpers/application_helper.rb:763
 msgid "%d results found"
 msgstr ""
  
-#: app/helpers/application_helper.rb:768
+#: app/helpers/application_helper.rb:769
 msgid "In all categories"
 msgstr ""
  
@@ -4153,7 +4153,7 @@ msgstr &quot;&quot;
 msgid "Search for:"
 msgstr ""
  
-#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:59
+#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:61
 msgid "More options"
 msgstr ""
  
@@ -4353,15 +4353,19 @@ msgstr &quot;&quot;
 msgid "News"
 msgstr ""
  
-#: app/views/home/index.rhtml:42
-msgid "Activate your enterprise"
+#: app/views/home/index.rhtml:31
+msgid "View more"
 msgstr ""
  
 #: app/views/home/index.rhtml:43
+msgid "Activate your enterprise"
+msgstr ""
+
+#: app/views/home/index.rhtml:44
 msgid "Enterprise activation code"
 msgstr ""
  
-#: app/views/home/index.rhtml:44 app/views/enterprise_editor/index.rhtml:17
+#: app/views/home/index.rhtml:45 app/views/enterprise_editor/index.rhtml:17
 msgid "Activate"
 msgstr ""
  
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.17.1\n"
-"POT-Creation-Date: 2009-05-25 20:58-0300\n"
+"Project-Id-Version: noosfero 0.18.0\n"
+"POT-Creation-Date: 2009-05-25 22:58-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"
@@ -843,56 +843,56 @@ msgid_plural &quot;%s members&quot;
 msgstr[0] ""
 msgstr[1] ""
  
-#: app/helpers/application_helper.rb:508
+#: app/helpers/application_helper.rb:509
 #: app/views/content_viewer/view_page.rhtml:92
 #: app/views/categories/index.rhtml:1
 msgid "Categories"
 msgstr ""
  
-#: app/helpers/application_helper.rb:531
+#: app/helpers/application_helper.rb:532
 msgid "open"
 msgstr ""
  
-#: app/helpers/application_helper.rb:570
+#: app/helpers/application_helper.rb:571
 #: app/views/layouts/application-ng.rhtml:70
 #: app/views/layouts/application-ng.rhtml:72
 #: app/views/layouts/application-ng.rhtml:75
 msgid "Search..."
 msgstr ""
  
-#: app/helpers/application_helper.rb:572
+#: app/helpers/application_helper.rb:573
 msgid "This is a search box. Click, write your query, and press enter to find"
 msgstr ""
  
-#: app/helpers/application_helper.rb:573
+#: app/helpers/application_helper.rb:574
 msgid "Click, write and press enter to find"
 msgstr ""
  
-#: app/helpers/application_helper.rb:579 app/models/link_list_block.rb:19
+#: app/helpers/application_helper.rb:580 app/models/link_list_block.rb:19
 #: app/views/search/_sellers_form.rhtml:21
 #: app/views/search/_search_form.rhtml:19 app/views/search/communities.rhtml:9
 #: app/views/search/articles.rhtml:10 app/views/search/people.rhtml:10
-#: app/views/home/index.rhtml:55 app/views/region_validators/region.rhtml:23
+#: app/views/home/index.rhtml:57 app/views/region_validators/region.rhtml:23
 msgid "Search"
 msgstr ""
  
-#: app/helpers/application_helper.rb:759
+#: app/helpers/application_helper.rb:760
 msgid "Searched for '%s'"
 msgstr ""
  
-#: app/helpers/application_helper.rb:760
+#: app/helpers/application_helper.rb:761
 msgid "In category %s"
 msgstr ""
  
-#: app/helpers/application_helper.rb:761
+#: app/helpers/application_helper.rb:762
 msgid "within %d km from %s"
 msgstr ""
  
-#: app/helpers/application_helper.rb:762
+#: app/helpers/application_helper.rb:763
 msgid "%d results found"
 msgstr ""
  
-#: app/helpers/application_helper.rb:768
+#: app/helpers/application_helper.rb:769
 msgid "In all categories"
 msgstr ""
  
@@ -4153,7 +4153,7 @@ msgstr &quot;&quot;
 msgid "Search for:"
 msgstr ""
  
-#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:59
+#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:61
 msgid "More options"
 msgstr ""
  
@@ -4353,15 +4353,19 @@ msgstr &quot;&quot;
 msgid "News"
 msgstr ""
  
-#: app/views/home/index.rhtml:42
-msgid "Activate your enterprise"
+#: app/views/home/index.rhtml:31
+msgid "View more"
 msgstr ""
  
 #: app/views/home/index.rhtml:43
+msgid "Activate your enterprise"
+msgstr ""
+
+#: app/views/home/index.rhtml:44
 msgid "Enterprise activation code"
 msgstr ""
  
-#: app/views/home/index.rhtml:44 app/views/enterprise_editor/index.rhtml:17
+#: app/views/home/index.rhtml:45 app/views/enterprise_editor/index.rhtml:17
 msgid "Activate"
 msgstr ""
  
@@ -11,9 +11,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.17.1\n"
-"POT-Creation-Date: 2009-05-25 20:58-0300\n"
-"PO-Revision-Date: 2009-05-25 21:45-0300\n"
+"Project-Id-Version: noosfero 0.18.0\n"
+"POT-Creation-Date: 2009-05-25 22:58-0300\n"
+"PO-Revision-Date: 2009-05-25 22:59-0300\n"
 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -849,58 +849,58 @@ msgid_plural &quot;%s members&quot;
 msgstr[0] "1 integrante"
 msgstr[1] "%s integrantes"
  
-#: app/helpers/application_helper.rb:508
+#: app/helpers/application_helper.rb:509
 #: app/views/content_viewer/view_page.rhtml:92
 #: app/views/categories/index.rhtml:1
 msgid "Categories"
 msgstr "Categorias"
  
-#: app/helpers/application_helper.rb:531
+#: app/helpers/application_helper.rb:532
 msgid "open"
 msgstr "aberto"
  
-#: app/helpers/application_helper.rb:570
+#: app/helpers/application_helper.rb:571
 #: app/views/layouts/application-ng.rhtml:70
 #: app/views/layouts/application-ng.rhtml:72
 #: app/views/layouts/application-ng.rhtml:75
 msgid "Search..."
 msgstr "Busca..."
  
-#: app/helpers/application_helper.rb:572
+#: app/helpers/application_helper.rb:573
 msgid "This is a search box. Click, write your query, and press enter to find"
 msgstr ""
 "Isto é uma caixa de busca. Clique, escreva sua consulta, e pressione enter "
 "para pesquisar"
  
-#: app/helpers/application_helper.rb:573
+#: app/helpers/application_helper.rb:574
 msgid "Click, write and press enter to find"
 msgstr "Clique, escreva e pressione enter para pesquisar"
  
-#: app/helpers/application_helper.rb:579 app/models/link_list_block.rb:19
+#: app/helpers/application_helper.rb:580 app/models/link_list_block.rb:19
 #: app/views/search/_sellers_form.rhtml:21
 #: app/views/search/_search_form.rhtml:19 app/views/search/communities.rhtml:9
 #: app/views/search/articles.rhtml:10 app/views/search/people.rhtml:10
-#: app/views/home/index.rhtml:55 app/views/region_validators/region.rhtml:23
+#: app/views/home/index.rhtml:57 app/views/region_validators/region.rhtml:23
 msgid "Search"
 msgstr "Busca"
  
-#: app/helpers/application_helper.rb:759
+#: app/helpers/application_helper.rb:760
 msgid "Searched for '%s'"
 msgstr "Busca por '%s'"
  
-#: app/helpers/application_helper.rb:760
+#: app/helpers/application_helper.rb:761
 msgid "In category %s"
 msgstr "Na categoria %s"
  
-#: app/helpers/application_helper.rb:761
+#: app/helpers/application_helper.rb:762
 msgid "within %d km from %s"
 msgstr "no raio de %s km até %s"
  
-#: app/helpers/application_helper.rb:762
+#: app/helpers/application_helper.rb:763
 msgid "%d results found"
 msgstr "%d resultados encontrados"
  
-#: app/helpers/application_helper.rb:768
+#: app/helpers/application_helper.rb:769
 msgid "In all categories"
 msgstr "Em todas as categorias"
  
@@ -4298,7 +4298,7 @@ msgstr &quot;Buscar dentro de:&quot;
 msgid "Search for:"
 msgstr "Buscar por:"
  
-#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:59
+#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:61
 msgid "More options"
 msgstr "Mais opções"
  
@@ -4501,15 +4501,19 @@ msgstr &quot;Editar empreendimento como favorito&quot;
 msgid "News"
 msgstr "Notícias"
  
-#: app/views/home/index.rhtml:42
+#: app/views/home/index.rhtml:31
+msgid "View more"
+msgstr "Ver mais"
+
+#: app/views/home/index.rhtml:43
 msgid "Activate your enterprise"
 msgstr "Ativar seu empreendimento"
  
-#: app/views/home/index.rhtml:43
+#: app/views/home/index.rhtml:44
 msgid "Enterprise activation code"
 msgstr "Código de Ativação do empreendimento"
  
-#: app/views/home/index.rhtml:44 app/views/enterprise_editor/index.rhtml:17
+#: app/views/home/index.rhtml:45 app/views/enterprise_editor/index.rhtml:17
 msgid "Activate"
 msgstr "Ativar"
...	...	@@ -3,31 +3,43 @@
3	3	<% end %>
4	4
5	5	<% if @has_news %>
6		- <h3><%= _('News') %></h3>
	6	+ <h1><%= _('News') %></h1>
7	7	<% cache @news_cache_key do %>
8	8	<div id='highlighted-news'>
9	9	<% @highlighted_news.each do \|highlighted\| %>
10		- <p><%= link_to(highlighted.title, highlighted.url) %><br/>
11		- <span class="post-date"><%= show_date(highlighted.published_at, true) %> </span></p>
12		- <div class='headline'><%= highlighted.first_paragraph %></div>
13		- <br style='clear:both' />
	10	+ <div class='highlighted-news-item'>
	11	+ <h2><%= link_to(highlighted.title, highlighted.url, :class => 'post-title') %></h2>
	12	+ <span class="post-date"><%= show_date(highlighted.published_at, true) %> </span></p>
	13	+ <p class='headline'><%= highlighted.first_paragraph %></p>
	14	+ <br style='clear:both' />
	15	+ </div>
14	16	<% end%>
15	17	</div>
16	18
	19	+ <div class='sep'></div>
	20	+
17	21	<div id='portal-news'>
18		- <% @portal_news.each do \|news\| %>
19		- <p><span class="post-date"><%= show_date(news.published_at, true) %> </span><%= link_to(news.title, news.url) %></p>
20		- <% end%>
	22	+ <ul>
	23	+ <% @portal_news.each do \|news\| %>
	24	+ <li>
	25	+ <span class="post-date"><%= show_date(news.published_at, true) %> </span>
	26	+ <%= link_to(news.title, news.url, :class => 'post-title' ) %>
	27	+ </li>
	28	+ <% end%>
	29	+ </ul>
21	30	</div>
22	31
	32	+ <div class='sep'></div>
	33	+
23	34	<% @area_news.each_with_index do \|folder, i\| %>
24	35	<% content_tag(:div, :class => ["news-area", ['even', 'odd'][i%2]].join(' ')) do %>
25	36	<h3><%= link_to folder.title, folder.url %></h3>
26	37	<ul>
27		- <% folder.news(3).each do \|news\| %>
28		- <li><span class='news-symbol'>></span> <%= link_to(news.title, news.url) %></li>
	38	+ <% folder.news(4).each do \|news\| %>
	39	+ <li> <%= link_to(news.title, news.url) %></li>
29	40	<% end%>
30	41	</ul>
	42	+ <%= link_to _('View more'), folder.url, :class => 'news-see-more' %>
31	43	<%end %>
32	44	<% end %>
33	45	<% end %>
...	...	@@ -47,16 +59,20 @@
47	59
48	60	<% end %>
49	61
50		-<div id='home-search' style='text-align: center'>
51		- <% form_tag :controller => 'search', :action => 'index' do %>
	62	+<% if environment.enabled?('search_in_home') %>
	63	+ <div id='home-search' style='text-align: center'>
	64	+ <% form_tag :controller => 'search', :action => 'index' do %>
52	65
53		- <div id='search-field' style='text-align: center;'>
54		- <%= text_field_tag('query', '', :size => 50) %>
55		- <%= submit_button(:search, _('Search')) %>
56		- </div>
	66	+ <div id='search-field' style='text-align: center;'>
	67	+ <%= text_field_tag('query', '', :size => 50) %>
	68	+ <%= submit_button(:search, _('Search')) %>
	69	+ </div>
57	70
58		- <div>
59		- <%= lightbox_link_to _('More options'), :controller => 'search', :action => 'popup' %>
60		- </div>
61		- <% end %>
62		-</div>
	71	+ <div>
	72	+ <%= lightbox_link_to _('More options'), :controller => 'search', :action => 'popup' %>
	73	+ </div>
	74	+ <% end %>
	75	+ </div>
	76	+<% end %>
	77	+
	78	+<br style='clear: both'/>
...	...
...	...	@@ -6,8 +6,8 @@
6	6	#, fuzzy
7	7	msgid ""
8	8	msgstr ""
9		-"Project-Id-Version: noosfero 0.17.1\n"
10		-"POT-Creation-Date: 2009-05-25 20:58-0300\n"
	9	+"Project-Id-Version: noosfero 0.18.0\n"
	10	+"POT-Creation-Date: 2009-05-25 22:58-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"
...	...	@@ -843,56 +843,56 @@ msgid_plural "%s members"
843	843	msgstr[0] ""
844	844	msgstr[1] ""
845	845
846		-#: app/helpers/application_helper.rb:508
	846	+#: app/helpers/application_helper.rb:509
847	847	#: app/views/content_viewer/view_page.rhtml:92
848	848	#: app/views/categories/index.rhtml:1
849	849	msgid "Categories"
850	850	msgstr ""
851	851
852		-#: app/helpers/application_helper.rb:531
	852	+#: app/helpers/application_helper.rb:532
853	853	msgid "open"
854	854	msgstr ""
855	855
856		-#: app/helpers/application_helper.rb:570
	856	+#: app/helpers/application_helper.rb:571
857	857	#: app/views/layouts/application-ng.rhtml:70
858	858	#: app/views/layouts/application-ng.rhtml:72
859	859	#: app/views/layouts/application-ng.rhtml:75
860	860	msgid "Search..."
861	861	msgstr ""
862	862
863		-#: app/helpers/application_helper.rb:572
	863	+#: app/helpers/application_helper.rb:573
864	864	msgid "This is a search box. Click, write your query, and press enter to find"
865	865	msgstr ""
866	866
867		-#: app/helpers/application_helper.rb:573
	867	+#: app/helpers/application_helper.rb:574
868	868	msgid "Click, write and press enter to find"
869	869	msgstr ""
870	870
871		-#: app/helpers/application_helper.rb:579 app/models/link_list_block.rb:19
	871	+#: app/helpers/application_helper.rb:580 app/models/link_list_block.rb:19
872	872	#: app/views/search/_sellers_form.rhtml:21
873	873	#: app/views/search/_search_form.rhtml:19 app/views/search/communities.rhtml:9
874	874	#: app/views/search/articles.rhtml:10 app/views/search/people.rhtml:10
875		-#: app/views/home/index.rhtml:55 app/views/region_validators/region.rhtml:23
	875	+#: app/views/home/index.rhtml:57 app/views/region_validators/region.rhtml:23
876	876	msgid "Search"
877	877	msgstr ""
878	878
879		-#: app/helpers/application_helper.rb:759
	879	+#: app/helpers/application_helper.rb:760
880	880	msgid "Searched for '%s'"
881	881	msgstr ""
882	882
883		-#: app/helpers/application_helper.rb:760
	883	+#: app/helpers/application_helper.rb:761
884	884	msgid "In category %s"
885	885	msgstr ""
886	886
887		-#: app/helpers/application_helper.rb:761
	887	+#: app/helpers/application_helper.rb:762
888	888	msgid "within %d km from %s"
889	889	msgstr ""
890	890
891		-#: app/helpers/application_helper.rb:762
	891	+#: app/helpers/application_helper.rb:763
892	892	msgid "%d results found"
893	893	msgstr ""
894	894
895		-#: app/helpers/application_helper.rb:768
	895	+#: app/helpers/application_helper.rb:769
896	896	msgid "In all categories"
897	897	msgstr ""
898	898
...	...	@@ -4153,7 +4153,7 @@ msgstr ""
4153	4153	msgid "Search for:"
4154	4154	msgstr ""
4155	4155
4156		-#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:59
	4156	+#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:61
4157	4157	msgid "More options"
4158	4158	msgstr ""
4159	4159
...	...	@@ -4353,15 +4353,19 @@ msgstr ""
4353	4353	msgid "News"
4354	4354	msgstr ""
4355	4355
4356		-#: app/views/home/index.rhtml:42
4357		-msgid "Activate your enterprise"
	4356	+#: app/views/home/index.rhtml:31
	4357	+msgid "View more"
4358	4358	msgstr ""
4359	4359
4360	4360	#: app/views/home/index.rhtml:43
	4361	+msgid "Activate your enterprise"
	4362	+msgstr ""
	4363	+
	4364	+#: app/views/home/index.rhtml:44
4361	4365	msgid "Enterprise activation code"
4362	4366	msgstr ""
4363	4367
4364		-#: app/views/home/index.rhtml:44 app/views/enterprise_editor/index.rhtml:17
	4368	+#: app/views/home/index.rhtml:45 app/views/enterprise_editor/index.rhtml:17
4365	4369	msgid "Activate"
4366	4370	msgstr ""
4367	4371
...	...
...	...	@@ -5,9 +5,9 @@
5	5	#
6	6	msgid ""
7	7	msgstr ""
8		-"Project-Id-Version: noosfero 0.17.1\n"
	8	+"Project-Id-Version: noosfero 0.18.0\n"
9	9	"Report-Msgid-Bugs-To: \n"
10		-"POT-Creation-Date: 2009-05-25 20:58-0300\n"
	10	+"POT-Creation-Date: 2009-05-25 22:58-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"
...	...	@@ -860,58 +860,58 @@ msgid_plural "%s members"
860	860	msgstr[0] "Ôter le membre"
861	861	msgstr[1] "Ôter le membre"
862	862
863		-#: app/helpers/application_helper.rb:508
	863	+#: app/helpers/application_helper.rb:509
864	864	#: app/views/content_viewer/view_page.rhtml:92
865	865	#: app/views/categories/index.rhtml:1
866	866	msgid "Categories"
867	867	msgstr "Catégories"
868	868
869		-#: app/helpers/application_helper.rb:531
	869	+#: app/helpers/application_helper.rb:532
870	870	msgid "open"
871	871	msgstr "ouvrir"
872	872
873		-#: app/helpers/application_helper.rb:570
	873	+#: app/helpers/application_helper.rb:571
874	874	#: app/views/layouts/application-ng.rhtml:70
875	875	#: app/views/layouts/application-ng.rhtml:72
876	876	#: app/views/layouts/application-ng.rhtml:75
877	877	msgid "Search..."
878	878	msgstr "Chercher..."
879	879
880		-#: app/helpers/application_helper.rb:572
	880	+#: app/helpers/application_helper.rb:573
881	881	msgid "This is a search box. Click, write your query, and press enter to find"
882	882	msgstr ""
883	883	"Ceci est une boîte de recherche. Cliquez, entrez votre requête et appuyez "
884	884	"sur Entrée pour trouver."
885	885
886		-#: app/helpers/application_helper.rb:573
	886	+#: app/helpers/application_helper.rb:574
887	887	msgid "Click, write and press enter to find"
888	888	msgstr "Cliquez, écrivez et appuyez sur Entrée pour trouver."
889	889
890		-#: app/helpers/application_helper.rb:579 app/models/link_list_block.rb:19
	890	+#: app/helpers/application_helper.rb:580 app/models/link_list_block.rb:19
891	891	#: app/views/search/_sellers_form.rhtml:21
892	892	#: app/views/search/_search_form.rhtml:19 app/views/search/communities.rhtml:9
893	893	#: app/views/search/articles.rhtml:10 app/views/search/people.rhtml:10
894		-#: app/views/home/index.rhtml:55 app/views/region_validators/region.rhtml:23
	894	+#: app/views/home/index.rhtml:57 app/views/region_validators/region.rhtml:23
895	895	msgid "Search"
896	896	msgstr "Chercher"
897	897
898		-#: app/helpers/application_helper.rb:759
	898	+#: app/helpers/application_helper.rb:760
899	899	msgid "Searched for '%s'"
900	900	msgstr "Recherche de «%s»"
901	901
902		-#: app/helpers/application_helper.rb:760
	902	+#: app/helpers/application_helper.rb:761
903	903	msgid "In category %s"
904	904	msgstr "Dans la catégorie %s"
905	905
906		-#: app/helpers/application_helper.rb:761
	906	+#: app/helpers/application_helper.rb:762
907	907	msgid "within %d km from %s"
908	908	msgstr "dans les %d km de %s"
909	909
910		-#: app/helpers/application_helper.rb:762
	910	+#: app/helpers/application_helper.rb:763
911	911	msgid "%d results found"
912	912	msgstr "%d resultats trouvés"
913	913
914		-#: app/helpers/application_helper.rb:768
	914	+#: app/helpers/application_helper.rb:769
915	915	#, fuzzy
916	916	msgid "In all categories"
917	917	msgstr "Désactiver les catégories"
...	...	@@ -4420,7 +4420,7 @@ msgstr "Recherche dans :"
4420	4420	msgid "Search for:"
4421	4421	msgstr "Rechercher :"
4422	4422
4423		-#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:59
	4423	+#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:61
4424	4424	msgid "More options"
4425	4425	msgstr "Plus d'options"
4426	4426
...	...	@@ -4633,17 +4633,22 @@ msgstr "Toutes les entreprises"
4633	4633	msgid "News"
4634	4634	msgstr "Nouveau %s"
4635	4635
4636		-#: app/views/home/index.rhtml:42
	4636	+#: app/views/home/index.rhtml:31
	4637	+#, fuzzy
	4638	+msgid "View more"
	4639	+msgstr "Voir le profil"
	4640	+
	4641	+#: app/views/home/index.rhtml:43
4637	4642	#, fuzzy
4638	4643	msgid "Activate your enterprise"
4639	4644	msgstr "Activer une entreprise approuvée"
4640	4645
4641		-#: app/views/home/index.rhtml:43
	4646	+#: app/views/home/index.rhtml:44
4642	4647	#, fuzzy
4643	4648	msgid "Enterprise activation code"
4644	4649	msgstr "Validation d'entreprises"
4645	4650
4646		-#: app/views/home/index.rhtml:44 app/views/enterprise_editor/index.rhtml:17
	4651	+#: app/views/home/index.rhtml:45 app/views/enterprise_editor/index.rhtml:17
4647	4652	msgid "Activate"
4648	4653	msgstr "Activer"
4649	4654
...	...
...	...	@@ -11,9 +11,9 @@
11	11	#
12	12	msgid ""
13	13	msgstr ""
14		-"Project-Id-Version: noosfero 0.17.1\n"
15		-"POT-Creation-Date: 2009-05-25 20:58-0300\n"
16		-"PO-Revision-Date: 2009-05-25 21:45-0300\n"
	14	+"Project-Id-Version: noosfero 0.18.0\n"
	15	+"POT-Creation-Date: 2009-05-25 22:58-0300\n"
	16	+"PO-Revision-Date: 2009-05-25 22:59-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"
...	...	@@ -849,58 +849,58 @@ msgid_plural "%s members"
849	849	msgstr[0] "1 integrante"
850	850	msgstr[1] "%s integrantes"
851	851
852		-#: app/helpers/application_helper.rb:508
	852	+#: app/helpers/application_helper.rb:509
853	853	#: app/views/content_viewer/view_page.rhtml:92
854	854	#: app/views/categories/index.rhtml:1
855	855	msgid "Categories"
856	856	msgstr "Categorias"
857	857
858		-#: app/helpers/application_helper.rb:531
	858	+#: app/helpers/application_helper.rb:532
859	859	msgid "open"
860	860	msgstr "aberto"
861	861
862		-#: app/helpers/application_helper.rb:570
	862	+#: app/helpers/application_helper.rb:571
863	863	#: app/views/layouts/application-ng.rhtml:70
864	864	#: app/views/layouts/application-ng.rhtml:72
865	865	#: app/views/layouts/application-ng.rhtml:75
866	866	msgid "Search..."
867	867	msgstr "Busca..."
868	868
869		-#: app/helpers/application_helper.rb:572
	869	+#: app/helpers/application_helper.rb:573
870	870	msgid "This is a search box. Click, write your query, and press enter to find"
871	871	msgstr ""
872	872	"Isto é uma caixa de busca. Clique, escreva sua consulta, e pressione enter "
873	873	"para pesquisar"
874	874
875		-#: app/helpers/application_helper.rb:573
	875	+#: app/helpers/application_helper.rb:574
876	876	msgid "Click, write and press enter to find"
877	877	msgstr "Clique, escreva e pressione enter para pesquisar"
878	878
879		-#: app/helpers/application_helper.rb:579 app/models/link_list_block.rb:19
	879	+#: app/helpers/application_helper.rb:580 app/models/link_list_block.rb:19
880	880	#: app/views/search/_sellers_form.rhtml:21
881	881	#: app/views/search/_search_form.rhtml:19 app/views/search/communities.rhtml:9
882	882	#: app/views/search/articles.rhtml:10 app/views/search/people.rhtml:10
883		-#: app/views/home/index.rhtml:55 app/views/region_validators/region.rhtml:23
	883	+#: app/views/home/index.rhtml:57 app/views/region_validators/region.rhtml:23
884	884	msgid "Search"
885	885	msgstr "Busca"
886	886
887		-#: app/helpers/application_helper.rb:759
	887	+#: app/helpers/application_helper.rb:760
888	888	msgid "Searched for '%s'"
889	889	msgstr "Busca por '%s'"
890	890
891		-#: app/helpers/application_helper.rb:760
	891	+#: app/helpers/application_helper.rb:761
892	892	msgid "In category %s"
893	893	msgstr "Na categoria %s"
894	894
895		-#: app/helpers/application_helper.rb:761
	895	+#: app/helpers/application_helper.rb:762
896	896	msgid "within %d km from %s"
897	897	msgstr "no raio de %s km até %s"
898	898
899		-#: app/helpers/application_helper.rb:762
	899	+#: app/helpers/application_helper.rb:763
900	900	msgid "%d results found"
901	901	msgstr "%d resultados encontrados"
902	902
903		-#: app/helpers/application_helper.rb:768
	903	+#: app/helpers/application_helper.rb:769
904	904	msgid "In all categories"
905	905	msgstr "Em todas as categorias"
906	906
...	...	@@ -4298,7 +4298,7 @@ msgstr "Buscar dentro de:"
4298	4298	msgid "Search for:"
4299	4299	msgstr "Buscar por:"
4300	4300
4301		-#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:59
	4301	+#: app/views/search/_search_form.rhtml:55 app/views/home/index.rhtml:61
4302	4302	msgid "More options"
4303	4303	msgstr "Mais opções"
4304	4304
...	...	@@ -4501,15 +4501,19 @@ msgstr "Editar empreendimento como favorito"
4501	4501	msgid "News"
4502	4502	msgstr "Notícias"
4503	4503
4504		-#: app/views/home/index.rhtml:42
	4504	+#: app/views/home/index.rhtml:31
	4505	+msgid "View more"
	4506	+msgstr "Ver mais"
	4507	+
	4508	+#: app/views/home/index.rhtml:43
4505	4509	msgid "Activate your enterprise"
4506	4510	msgstr "Ativar seu empreendimento"
4507	4511
4508		-#: app/views/home/index.rhtml:43
	4512	+#: app/views/home/index.rhtml:44
4509	4513	msgid "Enterprise activation code"
4510	4514	msgstr "Código de Ativação do empreendimento"
4511	4515
4512		-#: app/views/home/index.rhtml:44 app/views/enterprise_editor/index.rhtml:17
	4516	+#: app/views/home/index.rhtml:45 app/views/enterprise_editor/index.rhtml:17
4513	4517	msgid "Activate"
4514	4518	msgstr "Ativar"
4515	4519
...	...