Download as
Browse Code »

Commit 7c675b481b63e4ce62f9d106a673d1414ae81dc1

Authored by Antonio Terceiro
2 parents be9be62c 815ceb91
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 'rel-0.16.0'

Showing 10 changed files with 87 additions and 64 deletions   Show diff stats
app/views/cms/_blog.rhtml
  Diff comments   View file @7c675b4
... ... @@ -27,6 +27,9 @@
27 27 <div id='external-feed-options-only-once'>
28 28 <%= labelled_radio_button( _('Fetch posts only once'), 'article[external_feed_builder][only_once]', 'true', only_once) %>
29 29 <%= labelled_radio_button( _('Fetch posts periodically'), 'article[external_feed_builder][only_once]', 'false', !only_once) %>
  30 + <p>
  31 + <em><%= _('Feeds are updated in batches periodically. Please note that your posts will not be fetched immediately.') %></em>
  32 + </p>
30 33 </div>
31 34 </div>
32 35 </div>
... ...
po/bg/noosfero.po
  Diff comments   View file @7c675b4
... ... @@ -6,8 +6,8 @@
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
9   -"Project-Id-Version: noosfero 0.15.0\n"
10   -"POT-Creation-Date: 2009-04-07 23:53-0300\n"
  9 +"Project-Id-Version: noosfero 0.16.0\n"
  10 +"POT-Creation-Date: 2009-04-09 18:20-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"
... ... @@ -1426,7 +1426,6 @@ msgid &quot;This block presents some statistics about your environment.&quot;
1426 1426 msgstr ""
1427 1427  
1428 1428 #: app/models/environment_statistics_block.rb:21
1429   -#: public/designs/themes/zen3/footer.rhtml:14
1430 1429 msgid "One user"
1431 1430 msgid_plural "%{num} users"
1432 1431 msgstr[0] ""
... ... @@ -3812,6 +3811,12 @@ msgstr &quot;&quot;
3812 3811 msgid "Fetch posts periodically"
3813 3812 msgstr ""
3814 3813  
  3814 +#: app/views/cms/_blog.rhtml:31
  3815 +msgid ""
  3816 +"Feeds are updated in batches periodically. Please note that your posts will "
  3817 +"not be fetched immediately."
  3818 +msgstr ""
  3819 +
3815 3820 #: app/views/task_mailer/task_cancelled.text.plain.rhtml:1
3816 3821 #: app/views/task_mailer/task_finished.text.plain.rhtml:1
3817 3822 #: app/views/task_mailer/task_created.text.plain.rhtml:1
... ... @@ -5759,7 +5764,3 @@ msgstr &quot;&quot;
5759 5764 #: lib/zen3_terminology.rb:65
5760 5765 msgid "Disable activation of organizations"
5761 5766 msgstr ""
5762   -
5763   -#: public/designs/themes/zen3/footer.rhtml:2
5764   -msgid "A Ynternet.org project"
5765   -msgstr ""
... ...
po/de/noosfero.po
  Diff comments   View file @7c675b4
... ... @@ -6,8 +6,8 @@
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
9   -"Project-Id-Version: noosfero 0.15.0\n"
10   -"POT-Creation-Date: 2009-04-07 23:53-0300\n"
  9 +"Project-Id-Version: noosfero 0.16.0\n"
  10 +"POT-Creation-Date: 2009-04-09 18:20-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"
... ... @@ -1426,7 +1426,6 @@ msgid &quot;This block presents some statistics about your environment.&quot;
1426 1426 msgstr ""
1427 1427  
1428 1428 #: app/models/environment_statistics_block.rb:21
1429   -#: public/designs/themes/zen3/footer.rhtml:14
1430 1429 msgid "One user"
1431 1430 msgid_plural "%{num} users"
1432 1431 msgstr[0] ""
... ... @@ -3812,6 +3811,12 @@ msgstr &quot;&quot;
3812 3811 msgid "Fetch posts periodically"
3813 3812 msgstr ""
3814 3813  
  3814 +#: app/views/cms/_blog.rhtml:31
  3815 +msgid ""
  3816 +"Feeds are updated in batches periodically. Please note that your posts will "
  3817 +"not be fetched immediately."
  3818 +msgstr ""
  3819 +
