Merge branch 'rel-0.16.0'

Antonio Terceiro
2 parents be9be62c 815ceb91
Showing 10 changed files with 87 additions and 64 deletions Show diff stats
app/views/cms/_blog.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
@@ -27,6 +27,9 @@
       <div id='external-feed-options-only-once'>
         <%= labelled_radio_button( _('Fetch posts only once'), 'article[external_feed_builder][only_once]', 'true', only_once) %>
         <%= labelled_radio_button( _('Fetch posts periodically'), 'article[external_feed_builder][only_once]', 'false', !only_once) %>
+        <p>
+          <em><%= _('Feeds are updated in batches periodically. Please note that your posts will not be fetched immediately.') %></em>
+        </p>
       </div>
     </div>
   </div>
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.15.0\n"
-"POT-Creation-Date: 2009-04-07 23:53-0300\n"
+"Project-Id-Version: noosfero 0.16.0\n"
+"POT-Creation-Date: 2009-04-09 18:20-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"
@@ -1426,7 +1426,6 @@ msgid &quot;This block presents some statistics about your environment.&quot;
 msgstr ""
 #: app/models/environment_statistics_block.rb:21
-#: public/designs/themes/zen3/footer.rhtml:14
 msgid "One user"
 msgid_plural "%{num} users"
 msgstr[0] ""
@@ -3812,6 +3811,12 @@ msgstr &quot;&quot;
 msgid "Fetch posts periodically"
 msgstr ""
+#: app/views/cms/_blog.rhtml:31
+msgid ""
+"Feeds are updated in batches periodically. Please note that your posts will "
+"not be fetched immediately."
+msgstr ""
+
 #: app/views/task_mailer/task_cancelled.text.plain.rhtml:1
 #: app/views/task_mailer/task_finished.text.plain.rhtml:1
 #: app/views/task_mailer/task_created.text.plain.rhtml:1
@@ -5759,7 +5764,3 @@ msgstr &quot;&quot;
 #: lib/zen3_terminology.rb:65
 msgid "Disable activation of organizations"
 msgstr ""
-
-#: public/designs/themes/zen3/footer.rhtml:2
-msgid "A Ynternet.org project"
-msgstr ""
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.15.0\n"
-"POT-Creation-Date: 2009-04-07 23:53-0300\n"
+"Project-Id-Version: noosfero 0.16.0\n"
+"POT-Creation-Date: 2009-04-09 18:20-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"
@@ -1426,7 +1426,6 @@ msgid &quot;This block presents some statistics about your environment.&quot;
 msgstr ""
 #: app/models/environment_statistics_block.rb:21
-#: public/designs/themes/zen3/footer.rhtml:14
 msgid "One user"
 msgid_plural "%{num} users"
 msgstr[0] ""
@@ -3812,6 +3811,12 @@ msgstr &quot;&quot;
 msgid "Fetch posts periodically"
 msgstr ""
+#: app/views/cms/_blog.rhtml:31
+msgid ""
+"Feeds are updated in batches periodically. Please note that your posts will "
+"not be fetched immediately."
+msgstr ""
+
 #: app/views/task_mailer/task_cancelled.text.plain.rhtml:1
 #: app/views/task_mailer/task_finished.text.plain.rhtml:1
 #: app/views/task_mailer/task_created.text.plain.rhtml:1
@@ -5759,7 +5764,3 @@ msgstr &quot;&quot;
 #: lib/zen3_terminology.rb:65
 msgid "Disable activation of organizations"
 msgstr ""
-
-#: public/designs/themes/zen3/footer.rhtml:2
-msgid "A Ynternet.org project"
-msgstr ""
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.15.0\n"
-"POT-Creation-Date: 2009-04-07 23:53-0300\n"
+"Project-Id-Version: noosfero 0.16.0\n"
+"POT-Creation-Date: 2009-04-09 18:20-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"
@@ -1426,7 +1426,6 @@ msgid &quot;This block presents some statistics about your environment.&quot;
 msgstr ""
 #: app/models/environment_statistics_block.rb:21
