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

diff --combined app/views/oauth_clients/index.html.erb
index 54bb4f9f6f4133d17341adc6f0751f7810fe30ab,738e01a743143ddff1b6388f5a5cdfda85f1a071..0ce09d57c9014a34df87a33f4e9b81d850d9a59f
--- 1/app/views/oauth_clients/index.html.erb
--- 2/app/views/oauth_clients/index.html.erb
+++ b/app/views/oauth_clients/index.html.erb
@@@ -29,7 -29,7 +29,7 @@@
  <% end %>
  <h3><%= t ".my_apps" %></h3>
  <% if @client_applications.empty? %>
- <p><%= raw(t(".no_apps", :oauth => "<a href=\"https://oauth.net\">OAuth</a>")) %></p>
 -<p><%= t(".no_apps_html", :oauth => link_to(t(".oauth"), "https://oauth.net" )) %></p>
++<p><%= t(".no_apps_html", :oauth => link_to(t(".oauth"), "https://oauth.net")) %></p>
  <% else %>
  <p><%= t ".registered_apps" %></p>
  <% @client_applications.each do |client| %>

diff --combined app/views/site/about.html.erb
index 15255d9e0d57e1fc73e799a00a87dc431b2ad45c,3f310be5baff0156f545df5eaab684efdf34c9c8..e62af1659cbaa8fce56c2e8aeb5c296bda9f3b72
--- 1/app/views/site/about.html.erb
--- 2/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@@ -1,43 -1,41 +1,43 @@@
 -<div class='attr'>
 -  <div class='byosm'>
 -    <%= t ".copyright_html" %>
 -  </div>
 -
 -  <div class='user-image'></div>
 +<%= tag.div :lang => @locale, :dir => t("html.dir", :locale => @locale) do %>
 +  <div class='attr'>
 +    <div class='byosm'>
 +      <%= t ".copyright_html", :locale => @locale %>
 +    </div>
  
 -  <h1><%= t ".used_by_html", :name => content_tag(:span, "OpenStreetMap", :class => "user-name") %></h1>
 -</div>
 +    <div class='user-image'></div>
  
-     <h1><%= raw t ".used_by", :name => "<span class='user-name'>OpenStreetMap</span>", :locale => @locale %></h1>
 -<div class='text'>
 -  <div class='section'>
 -    <p><strong><%= t ".lede_text" %></strong></p>
 -    <h2><div class='icon local'></div><%= t ".local_knowledge_title" %></h2>
 -    <p><%= t ".local_knowledge_html" %></p>
++    <h1><%= t ".used_by_html", :name => content_tag(:span, "OpenStreetMap", :class => "user-name"), :locale => @locale %></h1>
    </div>
  
 -  <div class='section'>
 -    <h2><div class='icon community'></div><%= t ".community_driven_title" %></h2>
 -    <p><%= t ".community_driven_html", :diary_path => diary_entries_path %></p>
 -  </div>
 +  <div class='text'>
 +    <div class='section'>
 +      <p><strong><%= t ".lede_text", :locale => @locale %></strong></p>
 +      <h2><div class='icon local'></div><%= t ".local_knowledge_title", :locale => @locale %></h2>
 +      <p><%= t ".local_knowledge_html", :locale => @locale %></p>
 +    </div>
  
 -  <div class='section' id='open-data'>
 -    <h2><div class='icon open'></div><%= t ".open_data_title" %></h2>
 -    <p><%= t ".open_data_html", :copyright_path => copyright_path %></p>
 -  </div>
 +    <div class='section'>
 +      <h2><div class='icon community'></div><%= t ".community_driven_title", :locale => @locale %></h2>
 +      <p><%= t ".community_driven_html", :locale => @locale, :diary_path => diary_entries_path %></p>
 +    </div>
  
 -  <div class='section' id='legal'>
 -    <h2><div class='icon legal'></div><%= t ".legal_title" %></h2>
 -    <p><%= t ".legal_html" %></p>
 -  </div>
 +    <div class='section' id='open-data'>
 +      <h2><div class='icon open'></div><%= t ".open_data_title", :locale => @locale %></h2>
 +      <p><%= t ".open_data_html", :locale => @locale, :copyright_path => copyright_path %></p>
 +    </div>
 +
 +    <div class='section' id='legal'>
 +      <h2><div class='icon legal'></div><%= t ".legal_title", :locale => @locale %></h2>
 +      <p><%= t ".legal_html", :locale => @locale %></p>
 +    </div>
  
 -  <div class='section' id='partners'>
 -    <h2><div class='icon partners'></div><%= t ".partners_title" %></h2>
 -    <p><%= t "layouts.hosting_partners_html",
 -             :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
 -             :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"),
 -             :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>
 -    </p>
 +    <div class='section' id='partners'>
 +      <h2><div class='icon partners'></div><%= t ".partners_title", :locale => @locale %></h2>
 +      <p><%= t "layouts.hosting_partners_html", :locale => @locale,
 +                                                :ucl => link_to(t("layouts.partners_ucl", :locale => @locale), "https://www.ucl.ac.uk"),
 +                                                :bytemark => link_to(t("layouts.partners_bytemark", :locale => @locale), "https://www.bytemark.co.uk"),
 +                                                :partners => link_to(t("layouts.partners_partners", :locale => @locale), "https://hardware.openstreetmap.org/thanks/") %>
 +      </p>
 +    </div>
    </div>
 -</div>
 +<% end %>