3815 3820 #: app/views/task_mailer/task_cancelled.text.plain.rhtml:1
3816 3821 #: app/views/task_mailer/task_finished.text.plain.rhtml:1
3817 3822 #: app/views/task_mailer/task_created.text.plain.rhtml:1
... ... @@ -5759,7 +5764,3 @@ msgstr &quot;&quot;
5759 5764 #: lib/zen3_terminology.rb:65
5760 5765 msgid "Disable activation of organizations"
5761 5766 msgstr ""
5762   -
5763   -#: public/designs/themes/zen3/footer.rhtml:2
5764   -msgid "A Ynternet.org project"
5765   -msgstr ""
... ...
po/es/noosfero.po
  Diff comments   View file @7c675b4
... ... @@ -6,8 +6,8 @@
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
9   -"Project-Id-Version: noosfero 0.15.0\n"
10   -"POT-Creation-Date: 2009-04-07 23:53-0300\n"
  9 +"Project-Id-Version: noosfero 0.16.0\n"
  10 +"POT-Creation-Date: 2009-04-09 18:20-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"
... ... @@ -1426,7 +1426,6 @@ msgid &quot;This block presents some statistics about your environment.&quot;
1426 1426 msgstr ""
1427 1427  
1428 1428 #: app/models/environment_statistics_block.rb:21
1429   -#: public/designs/themes/zen3/footer.rhtml:14
1430 1429 msgid "One user"
1431 1430 msgid_plural "%{num} users"
1432 1431 msgstr[0] ""
... ... @@ -3812,6 +3811,12 @@ msgstr &quot;&quot;
3812 3811 msgid "Fetch posts periodically"
3813 3812 msgstr ""
3814 3813  
  3814 +#: app/views/cms/_blog.rhtml:31
  3815 +msgid ""
  3816 +"Feeds are updated in batches periodically. Please note that your posts will "
  3817 +"not be fetched immediately."
  3818 +msgstr ""
  3819 +
3815 3820 #: app/views/task_mailer/task_cancelled.text.plain.rhtml:1
3816 3821 #: app/views/task_mailer/task_finished.text.plain.rhtml:1
3817 3822 #: app/views/task_mailer/task_created.text.plain.rhtml:1
... ... @@ -5759,7 +5764,3 @@ msgstr &quot;&quot;
5759 5764 #: lib/zen3_terminology.rb:65
5760 5765 msgid "Disable activation of organizations"
5761 5766 msgstr ""
5762   -
5763   -#: public/designs/themes/zen3/footer.rhtml:2
5764   -msgid "A Ynternet.org project"
5765   -msgstr ""
... ...
po/fr/noosfero.po
  Diff comments   View file @7c675b4
... ... @@ -5,9 +5,9 @@
5 5 #
6 6 msgid ""
7 7 msgstr ""
8   -"Project-Id-Version: noosfero 0.15.0\n"
  8 +"Project-Id-Version: noosfero 0.16.0\n"
9 9 "Report-Msgid-Bugs-To: \n"
10   -"POT-Creation-Date: 2009-04-07 23:53-0300\n"
  10 +"POT-Creation-Date: 2009-04-09 18:20-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"
... ... @@ -1477,7 +1477,6 @@ msgstr &quot;Ce bloc présente quelques statistiques sur votre environnement.&quot;
1477 1477 #
1478 1478 # -- it is correct! :) -- terceiro
1479 1479 #: app/models/environment_statistics_block.rb:21
1480   -#: public/designs/themes/zen3/footer.rhtml:14
1481 1480 #, fuzzy
1482 1481 msgid "One user"
1483 1482 msgid_plural "%{num} users"
... ... @@ -4044,6 +4043,12 @@ msgstr &quot;&quot;
4044 4043 msgid "Fetch posts periodically"
4045 4044 msgstr ""
4046 4045  
  4046 +#: app/views/cms/_blog.rhtml:31
  4047 +msgid ""
  4048 +"Feeds are updated in batches periodically. Please note that your posts will "
  4049 +"not be fetched immediately."
  4050 +msgstr ""
  4051 +
