Merge branch 'i18n_by_chunk' of github.com:natacha-beck/cbrain into i18n_by_chunk

Author: natacha-beck

BrainPortal/app/views/portal/report.html.erb

@@ -50,7 +50,11 @@
 
 <h2><%= t('.headings.main') %></h2>
 
+<<<<<<< HEAD
 <%= t('.paragraphs.steps_html') %>
+=======
+<%= t('.steps_html') %>
+>>>>>>> 07d546bb2c55053b96eaaab57ef526437cab8c41
 
 
 <%= form_tag( report_path , :method => :get) do %>