Download as
Browse Code »

Commit 3d8df12472c0ec6c0b5e9e9fc79f366bcf330d69

Authored by Junior Silva
2 parents 05768802 ac370ca2
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Merge branch 'stable' of https://gitlab.com/noosfero/noosfero into image-diff-overflow

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
plugins/spaminator/views/spaminator_plugin_admin/reports.html.erb
  Diff comments   View file @3d8df12
... ... @@ -21,7 +21,7 @@
21 21 <td title='<%= _('Comments from spammers / number of comments verified') %>'><%= "#{report.spams_by_no_network} / #{report.processed_comments}" %></td>
22 22 <td title='<%= _('Spam comments / total number of comments') %>'><%= "#{report.spams} / #{report.total_comments}" %></td>
23 23 <td title='<%= _('People with more than 2 spam comments / number of people verified') %>'><%= "#{report.spammers_by_comments} / #{report.processed_people}" %></td>
24   - <td title='<%= _('People who signed up more than one month ago, have no network / number of comments verified') %>'><%= "#{report.spammers_by_no_network} / #{report.processed_people}" %></td>
  24 + <td title='<%= _('People who signed up more than one month ago, have no network / number of people verified') %>'><%= "#{report.spammers_by_no_network} / #{report.processed_people}" %></td>
25 25 <td title='<%= _('Spammers / total number of people') %>'><%= "#{report.spammers} / #{report.total_people}" %></td>
26 26 </tr>
27 27 <% end %>
... ...
po/es/noosfero.po
  Diff comments   View file @3d8df12
... ... @@ -6128,7 +6128,7 @@ msgstr &quot;Publicar comentario&quot;
6128 6128 #: app/views/scrap/notifier/mail.rhtml:1
6129 6129 #: app/views/user/mailer/activation_code.rhtml:1
6130 6130 msgid "Hi, %{recipient}!"
6131   -msgstr "¡Hola, %recipient}!"
  6131 +msgstr "¡Hola, %{recipient}!"
6132 6132  
6133 6133 #: app/views/comment/notifier/mail.rhtml:3
6134 6134 msgid ""
... ... @@ -9831,7 +9831,7 @@ msgid &quot;&quot;
9831 9831 "%{activation_url}"
9832 9832 msgstr ""
9833 9833 "¡Bienvenido a %{environment}! Para activar tu cuenta, sigue el enlace: "
9834   -"%{activation_urñ}"
  9834 +"%{activation_url}"
9835 9835  
9836 9836 #: app/views/categories/new.rhtml:1 app/views/categories/index.rhtml:7
9837 9837 #: app/views/categories/index.rhtml:16 app/views/categories/index.rhtml:25
... ...