Resolve conflict

[rails.git] / app / views / site / copyright.html.erb

diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb
index 160dfea7c48f7bc149127d11e8a5d94980046677..d782656688887d639bce75cb98a6449fcc948880 100644 (file)
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -3,7 +3,7 @@
   <!-- Maybe ease foreigners back to their native page -->
 
     <% if t('license_page.legal_babble', :locale => I18n.locale) != t('license_page.legal_babble', :locale => :en) %>
-      <h2><%= t 'license_page.native.title' %></h2>
+      <h1><%= t 'license_page.native.title' %></h1>
       <p>
         <%= raw t 'license_page.native.text',
                     :native_link => link_to(t('license_page.native.native_link'),
@@ -19,7 +19,7 @@
   <% else %>
     <!-- Maybe note that this page has been translated -->
     <% if t('license_page.legal_babble', :locale => @locale) != t('license_page.legal_babble', :locale => :en) %>
-      <h2><%= t 'license_page.foreign.title' %></h2>
+      <h1><%= t 'license_page.foreign.title' %></h1>
       <p>
         <%= raw t 'license_page.foreign.text',
                     :english_original_link => link_to(t('license_page.foreign.english_link'),
@@ -31,7 +31,7 @@
     <% end %>
   <% end %>
 
-  <h2><%= t "license_page.legal_babble.title_html", :locale => @locale %></h2>
+  <h1><%= t "license_page.legal_babble.title_html", :locale => @locale %></h1>
 
 <% end %>
 
@@ -57,6 +57,7 @@
 <ul id="contributors">
   <li><%= t "license_page.legal_babble.contributors_at_html", :locale => @locale %></li>
   <li><%= t "license_page.legal_babble.contributors_ca_html", :locale => @locale %></li>
+  <li><%= t "license_page.legal_babble.contributors_fi_html", :locale => @locale %></li>
   <li><%= t "license_page.legal_babble.contributors_fr_html", :locale => @locale %></li>
   <li><%= t "license_page.legal_babble.contributors_nl_html", :locale => @locale %></li>
   <li><%= t "license_page.legal_babble.contributors_nz_html", :locale => @locale %></li>
@@ -68,4 +69,4 @@
 
 <h3><%= t "license_page.legal_babble.infringement_title_html", :locale => @locale %></h3>
 <p><%= t "license_page.legal_babble.infringement_1_html", :locale => @locale %></p>
-<p><%= t "license_page.legal_babble.infringement_2_html", :locale => @locale %></p>
\ No newline at end of file
+<p><%= t "license_page.legal_babble.infringement_2_html", :locale => @locale %></p>