Download as
Browse Code »

Commit 3d8df12472c0ec6c0b5e9e9fc79f366bcf330d69

Authored by Junior Silva
2 parents 05768802 ac370ca2
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' 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,7 +21,7 @@
21 <td title='<%= _('Comments from spammers / number of comments verified') %>'><%= "#{report.spams_by_no_network} / #{report.processed_comments}" %></td> 21 <td title='<%= _('Comments from spammers / number of comments verified') %>'><%= "#{report.spams_by_no_network} / #{report.processed_comments}" %></td>
22 <td title='<%= _('Spam comments / total number of comments') %>'><%= "#{report.spams} / #{report.total_comments}" %></td> 22 <td title='<%= _('Spam comments / total number of comments') %>'><%= "#{report.spams} / #{report.total_comments}" %></td>
23 <td title='<%= _('People with more than 2 spam comments / number of people verified') %>'><%= "#{report.spammers_by_comments} / #{report.processed_people}" %></td> 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 <td title='<%= _('Spammers / total number of people') %>'><%= "#{report.spammers} / #{report.total_people}" %></td> 25 <td title='<%= _('Spammers / total number of people') %>'><%= "#{report.spammers} / #{report.total_people}" %></td>
26 </tr> 26 </tr>
27 <% end %> 27 <% end %>
po/es/noosfero.po
  Diff comments   View file @3d8df12
@@ -6128,7 +6128,7 @@ msgstr &quot;Publicar comentario&quot; @@ -6128,7 +6128,7 @@ msgstr &quot;Publicar comentario&quot;
6128 #: app/views/scrap/notifier/mail.rhtml:1 6128 #: app/views/scrap/notifier/mail.rhtml:1
6129 #: app/views/user/mailer/activation_code.rhtml:1 6129 #: app/views/user/mailer/activation_code.rhtml:1
6130 msgid "Hi, %{recipient}!" 6130 msgid "Hi, %{recipient}!"
6131 -msgstr "¡Hola, %recipient}!" 6131 +msgstr "¡Hola, %{recipient}!"
6132 6132
6133 #: app/views/comment/notifier/mail.rhtml:3 6133 #: app/views/comment/notifier/mail.rhtml:3
6134 msgid "" 6134 msgid ""
@@ -9831,7 +9831,7 @@ msgid &quot;&quot; @@ -9831,7 +9831,7 @@ msgid &quot;&quot;
9831 "%{activation_url}" 9831 "%{activation_url}"
9832 msgstr "" 9832 msgstr ""
9833 "¡Bienvenido a %{environment}! Para activar tu cuenta, sigue el enlace: " 9833 "¡Bienvenido a %{environment}! Para activar tu cuenta, sigue el enlace: "
9834 -"%{activation_urñ}" 9834 +"%{activation_url}"
9835 9835
9836 #: app/views/categories/new.rhtml:1 app/views/categories/index.rhtml:7 9836 #: app/views/categories/new.rhtml:1 app/views/categories/index.rhtml:7
9837 #: app/views/categories/index.rhtml:16 app/views/categories/index.rhtml:25 9837 #: app/views/categories/index.rhtml:16 app/views/categories/index.rhtml:25