diff --combined app/views/site/copyright.html.erb
index feec81c82172053f7921bbd8d537772c58647d1d,c6a0348df001f658ab014e6d3c0d27fbda00a92d..75f4e878db94bc50a4ecedcc2ac02cb849e95a79
--- 1/app/views/site/copyright.html.erb
--- 2/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@@ -6,14 -6,14 +6,14 @@@
        <%= tag.h1 :lang => @locale, :dir => t("html.dir", :locale => @locale) do %>
          <h1><%= t ".native.title" %></h1>
          <p>
-           <%= raw t ".native.text",
-                     :native_link => link_to(t(".native.native_link"),
-                                             :controller => "site",
-                                             :action => "copyright",
-                                             :copyright_locale => nil),
-                     :mapping_link => link_to(t(".native.mapping_link"),
-                                              :controller => "site",
-                                              :action => "index") %>
+           <%= t ".native.html",
 -              :native_link => link_to(t(".native.native_link"),
 -                                      :controller => "site",
 -                                      :action => "copyright",
 -                                      :copyright_locale => nil),
 -              :mapping_link => link_to(t(".native.mapping_link"),
 -                                       :controller => "site",
 -                                       :action => "index") %>
++                :native_link => link_to(t(".native.native_link"),
++                                        :controller => "site",
++                                        :action => "copyright",
++                                        :copyright_locale => nil),
++                :mapping_link => link_to(t(".native.mapping_link"),
++                                         :controller => "site",
++                                         :action => "index") %>
          </p>
        <% end %>
        <hr />
@@@ -24,11 -24,11 +24,11 @@@
        <% if t(".legal_babble", :locale => @locale) != t(".legal_babble", :locale => :en) %>
          <h1><%= t ".foreign.title" %></h1>
          <p>
-           <%= raw t ".foreign.text",
-                     :english_original_link => link_to(t(".foreign.english_link"),
-                                                       :controller => "site",
-                                                       :action => "copyright",
-                                                       :copyright_locale => "en") %>
+           <%= t ".foreign.html",
 -              :english_original_link => link_to(t(".foreign.english_link"),
 -                                                :controller => "site",
 -                                                :action => "copyright",
 -                                                :copyright_locale => "en") %>
++                :english_original_link => link_to(t(".foreign.english_link"),
++                                                  :controller => "site",
++                                                  :action => "copyright",
++                                                  :copyright_locale => "en") %>
          </p>
        <% end %>
        <hr />

diff --combined app/views/traces/_trace.html.erb
index 8b754a591d35803eb2312378fa8d8897cc8f1d2d,c8433599ff78dbdd8a01bcfb5fa471f2f66146a2..47860d50d4284dfeedf1b7f825beea665f3a9dfb
--- 1/app/views/traces/_trace.html.erb
--- 2/app/views/traces/_trace.html.erb
+++ b/app/views/traces/_trace.html.erb
@@@ -5,7 -5,7 +5,7 @@@
        <% if trace.inserted %>
          <a href="<%= url_for :controller => "traces", :action => "show", :id => trace.id, :display_name => trace.user.display_name %>"><img src="<%= url_for :controller => "traces", :action => "icon", :id => trace.id, :display_name => trace.user.display_name %>" border="0" alt="" /></a>
        <% else %>
 -        <span class="trace_pending"><%= t ".pending" %></span>
 +        <span class="text-danger"><%= t ".pending" %></span>
        <% end %>
      <% end %>
    </td>