-#: public/designs/themes/zen3/footer.rhtml:14
 msgid "One user"
 msgid_plural "%{num} users"
 msgstr[0] ""
@@ -3812,6 +3811,12 @@ msgstr &quot;&quot;
 msgid "Fetch posts periodically"
 msgstr ""
+#: app/views/cms/_blog.rhtml:31
+msgid ""
+"Feeds are updated in batches periodically. Please note that your posts will "
+"not be fetched immediately."
+msgstr ""
+
 #: app/views/task_mailer/task_cancelled.text.plain.rhtml:1
 #: app/views/task_mailer/task_finished.text.plain.rhtml:1
 #: app/views/task_mailer/task_created.text.plain.rhtml:1
@@ -5759,7 +5764,3 @@ msgstr &quot;&quot;
 #: lib/zen3_terminology.rb:65
 msgid "Disable activation of organizations"
 msgstr ""
-
-#: public/designs/themes/zen3/footer.rhtml:2
-msgid "A Ynternet.org project"
-msgstr ""
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.15.0\n"
+"Project-Id-Version: noosfero 0.16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-07 23:53-0300\n"
+"POT-Creation-Date: 2009-04-09 18:20-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"
@@ -1477,7 +1477,6 @@ msgstr &quot;Ce bloc présente quelques statistiques sur votre environnement.&quot;
 #
 # -- it is correct! :) -- terceiro
 #: app/models/environment_statistics_block.rb:21
-#: public/designs/themes/zen3/footer.rhtml:14
 #, fuzzy
 msgid "One user"
 msgid_plural "%{num} users"
@@ -4044,6 +4043,12 @@ msgstr &quot;&quot;
 msgid "Fetch posts periodically"
 msgstr ""
+#: app/views/cms/_blog.rhtml:31
+msgid ""
+"Feeds are updated in batches periodically. Please note that your posts will "
+"not be fetched immediately."
+msgstr ""
+
 #: app/views/task_mailer/task_cancelled.text.plain.rhtml:1
 #: app/views/task_mailer/task_finished.text.plain.rhtml:1
 #: app/views/task_mailer/task_created.text.plain.rhtml:1
@@ -6134,9 +6139,8 @@ msgstr &quot;info organisation&quot;
 msgid "Disable activation of organizations"
 msgstr "Déactiver la recherche d'organisations"
-#: public/designs/themes/zen3/footer.rhtml:2
-msgid "A Ynternet.org project"
-msgstr "Un projet d'Ynternet.org"
+#~ msgid "A Ynternet.org project"
+#~ msgstr "Un projet d'Ynternet.org"
 #, fuzzy
 #~ msgid "Ativar"
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.15.0\n"
-"POT-Creation-Date: 2009-04-07 23:53-0300\n"
+"Project-Id-Version: noosfero 0.16.0\n"
+"POT-Creation-Date: 2009-04-09 18:20-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"
@@ -1434,7 +1434,6 @@ msgid &quot;This block presents some statistics about your environment.&quot;
 msgstr ""
 #: app/models/environment_statistics_block.rb:21
-#: public/designs/themes/zen3/footer.rhtml:14
 msgid "One user"
 msgid_plural "%{num} users"
 msgstr[0] "Մեկ օգտվող"
@@ -3886,6 +3885,12 @@ msgstr &quot;&quot;
 msgid "Fetch posts periodically"
 msgstr ""
+#: app/views/cms/_blog.rhtml:31
+msgid ""
+"Feeds are updated in batches periodically. Please note that your posts will "
+"not be fetched immediately."
+msgstr ""
+
 #: app/views/task_mailer/task_cancelled.text.plain.rhtml:1
 #: app/views/task_mailer/task_finished.text.plain.rhtml:1
 #: app/views/task_mailer/task_created.text.plain.rhtml:1