4047 4052 #: app/views/task_mailer/task_cancelled.text.plain.rhtml:1
4048 4053 #: app/views/task_mailer/task_finished.text.plain.rhtml:1
4049 4054 #: app/views/task_mailer/task_created.text.plain.rhtml:1
... ... @@ -6134,9 +6139,8 @@ msgstr &quot;info organisation&quot;
6134 6139 msgid "Disable activation of organizations"
6135 6140 msgstr "Déactiver la recherche d'organisations"
6136 6141  
6137   -#: public/designs/themes/zen3/footer.rhtml:2
6138   -msgid "A Ynternet.org project"
6139   -msgstr "Un projet d'Ynternet.org"
  6142 +#~ msgid "A Ynternet.org project"
  6143 +#~ msgstr "Un projet d'Ynternet.org"
6140 6144  
6141 6145 #, fuzzy
6142 6146 #~ msgid "Ativar"
... ...
po/hy/noosfero.po
  Diff comments   View file @7c675b4
... ... @@ -6,8 +6,8 @@
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
9   -"Project-Id-Version: noosfero 0.15.0\n"
10   -"POT-Creation-Date: 2009-04-07 23:53-0300\n"
  9 +"Project-Id-Version: noosfero 0.16.0\n"
  10 +"POT-Creation-Date: 2009-04-09 18:20-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"
... ... @@ -1434,7 +1434,6 @@ msgid &quot;This block presents some statistics about your environment.&quot;
1434 1434 msgstr ""
1435 1435  
1436 1436 #: app/models/environment_statistics_block.rb:21
1437   -#: public/designs/themes/zen3/footer.rhtml:14
1438 1437 msgid "One user"
1439 1438 msgid_plural "%{num} users"
1440 1439 msgstr[0] "Մեկ օգտվող"
... ... @@ -3886,6 +3885,12 @@ msgstr &quot;&quot;
3886 3885 msgid "Fetch posts periodically"
3887 3886 msgstr ""
3888 3887  
  3888 +#: app/views/cms/_blog.rhtml:31
  3889 +msgid ""
  3890 +"Feeds are updated in batches periodically. Please note that your posts will "
  3891 +"not be fetched immediately."
  3892 +msgstr ""
  3893 +
3889 3894 #: app/views/task_mailer/task_cancelled.text.plain.rhtml:1
3890 3895 #: app/views/task_mailer/task_finished.text.plain.rhtml:1
3891 3896 #: app/views/task_mailer/task_created.text.plain.rhtml:1
... ... @@ -5883,9 +5888,8 @@ msgstr &quot;Կազնակերպությունները «%s»:&quot;
5883 5888 msgid "Disable activation of organizations"
5884 5889 msgstr "Դիզակտիվացնել կազմակերպությունների որոնումը"
5885 5890  
5886   -#: public/designs/themes/zen3/footer.rhtml:2
5887   -msgid "A Ynternet.org project"
5888   -msgstr "Ynternet.org - ի ծրագրերից մեկը"
  5891 +#~ msgid "A Ynternet.org project"
  5892 +#~ msgstr "Ynternet.org - ի ծրագրերից մեկը"
5889 5893  
5890 5894 #, fuzzy
5891 5895 #~ msgid "Ativar"
... ...
po/it/noosfero.po
  Diff comments   View file @7c675b4
... ... @@ -6,8 +6,8 @@
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
9   -"Project-Id-Version: noosfero 0.15.0\n"
10   -"POT-Creation-Date: 2009-04-07 23:53-0300\n"
  9 +"Project-Id-Version: noosfero 0.16.0\n"
  10 +"POT-Creation-Date: 2009-04-09 18:20-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"
... ... @@ -1426,7 +1426,6 @@ msgid &quot;This block presents some statistics about your environment.&quot;
1426 1426 msgstr ""
1427 1427  
1428 1428 #: app/models/environment_statistics_block.rb:21
1429   -#: public/designs/themes/zen3/footer.rhtml:14
1430 1429 msgid "One user"
1431 1430 msgid_plural "%{num} users"
1432 1431 msgstr[0] ""
... ... @@ -3812,6 +3811,12 @@ msgstr &quot;&quot;
3812 3811 msgid "Fetch posts periodically"
3813 3812 msgstr ""
3814 3813  
  3814 +#: app/views/cms/_blog.rhtml:31
  3815 +msgid ""
  3816 +"Feeds are updated in batches periodically. Please note that your posts will "
  3817 +"not be fetched immediately."
  3818 +msgstr ""
  3819 +