@@@ -17,20 -17,14 +17,20 @@@
        ... <%= time_ago_in_words(trace.timestamp, :scope => :'datetime.distance_in_words_ago') %></span>
        <%= link_to_if trace.inserted?, t(".map"), { :controller => "site", :action => "index", :mlat => trace.latitude, :mlon => trace.longitude, :anchor => "map=14/#{trace.latitude}/#{trace.longitude}" }, { :title => t(".view_map") } %> /
        <%= link_to t(".edit"), { :controller => "site", :action => "edit", :gpx => trace.id }, { :title => t(".edit_map") } %>
 -      <span class="trace_<%= trace.visibility %>"><%= t("." + trace.visibility) %></span>
 +
 +      <% badge_class = case trace.visibility
 +                       when "public", "identifiable" then "success"
 +                       else "danger"
 +                       end %>
 +      <span class="badge badge-<%= badge_class %> text-white"><%= t("." + trace.visibility) %></span>
 +
        <br />
        <%= trace.description %>
      <br />
      <%= t ".by" %> <%= link_to h(trace.user.display_name), user_path(trace.user) %>
      <% if !trace.tags.empty? %>
        <%= t ".in" %>
-       <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %>
+       <%= safe_join(trace.tags.collect { |tag| link_to_tag tag.tag }, ", ") %>
      <% end %>
    </td>
  </tr>

diff --combined app/views/traces/show.html.erb
index 728b29c45fee0868af0ba14a891be4d5b3904a1c,07134dbbd4b8599ff4fe874e94900060f4f5f852..e049797a864127ea8a0a164613fba02c4e0f7980
--- 1/app/views/traces/show.html.erb
--- 2/app/views/traces/show.html.erb
+++ b/app/views/traces/show.html.erb
@@@ -6,7 -6,7 +6,7 @@@
    <% if @trace.inserted %>
      <img src="<%= url_for :controller => "traces", :action => "picture", :id => @trace.id, :display_name => @trace.user.display_name %>">
    <% else %>
 -    <span class="trace_pending"><%= t ".pending" %></span>
 +    <span class="text-danger"><%= t ".pending" %></span>
    <% end %>
  <% end %>
  
@@@ -25,7 -25,7 +25,7 @@@
      <td><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/, '\1,') %></td></tr>
    <tr>
      <td><%= t ".start_coordinates" %></td>
 -    <td><div class="geo"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%= link_to t(".map"), :controller => "site", :action => "index", :mlat => @trace.latitude, :mlon => @trace.longitude, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%= link_to t(".edit"), :controller => "site", :action => "edit", :gpx => @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)</td>
 +    <td><div class="d-inline"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%= link_to t(".map"), :controller => "site", :action => "index", :mlat => @trace.latitude, :mlon => @trace.longitude, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%= link_to t(".edit"), :controller => "site", :action => "edit", :gpx => @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)</td>
    </tr>
    <% end %>
    <tr>
@@@ -40,7 -40,7 +40,7 @@@
      <td><%= t ".tags" %></td>
      <td>
      <% unless @trace.tags.empty? %>
-       <%= raw(@trace.tags.collect { |tag| link_to tag.tag, :controller => "traces", :action => "index", :tag => tag.tag, :id => nil }.join(", ")) %>
+       <%= safe_join(@trace.tags.collect { |tag| link_to tag.tag, :controller => "traces", :action => "index", :tag => tag.tag, :id => nil }, ", ") %>
      <% else %>
        <i><%= t ".none" %></i>
      <% end %>

diff --combined config/locales/en.yml
index 7c3aef4aa216508e3e65ea9c60495392b6ec0419,e1662571fa5fd42c19e36eac4ee016e1e0623d3b..0a8d068fe7096dbe14cad542a48c902ee6af2674
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -221,29 -221,29 +221,29 @@@ en
        discussion: Discussion
        still_open: "Changeset still open - discussion will open once the changeset is closed."
      node:
-       title: "Node: %{name}"
-       history_title: "Node History: %{name}"
+       title_html: "Node: %{name}"
+       history_title_html: "Node History: %{name}"
      way:
-       title: "Way: %{name}"
-       history_title: "Way History: %{name}"
+       title_html: "Way: %{name}"
+       history_title_html: "Way History: %{name}"
        nodes: "Nodes"