@@ -5883,9 +5888,8 @@ msgstr &quot;Կազնակերպությունները «%s»:&quot;
 msgid "Disable activation of organizations"
 msgstr "Դիզակտիվացնել կազմակերպությունների որոնումը"
-#: public/designs/themes/zen3/footer.rhtml:2
-msgid "A Ynternet.org project"
-msgstr "Ynternet.org - ի ծրագրերից մեկը"
+#~ msgid "A Ynternet.org project"
+#~ msgstr "Ynternet.org - ի ծրագրերից մեկը"
 #, fuzzy
 #~ msgid "Ativar"
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.15.0\n"
-"POT-Creation-Date: 2009-04-07 23:53-0300\n"
+"Project-Id-Version: noosfero 0.16.0\n"
+"POT-Creation-Date: 2009-04-09 18:20-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"
@@ -1426,7 +1426,6 @@ msgid &quot;This block presents some statistics about your environment.&quot;
 msgstr ""
 #: app/models/environment_statistics_block.rb:21
-#: public/designs/themes/zen3/footer.rhtml:14
 msgid "One user"
 msgid_plural "%{num} users"
 msgstr[0] ""
@@ -3812,6 +3811,12 @@ msgstr &quot;&quot;
 msgid "Fetch posts periodically"
 msgstr ""
+#: app/views/cms/_blog.rhtml:31
+msgid ""
+"Feeds are updated in batches periodically. Please note that your posts will "
+"not be fetched immediately."
+msgstr ""
+
 #: app/views/task_mailer/task_cancelled.text.plain.rhtml:1
 #: app/views/task_mailer/task_finished.text.plain.rhtml:1
 #: app/views/task_mailer/task_created.text.plain.rhtml:1
@@ -5759,7 +5764,3 @@ msgstr &quot;&quot;
 #: lib/zen3_terminology.rb:65
 msgid "Disable activation of organizations"
 msgstr ""
-
-#: public/designs/themes/zen3/footer.rhtml:2
-msgid "A Ynternet.org project"
-msgstr ""
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.15.0\n"
-"POT-Creation-Date: 2009-04-07 23:53-0300\n"
+"Project-Id-Version: noosfero 0.16.0\n"
+"POT-Creation-Date: 2009-04-09 18:20-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"
@@ -1426,7 +1426,6 @@ msgid &quot;This block presents some statistics about your environment.&quot;
 msgstr ""
 #: app/models/environment_statistics_block.rb:21
-#: public/designs/themes/zen3/footer.rhtml:14
 msgid "One user"
 msgid_plural "%{num} users"
 msgstr[0] ""
@@ -3812,6 +3811,12 @@ msgstr &quot;&quot;
 msgid "Fetch posts periodically"
 msgstr ""
+#: app/views/cms/_blog.rhtml:31
+msgid ""
+"Feeds are updated in batches periodically. Please note that your posts will "
+"not be fetched immediately."
+msgstr ""
+
 #: app/views/task_mailer/task_cancelled.text.plain.rhtml:1
 #: app/views/task_mailer/task_finished.text.plain.rhtml:1
 #: app/views/task_mailer/task_created.text.plain.rhtml:1
@@ -5759,7 +5764,3 @@ msgstr &quot;&quot;
 #: lib/zen3_terminology.rb:65
 msgid "Disable activation of organizations"
 msgstr ""
-
-#: public/designs/themes/zen3/footer.rhtml:2
-msgid "A Ynternet.org project"
-msgstr ""
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.15.0\n"
-"POT-Creation-Date: 2009-04-07 23:53-0300\n"
+"Project-Id-Version: noosfero 0.16.0\n"
+"POT-Creation-Date: 2009-04-09 18:20-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"
@@ -1426,7 +1426,6 @@ msgid &quot;This block presents some statistics about your environment.&quot;
 msgstr ""
 #: app/models/environment_statistics_block.rb:21