3815 3820 #: app/views/task_mailer/task_cancelled.text.plain.rhtml:1
3816 3821 #: app/views/task_mailer/task_finished.text.plain.rhtml:1
3817 3822 #: app/views/task_mailer/task_created.text.plain.rhtml:1
... ... @@ -5759,7 +5764,3 @@ msgstr &quot;&quot;
5759 5764 #: lib/zen3_terminology.rb:65
5760 5765 msgid "Disable activation of organizations"
5761 5766 msgstr ""
5762   -
5763   -#: public/designs/themes/zen3/footer.rhtml:2
5764   -msgid "A Ynternet.org project"
5765   -msgstr ""
... ...
po/nl/noosfero.po
  Diff comments   View file @7c675b4
... ... @@ -6,8 +6,8 @@
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
9   -"Project-Id-Version: noosfero 0.15.0\n"
10   -"POT-Creation-Date: 2009-04-07 23:53-0300\n"
  9 +"Project-Id-Version: noosfero 0.16.0\n"
  10 +"POT-Creation-Date: 2009-04-09 18:20-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"
... ... @@ -1426,7 +1426,6 @@ msgid &quot;This block presents some statistics about your environment.&quot;
1426 1426 msgstr ""
1427 1427  
1428 1428 #: app/models/environment_statistics_block.rb:21
1429   -#: public/designs/themes/zen3/footer.rhtml:14
1430 1429 msgid "One user"
1431 1430 msgid_plural "%{num} users"
1432 1431 msgstr[0] ""
... ... @@ -3812,6 +3811,12 @@ msgstr &quot;&quot;
3812 3811 msgid "Fetch posts periodically"
3813 3812 msgstr ""
3814 3813  
  3814 +#: app/views/cms/_blog.rhtml:31
  3815 +msgid ""
  3816 +"Feeds are updated in batches periodically. Please note that your posts will "
  3817 +"not be fetched immediately."
  3818 +msgstr ""
  3819 +
3815 3820 #: app/views/task_mailer/task_cancelled.text.plain.rhtml:1
3816 3821 #: app/views/task_mailer/task_finished.text.plain.rhtml:1
3817 3822 #: app/views/task_mailer/task_created.text.plain.rhtml:1
... ... @@ -5759,7 +5764,3 @@ msgstr &quot;&quot;
5759 5764 #: lib/zen3_terminology.rb:65
5760 5765 msgid "Disable activation of organizations"
5761 5766 msgstr ""
5762   -
5763   -#: public/designs/themes/zen3/footer.rhtml:2
5764   -msgid "A Ynternet.org project"
5765   -msgstr ""
... ...
po/noosfero.pot
  Diff comments   View file @7c675b4
... ... @@ -6,8 +6,8 @@
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
9   -"Project-Id-Version: noosfero 0.15.0\n"
10   -"POT-Creation-Date: 2009-04-07 23:53-0300\n"
  9 +"Project-Id-Version: noosfero 0.16.0\n"
  10 +"POT-Creation-Date: 2009-04-09 18:20-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"
... ... @@ -1426,7 +1426,6 @@ msgid &quot;This block presents some statistics about your environment.&quot;
1426 1426 msgstr ""
1427 1427  
1428 1428 #: app/models/environment_statistics_block.rb:21
1429   -#: public/designs/themes/zen3/footer.rhtml:14
1430 1429 msgid "One user"
1431 1430 msgid_plural "%{num} users"
1432 1431 msgstr[0] ""
... ... @@ -3812,6 +3811,12 @@ msgstr &quot;&quot;
3812 3811 msgid "Fetch posts periodically"
3813 3812 msgstr ""
3814 3813  
  3814 +#: app/views/cms/_blog.rhtml:31
  3815 +msgid ""
  3816 +"Feeds are updated in batches periodically. Please note that your posts will "
  3817 +"not be fetched immediately."
  3818 +msgstr ""
  3819 +