-       also_part_of:
+       also_part_of_html:
          one: "part of way %{related_ways}"
          other: "part of ways %{related_ways}"
      relation:
-       title: "Relation: %{name}"
-       history_title: "Relation History: %{name}"
+       title_html: "Relation: %{name}"
+       history_title_html: "Relation History: %{name}"
        members: "Members"
      relation_member:
-       entry: "%{type} %{name}"
-       entry_role: "%{type} %{name} as %{role}"
+       entry_html: "%{type} %{name}"
+       entry_role_html: "%{type} %{name} as %{role}"
        type:
          node: "Node"
          way: "Way"
          relation: "Relation"
      containing_relation:
-       entry: "Relation %{relation_name}"
-       entry_role: "Relation %{relation_name} (as %{relation_role})"
+       entry_html: "Relation %{relation_name}"
+       entry_role_html: "Relation %{relation_name} (as %{relation_role})"
      not_found:
        sorry: "Sorry, %{type} #%{id} could not be found."
        type:
@@@ -373,14 -373,14 +373,14 @@@
        title: "%{user}'s diary | %{title}"
        user_title: "%{user}'s diary"
        leave_a_comment: "Leave a comment"
-       login_to_leave_a_comment: "%{login_link} to leave a comment"
+       login_to_leave_a_comment_html: "%{login_link} to leave a comment"
        login: "Login"
      no_such_entry:
        title: "No such diary entry"
        heading: "No entry with the id: %{id}"
        body: "Sorry, there is no diary entry or comment with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
      diary_entry:
-       posted_by: "Posted by %{link_user} on %{created} in %{language_link}"
+       posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}"
        comment_link: Comment on this entry
        reply_link: Reply to this entry
        comment_count:
@@@ -393,7 -393,7 +393,7 @@@
        confirm: Confirm
        report: Report this entry
      diary_comment:
-       comment_from: "Comment from %{link_user} on %{comment_created_at}"
+       comment_from_html: "Comment from %{link_user} on %{comment_created_at}"
        hide_link: Hide this comment
        unhide_link: Unhide this comment
        confirm: Confirm
@@@ -422,12 -422,12 +422,12 @@@
    geocoder:
      search:
        title:
-         latlon: 'Results from <a href="https://openstreetmap.org/">Internal</a>'
-         ca_postcode: 'Results from <a href="https://geocoder.ca/">Geocoder.CA</a>'
-         osm_nominatim: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
-         geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
-         osm_nominatim_reverse: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
-         geonames_reverse: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
+         latlon_html: 'Results from <a href="https://openstreetmap.org/">Internal</a>'
+         ca_postcode_html: 'Results from <a href="https://geocoder.ca/">Geocoder.CA</a>'
+         osm_nominatim_html: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
+         geonames_html: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
+         osm_nominatim_reverse_html: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
+         geonames_reverse_html: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
      search_osm_nominatim:
        prefix_format: "%{name}"
        prefix:
@@@ -1273,7 -1273,7 +1273,7 @@@
        from: "From"
        subject: "Subject"
        date: "Date"
-       no_messages_yet: "You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
+       no_messages_yet_html: "You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
        people_mapping_nearby: "people mapping nearby"
      message_summary:
        unread_button: "Mark as unread"
@@@ -1282,7 -1282,7 +1282,7 @@@
        destroy_button: "Delete"
      new:
        title: "Send message"
-       send_message_to: "Send a new message to %{name}"
+       send_message_to_html: "Send a new message to %{name}"
        subject: "Subject"
        body: "Body"
        back_to_inbox: "Back to inbox"
@@@ -1295,7 -1295,7 +1295,7 @@@
        body: "Sorry there is no message with that id."
      outbox:
        title: "Outbox"
-       my_inbox: "My %{inbox_link}"
+       my_inbox_html: "My %{inbox_link}"
        inbox: "inbox"
        outbox: "outbox"
        messages:
@@@ -1304,7 -1304,7 +1304,7 @@@
        to: "To"
        subject: "Subject"
        date: "Date"
-       no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
+       no_sent_messages_html: "You have no sent messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
        people_mapping_nearby: "people mapping nearby"
      reply:
        wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."
@@@ -1330,7 -1330,7 +1330,7 @@@
      about:
        next: Next
        copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