-#: public/designs/themes/zen3/footer.rhtml:14
 msgid "One user"
 msgid_plural "%{num} users"
 msgstr[0] ""
@@ -3812,6 +3811,12 @@ msgstr &quot;&quot;
 msgid "Fetch posts periodically"
 msgstr ""
+#: app/views/cms/_blog.rhtml:31
+msgid ""
+"Feeds are updated in batches periodically. Please note that your posts will "
+"not be fetched immediately."
+msgstr ""
+
 #: app/views/task_mailer/task_cancelled.text.plain.rhtml:1
 #: app/views/task_mailer/task_finished.text.plain.rhtml:1
 #: app/views/task_mailer/task_created.text.plain.rhtml:1
@@ -5759,7 +5764,3 @@ msgstr &quot;&quot;
 #: lib/zen3_terminology.rb:65
 msgid "Disable activation of organizations"
 msgstr ""
-
-#: public/designs/themes/zen3/footer.rhtml:2
-msgid "A Ynternet.org project"
-msgstr ""
@@ -11,9 +11,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.15.0\n"
-"POT-Creation-Date: 2009-04-07 23:53-0300\n"
-"PO-Revision-Date: 2009-04-07 23:56-0300\n"
+"Project-Id-Version: noosfero 0.16.0\n"
+"POT-Creation-Date: 2009-04-09 18:20-0300\n"
+"PO-Revision-Date: 2009-04-09 18:22-0300\n"
 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1446,7 +1446,6 @@ msgid &quot;This block presents some statistics about your environment.&quot;
 msgstr "Este bloco apresenta suas estatísticas sobre seu ambiente."
 #: app/models/environment_statistics_block.rb:21
-#: public/designs/themes/zen3/footer.rhtml:14
 msgid "One user"
 msgid_plural "%{num} users"
 msgstr[0] "Um usuário"
@@ -3943,6 +3942,14 @@ msgstr &quot;Obter posts apenas uma vez&quot;
 msgid "Fetch posts periodically"
 msgstr "Obter posts periodicamente"
+#: app/views/cms/_blog.rhtml:31
+msgid ""
+"Feeds are updated in batches periodically. Please note that your posts will "
+"not be fetched immediately."
+msgstr ""
+"Os feeds são atualizados em lote periodicamente. Por favor, note que seus "
+"não serão obtidos imediatamente."
+
 #: app/views/task_mailer/task_cancelled.text.plain.rhtml:1
 #: app/views/task_mailer/task_finished.text.plain.rhtml:1
 #: app/views/task_mailer/task_created.text.plain.rhtml:1
@@ -4995,9 +5002,9 @@ msgid &quot;&quot;
 "Firefox? That is a great web browser, free, and made by people from all over "
 "the world."
 msgstr ""
-"Este site não será apresentado tão com quanto poderia. Você não gostaria de usar o "
-"Firefox? É um ótimo navegador, livre e feito por pessoas de todos as partes "
-"do mundo."
+"Este site não será apresentado tão com quanto poderia. Você não gostaria de "
+"usar o Firefox? É um ótimo navegador, livre e feito por pessoas de todos as "
+"partes do mundo."
 #: app/views/layouts/application.rhtml:190
 msgid "Get Firefox Now!"
@@ -5969,9 +5976,8 @@ msgstr &quot;Código de Ativação da Organização&quot;
 msgid "Disable activation of organizations"
 msgstr "Desabilitar ativação de organizações"
-#: public/designs/themes/zen3/footer.rhtml:2
-msgid "A Ynternet.org project"
-msgstr "Um projeto da Ynternet.org"
+#~ msgid "A Ynternet.org project"
+#~ msgstr "Um projeto da Ynternet.org"
 #~ msgid "article"
 #~ msgstr "artigo"