3815 3820 #: app/views/task_mailer/task_cancelled.text.plain.rhtml:1
3816 3821 #: app/views/task_mailer/task_finished.text.plain.rhtml:1
3817 3822 #: app/views/task_mailer/task_created.text.plain.rhtml:1
... ... @@ -5759,7 +5764,3 @@ msgstr &quot;&quot;
5759 5764 #: lib/zen3_terminology.rb:65
5760 5765 msgid "Disable activation of organizations"
5761 5766 msgstr ""
5762   -
5763   -#: public/designs/themes/zen3/footer.rhtml:2
5764   -msgid "A Ynternet.org project"
5765   -msgstr ""
... ...
po/pt_BR/noosfero.po
  Diff comments   View file @7c675b4
... ... @@ -11,9 +11,9 @@
11 11 #
12 12 msgid ""
13 13 msgstr ""
14   -"Project-Id-Version: noosfero 0.15.0\n"
15   -"POT-Creation-Date: 2009-04-07 23:53-0300\n"
16   -"PO-Revision-Date: 2009-04-07 23:56-0300\n"
  14 +"Project-Id-Version: noosfero 0.16.0\n"
  15 +"POT-Creation-Date: 2009-04-09 18:20-0300\n"
  16 +"PO-Revision-Date: 2009-04-09 18:22-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"
... ... @@ -1446,7 +1446,6 @@ msgid &quot;This block presents some statistics about your environment.&quot;
1446 1446 msgstr "Este bloco apresenta suas estatísticas sobre seu ambiente."
1447 1447  
1448 1448 #: app/models/environment_statistics_block.rb:21
1449   -#: public/designs/themes/zen3/footer.rhtml:14
1450 1449 msgid "One user"
1451 1450 msgid_plural "%{num} users"
1452 1451 msgstr[0] "Um usuário"
... ... @@ -3943,6 +3942,14 @@ msgstr &quot;Obter posts apenas uma vez&quot;
3943 3942 msgid "Fetch posts periodically"
3944 3943 msgstr "Obter posts periodicamente"
3945 3944  
  3945 +#: app/views/cms/_blog.rhtml:31
  3946 +msgid ""
  3947 +"Feeds are updated in batches periodically. Please note that your posts will "
  3948 +"not be fetched immediately."
  3949 +msgstr ""
  3950 +"Os feeds são atualizados em lote periodicamente. Por favor, note que seus "
  3951 +"não serão obtidos imediatamente."
  3952 +
3946 3953 #: app/views/task_mailer/task_cancelled.text.plain.rhtml:1
3947 3954 #: app/views/task_mailer/task_finished.text.plain.rhtml:1
3948 3955 #: app/views/task_mailer/task_created.text.plain.rhtml:1
... ... @@ -4995,9 +5002,9 @@ msgid &quot;&quot;
4995 5002 "Firefox? That is a great web browser, free, and made by people from all over "
4996 5003 "the world."
4997 5004 msgstr ""
4998   -"Este site não será apresentado tão com quanto poderia. Você não gostaria de usar o "
4999   -"Firefox? É um ótimo navegador, livre e feito por pessoas de todos as partes "
5000   -"do mundo."
  5005 +"Este site não será apresentado tão com quanto poderia. Você não gostaria de "
  5006 +"usar o Firefox? É um ótimo navegador, livre e feito por pessoas de todos as "
  5007 +"partes do mundo."
5001 5008  
5002 5009 #: app/views/layouts/application.rhtml:190
5003 5010 msgid "Get Firefox Now!"
... ... @@ -5969,9 +5976,8 @@ msgstr &quot;Código de Ativação da Organização&quot;
5969 5976 msgid "Disable activation of organizations"
5970 5977 msgstr "Desabilitar ativação de organizações"
5971 5978  
5972   -#: public/designs/themes/zen3/footer.rhtml:2
5973   -msgid "A Ynternet.org project"
5974   -msgstr "Um projeto da Ynternet.org"
  5979 +#~ msgid "A Ynternet.org project"
  5980 +#~ msgstr "Um projeto da Ynternet.org"
5975 5981  
5976 5982 #~ msgid "article"
5977 5983 #~ msgstr "artigo"
... ...