-       used_by: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices"
+       used_by_html: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices"
        lede_text: |
          OpenStreetMap is built by a community of mappers that contribute and maintain data
          about roads, trails, cafés, railway stations, and much more, all over the world.
@@@ -1373,11 -1373,11 +1373,11 @@@
      copyright:
        foreign:
          title: About this translation
-         text: In the event of a conflict between this translated page and %{english_original_link}, the English page shall take precedence
+         html: In the event of a conflict between this translated page and %{english_original_link}, the English page shall take precedence
          english_link: the English original
        native:
          title: About this page
-         text: You are viewing the English version of the copyright page. You can go back to the %{native_link} of this page or you can stop reading about copyright and %{mapping_link}.
+         html: You are viewing the English version of the copyright page. You can go back to the %{native_link} of this page or you can stop reading about copyright and %{mapping_link}.
          native_link: THIS_LANGUAGE_NAME_HERE version
          mapping_link: start mapping
        legal_babble:
@@@ -1521,12 -1521,12 +1521,12 @@@
        remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
      edit:
        not_public: "You have not set your edits to be public."
-       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your %{user_page}."
+       not_public_description_html: "You can no longer edit the map unless you do so. You can set your edits as public from your %{user_page}."
        user_page_link: user page
-       anon_edits: "(%{link})"
+       anon_edits_html: "(%{link})"
        anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
        anon_edits_link_text: "Find out why this is the case."
-       flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="https://get.adobe.com/flashplayer/">download Flash Player from Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
+       flash_player_required_html: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="https://get.adobe.com/flashplayer/">download Flash Player from Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
        potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
        potlatch2_not_configured: "Potlatch 2 has not been configured - please see https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information"
        potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)"
@@@ -1541,7 -1541,7 +1541,7 @@@
        map_image: "Map Image (shows standard layer)"
        embeddable_html: "Embeddable HTML"
        licence: "Licence"
-       export_details: 'OpenStreetMap data is licensed under the <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).'
+       export_details_html: 'OpenStreetMap data is licensed under the <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).'
        too_large:
          advice: "If the above export fails, please consider using one of the sources listed below:"
          body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads."
@@@ -1911,7 -1911,7 +1911,7 @@@
    oauth:
      authorize:
        title: "Authorize access to your account"
-       request_access: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
+       request_access_html: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
        allow_to: "Allow the client application to:"
        allow_read_prefs:  "read your user preferences."
        allow_write_prefs: "modify your user preferences."
@@@ -1923,7 -1923,7 +1923,7 @@@
        grant_access: "Grant Access"
      authorize_success:
        title: "Authorization request allowed"
-       allowed: "You have granted application %{app_name} access to your account."
+       allowed_html: "You have granted application %{app_name} access to your account."
        verification: "The verification code is %{code}."
      authorize_failure:
        title: "Authorization request failed"
@@@ -1965,7 -1965,8 +1965,8 @@@
        issued_at: "Issued At"
        revoke: "Revoke!"
        my_apps: "My Client Applications"
-       no_apps: "Do you have an application you would like to register for use with us using the %{oauth} standard? You must register your web application before it can make OAuth requests to this service."
+       no_apps_html: "Do you have an application you would like to register for use with us using the %{oauth} standard? You must register your web application before it can make OAuth requests to this service."
+       oauth: OAuth
        registered_apps: "You have the following client applications registered:"
        register_new: "Register your application"
      form:
@@@ -1996,7 -1997,7 +1997,7 @@@
        heading: "Login"
        email or username: "Email Address or Username:"
        password: "Password:"
-       openid: "%{logo} OpenID:"
+       openid_html: "%{logo} OpenID:"
        remember: "Remember me"
        lost password link: "Lost your password?"
        login_button: "Login"
@@@ -2062,7 -2063,7 +2063,7 @@@
      new:
        title: "Sign Up"
        no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
-       contact_webmaster: 'Please contact the <a href="%{webmaster}">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
+       contact_webmaster_html: 'Please contact the <a href="%{webmaster}">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
        about:
          header: Free and editable
          html: |
@@@ -2072,7 -2073,7 +2073,7 @@@
        license_agreement: 'When you confirm your account you will need to agree to the <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'
        email address: "Email Address:"
        confirm email address: "Confirm Email Address:"
