Merge remote-tracking branch 'upstream/pull/2661'

This commit is contained in:
Tom Hughes 2020-07-01 08:28:08 +01:00
commit 0585866202
2 changed files with 18 additions and 13 deletions

View file

@ -44,12 +44,13 @@
<%= tag.div :lang => @locale, :dir => t("html.dir", :locale => @locale) do %>
<p><%= t ".legal_babble.intro_1_html", :locale => @locale %></p>
<p><%= t ".legal_babble.intro_2_html", :locale => @locale %></p>
<p><%= t ".legal_babble.intro_3_html", :locale => @locale %></p>
<p><%= t ".legal_babble.intro_3_1_html", :locale => @locale %></p>
<h3><%= t ".legal_babble.credit_title_html", :locale => @locale %></h3>
<p><%= t ".legal_babble.credit_1_html", :locale => @locale %></p>
<p><%= t ".legal_babble.credit_2_html", :locale => @locale %></p>
<p><%= t ".legal_babble.credit_3_html", :locale => @locale %></p>
<p><%= t ".legal_babble.credit_2_1_html", :locale => @locale %></p>
<p><%= t ".legal_babble.credit_3_1_html", :locale => @locale %></p>
<p><%= t ".legal_babble.credit_4_html", :locale => @locale %></p>
<p><%= image_tag("attribution_example.png",
:alt => t(".legal_babble.attribution_example.alt"),
:border => 0,