-       not displayed publicly: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information'
+       not_displayed_publicly_html: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information'
        display name: "Display Name:"
        display name description: "Your publicly displayed username. You can change this later in the preferences."
        external auth: "Third Party Authentication:"
@@@ -2096,7 -2097,7 +2097,7 @@@
        consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain"
        consider_pd_why: "what's this?"
        consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
-       guidance: 'Information to help understand these terms: a <a href="%{summary}">human readable summary</a> and some <a href="%{translations}">informal translations</a>'
+       guidance_html: 'Information to help understand these terms: a <a href="%{summary}">human readable summary</a> and some <a href="%{translations}">informal translations</a>'
        continue: Continue
        declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
        decline: "Decline"
@@@ -2142,7 -2143,7 +2143,7 @@@
        spam score: "Spam Score:"
        description: Description
        user location: User location
-       if set location: "Set your home location on the %{settings_link} page to see nearby users."
+       if_set_location_html: "Set your home location on the %{settings_link} page to see nearby users."
        settings_link_text: settings
        my friends: My friends
        no friends: You have not added any friends yet.
@@@ -2198,7 -2199,7 +2199,7 @@@
          disabled link text: "why can't I edit?"
        public editing note:
          heading: "Public editing"
-         text: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
+         html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
        contributor terms:
          heading: "Contributor Terms:"
          agreed: "You have agreed to the new Contributor Terms."
@@@ -2275,8 -2276,8 +2276,8 @@@
        showing:
          one: Page %{page} (%{first_item} of %{items})
          other: Page %{page} (%{first_item}-%{last_item} of %{items})
-       summary: "%{name} created from %{ip_address} on %{date}"
-       summary_no_ip: "%{name} created on %{date}"
+       summary_html: "%{name} created from %{ip_address} on %{date}"
+       summary_no_ip_html: "%{name} created on %{date}"
        confirm: Confirm Selected Users
        hide: Hide Selected Users
        empty: No matching users found
@@@ -2284,7 -2285,7 +2285,7 @@@
        title: Account Suspended
        heading: Account Suspended
        webmaster: webmaster
-       body: |
+       body_html: |
          <p>
            Sorry, your account has been automatically suspended due to
            suspicious activity.
@@@ -2335,7 -2336,7 +2336,7 @@@
        back: "Back to index"
      new:
        title: "Creating block on %{name}"
-       heading: "Creating block on %{name}"
+       heading_html: "Creating block on %{name}"
        reason: "The reason why %{name} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."
        period: "How long, starting now, the user will be blocked from the API for."
        tried_contacting: "I have contacted the user and asked them to stop."
@@@ -2344,7 -2345,7 +2345,7 @@@
        back: "View all blocks"
      edit:
        title: "Editing block on %{name}"
-       heading: "Editing block on %{name}"
+       heading_html: "Editing block on %{name}"
        reason: "The reason why %{name} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."
        period: "How long, starting now, the user will be blocked from the API for."
        show: "View this block"
@@@ -2366,7 -2367,7 +2367,7 @@@
        empty: "No blocks have been made yet."
      revoke:
        title: "Revoking block on %{block_on}"
-       heading: "Revoking block on %{block_on} by %{block_by}"
+       heading_html: "Revoking block on %{block_on} by %{block_by}"
        time_future: "This block will end in %{time}."
        past: "This block ended %{time} and cannot be revoked now."
        confirm: "Are you sure you wish to revoke this block?"
@@@ -2395,15 -2396,15 +2396,15 @@@
            other: "%{count} years"
      blocks_on:
        title: "Blocks on %{name}"
-       heading: "List of blocks on %{name}"
+       heading_html: "List of blocks on %{name}"
        empty: "%{name} has not been blocked yet."
      blocks_by:
        title: "Blocks by %{name}"
-       heading: "List of blocks by %{name}"
+       heading_html: "List of blocks by %{name}"
        empty: "%{name} has not made any blocks yet."
      show:
        title: "%{block_on} blocked by %{block_by}"
-       heading: "%{block_on} blocked by %{block_by}"
+       heading_html: "%{block_on} blocked by %{block_by}"
        created: "Created"
        status: "Status"
        show: "Show"
@@@ -2472,8 -2473,6 +2473,8 @@@
          out: Zoom Out
        locate:
          title: Show My Location
 +        metersUnit: meters
 +        feetUnit: feet
          popup: You are within {distance} {unit} of this point
        base:
          standard: Standard