From: Tom Hughes <tom@compton.nu>
Date: Tue, 10 Dec 2024 19:03:55 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4200'
X-Git-Tag: live~4
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/edda4af515cfb0bd4de1ed0650b47e124bfad6ed?hp=156c526c22fd9f96ffc8667fafaaf10e206a70e4

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

diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
index 67a676d87..6da5e7164 100644
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -24,10 +24,10 @@ jobs:
           bundler-cache: true
       - name: Create base branch
         run: |
-          git fetch ${{ github.event.pull_request.base.repo.clone_url }} ${{ github.event.pull_request.base.ref }}:danger_base
+          git fetch ${{ github.event.pull_request.base.repo.clone_url }} ${{ github.event.pull_request.base.sha }}:danger_base
       - name: Create head branch
         run: |
-          git fetch ${{ github.event.pull_request.head.repo.clone_url }} ${{ github.event.pull_request.head.ref }}:danger_head
+          git fetch ${{ github.event.pull_request.head.repo.clone_url }} ${{ github.event.pull_request.head.sha }}:danger_head
       - name: Danger
         env:
           DANGER_GITHUB_BEARER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Gemfile.lock b/Gemfile.lock
index d909ddad6..da664ddf0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -60,7 +60,7 @@ GEM
       activemodel (= 7.2.2)
       activesupport (= 7.2.2)
       timeout (>= 0.4.0)
-    activerecord-import (1.8.1)
+    activerecord-import (2.0.0)
       activerecord (>= 4.2)
     activestorage (7.2.2)
       actionpack (= 7.2.2)
@@ -92,7 +92,7 @@ GEM
     autoprefixer-rails (10.4.19.0)
       execjs (~> 2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1016.0)
+    aws-partitions (1.1019.0)
     aws-sdk-core (3.214.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
@@ -101,7 +101,7 @@ GEM
     aws-sdk-kms (1.96.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.175.0)
+    aws-sdk-s3 (1.176.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -208,7 +208,7 @@ GEM
       activerecord (>= 3.0, < 9.0)
       delayed_job (>= 3.0, < 5)
     docile (1.4.1)
-    doorkeeper (5.8.0)
+    doorkeeper (5.8.1)
       railties (>= 5)
     doorkeeper-i18n (5.2.7)
       doorkeeper (>= 5.2)
@@ -265,7 +265,7 @@ GEM
     factory_bot_rails (6.4.4)
       factory_bot (~> 6.5)
       railties (>= 5.0.0)
-    faraday (2.12.1)
+    faraday (2.12.2)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -373,7 +373,7 @@ GEM
     mini_portile2 (2.8.8)
     mini_racer (0.9.0)
       libv8-node (~> 18.19.0.0)
-    minitest (5.25.2)
+    minitest (5.25.4)
     minitest-focus (1.4.0)
       minitest (>= 4, < 6)
     msgpack (1.7.5)
@@ -393,7 +393,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.16.8)
+    nokogiri (1.17.1)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth (1.1.0)
@@ -461,7 +461,7 @@ GEM
     pg (1.5.9)
     popper_js (2.11.8)
     progress (3.6.0)
-    pstore (0.1.3)
+    pstore (0.1.4)
     psych (5.2.1)
       date
       stringio
@@ -639,7 +639,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.6.0)
     uri (0.13.1)
-    useragent (0.16.10)
+    useragent (0.16.11)
     validates_email_format_of (1.8.2)
       i18n (>= 0.8.0)
       simpleidn
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index c419f9321..56495b31a 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -207,7 +207,7 @@ $(document).ready(function () {
   if (OSM.MATOMO) {
     map.on("layeradd", function (e) {
       if (e.layer.options) {
-        var goal = OSM.MATOMO.goals[e.layer.options.keyid];
+        var goal = OSM.MATOMO.goals[e.layer.options.layerId];
 
         if (goal) {
           $("body").trigger("matomogoal", goal);
@@ -255,20 +255,10 @@ $(document).ready(function () {
     });
 
     function sendRemoteEditCommand(url, callback) {
-      var iframe = $("<iframe>");
-      var timeoutId = setTimeout(function () {
-        alert(I18n.t("site.index.remote_failed"));
-        iframe.remove();
-      }, 5000);
-
-      iframe
-        .hide()
-        .appendTo("body")
-        .attr("src", url)
-        .on("load", function () {
-          clearTimeout(timeoutId);
-          iframe.remove();
-          if (callback) callback();
+      fetch(url, { mode: "no-cors", signal: AbortSignal.timeout(5000) })
+        .then(callback)
+        .catch(function () {
+          alert(I18n.t("site.index.remote_failed"));
         });
     }
 
diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index dc692a4a5..35b958c7a 100644
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -29,7 +29,7 @@ L.OSM.layers = function (options) {
 
       map.whenReady(function () {
         var miniMap = L.map(mapContainer[0], { attributionControl: false, zoomControl: false, keyboard: false })
-          .addLayer(new layer.constructor({ apikey: layer.options.apikey }));
+          .addLayer(new layer.constructor(layer.options));
 
         miniMap.dragging.disable();
         miniMap.touchZoom.disable();
diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index 78f43b73a..02ed318ac 100644
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -20,17 +20,24 @@ L.OSM.Map = L.Map.extend({
     for (const layerDefinition of OSM.LAYER_DEFINITIONS) {
       if (layerDefinition.apiKeyId && !OSM[layerDefinition.apiKeyId]) continue;
 
-      const layerOptions = {
-        attribution: makeAttribution(layerDefinition.credit),
-        code: layerDefinition.code,
-        keyid: layerDefinition.keyId,
-        name: I18n.t(`javascripts.map.base.${layerDefinition.nameId}`)
-      };
-      if (layerDefinition.apiKeyId) {
-        layerOptions.apikey = OSM[layerDefinition.apiKeyId];
+      let layerConstructor = L.OSM.TileLayer;
+      const layerOptions = {};
+
+      for (const [property, value] of Object.entries(layerDefinition)) {
+        if (property === "credit") {
+          layerOptions.attribution = makeAttribution(value);
+        } else if (property === "nameId") {
+          layerOptions.name = I18n.t(`javascripts.map.base.${value}`);
+        } else if (property === "apiKeyId") {
+          layerOptions.apikey = OSM[value];
+        } else if (property === "leafletOsmId") {
+          layerConstructor = L.OSM[value];
+        } else {
+          layerOptions[property] = value;
+        }
       }
 
-      const layer = new L.OSM[layerDefinition.leafletOsmId](layerOptions);
+      const layer = new layerConstructor(layerOptions);
       this.baseLayers.push(layer);
     }
 
@@ -125,7 +132,7 @@ L.OSM.Map = L.Map.extend({
   getMapBaseLayerId: function () {
     var baseLayerId;
     this.eachLayer(function (layer) {
-      if (layer.options && layer.options.keyid) baseLayerId = layer.options.keyid;
+      if (layer.options && layer.options.layerId) baseLayerId = layer.options.layerId;
     });
     return baseLayerId;
   },
diff --git a/app/assets/stylesheets/browse.scss b/app/assets/stylesheets/browse.scss
deleted file mode 100644
index 2dac602fe..000000000
--- a/app/assets/stylesheets/browse.scss
+++ /dev/null
@@ -1,180 +0,0 @@
-$map-sidebar-icons: (
-
-  /* Nodes (and ways as areas) */
-
-  ".aeroway.aerodrome": ("filename": "aerodrome.p.16.png"),
-  
-  ".amenity.atm": ("filename": "amenity_atm.16.png", "invert": true),
-  ".amenity.bank": ("filename": "amenity_bank.16.png", "invert": true),
-  ".amenity.bar": ("filename": "amenity_bar.16.png", "invert": true),
-  ".amenity.bench": ("filename": "amenity_bench.16.png", "invert": true),
-  ".amenity.biergarten": ("filename": "amenity_biergarten.16.png", "invert": true),
-  ".amenity.bicycle_parking": ("filename": "amenity_bicycle_parking.16.png"),
-  ".amenity.bicycle_rental": ("filename": "transport_rental_bicycle.16.png"),
-  ".amenity.bus_station": ("filename": "bus_station.n.16.png"),
-  ".amenity.cafe": ("filename": "amenity_cafe.16.png", "invert": true),
-  ".amenity.car_rental": ("filename": "transport_rental_car.16.png"),
-  ".amenity.car_sharing": ("filename": "car_share.p.16.png"),
-  ".amenity.childcare": ("filename": "amenity_childcare.p.16.png"),
-  ".amenity.cinema": ("filename": "amenity_cinema.16.png", "invert": true),
-  ".amenity.courthouse": ("filename": "amenity_courthouse.16.png", "invert": true),
-  ".amenity.dentist": ("filename": "amenity_dentist.16.png"),
-  ".amenity.doctors": ("filename": "amenity_doctors.16.png"),
-  ".amenity.drinking_water": ("filename": "amenity_drinking_water.16.png", "invert": true),
-  ".amenity.fast_food": ("filename": "amenity_fast_food.16.png", "invert": true),
-  ".amenity.fire_station": ("filename": "amenity_fire_station.16.png", "invert": true),
-  ".amenity.fuel": ("filename": "amenity_fuel.16.png"),
-  ".amenity.hospital": ("filename": "amenity_hospital.16.png"),
-  ".amenity.kindergarten": ("filename": "amenity_childcare.p.16.png"),
-  ".amenity.library": ("filename": "library.p.16.png", "invert": true),
-  ".amenity.nightclub": ("filename": "amenity_nightclub.16.png", "invert": true),
-  ".amenity.parking": ("filename": "parking.p.16.png"),
-  ".amenity.pharmacy": ("filename": "amenity_pharmacy.16.png"),
-  ".amenity.place_of_worship": ("filename": "amenity_place_of_worship.16.png", "invert": true),
-  ".amenity.police": ("filename": "amenity_police.16.png", "invert": true),
-  ".amenity.post_box": ("filename": "post_box.p.16.png", "invert": true),
-  ".amenity.post_office": ("filename": "post_office.p.16.png", "invert": true),
-  ".amenity.prison": ("filename": "amenity_prison.16.png", "invert": true),
-  ".amenity.pub": ("filename": "amenity_pub.16.png", "invert": true),
-  ".amenity.restaurant": ("filename": "amenity_restaurant.16.png", "invert": true),
-  ".amenity.recycling": ("filename": "amenity_recycling.16.png", "invert": true),
-  ".amenity.school": ("filename": "education_school.p.16.png"),
-  ".amenity.shelter": ("filename": "shelter2.p.16.png"),
-  ".amenity.taxi": ("filename": "amenity_taxi.16.png"),
-  ".amenity.telephone": ("filename": "telephone.p.16.png", "invert": true),
-  ".amenity.theatre": ("filename": "amenity_theatre.16.png", "invert": true),
-  ".amenity.toilets": ("filename": "amenity_toilets.16.png", "invert": true),
-  ".amenity.townhall": ("filename": "amenity_townhall.16.png", "invert": true),
-  ".amenity.university": ("filename": "education_university.p.16.png"),
-  ".amenity.veterinary": ("filename": "health_veterinary.p.16.png"),
-  ".amenity.waste_basket": ("filename": "amenity_waste_basket.16.png", "invert": true),
-
-  ".barrier.gate": ("filename": "gate2.p.16.png", "invert": true),
-
-  ".highway.bus_stop": ("filename": "highway_bus_stop.16.png"),
-  ".highway.mini_roundabout": ("filename": "mini_round.p.16.png"),
-  ".highway.traffic_signals": ("filename": "traffic_light.png", "invert": true),
-  ".highway.turning_circle": ("filename": "turning_circle.p.16.png"),
-
-  ".historic.archaeological_site": ("filename": "historic_archaeological_site.16.png", "invert": true),
-  ".historic.castle": ("filename": "tourist_castle.p.16.png", "invert": true),
-  ".historic.memorial": ("filename": "historic_memorial.16.png", "invert": true),
-  ".historic.monument": ("filename": "historic_monument.16.png", "invert": true),
-  ".historic.ruins": ("filename": "tourist_ruins.p.16.png", "invert": true),
-  ".historic.wreck": ("filename": "tourist_wreck.p.16.png", "invert": true),
-
-  ".man_made.lighthouse": ("filename": "man_made_lighthouse.16.png"),
-  ".man_made.water_tower": ("filename": "man_made_water_tower.16.png", "invert": true),
-  ".man_made.windmill": ("filename": "man_made_windmill.16.png", "invert": true),
-
-  ".natural.tree": ("filename": "tree.p.16.png"),
-
-  ".office.diplomatic": ("filename": "office_diplomatic.16.png"),
-  ".office.estate_agent": ("filename": "shop_estateagent.16.png"),
-
-  ".railway.halt": ("filename": "halt.p.16.png"),
-  ".railway.station": ("filename": "station.p.16.png"),
-  ".railway.level_crossing": ("filename": "level_crossing.p.16.png", "invert": true),
-
-  ".shop": ("filename": "shop_convenience.p.16.png"),
-  ".shop.alcohol": ("filename": "shop_alcohol.16.png"),
-  ".shop.bakery": ("filename": "shop_bakery.16.png"),
-  ".shop.bicycle": ("filename": "shop_bicycle.16.png"),
-  ".shop.books": ("filename": "shop_books.16.png"),
-  ".shop.butcher": ("filename": "shop_butcher.p.16.png"),
-  ".shop.clothes": ("filename": "shop_clothes.16.png"),
-  ".shop.car_parts": ("filename": "shop_car_parts.16.png"),
-  ".shop.car_repair": ("filename": "shop_car_repair.16.png"),
-  ".shop.convenience": ("filename": "shop_convenience.p.16.png"),
-  ".shop.doityourself": ("filename": "shop_doityourself.16.png"),
-  ".shop.electronics": ("filename": "shop_electronics.16.png"),
-  ".shop.estate_agent": ("filename": "shop_estateagent.16.png"),
-  ".shop.fashion": ("filename": "shop_clothes.16.png"),
-  ".shop.florist": ("filename": "shop_florist.16.png"),
-  ".shop.furniture": ("filename": "shop_furniture.16.png"),
-  ".shop.garden_centre": ("filename": "shop_florist.16.png"),
-  ".shop.gift": ("filename": "shop_gift.16.png"),
-  ".shop.greengrocer": ("filename": "shop_greengrocer.p.16.png"),
-  ".shop.hardware": ("filename": "shop_doityourself.16.png"),
-  ".shop.hairdresser": ("filename": "shop_hairdresser.16.png"),
-  ".shop.jewelry": ("filename": "shop_jewelry.16.png"),
-  ".shop.mobile_phone": ("filename": "shop_mobile_phone.16.png"),
-  ".shop.optician": ("filename": "shop_optician.16.png"),
-  ".shop.pet": ("filename": "shop_pet.16.png"),
-  ".shop.seafood": ("filename": "shop_seafood.16.png"),
-  ".shop.shoes": ("filename": "shop_shoes.16.png"),
-  ".shop.supermarket": ("filename": "shop_supermarket.p.16.png"),
-
-  ".tourism.alpine_hut": ("filename": "tourism_alpine_hut.16.png"),
-  ".tourism.camp_site": ("filename": "tourism_camp_site.16.png"),
-  ".tourism.caravan_site": ("filename": "tourism_caravan_site.16.png"),
-  ".tourism.hostel": ("filename": "tourism_hostel.16.png"),
-  ".tourism.hotel": ("filename": "tourism_hotel.16.png"),
-  ".tourism.motel": ("filename": "tourism_motel.16.png"),
-  ".tourism.museum": ("filename": "tourism_museum.16.png", "invert": true),
-  ".tourism.picnic_site": ("filename": "tourism_picnic_site.16.png", "invert": true),
-  ".tourism.viewpoint": ("filename": "view_point.p.16.png", "invert": true),
-  ".tourism.wilderness_hut": ("filename": "tourism_wilderness_hut.16.png"),
-
-  /* Ways */
-
-  ".aeroway.runway": ("filename": "runway.20.png"),
-  ".aeroway.taxiway": ("filename": "taxiway.20.png"),
-
-  ".barrier.wall": ("filename": "wall.20.png"),
-
-  ".building": ("filename": "building.png"),
-
-  ".highway.bridleway": ("filename": "bridleway.20.png"),
-  ".highway.cycleway": ("filename": "cycleway.20.png"),
-  ".highway.footway": ("filename": "footway.20.png"),
-  ".highway.motorway": ("filename": "motorway.20.png"),
-  ".highway.motorway_link": ("filename": "motorway.20.png"),
-  ".highway.path": ("filename": "path.20.png"),
-  ".highway.pedestrian": ("filename": "service.20.png"),
-  ".highway.primary": ("filename": "primary.20.png"),
-  ".highway.primary_link": ("filename": "primary.20.png"),
-  ".highway.residential": ("filename": "unclassified.20.png"),
-  ".highway.secondary": ("filename": "secondary.20.png"),
-  ".highway.secondary_link": ("filename": "secondary.20.png"),
-  ".highway.service": ("filename": "service.20.png"),
-  ".highway.tertiary": ("filename": "tertiary.20.png"),
-  ".highway.track": ("filename": "track.20.png"),
-  ".highway.trunk": ("filename": "trunk.20.png"),
-  ".highway.trunk_link": ("filename": "trunk.20.png"),
-  ".highway.unclassified": ("filename": "unclassified.20.png"),
-
-  ".landuse.brownfield": ("filename": "brownfield.png"),
-  ".landuse.cemetery": ("filename": "cemetery.png"),
-  ".landuse.commercial": ("filename": "commercial.png"),
-  ".landuse.farmland": ("filename": "farmland.png"),
-  ".landuse.farmyard": ("filename": "farmyard.png"),
-  ".landuse.forest": ("filename": "forest.png"),
-  ".landuse.grass": ("filename": "grass.png"),
-  ".landuse.industrial": ("filename": "industrial.png"),
-  ".landuse.meadow": ("filename": "meadow.png"),
-  ".landuse.military": ("filename": "military.png"),
-  ".landuse.residential": ("filename": "residential.png"),
-  ".landuse.retail": ("filename": "retail.png"),
-  ".landuse.tourism": ("filename": "tourism.png"),
-
-  ".leisure.golf_course": ("filename": "golf.png"),
-  ".leisure.park": ("filename": "park.png"),
-  ".leisure.picnic_table": ("filename": "tourism_picnic_site.16.png", "invert": true),
-  ".leisure.playground": ("filename": "leisure_playground.16.png", "invert": true),
-  ".leisure.pitch": ("filename": "pitch.png"),
-  ".leisure.nature_reserve": ("filename": "reserve.png"),
-  ".leisure.water_park": ("filename": "leisure_water_park.16.png", "invert": true),
-
-  ".natural.grassland": ("filename": "grassland.png"),
-  ".natural.heath": ("filename": "heathland.png"),
-  ".natural.scrub": ("filename": "scrub.png"),
-  ".natural.water": ("filename": "lake.png"),
-  ".natural.wood": ("filename": "wood.png"),
-
-  ".railway.light_rail": ("filename": "light_rail.20.png"),
-  ".railway.rail": ("filename": "rail.20.png"),
-  ".railway.subway": ("filename": "subway.20.png"),
-  ".railway.tram": ("filename": "tram.20.png"),
-
-)
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index cf63c8f8c..c5e2d14b1 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1,6 +1,5 @@
 @use "sass:map";
 @import "parameters";
-@import "browse";
 @import "bootstrap";
 @import "rails_bootstrap_forms";
 
@@ -217,6 +216,10 @@ body.small-nav {
     .search_forms {
       display: block;
     }
+
+    .username {
+      max-width: unset;
+    }
   }
 
   #sidebar .search_forms {
@@ -966,34 +969,20 @@ img.trace_image {
 
 /* Rules for map sidebar icons */
 
-.browse-section {
-  .node::before,
-  .way::before,
-  .relation::before {
-    display: inline-block;
-    width: 25px;
-    margin-left: -25px;
-  }
+.browse-section .browse-element-list {
+  line-height: 1.25rem;
 
-  .node, .way, .relation {
-    margin-left: 25px;
+  .browse-icon {
+    height: 1.25rem;
   }
 
-  .node::before     { content: image-url('browse/node.svg'); }
-  .way::before      { content: image-url('browse/way.svg'); }
-  .relation::before { content: image-url('browse/relation.svg'); }
-}
-
-@each $class, $item in $map-sidebar-icons {
-  .browse-section #{$class}::before {
-    content: image-url('browse/#{map.get($item, "filename")}');
+  .d-flex > .browse-icon {
+    height: max(20px, 1.25rem);
   }
 
-  @if map.get($item, "invert") {
-    @include color-mode(dark) {
-      .browse-section #{$class}::before {
-        filter: invert(.8) hue-rotate(180deg);
-      }
+  @include color-mode(dark) {
+    .browse-icon-invertible {
+      filter: invert(.8) hue-rotate(180deg);
     }
   }
 }
diff --git a/app/controllers/api/relations_controller.rb b/app/controllers/api/relations_controller.rb
index b237f8bf8..a9b85de7d 100644
--- a/app/controllers/api/relations_controller.rb
+++ b/app/controllers/api/relations_controller.rb
@@ -48,8 +48,6 @@ module Api
     end
 
     def update
-      logger.debug request.raw_post
-
       relation = Relation.find(params[:id])
       new_relation = Relation.from_xml(request.raw_post)
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7ce804ced..bde7e0287 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -21,7 +21,7 @@ class ApplicationController < ActionController::Base
 
   def self.allow_thirdparty_images(**options)
     content_security_policy(options) do |policy|
-      policy.img_src("*")
+      policy.img_src("*", :data)
     end
   end
 
@@ -253,9 +253,7 @@ class ApplicationController < ActionController::Base
   def map_layout
     policy = request.content_security_policy.clone
 
-    policy.child_src(*policy.child_src, "http://127.0.0.1:8111", "https://127.0.0.1:8112")
-    policy.frame_src(*policy.frame_src, "http://127.0.0.1:8111", "https://127.0.0.1:8112")
-    policy.connect_src(*policy.connect_src, Settings.nominatim_url, Settings.overpass_url, Settings.fossgis_osrm_url, Settings.graphhopper_url, Settings.fossgis_valhalla_url)
+    policy.connect_src(*policy.connect_src, "http://127.0.0.1:8111", Settings.nominatim_url, Settings.overpass_url, Settings.fossgis_osrm_url, Settings.graphhopper_url, Settings.fossgis_valhalla_url)
     policy.form_action(*policy.form_action, "render.openstreetmap.org")
     policy.style_src(*policy.style_src, :unsafe_inline)
 
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index fe900d627..5cedb3c70 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -18,8 +18,8 @@ class IssuesController < ApplicationController
     @title = t ".title"
 
     @issue_types = []
-    @issue_types.push("Note", "User") if current_user.moderator?
-    @issue_types.push("DiaryEntry", "DiaryComment", "User") if current_user.administrator?
+    @issue_types |= %w[Note User] if current_user.moderator?
+    @issue_types |= %w[DiaryEntry DiaryComment User] if current_user.administrator?
 
     @users = User.joins(:roles).where(:user_roles => { :role => current_user.roles.map(&:role) }).distinct
     @issues = Issue.visible_to(current_user)
@@ -48,7 +48,7 @@ class IssuesController < ApplicationController
   end
 
   def show
-    @title = t ".title", :status => @issue.status.humanize, :issue_id => @issue.id
+    @title = t ".title.#{@issue.status}", :issue_id => @issue.id
     @read_reports = @issue.read_reports
     @unread_reports = @issue.unread_reports
     @comments = @issue.comments
diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 69a8f8fa2..482503e8a 100644
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -1,15 +1,38 @@
 module BrowseHelper
+  def element_icon(type, object)
+    selected_icon_data = { :filename => "#{type}.svg", :priority => 1 }
+
+    unless object.redacted?
+      target_tags = object.tags.find_all { |k, _v| BROWSE_ICONS.key? k }.sort
+      title = target_tags.map { |k, v| "#{k}=#{v}" }.to_sentence unless target_tags.empty?
+
+      target_tags.each do |k, v|
+        icon_data = BROWSE_ICONS[k][v] || BROWSE_ICONS[k][:*]
+        selected_icon_data = icon_data if icon_data && icon_data[:priority] > selected_icon_data[:priority]
+      end
+    end
+
+    image_tag "browse/#{selected_icon_data[:filename]}",
+              :size => 20,
+              :class => ["align-bottom object-fit-none browse-icon", { "browse-icon-invertible" => selected_icon_data[:invert] }],
+              :title => title
+  end
+
   def element_single_current_link(type, object)
-    link_to object, { :class => element_class(type, object), :title => element_title(object), :rel => (link_follow(object) if type == "node") } do
+    link_to object, { :rel => (link_follow(object) if type == "node") } do
       element_strikethrough object do
         printable_element_name object
       end
     end
   end
 
-  def element_list_item(type, object, &block)
-    tag.li :class => element_class(type, object), :title => element_title(object) do
-      element_strikethrough object, &block
+  def element_list_item(type, object, &)
+    tag.li(tag.div(element_icon(type, object) + tag.div(:class => "align-self-center", &), :class => "d-flex gap-1"))
+  end
+
+  def element_list_item_with_strikethrough(type, object, &)
+    element_list_item type, object do
+      element_strikethrough object, &
     end
   end
 
@@ -52,20 +75,6 @@ module BrowseHelper
     end
   end
 
-  def element_class(type, object)
-    classes = [type]
-    classes += icon_tags(object).flatten.map { |t| h(t) } unless object.redacted?
-    classes.join(" ")
-  end
-
-  def element_title(object)
-    if object.redacted?
-      ""
-    else
-      h(icon_tags(object).map { |k, v| "#{k}=#{v}" }.to_sentence)
-    end
-  end
-
   def link_follow(object)
     "nofollow" if object.tags.empty?
   end
@@ -107,12 +116,6 @@ module BrowseHelper
 
   private
 
-  ICON_TAGS = %w[aeroway amenity barrier building highway historic landuse leisure man_made natural office railway shop tourism waterway].freeze
-
-  def icon_tags(object)
-    object.tags.find_all { |k, _v| ICON_TAGS.include? k }.sort
-  end
-
   def name_locales(object)
     object.tags.keys.map { |k| Regexp.last_match(1) if k =~ /^name:(.*)$/ }.flatten
   end
diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index 21c8fa51e..2e9850aef 100644
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -18,7 +18,8 @@ module NoteHelper
     elsif author.status == "deleted"
       t("users.no_such_user.deleted")
     else
-      link_to h(author.display_name), link_options.merge(:controller => "/users", :action => "show", :display_name => author.display_name)
+      link_to h(author.display_name), link_options.merge(:controller => "/users", :action => "show", :display_name => author.display_name),
+              :class => "mw-100 d-inline-block align-bottom text-truncate text-wrap", :dir => "auto"
     end
   end
 end
diff --git a/app/views/browse/_containing_relation.html.erb b/app/views/browse/_containing_relation.html.erb
index febb3e129..2c1072364 100644
--- a/app/views/browse/_containing_relation.html.erb
+++ b/app/views/browse/_containing_relation.html.erb
@@ -1,7 +1,8 @@
-<li><%= linked_name = link_to printable_element_name(containing_relation.relation), containing_relation.relation
-        if containing_relation.member_role.blank?
-          t ".entry_html", :relation_name => linked_name
-        else
-          t ".entry_role_html", :relation_name => linked_name, :relation_role => containing_relation.member_role
-        end %>
-</li>
+<%= element_list_item "relation", containing_relation.relation do %>
+  <%= linked_name = link_to printable_element_name(containing_relation.relation), containing_relation.relation
+      if containing_relation.member_role.blank?
+        linked_name
+      else
+        t ".entry_role_html", :relation_name => linked_name, :relation_role => containing_relation.member_role
+      end %>
+<% end %>
diff --git a/app/views/browse/_node.html.erb b/app/views/browse/_node.html.erb
index 0ffe7c68b..52939d3a1 100644
--- a/app/views/browse/_node.html.erb
+++ b/app/views/browse/_node.html.erb
@@ -15,9 +15,11 @@
       <% unless node.ways.empty? %>
         <details <%= "open" if node.ways.count < 10 %>>
           <summary><%= t "browse.part_of_ways", :count => node.ways.uniq.count %></summary>
-          <ul class="list-unstyled">
+          <ul class="list-unstyled browse-element-list">
             <% node.ways.uniq.each do |way| %>
-              <li><%= element_single_current_link "way", way %></li>
+              <%= element_list_item "way", way do %>
+                <%= element_single_current_link "way", way %>
+              <% end %>
             <% end %>
           </ul>
         </details>
@@ -25,7 +27,7 @@
       <% unless node.containing_relation_members.empty? %>
         <details <%= "open" if node.containing_relation_members.count < 10 %>>
           <summary><%= t "browse.part_of_relations", :count => node.containing_relation_members.uniq.count %></summary>
-          <ul class="list-unstyled">
+          <ul class="list-unstyled browse-element-list">
             <%= render :partial => "browse/containing_relation", :collection => node.containing_relation_members.uniq %>
           </ul>
         </details>
diff --git a/app/views/browse/_relation.html.erb b/app/views/browse/_relation.html.erb
index 5dcdffa47..447067900 100644
--- a/app/views/browse/_relation.html.erb
+++ b/app/views/browse/_relation.html.erb
@@ -14,7 +14,7 @@
       <h4><%= t "browse.part_of" %></h4>
       <details <%= "open" if relation.containing_relation_members.count < 10 %>>
         <summary><%= t "browse.part_of_relations", :count => relation.containing_relation_members.uniq.count %></summary>
-        <ul class="list-unstyled">
+        <ul class="list-unstyled browse-element-list">
           <%= render :partial => "browse/containing_relation", :collection => relation.containing_relation_members.uniq %>
         </ul>
       </details>
@@ -24,7 +24,7 @@
       <h4><%= t ".members" %></h4>
       <details <%= "open" if relation.relation_members.count < 10 %>>
         <summary><%= t ".members_count", :count => relation.relation_members.count %></summary>
-        <ul class="list-unstyled">
+        <ul class="list-unstyled browse-element-list">
           <%= render :partial => "browse/relation_member", :collection => relation.relation_members %>
         </ul>
       </details>
diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb
index d122f0edf..c00396fbd 100644
--- a/app/views/browse/_relation_member.html.erb
+++ b/app/views/browse/_relation_member.html.erb
@@ -1,6 +1,6 @@
 <% linked_name = link_to printable_element_name(relation_member.member), relation_member.member, { :rel => link_follow(relation_member.member) }
    type_str = t ".type.#{relation_member.member_type.downcase}" %>
-<%= element_list_item relation_member.member_type.downcase, relation_member.member do %>
+<%= element_list_item_with_strikethrough relation_member.member_type.downcase, relation_member.member do %>
   <%= if relation_member.member_role.blank?
         t ".entry_html", :type => type_str, :name => linked_name
       else
diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb
index d04eff140..9181a3e08 100644
--- a/app/views/browse/_way.html.erb
+++ b/app/views/browse/_way.html.erb
@@ -14,7 +14,7 @@
       <h4><%= t "browse.part_of" %></h4>
       <details <%= "open" if way.containing_relation_members.count < 10 %>>
         <summary><%= t "browse.part_of_relations", :count => way.containing_relation_members.uniq.count %></summary>
-        <ul class="list-unstyled">
+        <ul class="list-unstyled browse-element-list">
           <%= render :partial => "browse/containing_relation", :collection => way.containing_relation_members.uniq %>
         </ul>
       </details>
@@ -24,17 +24,18 @@
       <h4><%= t ".nodes" %></h4>
       <details <%= "open" if way.way_nodes.count < 10 %>>
         <summary><%= t ".nodes_count", :count => way.way_nodes.count %></summary>
-        <ul class="list-unstyled">
+        <ul class="list-unstyled browse-element-list">
           <% way.way_nodes.each do |wn| %>
-            <li>
+            <%= element_list_item "node", wn.node do %>
               <%= element_single_current_link "node", wn.node %>
               <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %>
+              <% icon_connector = " " %>
               <% if related_ways.size > 0 then %>
                 (<%= t ".also_part_of_html",
                        :count => related_ways.size,
-                       :related_ways => to_sentence(related_ways.map { |w| element_single_current_link "way", w }) %>)
+                       :related_ways => to_sentence(related_ways.map { |w| element_icon("way", w) + icon_connector + element_single_current_link("way", w) }) %>)
               <% end %>
-            </li>
+            <% end %>
           <% end %>
         </ul>
       </details>
diff --git a/app/views/changesets/_elements.html.erb b/app/views/changesets/_elements.html.erb
index fd5dd8a26..a95bed6fa 100644
--- a/app/views/changesets/_elements.html.erb
+++ b/app/views/changesets/_elements.html.erb
@@ -1,12 +1,12 @@
 <%= turbo_frame_tag "changeset_#{type.pluralize}" do %>
   <%= render :partial => "paging_nav", :locals => { :type => type, :pages => pages } %>
-  <ul class="list-unstyled" data-turbo="false">
+  <ul class="list-unstyled browse-element-list" data-turbo="false">
     <% elements.each do |element| %>
-      <%= element_list_item type, element do
-            t "printable_name.current_and_old_links_html",
+      <%= element_list_item_with_strikethrough type, element do %>
+        <%= t "printable_name.current_and_old_links_html",
               :current_link => link_to(printable_element_name(element), :controller => type.pluralize, :action => :show, :id => element.id[0]),
-              :old_link => link_to(printable_element_version(element), :controller => "old_#{type.pluralize}", :action => :show, :id => element.id[0], :version => element.version)
-          end %>
+              :old_link => link_to(printable_element_version(element), :controller => "old_#{type.pluralize}", :action => :show, :id => element.id[0], :version => element.version) %>
+      <% end %>
     <% end %>
   </ul>
 <% end %>
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 95dfbf6f2..3f79190fa 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -15,7 +15,7 @@
     </div>
     <div class="mb-3 col-md-auto">
       <%= select_tag :issue_type,
-                     options_for_select(@issue_types, params[:issue_type]),
+                     options_for_select(@issue_types.map { |issue_type| [issue_type.constantize.model_name.human, issue_type] }, params[:issue_type]),
                      :include_blank => t(".select_type"),
                      :data => { :behavior => "category_dropdown" },
                      :class => "form-select" %>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index a58b8c5cb..74e7c0a4c 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-<h1><%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %></h1>
+<h1><%= @title %></h1>
 <p><%= @issue.reportable.model_name.human %> : <%= link_to reportable_title(@issue.reportable), reportable_url(@issue.reportable) %></p>
 <p class="text-body-secondary">
   <small>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index ff95be2f5..190ea44e5 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -85,7 +85,7 @@
     </ul>
     <% if current_user && current_user.id %>
       <div class='d-inline-flex dropdown user-menu logged-in'>
-        <button class='d-flex gap-1 align-items-center justify-content-center dropdown-toggle btn btn-outline-secondary border-secondary-subtle bg-body text-secondary px-2 py-1 flex-grow-1' type='button' data-bs-toggle='dropdown'>
+        <button class='d-flex gap-1 align-items-center justify-content-center dropdown-toggle btn btn-outline-secondary border-secondary-subtle bg-body text-secondary px-2 py-1 flex-grow-1 mw-100' type='button' data-bs-toggle='dropdown'>
           <%= user_thumbnail_tiny(current_user, :class => "user_thumbnail_tiny rounded-1 bg-body") %>
           <% if current_user.new_messages.size > 0 %>
             <span class="badge count-number position-static m-1"><%= current_user.new_messages.size %></span>
diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb
index 8dda65c25..d17612e29 100644
--- a/app/views/notes/show.html.erb
+++ b/app/views/notes/show.html.erb
@@ -9,19 +9,17 @@
   </div>
 
   <div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">
-    <ul class="list-unstyled">
-      <li><%= note_event("opened", @note.created_at, @note.author) %></li>
-      <% if @note.status == "closed" %>
-        <li><%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %></li>
-      <% end %>
-      <li>
-        <%= t "browse.location" %>
-        <%= link_to(t(".coordinates_html",
-                      :latitude => tag.span(number_with_delimiter(@note.lat), :class => "latitude"),
-                      :longitude => tag.span(number_with_delimiter(@note.lon), :class => "longitude")),
-                    root_path(:anchor => "map=18/#{@note.lat}/#{@note.lon}")) %>
-      </li>
-    </ul>
+    <p class="mb-2"><%= note_event("opened", @note.created_at, @note.author) %></p>
+    <% if @note.status == "closed" %>
+      <p class="mb-2"><%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %></p>
+    <% end %>
+    <p>
+      <%= t "browse.location" %>
+      <%= link_to t(".coordinates_html",
+                    :latitude => tag.span(number_with_delimiter(@note.lat), :class => "latitude"),
+                    :longitude => tag.span(number_with_delimiter(@note.lon), :class => "longitude")),
+                  root_path(:anchor => "map=18/#{@note.lat}/#{@note.lon}") %>
+    </p>
   </div>
 
   <% if @note_comments.find { |comment| comment.author.nil? } -%>
diff --git a/app/views/traces/index.html.erb b/app/views/traces/index.html.erb
index 998dd248d..4311ba082 100644
--- a/app/views/traces/index.html.erb
+++ b/app/views/traces/index.html.erb
@@ -56,7 +56,8 @@
             </li>
           <% end %>
           <li class="nav-item">
-            <%= link_to t(".traces_from", :user => @target_user&.display_name), { :controller => "traces", :action => "index", :display_name => @target_user&.display_name }, { :class => "nav-link active" } %>
+            <%= link_to t(".traces_from_html", :user => tag.span(@target_user.display_name, :class => "username text-truncate d-inline-block align-bottom", :dir => "auto")),
+                        { :controller => "traces", :action => "index", :display_name => @target_user.display_name }, { :class => "nav-link active" } %>
           </li>
         <% end %>
       </ul>
diff --git a/config/browse_icons.yml b/config/browse_icons.yml
new file mode 100644
index 000000000..f24d7676c
--- /dev/null
+++ b/config/browse_icons.yml
@@ -0,0 +1,186 @@
+aeroway:
+  aerodrome: { filename: "aerodrome.p.16.png" }
+
+  runway: { filename: "runway.20.png" }
+  taxiway: { filename: "taxiway.20.png" }
+
+amenity:
+  atm: { filename: "amenity_atm.16.png", invert: true }
+  bank: { filename: "amenity_bank.16.png", invert: true }
+  bar: { filename: "amenity_bar.16.png", invert: true }
+  bench: { filename: "amenity_bench.16.png", invert: true }
+  biergarten: { filename: "amenity_biergarten.16.png", invert: true }
+  bicycle_parking: { filename: "amenity_bicycle_parking.16.png" }
+  bicycle_rental: { filename: "transport_rental_bicycle.16.png" }
+  bus_station: { filename: "bus_station.n.16.png" }
+  cafe: { filename: "amenity_cafe.16.png", invert: true }
+  car_rental: { filename: "transport_rental_car.16.png" }
+  car_sharing: { filename: "car_share.p.16.png" }
+  childcare: { filename: "amenity_childcare.p.16.png" }
+  cinema: { filename: "amenity_cinema.16.png", invert: true }
+  courthouse: { filename: "amenity_courthouse.16.png", invert: true }
+  dentist: { filename: "amenity_dentist.16.png" }
+  doctors: { filename: "amenity_doctors.16.png" }
+  drinking_water: { filename: "amenity_drinking_water.16.png", invert: true }
+  fast_food: { filename: "amenity_fast_food.16.png", invert: true }
+  fire_station: { filename: "amenity_fire_station.16.png", invert: true }
+  fuel: { filename: "amenity_fuel.16.png" }
+  hospital: { filename: "amenity_hospital.16.png" }
+  kindergarten: { filename: "amenity_childcare.p.16.png" }
+  library: { filename: "library.p.16.png", invert: true }
+  nightclub: { filename: "amenity_nightclub.16.png", invert: true }
+  parking: { filename: "parking.p.16.png" }
+  pharmacy: { filename: "amenity_pharmacy.16.png" }
+  place_of_worship: { filename: "amenity_place_of_worship.16.png", invert: true }
+  police: { filename: "amenity_police.16.png", invert: true }
+  post_box: { filename: "post_box.p.16.png", invert: true }
+  post_office: { filename: "post_office.p.16.png", invert: true }
+  prison: { filename: "amenity_prison.16.png", invert: true }
+  pub: { filename: "amenity_pub.16.png", invert: true }
+  restaurant: { filename: "amenity_restaurant.16.png", invert: true }
+  recycling: { filename: "amenity_recycling.16.png", invert: true }
+  school: { filename: "education_school.p.16.png" }
+  shelter: { filename: "shelter2.p.16.png" }
+  taxi: { filename: "amenity_taxi.16.png" }
+  telephone: { filename: "telephone.p.16.png", invert: true }
+  theatre: { filename: "amenity_theatre.16.png", invert: true }
+  toilets: { filename: "amenity_toilets.16.png", invert: true }
+  townhall: { filename: "amenity_townhall.16.png", invert: true }
+  university: { filename: "education_university.p.16.png" }
+  veterinary: { filename: "health_veterinary.p.16.png" }
+  waste_basket: { filename: "amenity_waste_basket.16.png", invert: true }
+
+barrier:
+  gate: { filename: "gate2.p.16.png", invert: true }
+
+  wall: { filename: "wall.20.png" }
+
+building:
+  :*: { filename: "building.png" }
+
+highway:
+  bus_stop: { filename: "highway_bus_stop.16.png" }
+  mini_roundabout: { filename: "mini_round.p.16.png" }
+  traffic_signals: { filename: "traffic_light.png", invert: true }
+  turning_circle: { filename: "turning_circle.p.16.png" }
+
+  bridleway: { filename: "bridleway.20.png" }
+  cycleway: { filename: "cycleway.20.png" }
+  footway: { filename: "footway.20.png" }
+  motorway: { filename: "motorway.20.png" }
+  motorway_link: { filename: "motorway.20.png" }
+  path: { filename: "path.20.png" }
+  pedestrian: { filename: "service.20.png" }
+  primary: { filename: "primary.20.png" }
+  primary_link: { filename: "primary.20.png" }
+  residential: { filename: "unclassified.20.png" }
+  secondary: { filename: "secondary.20.png" }
+  secondary_link: { filename: "secondary.20.png" }
+  service: { filename: "service.20.png" }
+  tertiary: { filename: "tertiary.20.png" }
+  track: { filename: "track.20.png" }
+  trunk: { filename: "trunk.20.png" }
+  trunk_link: { filename: "trunk.20.png" }
+  unclassified: { filename: "unclassified.20.png" }
+
+historic:
+  archaeological_site: { filename: "historic_archaeological_site.16.png", invert: true }
+  castle: { filename: "tourist_castle.p.16.png", invert: true }
+  memorial: { filename: "historic_memorial.16.png", invert: true }
+  monument: { filename: "historic_monument.16.png", invert: true }
+  ruins: { filename: "tourist_ruins.p.16.png", invert: true }
+  wreck: { filename: "tourist_wreck.p.16.png", invert: true }
+
+landuse:
+  brownfield: { filename: "brownfield.png" }
+  cemetery: { filename: "cemetery.png" }
+  commercial: { filename: "commercial.png" }
+  farmland: { filename: "farmland.png" }
+  farmyard: { filename: "farmyard.png" }
+  forest: { filename: "forest.png" }
+  grass: { filename: "grass.png" }
+  industrial: { filename: "industrial.png" }
+  meadow: { filename: "meadow.png" }
+  military: { filename: "military.png" }
+  residential: { filename: "residential.png" }
+  retail: { filename: "retail.png" }
+  tourism: { filename: "tourism.png" }
+
+leisure:
+  golf_course: { filename: "golf.png" }
+  park: { filename: "park.png" }
+  picnic_table: { filename: "tourism_picnic_site.16.png", invert: true }
+  playground: { filename: "leisure_playground.16.png", invert: true }
+  pitch: { filename: "pitch.png" }
+  nature_reserve: { filename: "reserve.png" }
+  water_park: { filename: "leisure_water_park.16.png", invert: true }
+
+man_made:
+  lighthouse: { filename: "man_made_lighthouse.16.png" }
+  water_tower: { filename: "man_made_water_tower.16.png", invert: true }
+  windmill: { filename: "man_made_windmill.16.png", invert: true }
+
+natural:
+  tree: { filename: "tree.p.16.png" }
+
+  grassland: { filename: "grassland.png" }
+  heath: { filename: "heathland.png" }
+  scrub: { filename: "scrub.png" }
+  water: { filename: "lake.png" }
+  wood: { filename: "wood.png" }
+
+office:
+  diplomatic: { filename: "office_diplomatic.16.png" }
+  estate_agent: { filename: "shop_estateagent.16.png" }
+
+railway:
+  halt: { filename: "halt.p.16.png" }
+  station: { filename: "station.p.16.png" }
+  level_crossing: { filename: "level_crossing.p.16.png", invert: true }
+
+  light_rail: { filename: "light_rail.20.png" }
+  rail: { filename: "rail.20.png" }
+  subway: { filename: "subway.20.png" }
+  tram: { filename: "tram.20.png" }
+
+shop:
+  :*: { filename: "shop_convenience.p.16.png", priority: 20 }
+  alcohol: { filename: "shop_alcohol.16.png" }
+  bakery: { filename: "shop_bakery.16.png" }
+  bicycle: { filename: "shop_bicycle.16.png" }
+  books: { filename: "shop_books.16.png" }
+  butcher: { filename: "shop_butcher.p.16.png" }
+  clothes: { filename: "shop_clothes.16.png" }
+  car_parts: { filename: "shop_car_parts.16.png" }
+  car_repair: { filename: "shop_car_repair.16.png" }
+  convenience: { filename: "shop_convenience.p.16.png" }
+  doityourself: { filename: "shop_doityourself.16.png" }
+  electronics: { filename: "shop_electronics.16.png" }
+  estate_agent: { filename: "shop_estateagent.16.png" }
+  fashion: { filename: "shop_clothes.16.png" }
+  florist: { filename: "shop_florist.16.png" }
+  furniture: { filename: "shop_furniture.16.png" }
+  garden_centre: { filename: "shop_florist.16.png" }
+  gift: { filename: "shop_gift.16.png" }
+  greengrocer: { filename: "shop_greengrocer.p.16.png" }
+  hardware: { filename: "shop_doityourself.16.png" }
+  hairdresser: { filename: "shop_hairdresser.16.png" }
+  jewelry: { filename: "shop_jewelry.16.png" }
+  mobile_phone: { filename: "shop_mobile_phone.16.png" }
+  optician: { filename: "shop_optician.16.png" }
+  pet: { filename: "shop_pet.16.png" }
+  seafood: { filename: "shop_seafood.16.png" }
+  shoes: { filename: "shop_shoes.16.png" }
+  supermarket: { filename: "shop_supermarket.p.16.png" }
+
+tourism:
+  alpine_hut: { filename: "tourism_alpine_hut.16.png" }
+  camp_site: { filename: "tourism_camp_site.16.png" }
+  caravan_site: { filename: "tourism_caravan_site.16.png" }
+  hostel: { filename: "tourism_hostel.16.png" }
+  hotel: { filename: "tourism_hotel.16.png" }
+  motel: { filename: "tourism_motel.16.png" }
+  museum: { filename: "tourism_museum.16.png", invert: true }
+  picnic_site: { filename: "tourism_picnic_site.16.png", invert: true }
+  viewpoint: { filename: "view_point.p.16.png", invert: true }
+  wilderness_hut: { filename: "tourism_wilderness_hut.16.png" }
diff --git a/config/initializers/browse_icons.rb b/config/initializers/browse_icons.rb
new file mode 100644
index 000000000..a55df97b6
--- /dev/null
+++ b/config/initializers/browse_icons.rb
@@ -0,0 +1,13 @@
+begin
+  BROWSE_ICONS = YAML.load_file(Rails.root.join("config/browse_icons.yml")).transform_values do |tag_key_data|
+    transformed_tag_key_data = {}
+    tag_key_data.each do |tag_value, tag_value_data|
+      tag_value_data = tag_value_data.deep_symbolize_keys
+      tag_value_data[:priority] ||= tag_value == :* ? 10 : 100
+      transformed_tag_key_data[tag_value] = tag_value_data
+    end
+    transformed_tag_key_data
+  end
+rescue StandardError
+  BROWSE_ICONS = {}.freeze
+end
diff --git a/config/layers.yml b/config/layers.yml
index 3b5bc944f..4f883cc94 100644
--- a/config/layers.yml
+++ b/config/layers.yml
@@ -1,6 +1,6 @@
 - leafletOsmId: "Mapnik"
   code: "M"
-  keyId: "mapnik"
+  layerId: "mapnik"
   nameId: "standard"
   credit:
     id: "make_a_donation"
@@ -9,7 +9,7 @@
 
 - leafletOsmId: "CyclOSM"
   code: "Y"
-  keyId: "cyclosm"
+  layerId: "cyclosm"
   nameId: "cyclosm"
   credit:
     id: "cyclosm_credit"
@@ -23,7 +23,7 @@
 
 - leafletOsmId: "CycleMap"
   code: "C"
-  keyId: "cyclemap"
+  layerId: "cyclemap"
   nameId: "cycle_map"
   apiKeyId: "THUNDERFOREST_KEY"
   credit:
@@ -35,7 +35,7 @@
 
 - leafletOsmId: "TransportMap"
   code: "T"
-  keyId: "transportmap"
+  layerId: "transportmap"
   nameId: "transport_map"
   apiKeyId: "THUNDERFOREST_KEY"
   credit:
@@ -47,7 +47,7 @@
 
 - leafletOsmId: "TracestrackTopo"
   code: "P"
-  keyId: "tracestracktopo"
+  layerId: "tracestracktopo"
   nameId: "tracestracktop_topo"
   apiKeyId: "TRACESTRACK_KEY"
   credit:
@@ -59,7 +59,7 @@
 
 - leafletOsmId: "HOT"
   code: "H"
-  keyId: "hot"
+  layerId: "hot"
   nameId: "hot"
   credit:
     id: "hotosm_credit"
diff --git a/config/locales/af.yml b/config/locales/af.yml
index dd6bea380..7c7cdcb68 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -315,7 +315,6 @@ af:
         way: Weg
         relation: Verwantskap
     containing_relation:
-      entry_html: Verwantskap %{relation_name}
       entry_role_html: Verwantskap %{relation_name} (as %{relation_role})
     not_found:
       title: Kon nie gevind word
@@ -1736,7 +1735,7 @@ af:
       tagged_with: gemerk met %{tags}
       upload_trace: Laai 'n GPS-spoor op
       my_traces: My Spore
-      traces_from: Openbare spore van %{user}
+      traces_from_html: Openbare spore van %{user}
     destroy:
       scheduled_for_deletion: Spoor is vir verwydering geoormerk
   application:
diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 860ad370f..91784f187 100644
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -151,7 +151,6 @@ aln:
         way: Udhë
         relation: Lidhje
     containing_relation:
-      entry_html: Lidhja %{relation_name}
       entry_role_html: Lidhja %{relation_name} (sikur %{relation_role})
     not_found:
       sorry: Na vjen keq, %{type} me ID %{id}, nuk mujti me u gjetë.
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 033774cb5..ee85a6bf1 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -450,7 +450,6 @@ ar:
         way: طريق
         relation: علاقة
     containing_relation:
-      entry_html: العلاقة %{relation_name}
       entry_role_html: العلاقة %{relation_name} (كــ%{relation_role})
     not_found:
       title: لم يتم العثور عليه
diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index 59489ad0b..1cfd348d3 100644
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -131,7 +131,6 @@ arz:
         way: طريق
         relation: علاقة
     containing_relation:
-      entry_html: العلاقه %{relation_name}
       entry_role_html: العلاقه %{relation_name} (كــ %{relation_role})
     not_found:
       sorry: عفوًا، لم يتم العثور على %{type} بالمعرّف %{id}.
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index d0e9f358d..b25bfd269 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -283,7 +283,6 @@ ast:
         way: Vía
         relation: Rellación
     containing_relation:
-      entry_html: Rellación %{relation_name}
       entry_role_html: Rellación %{relation_name} (como %{relation_role})
     not_found:
       sorry: Sentímoslo, el/la %{type} númberu %{id} nun pudo alcontrase.
diff --git a/config/locales/az.yml b/config/locales/az.yml
index 917cf11bd..f74e4dbc9 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -186,7 +186,6 @@ az:
         way: Xətt
         relation: Əlaqə
     containing_relation:
-      entry_html: Əlaqəsi %{relation_name}
       entry_role_html: Əlaqəsi %{relation_name} (%{relation_role} kimi)
     not_found:
       sorry: Təəsüf ki, %{id} %{type} tapılmadı.
diff --git a/config/locales/ba.yml b/config/locales/ba.yml
index 2b9da91af..d097f80ac 100644
--- a/config/locales/ba.yml
+++ b/config/locales/ba.yml
@@ -375,7 +375,6 @@ ba:
         way: Һыҙат
         relation: Мөнәсәбәт
     containing_relation:
-      entry_html: Мөнәсәбәт %{relation_name}
       entry_role_html: Мөнәсәбәт %{relation_name} (ролендә %{relation_role})
     not_found:
       title: Табылманы
diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 1a7f6db32..b87ac1252 100644
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -324,7 +324,6 @@ be-Tarask:
         way: Шлях
         relation: Адносіны
     containing_relation:
-      entry_html: Адносіны %{relation_name}
       entry_role_html: Адносіны %{relation_name} (як %{relation_role})
     not_found:
       title: Ня знойдзена
diff --git a/config/locales/be.yml b/config/locales/be.yml
index a31c09179..b722d3745 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -433,7 +433,6 @@ be:
         way: Лінія
         relation: Дачыненне
     containing_relation:
-      entry_html: Дачыненне %{relation_name}
       entry_role_html: Дачыненне %{relation_name} (як %{relation_role})
     not_found:
       title: Не знойдзена
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 7173dac39..2cb7d4afb 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -319,7 +319,6 @@ bg:
         way: Път
         relation: Релация
     containing_relation:
-      entry_html: Релация %{relation_name}
       entry_role_html: Релация %{relation_name} (като %{relation_role})
     not_found:
       sorry: Съжаляваме, %{type} № %{id} не е намерен.
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 3b30f1a0a..8d4576d17 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -389,7 +389,6 @@ bn:
         way: রাস্তা
         relation: সম্পর্ক
     containing_relation:
-      entry_html: সম্পর্ক %{relation_name}
       entry_role_html: সম্পর্ক %{relation_name} (যখন %{relation_role})
     not_found:
       title: পাওয়া যায়নি
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 820609208..dea9d56dd 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -404,7 +404,6 @@ br:
         way: Hent
         relation: Darempred
     containing_relation:
-      entry_html: Darempred %{relation_name}
       entry_role_html: Darempred %{relation_name} (evel %{relation_role})
     not_found:
       title: N'eo ket bet kavet
@@ -2417,7 +2416,7 @@ br:
       upload_trace: Kas ur roud
       all_traces: An holl roudoù
       my_traces: Ma roudoù
-      traces_from: Roudoù GPS foran gant %{user}
+      traces_from_html: Roudoù GPS foran gant %{user}
       remove_tag_filter: Lemel ar sil tikedennoù
     destroy:
       scheduled_for_deletion: Roudenn da vezañ dilamet
@@ -2801,9 +2800,9 @@ br:
     navigation:
       all_blocks: An holl stankadurioù
       blocks_on_me: Stankadurioù evidon
-      blocks_on_user: Stankadurioù evit %{user}
+      blocks_on_user_html: Stankadurioù evit %{user}
       blocks_by_me: Stankadurioù graet ganin
-      blocks_by_user: Stankadurioù gant %{user}
+      blocks_by_user_html: Stankadurioù gant %{user}
       block: 'Stankadur #%{id}'
       new_block: Stankadenn nevez
   user_mutes:
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index ad06e6917..cd7607a91 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -204,7 +204,6 @@ bs:
         way: Putanja
         relation: Relacija
     containing_relation:
-      entry_html: Relacija %{relation_name}
       entry_role_html: Relacija %{relation_name} (kao %{relation_role})
     not_found:
       sorry: 'Žao nam je, ali %{type} #%{id} se ne može naći.'
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 8c309fb2f..9322319b9 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -403,7 +403,6 @@ ca:
         way: Via
         relation: Relació
     containing_relation:
-      entry_html: Relació %{relation_name}
       entry_role_html: Relació %{relation_name} (com a %{relation_role})
     not_found:
       title: No s'ha trobat
@@ -2453,7 +2452,7 @@ ca:
       upload_trace: Puja una traça
       all_traces: Totes les traces
       my_traces: Les meves traces
-      traces_from: Traces públiques de %{user}
+      traces_from_html: Traces públiques de %{user}
       remove_tag_filter: Elimina el filtre d'etiquetes
     destroy:
       scheduled_for_deletion: Traça programada per a ser suprimida
@@ -2820,9 +2819,9 @@ ca:
     navigation:
       all_blocks: Tots els bloquejos
       blocks_on_me: Bloquejos a mi
-      blocks_on_user: Bloquejos a %{user}
+      blocks_on_user_html: Bloquejos a %{user}
       blocks_by_me: Bloquejos fets per mi
-      blocks_by_user: Bloquejos fets per %{user}
+      blocks_by_user_html: Bloquejos fets per %{user}
       block: 'Bloqueig #%{id}'
   user_mutes:
     index:
diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index aae9eea7e..c8ae5a52f 100644
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -365,7 +365,6 @@ ce:
         way: Сиз
         relation: Хилар
     containing_relation:
-      entry_html: Хилар %{relation_name}
       entry_role_html: Хилар %{relation_name} (ролехь %{relation_role})
     not_found:
       title: Цакарийна
@@ -2544,7 +2543,7 @@ ce:
       upload_trace: Чуйаккха трек
       all_traces: Ерриге а трекаш
       my_traces: Сан трекаш
-      traces_from: '%{user}-ан йукъара трекаш'
+      traces_from_html: '%{user}-ан йукъара трекаш'
       remove_tag_filter: ДӀаяккха теган фильтр
     destroy:
       scheduled_for_deletion: ДӀаяккха лерина трек
@@ -2951,9 +2950,9 @@ ce:
     navigation:
       all_blocks: Ерриге а блокаш
       blocks_on_me: Сан блоктохарш
-      blocks_on_user: Блокаш йу %{user} тӀехь
+      blocks_on_user_html: Блокаш йу %{user} тӀехь
       blocks_by_me: Сан блоктохарш
-      blocks_by_user: Блокаш йина %{user}
+      blocks_by_user_html: Блокаш йина %{user}
       block: 'Блок #%{id}'
       new_block: Керла блок
   user_mutes:
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 71ac17404..79489fdce 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -445,7 +445,6 @@ cs:
         way: Cesta
         relation: Relace
     containing_relation:
-      entry_html: Relace %{relation_name}
       entry_role_html: Relace %{relation_name} (jako %{relation_role})
     not_found:
       title: Nenalezeno
@@ -2661,7 +2660,7 @@ cs:
       upload_trace: Nahrát stopu
       all_traces: VÅ¡echny stopy
       my_traces: Moje stopy
-      traces_from: Veřejné stopy uživatele %{user}
+      traces_from_html: Veřejné stopy uživatele %{user}
       remove_tag_filter: Vymazat filtr tagů
     destroy:
       scheduled_for_deletion: Stopa označena ke smazání
@@ -3082,9 +3081,9 @@ cs:
     navigation:
       all_blocks: VÅ¡echny bloky
       blocks_on_me: Moje zablokování
-      blocks_on_user: Bloky uživatele %{user}
+      blocks_on_user_html: Bloky uživatele %{user}
       blocks_by_me: Zablokování mnou
-      blocks_by_user: Bloky od uživatele %{user}
+      blocks_by_user_html: Bloky od uživatele %{user}
       block: 'Blok #%{id}'
       new_block: Nové blokování
   user_mutes:
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 4e25e4fd8..8116b511e 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -425,7 +425,6 @@ cy:
         way: Llwybr
         relation: Perthynas
     containing_relation:
-      entry_html: Perthynas %{relation_name}
       entry_role_html: Perthynas %{relation_name} (fel %{relation_role})
     not_found:
       title: Heb ei Ganfod
@@ -2557,7 +2556,7 @@ cy:
       upload_trace: Uwchlwytho ôl
       all_traces: Pob Ôl
       my_traces: Fy Olion
-      traces_from: Olion Cyhoeddus gan %{user}
+      traces_from_html: Olion Cyhoeddus gan %{user}
       remove_tag_filter: Dileu Hidlydd Tagiau
     destroy:
       scheduled_for_deletion: Mae'r ôl wedi'i drefnu i'w ddileu
@@ -2925,9 +2924,9 @@ cy:
     navigation:
       all_blocks: Pob Bloc
       blocks_on_me: Blociau arnaf i
-      blocks_on_user: Blociau ar %{user}
+      blocks_on_user_html: Blociau ar %{user}
       blocks_by_me: Blociau gennyf i
-      blocks_by_user: Blociau gan %{user}
+      blocks_by_user_html: Blociau gan %{user}
       block: 'Bloc #%{id}'
       new_block: Bloc Newydd
   user_mutes:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index be826e5c7..e816a6ebc 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -396,8 +396,7 @@ da:
         way: Vej
         relation: Relation
     containing_relation:
-      entry_html: Relation %{relation_name}
-      entry_role_html: Relation %{relation_name} (som %{relation_role})
+      entry_role_html: '%{relation_name} (som %{relation_role})'
     not_found:
       title: Ikke fundet
       sorry: Beklager, %{type} med id %{id} blev ikke fundet.
@@ -2599,7 +2598,7 @@ da:
       upload_trace: Overfør et spor
       all_traces: Alle GPS-spor
       my_traces: Mine spor
-      traces_from: Offentlige GPS-spor fra %{user}
+      traces_from_html: Offentlige GPS-spor fra %{user}
       remove_tag_filter: Fjern tag-filter
     destroy:
       scheduled_for_deletion: Spor planlagt til at blive slettet
@@ -3013,9 +3012,9 @@ da:
     navigation:
       all_blocks: Alle blokeringer
       blocks_on_me: Blokeringer af mig
-      blocks_on_user: Blokeringer af %{user}
+      blocks_on_user_html: Blokeringer af %{user}
       blocks_by_me: Blokeringer udført af mig
-      blocks_by_user: Blokeringer udført af %{user}
+      blocks_by_user_html: Blokeringer udført af %{user}
       block: 'Blokering #%{id}'
       new_block: Ny blokering
   user_mutes:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 833e4f3c7..ec0595258 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -482,7 +482,6 @@ de:
         way: Weg
         relation: Relation
     containing_relation:
-      entry_html: Relation %{relation_name}
       entry_role_html: Relation %{relation_name} (als %{relation_role})
     not_found:
       title: Nicht gefunden
@@ -2748,7 +2747,7 @@ de:
       upload_trace: Lade einen Track hoch
       all_traces: Alle Tracks
       my_traces: Meine Tracks
-      traces_from: Öffentliche Tracks von %{user}
+      traces_from_html: Öffentliche Tracks von %{user}
       remove_tag_filter: Tag-Filter entfernen
     destroy:
       scheduled_for_deletion: Für die Löschung vorgesehener Track
@@ -3173,9 +3172,9 @@ de:
     navigation:
       all_blocks: Alle Sperren
       blocks_on_me: Meine Sperren
-      blocks_on_user: Sperren für %{user}
+      blocks_on_user_html: Sperren für %{user}
       blocks_by_me: Sperren von mir
-      blocks_by_user: Sperren von %{user}
+      blocks_by_user_html: Sperren von %{user}
       block: 'Sperre #%{id}'
       new_block: Neue Sperre
   user_mutes:
diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index a51629a53..73bdfb705 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -239,7 +239,6 @@ diq:
         way: Ray
         relation: Elaqe
     containing_relation:
-      entry_html: Elaqe %{relation_name}
       entry_role_html: Eleqe %{relation_name} (%{relation_role} deye)
     not_found:
       title: Nêvineya
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 12d4779b1..1d7db4aa1 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -224,7 +224,6 @@ dsb:
         way: Puś
         relation: Relacija
     containing_relation:
-      entry_html: Relacija %{relation_name}
       entry_role_html: Relacija %{relation_name} (ako %{relation_role})
     not_found:
       sorry: 'Bóžko %{type} #%{id} njejo se dał namakaś.'
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 4989e02e9..465f9fd9a 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -414,7 +414,6 @@ el:
         way: Γραμμή
         relation: Σχέση
     containing_relation:
-      entry_html: Σχέση %{relation_name}
       entry_role_html: Σχέση %{relation_name} (ως %{relation_role})
     not_found:
       title: Δεν βρέθηκε
@@ -2675,7 +2674,7 @@ el:
       upload_trace: Αποστολή ίχνους
       all_traces: Όλα τα ίχνη
       my_traces: Τα ίχνη μου
-      traces_from: Δημόσια ίχνη από %{user}
+      traces_from_html: Δημόσια ίχνη από %{user}
       remove_tag_filter: Κατάργηση φίλτρου ετικετών
     destroy:
       scheduled_for_deletion: Το ίχνος προγραμματίστηκε για διαγραφή
@@ -3097,9 +3096,9 @@ el:
     navigation:
       all_blocks: Όλες οι φραγές
       blocks_on_me: Φραγές σε μένα
-      blocks_on_user: Φραγές σε %{user}
+      blocks_on_user_html: Φραγές σε %{user}
       blocks_by_me: Φραγές από μένα
-      blocks_by_user: Φραγές από %{user}
+      blocks_by_user_html: Φραγές από %{user}
       block: 'Φραγή #%{id}'
       new_block: Νέα Φραγή
   user_mutes:
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index b478474b2..9d4d1c4a4 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -296,7 +296,6 @@ en-GB:
         way: Way
         relation: Relation
     containing_relation:
-      entry_html: Relation %{relation_name}
       entry_role_html: Relation %{relation_name} (as %{relation_role})
     not_found:
       title: Not Found
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4fdc9741c..c3a0c5aed 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -59,6 +59,7 @@ en:
       message: "Message"
       node: "Node"
       node_tag: "Node Tag"
+      note: "Note"
       old_node: "Old Node"
       old_node_tag: "Old Node Tag"
       old_relation: "Old Relation"
@@ -356,8 +357,7 @@ en:
         way: "Way"
         relation: "Relation"
     containing_relation:
-      entry_html: "Relation %{relation_name}"
-      entry_role_html: "Relation %{relation_name} (as %{relation_role})"
+      entry_role_html: "%{relation_name} (as %{relation_role})"
     not_found:
       title: Not Found
       sorry: "Sorry, %{type} #%{id} could not be found."
@@ -1477,7 +1477,10 @@ en:
         open: Open
         resolved: Resolved
     show:
-      title: "%{status} Issue #%{issue_id}"
+      title:
+        open: "Open Issue #%{issue_id}"
+        ignored: "Ignored Issue #%{issue_id}"
+        resolved: "Resolved Issue #%{issue_id}"
       reports:
         one: "%{count} report"
         other: "%{count} reports"
@@ -2544,7 +2547,7 @@ en:
       upload_trace: "Upload a trace"
       all_traces: "All Traces"
       my_traces: "My Traces"
-      traces_from: "Public Traces from %{user}"
+      traces_from_html: "Public Traces from %{user}"
       remove_tag_filter: "Remove Tag Filter"
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 0e4589d1f..4489a540f 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -386,7 +386,6 @@ eo:
         way: Linio
         relation: Rilato
     containing_relation:
-      entry_html: Rilato %{relation_name}
       entry_role_html: Rilato %{relation_name} (kiel %{relation_role})
     not_found:
       title: Ne trovita
@@ -2568,7 +2567,7 @@ eo:
       upload_trace: Alŝuti spuron
       all_traces: Ĉiuj spuroj
       my_traces: Miaj spuroj
-      traces_from: Publikaj spuroj de %{user}
+      traces_from_html: Publikaj spuroj de %{user}
       remove_tag_filter: Forigi filtrilon de etikedoj
     destroy:
       scheduled_for_deletion: Spuro forviŝota
@@ -2971,9 +2970,9 @@ eo:
     navigation:
       all_blocks: Ĉiuj blokadoj
       blocks_on_me: Blokadoj por mi
-      blocks_on_user: Blokadoj por %{user}
+      blocks_on_user_html: Blokadoj por %{user}
       blocks_by_me: Blokadoj de mi
-      blocks_by_user: Blokadoj de %{user}
+      blocks_by_user_html: Blokadoj de %{user}
       block: 'Blokado #%{id}'
       new_block: Nova blokado
   user_mutes:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 26b0e2cc7..548799395 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -467,7 +467,6 @@ es:
         way: Vía
         relation: Relación
     containing_relation:
-      entry_html: Relación %{relation_name}
       entry_role_html: Relación %{relation_name} (como %{relation_role})
     not_found:
       title: No encontrado
@@ -2713,7 +2712,7 @@ es:
       upload_trace: Subir una traza
       all_traces: Todas las trazas
       my_traces: Mis trazas
-      traces_from: Trazas Públicos de %{user}
+      traces_from_html: Trazas Públicos de %{user}
       remove_tag_filter: Eliminar Filtro de Etiquetas
     destroy:
       scheduled_for_deletion: Traza programada para eliminación
@@ -3133,9 +3132,9 @@ es:
     navigation:
       all_blocks: Todos los bloqueos
       blocks_on_me: Bloqueos sobre mí
-      blocks_on_user: Bloqueos en %{user}
+      blocks_on_user_html: Bloqueos en %{user}
       blocks_by_me: Bloqueados por mí
-      blocks_by_user: Bloqueos por %{user}
+      blocks_by_user_html: Bloqueos por %{user}
       block: 'Bloqueo #%{id}'
       new_block: Nuevo bloqueo
   user_mutes:
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 6ecf31b3d..7f9c9783b 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -363,7 +363,6 @@ et:
         way: joon
         relation: relatsioon
     containing_relation:
-      entry_html: Relatsioon %{relation_name}
       entry_role_html: Relatsioon %{relation_name} (kui %{relation_role})
     not_found:
       title: Ei leidu
@@ -2450,7 +2449,7 @@ et:
       upload_trace: Lisa GPS-rada
       all_traces: Kõik rajad
       my_traces: Minu rajad
-      traces_from: Kasutaja %{user} avalikud rajad
+      traces_from_html: Kasutaja %{user} avalikud rajad
       remove_tag_filter: Eemalda sildifilter
     destroy:
       scheduled_for_deletion: Raja kustutamine kantud tööplaani.
@@ -2806,9 +2805,9 @@ et:
     navigation:
       all_blocks: Kõik blokeeringud
       blocks_on_me: Mulle seatud blokeeringud
-      blocks_on_user: Blokeeritava %{user} blokeeringud
+      blocks_on_user_html: Blokeeritava %{user} blokeeringud
       blocks_by_me: Minu seatud blokeeringud
-      blocks_by_user: Blokeerija %{user} blokeeringud
+      blocks_by_user_html: Blokeerija %{user} blokeeringud
       block: 'Blokeering #%{id}'
   user_mutes:
     index:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 769802340..e635fa0f6 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -378,7 +378,6 @@ eu:
         way: Bide
         relation: Erlazio
     containing_relation:
-      entry_html: '%{relation_name} erlazioa'
       entry_role_html: '%{relation_name} erlazioa (%{relation_role} rolean)'
     not_found:
       title: Ez da aurkitu
@@ -2383,7 +2382,7 @@ eu:
       upload_trace: Aztarna bat igo
       all_traces: Aztarna guztiak
       my_traces: Nire aztarnak
-      traces_from: '%{user} erabiltzailearen GPS aztarna publikoak'
+      traces_from_html: '%{user} erabiltzailearen GPS aztarna publikoak'
       remove_tag_filter: Kendu etiketa-iragazkia
     destroy:
       scheduled_for_deletion: Ezabatzear dauden aztarnak
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index e3dd9ed20..4c659ad3e 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -393,7 +393,6 @@ fa:
         way: راه
         relation: رابطه
     containing_relation:
-      entry_html: رابطهٔ %{relation_name}
       entry_role_html: رابطهٔ %{relation_name} (با نقش %{relation_role})
     not_found:
       title: یافت نشد
@@ -2150,7 +2149,7 @@ fa:
       upload_trace: بارگذاری یک رد
       all_traces: همهٔ ردها
       my_traces: ردهای من
-      traces_from: ردهای عمومی %{user}
+      traces_from_html: ردهای عمومی %{user}
       remove_tag_filter: حذف پالایهٔ برچسب
     destroy:
       scheduled_for_deletion: این رد در زمان‌بندی حذف قرار گرفت
@@ -2476,11 +2475,11 @@ fa:
     navigation:
       all_blocks: تمام قطع دسترسی‌ها
       blocks_on_me: قطع دسترسی‌های من
-      blocks_on_user: قطع دسترسی‌های %{user}
+      blocks_on_user_html: قطع دسترسی‌های %{user}
       blocks_by_me: |-
         Blocks by Me
         بسته شدها یا مسدود شدهها
-      blocks_by_user: |-
+      blocks_by_user_html: |-
         Blocks by %{user}
 
         بستن توسط یا مسدود شدن توسط
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 1c091e9b3..e288faa10 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -395,7 +395,6 @@ fi:
         way: Polku
         relation: Relaatio
     containing_relation:
-      entry_html: Relaatio %{relation_name}
       entry_role_html: Relaatio %{relation_name} (rooli %{relation_role})
     not_found:
       title: Ei löytynyt
@@ -2331,7 +2330,7 @@ fi:
       upload_trace: Lisää GPS-jälki
       all_traces: Kaikki jäljet
       my_traces: Omat jäljet
-      traces_from: Julkiset jäljet käyttäjältä %{user}
+      traces_from_html: Julkiset jäljet käyttäjältä %{user}
       remove_tag_filter: Poista tunnistesuodatin
     destroy:
       scheduled_for_deletion: Jälki on poistojonossa.
diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index d83512221..4f9ea0c0a 100644
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -226,7 +226,6 @@ fit:
         way: Polku
         relation: Relaatio
     containing_relation:
-      entry_html: Relaatio %{relation_name}
       entry_role_html: Relaatio %{relation_name} (rooli %{relation_role})
     not_found:
       sorry: 'Pahoittelemme, %{type} #%{id} ei ole olemassa.'
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 454ef3abb..45da8d456 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -498,7 +498,6 @@ fr:
         way: Chemin
         relation: Relation
     containing_relation:
-      entry_html: Relation %{relation_name}
       entry_role_html: Relation %{relation_name} (avec le rôle %{relation_role})
     not_found:
       title: Non trouvé
@@ -2781,7 +2780,7 @@ fr:
       upload_trace: Téléverser une trace
       all_traces: Toutes les traces
       my_traces: Mes traces
-      traces_from: Traces publiques de %{user}
+      traces_from_html: Traces publiques de %{user}
       remove_tag_filter: Retirer le filtre de balises
     destroy:
       scheduled_for_deletion: Trace planifiée pour suppression
@@ -3202,9 +3201,9 @@ fr:
     navigation:
       all_blocks: Tous les blocages
       blocks_on_me: Blocages me concernant
-      blocks_on_user: Blocages sur %{user}
+      blocks_on_user_html: Blocages sur %{user}
       blocks_by_me: Blocages de ma part
-      blocks_by_user: Blocages effectués par %{user}
+      blocks_by_user_html: Blocages effectués par %{user}
       block: 'Blocage #%{id}'
       new_block: Nouveau blocage
   user_mutes:
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 7faa3f1c5..74187c38e 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -303,7 +303,6 @@ fur:
         way: Vie
         relation: Relazion
     containing_relation:
-      entry_html: Relazion %{relation_name}
       entry_role_html: Relazion %{relation_name} (come %{relation_role})
     not_found:
       title: No cjatât
@@ -1361,7 +1360,7 @@ fur:
       upload_trace: Cjame un percors
       all_traces: Ducj i percors
       my_traces: I miei percors
-      traces_from: Percors publics di %{user}
+      traces_from_html: Percors publics di %{user}
     georss:
       title: Percors GPS di OpenStreetMap
     description:
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index f332de1e3..825f9a583 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -337,7 +337,6 @@ fy:
         way: Line
         relation: Relaasje
     containing_relation:
-      entry_html: Relaasje %{relation_name}
       entry_role_html: Relaasje %{relation_name} (as %{relation_role})
     not_found:
       title: Net fûn
@@ -2080,7 +2079,7 @@ fy:
       upload_trace: Trajekt oplade
       all_traces: Alle trajekten
       my_traces: Myn trajekten
-      traces_from: Iepenbiere trajekten fan %{user}
+      traces_from_html: Iepenbiere trajekten fan %{user}
       remove_tag_filter: Lebelfilter weilitte
     destroy:
       scheduled_for_deletion: Trajekt ynplend om te wiskjen
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 7463a5478..92f446ed7 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -233,7 +233,6 @@ ga:
         way: Bealach
         relation: Gaol
     containing_relation:
-      entry_html: Gaol %{relation_name}
       entry_role_html: Gaol %{relation_name} (mar %{relation_role})
     not_found:
       sorry: 'Ár leithscéil, níorbh fhéidir %{type} #%{id} a aimsiú.'
diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index a3a89fd67..ff577e670 100644
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -134,7 +134,6 @@ gcf:
       type:
         way: Chimen
     containing_relation:
-      entry_html: Rèlasion %{relation_name}
       entry_role_html: Rèlasion %{relation_name} (adan wol %{relation_role})
     not_found:
       sorry: Désolé, l’objet %{type} nº %{id} n’a pas pu être trouvé.
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index cc0945922..61aa60109 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -320,7 +320,6 @@ gd:
         way: Slighe
         relation: Dàimh
     containing_relation:
-      entry_html: Dàimh %{relation_name}
       entry_role_html: Dàimh %{relation_name} ('na %{relation_role})
     not_found:
       sorry: Duilich ach cha deach %{type} àireamh %{id} a lorg.
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 79b201650..76e063b01 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -385,7 +385,6 @@ gl:
         way: Vía
         relation: Relación
     containing_relation:
-      entry_html: Relación %{relation_name}
       entry_role_html: Relación %{relation_name} (como %{relation_role})
     not_found:
       title: Non atopado
@@ -2633,7 +2632,7 @@ gl:
       upload_trace: Subir unha pista
       all_traces: Todas as pistas
       my_traces: As miñas pistas GPS
-      traces_from: Pistas públicas de %{user}
+      traces_from_html: Pistas públicas de %{user}
       remove_tag_filter: Eliminar etiqueta do filtro
     destroy:
       scheduled_for_deletion: Pista agardando a súa eliminación
@@ -3043,9 +3042,9 @@ gl:
     navigation:
       all_blocks: Todos os bloqueos
       blocks_on_me: Os meus bloqueos
-      blocks_on_user: Bloqueos feitos a %{user}
+      blocks_on_user_html: Bloqueos feitos a %{user}
       blocks_by_me: Bloqueos efectuados
-      blocks_by_user: Bloqueos feitos por %{user}
+      blocks_by_user_html: Bloqueos feitos por %{user}
       block: Bloqueo n.º %{id}
       new_block: Novo bloqueo
   user_mutes:
diff --git a/config/locales/gsw.yml b/config/locales/gsw.yml
index 51a47ff4b..dbb0d0f32 100644
--- a/config/locales/gsw.yml
+++ b/config/locales/gsw.yml
@@ -123,7 +123,6 @@ gsw:
         way: Wäg
         relation: Relation
     containing_relation:
-      entry_html: Relation %{relation_name}
       entry_role_html: Relation %{relation_name} (as %{relation_role})
     not_found:
       sorry: '%{type} mit de Nummer %{id} konnt leider net gfunde wärre.'
diff --git a/config/locales/he.yml b/config/locales/he.yml
index ee567f2ec..e77888d9c 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -426,8 +426,7 @@ he:
         way: קו
         relation: יחס
     containing_relation:
-      entry_html: יחס %{relation_name}
-      entry_role_html: יחס %{relation_name} (בתור %{relation_role})
+      entry_role_html: '%{relation_name} (בתור %{relation_role})'
     not_found:
       title: לא נמצא
       sorry: אנו מתנצלים, אך לא מצאנו %{type} מספר %{id}.
@@ -2603,7 +2602,7 @@ he:
       upload_trace: העלאת מסלול
       all_traces: כל המסלולים
       my_traces: המסלולים שלי
-      traces_from: מסלולים ציבוריים מאת %{user}
+      traces_from_html: מסלולים ציבוריים מאת %{user}
       remove_tag_filter: הסרת סינון לפי תג
     destroy:
       scheduled_for_deletion: מסלול מיועד למחיקה
@@ -3008,9 +3007,9 @@ he:
     navigation:
       all_blocks: כל החסימות
       blocks_on_me: חסימות שלי
-      blocks_on_user: חסימות של %{user}
+      blocks_on_user_html: חסימות של %{user}
       blocks_by_me: חסימות שעשיתי
-      blocks_by_user: חסימות שנעשו על־ידי %{user}
+      blocks_by_user_html: חסימות שנעשו על־ידי %{user}
       block: חסימה מס׳ %{id}
       new_block: חסימה חדשה
   user_mutes:
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index f5ddfc58d..d0e7e46e5 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -318,7 +318,6 @@ hi:
         way: रेखा
         relation: संबंध
     containing_relation:
-      entry_html: संबंध %{relation_name}
       entry_role_html: संबंध %{relation_name} (as %{relation_role})
     not_found:
       title: नहीं मिला
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 310d2dee2..be5c340a8 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -308,7 +308,6 @@ hr:
         way: Put
         relation: Relacija
     containing_relation:
-      entry_html: Relacija %{relation_name}
       entry_role_html: Relacija %{relation_name} (kao %{relation_role})
     not_found:
       sorry: 'Nažalost, %{type} #%{id} nije pronađen.'
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index d6968c849..db45ff706 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -363,7 +363,6 @@ hsb:
         way: Puć
         relation: Relacija
     containing_relation:
-      entry_html: Relacija %{relation_name}
       entry_role_html: Relacija %{relation_name} (jako %{relation_role})
     not_found:
       title: Njenamakane
@@ -2191,7 +2190,7 @@ hsb:
       upload_trace: Ćěr nahrać
       all_traces: Wšě ćěrje
       my_traces: Moje ćěrje
-      traces_from: Zjawne ćěrje wot %{user}
+      traces_from_html: Zjawne ćěrje wot %{user}
     destroy:
       scheduled_for_deletion: Čara předwidźana za zničenje
     offline_warning:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 04a29ded1..a71e7c654 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -78,8 +78,8 @@ hu:
           is_already_muted: már el van némítva
     models:
       acl: Hozzáférés-szabályzási lista
-      changeset: Módosításkészlet
-      changeset_tag: Módosításkészlet címkéje
+      changeset: Módosításcsomag
+      changeset_tag: Módosításcsomag címkéje
       country: Ország
       diary_comment: Hozzászólás a naplóhoz
       diary_entry: Naplóbejegyzés
@@ -188,11 +188,10 @@ hu:
       trace:
         tagstring: vesszővel elválasztva
       user_block:
-        reason: A felhasználó letiltásának oka. Kérjük, légy a lehető legnyugodtabb
-          és észszerűbb, adj meg minél több részletet a helyzetről, és ne feledd,
-          hogy az üzenet nyilvánosan látható lesz. Gondolj arra, hogy nem minden felhasználó
-          érti a közösségi szakzsargont, ezért kérjük, próbálj laikus kifejezéseket
-          használni.
+        reason: A felhasználó letiltásának oka. Légy a lehető legnyugodtabb és ésszerűbb,
+          adj meg minél több részletet a helyzetről, és ne feledd, hogy az üzenet
+          nyilvánosan látható lesz. Gondolj arra, hogy nem minden felhasználó érti
+          a közösségi szakzsargont, ezért kérjük, próbálj laikus kifejezéseket használni.
         needs_view: Be kell-e jelentkeznie a felhasználónak, mielőtt a blokkolás feloldódik?
       user:
         new_email: (soha nem jelenik meg nyilvánosan)
@@ -264,11 +263,11 @@ hu:
         reopened_at_by_html: 'Újraaktiválta %{user} ekkor: %{when}'
       rss:
         title: OpenStreetMap jegyzetek
-        description_all: Jelentett, kommentált vagy lezárt feljegyzések listája
+        description_all: Jelentett, kommentált vagy lezárt jegyzetek listája
         description_area: Bejelentett, hozzászólással ellátott vagy lezárt jegyzetek
           a területeden [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
-        description_item: RSS hírcsatorna a %{id} jegyzethez
-        opened: új megjegyzés (%{place} közelében)
+        description_item: RSS hírcsatorna a(z) %{id} jegyzethez
+        opened: új jegyzet (%{place} közelében)
         commented: új hozzászólás (%{place} közelében)
         closed: lezárt jegyzet (%{place} közelében)
         reopened: újraaktivált jegyzet (%{place} közelében)
@@ -295,7 +294,7 @@ hu:
           megmaradnak, de nem lesznek láthatóak.
         retain_notes: Térképjegyzeteid és jegyzethozzászólásaid (ha vannak) megmaradnak,
           de nem lesznek láthatóak.
-        retain_changeset_discussions: A módosításkészletekhez fűzött hozzászólásaid
+        retain_changeset_discussions: A módosításcsomagokhoz fűzött hozzászólásaid
           (ha vannak) megőrződnek.
         retain_email: Az e-mail-címed is megmarad.
         recent_editing_html: Mivel nemrégiben szerkesztettél, fiókod jelenleg nem
@@ -351,7 +350,7 @@ hu:
     edited_ago_by_html: Szerkesztette %{user} %{time_ago}
     version: Verzió
     redacted_version: Szerkesztett verzió
-    in_changeset: Módosításkészlet
+    in_changeset: Módosításcsomag
     anonymous: névtelen
     no_comment: (nincs hozzászólás)
     part_of: 'Része ennek:'
@@ -369,10 +368,10 @@ hu:
     view_redaction_message: Adattörlési üzenet megtekintése
     location: 'Hely:'
     node:
-      title_html: '%{name} pont'
+      title_html: 'Pont: %{name}'
       history_title_html: '%{name} pont előzményei'
     way:
-      title_html: '%{name} vonal'
+      title_html: 'Vonal: %{name}'
       history_title_html: '%{name} vonal előzményei'
       nodes: Pontok
       nodes_count:
@@ -382,7 +381,7 @@ hu:
         one: '%{related_ways} vonal része'
         other: '%{related_ways} vonalak része'
     relation:
-      title_html: '%{name} kapcsolat'
+      title_html: 'Kapcsolat: %{name}'
       history_title_html: '%{name} kapcsolat előzményei'
       members: Tagok
       members_count:
@@ -395,7 +394,6 @@ hu:
         way: 'Vonal:'
         relation: 'Kapcsolat:'
     containing_relation:
-      entry_html: '%{relation_name} kapcsolat'
       entry_role_html: '%{relation_name} kapcsolat (mint %{relation_role})'
     not_found:
       title: Nem található
@@ -404,7 +402,7 @@ hu:
         node: pont
         way: vonal
         relation: kapcsolat
-        changeset: módosításkészlet
+        changeset: módosításcsomag
         note: jegyzet
     timeout:
       title: Időtúllépési hiba
@@ -414,7 +412,7 @@ hu:
         node: pont
         way: vonal
         relation: kapcsolat
-        changeset: módosításkészlet
+        changeset: módosításcsomag
         note: jegyzet
     redacted:
       redaction: '%{id} adattörlési művelet'
@@ -447,13 +445,13 @@ hu:
       enclosing: A helyet körülvevő objektumok
   nodes:
     timeout:
-      sorry: Sajnáljuk, a %{id} azonosítójú csomópont adatainak lekérése túl sokáig
+      sorry: Sajnáljuk, a(z) %{id} azonosítójú pont adatainak lekérése túl sokáig
         tartott.
   old_nodes:
     not_found:
       sorry: 'Sajnáljuk, nem található meg #%{id} pont %{version} verziója.'
     timeout:
-      sorry: Sajnáljuk, a %{id} azonosítójú csomópont előzményeinek lekérése túl sokáig
+      sorry: Sajnáljuk, a(z) %{id} azonosítójú pont előzményeinek lekérése túl sokáig
         tartott.
   ways:
     timeout:
@@ -478,53 +476,53 @@ hu:
   changeset_comments:
     feeds:
       comment:
-        comment: 'Új hozzászólás #%{changeset_id} módosításkészlethez %{author} felhasználótól'
+        comment: 'Új hozzászólás #%{changeset_id} módosításcsomaghoz  %{author} felhasználótól'
         commented_at_by_html: '%{user} frissítette ekkor: %{when}'
       show:
-        title_all: OpenStreetMap módosításkészlet-megbeszélés
-        title_particular: 'A #%{changeset_id} OpenStreetMap módosításkészlethez tartozó
+        title_all: OpenStreetMap módosításcsomag-megbeszélés
+        title_particular: 'A #%{changeset_id} OpenStreetMap módosításcsomaghoz tartozó
           megbeszélés'
       timeout:
-        sorry: Sajnáljuk, túl sokáig tartott az általad kért módosításkészlet-hozzászólások
+        sorry: Sajnáljuk, túl sokáig tartott az általad kért módosításcsomag-hozzászólások
           listájának lekérése.
   changesets:
     changeset:
       no_edits: (nincs szerkesztés)
-      view_changeset_details: Módosításkészlet részleteinek megtekintése
+      view_changeset_details: Módosításcsomag részleteinek megtekintése
     index:
-      title: Módosításkészletek
-      title_user: '%{user} módosításkészletei'
-      title_user_link_html: '%{user_link} módosításkészletei'
-      title_friend: Ismerősök módosításkészletei
-      title_nearby: Közeli felhasználók módosításkészletei
-      empty: Nem található módosításkészlet
-      empty_area: Ezen a területen nincs módosításkészlet.
-      empty_user: Ettől a felhasználótól nincs módosításkészlet.
-      no_more: Nem találtunk több módosításkészletet.
-      no_more_area: Ezen a területen nincs több módosításkészlet.
-      no_more_user: Ettől a felhasználótól nincs több módosításkészlet.
+      title: Módosításcsomagok
+      title_user: '%{user} módosításcsomagjai'
+      title_user_link_html: '%{user_link} módosításcsomagjai'
+      title_friend: Ismerősök módosításcsomagjai
+      title_nearby: Közeli felhasználók módosításcsomagjai
+      empty: Nem található módosításcsomag.
+      empty_area: Ezen a területen nincs módosításcsomag.
+      empty_user: Ettől a felhasználótól nincs módosításcsomag.
+      no_more: Nem található több módosításcsomag.
+      no_more_area: Ezen a területen nincs több módosításcsomag.
+      no_more_user: Ettől a felhasználótól nincs több módosításcsomag.
       load_more: Továbbiak betöltése
       feed:
-        title: '%{id} módosításkészlet'
-        title_comment: '%{id} módosításkészlet - %{comment}'
+        title: '%{id} módosításcsomag'
+        title_comment: '%{id} módosításcsomag – %{comment}'
         created: Létrehozva
         closed: Lezárva
         belongs_to: Szerző
     subscribe:
-      heading: Feliratkozol a következő módosításkészlet megbeszélésére?
+      heading: Feliratkozol a következő módosításcsomag-megbeszélésére?
       button: Feliratkozás a megbeszélésre
     unsubscribe:
-      heading: Leiratkozol a következő módosításkészlet megbeszéléséről?
+      heading: Leiratkozol a következő módosításcsomag-megbeszéléséről?
       button: Leiratkozás a megbeszélésről
     heading:
-      title: '%{id} számú módosításkészlet'
+      title: '%{id} számú módosításcsomag'
       created_by_html: 'Létrehozta: %{link_user} (%{created}).'
     no_such_entry:
       heading: Nincs %{id} azonosítójú naplóbejegyzés
-      body: Sajnáljuk, nincs %{id} azonosítójú módosításkészlet. Ellenőrizd a helyességét.
-        Az is lehet, hogy rossz linkre kattintottál.
+      body: Sajnáljuk, nincs %{id} azonosítójú módosításcsomag. Ellenőrizd, hogy jól
+        írtad-e. Az is lehet, hogy rossz linkre kattintottál.
     show:
-      title: '%{id} módosításkészlet'
+      title: 'Módosításcsomag: %{id}'
       created: 'Létrehozva: %{when}'
       closed: 'Lezárva: %{when}'
       created_ago_html: Létrehozva %{time_ago}
@@ -533,8 +531,8 @@ hu:
       closed_ago_by_html: Lezárta %{user} %{time_ago}
       discussion: Megbeszélés
       join_discussion: Jelentkezz be, hogy bekapcsolódhass a megbeszélésbe
-      still_open: A módosításkészlet még nyitva van – a megbeszélés akkor nyílik meg,
-        ha a módosításkészlet lezárul.
+      still_open: A módosításcsomag még nyitva van – a megbeszélés akkor nyílik meg,
+        ha a módosításcsomag lezárul.
       subscribe: Feliratkozás
       unsubscribe: Leiratkozás
       comment_by_html: Hozzászólt %{user} %{time_ago}
@@ -542,8 +540,8 @@ hu:
       hide_comment: elrejtés
       unhide_comment: megjelenítés
       comment: Hozzászólás
-      changesetxml: Módosításkészlet adatai (XML)
-      osmchangexml: Módosításkészlet tartalma (osmChange XML)
+      changesetxml: Módosításcsomag XML-ben
+      osmchangexml: osmChange XML
     paging_nav:
       nodes: Pontok (%{count})
       nodes_paginated: 'Pontok (%{x}-%{y} ennyiből: %{count})'
@@ -552,7 +550,7 @@ hu:
       relations: Kapcsolatok (%{count})
       relations_paginated: 'Kapcsolatok (%{x}-%{y} ennyiből: %{count})'
     timeout:
-      sorry: Sajnáljuk, az általad kért módosításkészletek listájának beolvasása túl
+      sorry: Sajnáljuk, az általad kért módosításcsomagok listájának lekérése túl
         sokáig tartott.
   dashboards:
     contact:
@@ -573,9 +571,9 @@ hu:
       nearby users: További közeli felhasználók
       no nearby users: Még nincsenek más felhasználók, akik megadták, hogy a közelben
         szerkesztenek.
-      friends_changesets: ismerősök módosításkészletei
+      friends_changesets: ismerősök módosításcsomagjai
       friends_diaries: ismerősök naplóbejegyzései
-      nearby_changesets: közeli felhasználók módosításkészletei
+      nearby_changesets: közeli felhasználók módosításcsomagjai
       nearby_diaries: közeli felhasználók naplóbejegyzései
   diary_entries:
     new:
@@ -611,8 +609,7 @@ hu:
       title: Nincs ilyen naplóbejegyzés
       heading: 'Nincs naplóbejegyzés ezzel az azonosítóval: %{id}'
       body: Sajnáljuk, de nincs %{id} azonosítójú naplóbejegyzés vagy hozzászólás.
-        Kérjük, ellenőrizd a kifejezés helyességét. Az is lehet, hogy rossz linkre
-        kattintottál.
+        Ellenőrizd, hogy jól írtad-e. Az is lehet, hogy rossz linkre kattintottál.
     diary_entry:
       posted_by_html: '%{link_user} bejegyzése %{language_link} nyelven ekkor: %{created}'
       updated_at_html: 'Utolsó frissítés: %{updated}'
@@ -702,8 +699,8 @@ hu:
       contact_url_title: A különféle kapcsolatfelvételi csatornák magyarázata
       contact: kapcsolat
       contact_the_community_html: Nyugodtan keresd fel az OpenStreetMap közösséget
-        (%{contact_link}), ha hibás linket vagy más hibát találtál. Kérjük, ne felejtsd
-        el feljegyezni a hibás oldal pontos URL-jét.
+        (%{contact_link}), ha hibás linket vagy más hibát találtál. Ne felejtsd el
+        feljegyezni a hibás oldal pontos URL-jét.
     bad_request:
       title: Rossz kérés
       description: Az OpenStreetMap szerveren kért művelet nem érvényes (HTTP 400)
@@ -1574,7 +1571,7 @@ hu:
     helper:
       reportable_title:
         diary_comment: '%{entry_title} naplóbejegyzés, #%{comment_id} hozzászólás'
-        note: 'Megjegyzés #%{note_id}'
+        note: '#%{note_id} jegyzet'
   issue_comments:
     create:
       comment_created: Hozzászólásod sikeresen létrehozva
@@ -1584,7 +1581,7 @@ hu:
       title_html: '%{link} bejelentése'
       missing_params: Nem hozhatsz létre új bejelentést
       disclaimer:
-        intro: 'Mielőtt elküldöd a bejelentést, kérjük, győződj meg a következőkről:'
+        intro: 'Mielőtt elküldöd a bejelentést, győződj meg a következőkről:'
         not_just_mistake: Biztos vagy abban, hogy a probléma nem csupán egy hiba
         unable_to_fix: A problémát nem tudod megoldani a sem magad, sem a közösség
           tagjainak segítségével
@@ -1607,9 +1604,9 @@ hu:
           vandal_label: Ez a felhasználó vandál
           other_label: Egyéb
         note:
-          spam_label: A megjegyzés spam
-          personal_label: A megjegyzés személyes adatot tartalmaz
-          abusive_label: A megjegyzés sértő
+          spam_label: A jegyzet spam
+          personal_label: A jegyzet személyes adatot tartalmaz
+          abusive_label: A jegyzet sértő
           other_label: Egyéb
     create:
       successful_report: Bejelentésedet sikeresen regisztráltuk
@@ -1692,11 +1689,11 @@ hu:
         %{trace_description} leírású, címke nélküli fájlod
     gpx_failure:
       hi: Szia %{to_user}!
-      failed_to_import: 'nem sikerült GPS nyomkövetési fájlként importálni. Kérjük,
-        ellenőrizze, hogy a fájl egy érvényes GPX-fájl vagy egy GPX-fájl(oka)t tartalmazó
-        archívum a támogatott formátumban (.tar.gz, .tar.bz2, .tar, .zip, .gpx.gz,
-        .gpx.bz2). . Formátum- vagy szintaktikai probléma lehet a fájllal? Itt van
-        az importálási hiba:'
+      failed_to_import: 'nem sikerült GPS nyomkövetési fájlként importálni. Ellenőrizd,
+        hogy a fájl egy érvényes GPX-fájl vagy egy GPX-fájl(oka)t tartalmazó archívum
+        a támogatott formátumban (.tar.gz, .tar.bz2, .tar, .zip, .gpx.gz, .gpx.bz2).
+        . Formátum- vagy szintaktikai probléma lehet a fájllal? Itt látható az importálási
+        hiba:'
       more_info: 'További információ a GPX importálási hibáiról és azok elkerüléséről
         itt található: %{url}.'
       more_info_html: 'A GPX importálási hibákról és elkerülésükről további tájékoztatás
@@ -1738,7 +1735,7 @@ hu:
       click_the_link: Ha ez Te vagy, akkor a jelszó alaphelyzetbe állításához kattints
         az alábbi hivatkozásra.
     note_comment_notification:
-      description: 'OpenStreetMap megjegyzés #%{id}'
+      description: 'OpenStreetMap jegyzet #%{id}'
       anonymous: Egy névtelen felhasználó
       greeting: Szia!
       commented:
@@ -1775,27 +1772,27 @@ hu:
       details: 'Válaszolj, vagy tudj meg többet a jegyzetről itt: %{url}.'
       details_html: 'Válaszolj, vagy tudj meg többet a jegyzetről itt: %{url}.'
     changeset_comment_notification:
-      description: 'OpenStreetMap módosításkészlet #%{id}'
+      description: 'OpenStreetMap módosításcsomag #%{id}'
       hi: Szia %{to_user}!
       commented:
-        subject_own: '[OpenStreetMap] %{commenter} hozzászólt az egyik módosításkészletedhez'
-        subject_other: '[OpenStreetMap] %{commenter} hozzászólt egy módosításkészlethez,
+        subject_own: '[OpenStreetMap] %{commenter} hozzászólt az egyik módosításcsomagodhoz'
+        subject_other: '[OpenStreetMap] %{commenter} hozzászólt egy módosításcsomaghoz,
           amely téged is érdekel'
-        your_changeset: '%{commenter} hozzászólt az egyik módosításkészletedhez ekkor:
+        your_changeset: '%{commenter} hozzászólt az egyik módosításcsomagodhoz ekkor:
           %{time}'
-        your_changeset_html: '%{commenter} hozzászólt az egyik módosításkészletedhez
+        your_changeset_html: '%{commenter} hozzászólt az egyik módosításcsomagodhoz
           ekkor: %{time}'
         commented_changeset: '%{commenter} hozzászólt %{changeset_author} általad
-          is figyelt módosításkészletéhez ekkor: %{time}'
+          is figyelt módosításcsomagjához ekkor: %{time}'
         commented_changeset_html: '%{commenter} hozzászólt %{changeset_author} általad
-          is figyelt módosításkészletéhez ekkor: %{time}'
+          is figyelt módosításcsomagjához ekkor: %{time}'
         partial_changeset_with_comment: „%{changeset_comment}” hozzászólással
         partial_changeset_with_comment_html: '%{changeset_comment} hozzászólással'
         partial_changeset_without_comment: hozzászólás nélkül
-      details: 'Válaszolj, vagy tudj meg többet a módosításkészletről itt: %{url}.'
-      details_html: 'Válaszolj, vagy tudj meg többet a módosításkészletről itt: %{url}.'
-      unsubscribe: 'A módosításkészlet frissüléseiről leiratkozhatsz itt: %{url}.'
-      unsubscribe_html: 'A módosításkészlet frissüléseiről leiratkozhatsz itt: %{url}.'
+      details: 'Válaszolj, vagy tudj meg többet a módosításcsomagról itt: %{url}.'
+      details_html: 'Válaszolj, vagy tudj meg többet a módosításcsomagról itt: %{url}.'
+      unsubscribe: 'A módosításcsomag frissüléseiről leiratkozhatsz itt: %{url}.'
+      unsubscribe_html: 'A módosításcsomag frissüléseiről leiratkozhatsz itt: %{url}.'
   confirmations:
     confirm:
       heading: Nézd meg az e-mailjeidet!
@@ -1821,7 +1818,7 @@ hu:
       failure: Ezzel a tokennel már meg lett erősítve egy e-mail cím.
       unknown_token: Ez a megerősítő kód lejárt, vagy nem létezik.
     resend_success_flash:
-      confirmation_sent: Küldtünk egy új megerősítő megjegyzést a(z) %{email} címre.
+      confirmation_sent: Küldtünk egy új megerősítő üzenetet a(z) %{email} címre.
         Amint megerősíted fiókodat, kezdhetsz is térképezni.
       whitelist: Ha olyan antispam rendszert használsz, amely visszaigazolási kéréseket
         küld, akkor kérjük, ellenőrizd, hogy a(z) %{sender} az engedélyezett listán
@@ -2209,6 +2206,8 @@ hu:
           adatokat tartalmazza, az állam szerzői joga fenntartva.'
         contributors_za_south_africa: Dél-Afrika
         contributors_za_ngi: 'Chief Directorate: National Geo-Spatial Information'
+        contributors_gb_credit_html: "%{united_kingdom}: Térképészeti Szolgálat adatai
+          &copy; Királyi szerzői és adatbázisjog \n2010-2023."
         contributors_gb_united_kingdom: Egyesült Királyság
         contributors_2_html: Ezekről és más, az OpenStreetMap fejlesztésére használt
           forrásokról további részletekért tekintsd meg a %{contributors_page_link}
@@ -2542,10 +2541,15 @@ hu:
       trace_uploaded: A GPX-fájl feltöltődött, és várakozik az adatbázisba való beillesztésre.
         Ez általában fél órán belül megtörténik, és kapni fogsz egy e-mailt, amint
         elkészült.
-      upload_failed: A GPX feltöltése meghiúsult. Kérjük, próbáld meg újra.
-      traces_waiting: '%{count} nyomvonalad várakozik feltöltésre. Kérjük, fontold
-        meg, hogy megvárod, amíg ezek befejeződnek mielőtt feltöltesz továbbiakat,
-        hogy így ne tartsd fel a többi felhasználót a sorban.'
+      upload_failed: A GPX feltöltése meghiúsult. A rendszergazda értesítést kapott
+        a hibáról. Próbáld meg újra.
+      traces_waiting:
+        one: '%{count} nyomvonalad várakozik feltöltésre. Kérjük, várd meg, amíg ezek
+          befejeződnek, mielőtt feltöltesz továbbiakat, hogy ne tartsd fel a többi
+          felhasználót a sorban.'
+        other: '%{count} nyomvonalad várakozik feltöltésre. Kérjük, várd meg, amíg
+          ezek befejeződnek, mielőtt feltöltesz továbbiakat, hogy ne tartsd fel a
+          többi felhasználót a sorban.'
     edit:
       cancel: Mégse
       title: 'Nyomvonal szerkesztése: %{name}'
@@ -2603,7 +2607,7 @@ hu:
       upload_trace: Nyomvonal feltöltése
       all_traces: Minden nyomvonal
       my_traces: Saját nyomvonalak
-      traces_from: '%{user} nyilvános nyomvonalai'
+      traces_from_html: '%{user} nyilvános nyomvonalai'
       remove_tag_filter: Címkeszűrő eltávolítása
     destroy:
       scheduled_for_deletion: A nyomvonal törlésre kijelölve
@@ -2746,8 +2750,7 @@ hu:
         paragraph_2: Regisztrálj a közreműködés megkezdéséhez.
         welcome: Üdvözlünk az OpenStreetMapen
       duplicate_social_email: Ha már rendelkezel OpenStreetMap fiókkal, és külső identitásszolgáltatót
-        szeretnél használni, kérjük, jelentkezz be jelszavaddal, és módosítsd fiókod
-        beállításait.
+        szeretnél használni, jelentkezz be jelszavaddal, és módosítsd fiókod beállításait.
       display name description: A nyilvánosan megjelenített felhasználóneved. A beállításaidban
         később megváltoztathatod.
       by_signing_up:
@@ -3013,9 +3016,9 @@ hu:
     navigation:
       all_blocks: Minden blokk
       blocks_on_me: Engem sújtó blokkolások
-      blocks_on_user: '%{user} blokkolásai'
+      blocks_on_user_html: '%{user} blokkolásai'
       blocks_by_me: Általam kiosztott blokkolások
-      blocks_by_user: '%{user} blokkolásai'
+      blocks_by_user_html: '%{user} blokkolásai'
       block: '#%{id} blokk'
       new_block: Újabb blokkolások
   user_mutes:
@@ -3061,11 +3064,11 @@ hu:
       closed: Lezárva
       status: Állapot
     show:
-      title: '%{id} jegyzet'
+      title: 'Jegyzet: %{id}'
       description: Leírás
-      open_title: '%{note_name} megoldatlan jegyzet'
-      closed_title: '%{note_name} megoldott jegyzet'
-      hidden_title: '%{note_name} rejtett jegyzet'
+      open_title: 'Megoldatlan jegyzet: %{note_name}'
+      closed_title: 'Megoldott jegyzet: %{note_name}'
+      hidden_title: Elrejtett jegyzet %{note_name}
       event_opened_by_html: Létrehozta %{user} %{time_ago}
       event_opened_by_anonymous_html: Létrehozta egy névtelen felhasználó %{time_ago}
       event_commented_by_html: Hozzászólt %{user} %{time_ago}
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 2c41b8f25..1afe3205a 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -369,7 +369,6 @@ ia:
         way: Via
         relation: Relation
     containing_relation:
-      entry_html: Relation %{relation_name}
       entry_role_html: Relation %{relation_name} (como %{relation_role})
     not_found:
       title: Non trovate
@@ -2602,7 +2601,7 @@ ia:
       upload_trace: Incargar un tracia
       all_traces: Tote le tracias
       my_traces: Mi tracias
-      traces_from: Tracias public de %{user}
+      traces_from_html: Tracias public de %{user}
       remove_tag_filter: Remover filtro de etiquettas
     destroy:
       scheduled_for_deletion: Tracia programmate pro deletion
@@ -3011,9 +3010,9 @@ ia:
     navigation:
       all_blocks: Tote le blocadas
       blocks_on_me: Blocadas sur me
-      blocks_on_user: Blocadas sur %{user}
+      blocks_on_user_html: Blocadas sur %{user}
       blocks_by_me: Blocadas facite per me
-      blocks_by_user: Blocadas facite per %{user}
+      blocks_by_user_html: Blocadas facite per %{user}
       block: Blocada №%{id}
       new_block: Nove blocada
   user_mutes:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index f16032aab..d44592b69 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -381,7 +381,6 @@ id:
         way: Way/Garis
         relation: Relasi
     containing_relation:
-      entry_html: Relasi %{relation_name}
       entry_role_html: Relasi %{relation_name} (as %{relation_role})
     not_found:
       title: Tidak Ditemukan
@@ -2504,7 +2503,7 @@ id:
       upload_trace: Unggah jejak GPS
       all_traces: Semua Jejak
       my_traces: Jejak Saya
-      traces_from: Jejak Publik dari %{user}
+      traces_from_html: Jejak Publik dari %{user}
       remove_tag_filter: Hapus Filter Tag
     destroy:
       scheduled_for_deletion: Trek yang dijadwalkan untuk dihapus
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 821c79552..c83902172 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -392,7 +392,6 @@ is:
         way: Leið
         relation: Vensl
     containing_relation:
-      entry_html: Venslin %{relation_name}
       entry_role_html: Venslin %{relation_name} (sem „%{relation_role}“)
     not_found:
       title: Fannst ekki
@@ -2651,7 +2650,7 @@ is:
       upload_trace: Senda inn feril
       all_traces: Allar ferlar
       my_traces: Ferlarnir mínir
-      traces_from: Opinberir ferlar frá %{user}
+      traces_from_html: Opinberir ferlar frá %{user}
       remove_tag_filter: Fjarlægja merkjasíu
     destroy:
       scheduled_for_deletion: Þessum feril verður eitt
@@ -3064,9 +3063,9 @@ is:
     navigation:
       all_blocks: Öll bönn
       blocks_on_me: Bönn gegn mér
-      blocks_on_user: Bönn gegn %{user}
+      blocks_on_user_html: Bönn gegn %{user}
       blocks_by_me: Bönn eftir mig
-      blocks_by_user: Bönn eftir %{user}
+      blocks_by_user_html: Bönn eftir %{user}
       block: 'Bann #%{id}'
   user_mutes:
     index:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 51c2bfc4b..d0925a5f6 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -24,6 +24,7 @@
 # Author: Fringio
 # Author: Frubino
 # Author: Gianfranco
+# Author: HaukweKwor
 # Author: Isiond
 # Author: JackLantern
 # Author: Jlrb+
@@ -362,7 +363,7 @@ it:
         link: https://osmfoundation.org/wiki/Licence/Contributor_Terms/IT
         link text: che cos'è questo?
       save changes button: Salva modifiche
-      delete_account: Elimina account...
+      delete_account: Elimina Utenza...
     go_public:
       heading: Modifica pubblica
       currently_not_public: Attualmente le tue modifiche sono anonime e le persone
@@ -431,8 +432,7 @@ it:
         way: Percorso
         relation: Relazione
     containing_relation:
-      entry_html: Relazione %{relation_name}
-      entry_role_html: Relazione %{relation_name} (come %{relation_role})
+      entry_role_html: '%{relation_name} (come %{relation_role})'
     not_found:
       title: Non trovato
       sorry: 'Impossibile trovare %{type} #%{id}.'
@@ -2667,7 +2667,7 @@ it:
       upload_trace: Carica un tracciato
       all_traces: Tutti i tracciati
       my_traces: I miei tracciati
-      traces_from: Tracciati pubblici di %{user}
+      traces_from_html: Tracciati pubblici di %{user}
       remove_tag_filter: Rimuovi filtro delle etichette
     destroy:
       scheduled_for_deletion: Tracciato in attesa di essere eliminato
@@ -3078,9 +3078,9 @@ it:
     navigation:
       all_blocks: Tutti i blocchi
       blocks_on_me: Blocchi su di me
-      blocks_on_user: Blocchi su %{user}
+      blocks_on_user_html: Blocchi su %{user}
       blocks_by_me: Blocchi applicati da me
-      blocks_by_user: Blocchi imposti da %{user}
+      blocks_by_user_html: Blocchi imposti da %{user}
       block: 'Blocco #%{id}'
       new_block: Nuovo blocco
   user_mutes:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 7ee065dfe..9f85fac29 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -390,7 +390,6 @@ ja:
         way: ウェイ
         relation: リレーション
     containing_relation:
-      entry_html: リレーション %{relation_name}
       entry_role_html: リレーション %{relation_name} (%{relation_role} として)
     not_found:
       title: 見つかりません
@@ -2390,7 +2389,7 @@ ja:
       upload_trace: トレースをアップロード
       all_traces: 全てのトレース
       my_traces: 自分のトレース
-      traces_from: '%{user}さんによる公開GPSトレース'
+      traces_from_html: '%{user}さんによる公開GPSトレース'
       remove_tag_filter: タグフィルターの削除
     destroy:
       scheduled_for_deletion: トレースの削除準備を行いました
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 16fe02f21..6cc951a44 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -163,7 +163,6 @@ ka:
         way: გზა
         relation: ურთიერთობა
     containing_relation:
-      entry_html: ურთიერთობა %{relation_name}
       entry_role_html: ურთიერთობა %{relation_name} (როგორც %{relation_role})
     not_found:
       sorry: 'სამწუხაროდ, %{type} #%{id} ვერ მოიძებნა.'
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 24d5b1dc7..dffc4b02d 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -257,7 +257,6 @@ kab:
         way: Abrid
         relation: Assaɣ
     containing_relation:
-      entry_html: Assaɣ %{relation_name}
       entry_role_html: Assaɣ %{relation_name} (am %{relation_role})
     not_found:
       sorry: 'Suref-aɣ, %{type} #%{id} ulac-it.'
diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml
index 54c620e84..0e713250c 100644
--- a/config/locales/kk-cyrl.yml
+++ b/config/locales/kk-cyrl.yml
@@ -266,8 +266,6 @@ kk-cyrl:
         node: Нүкте
         way: Сызық
         relation: Қатынас
-    containing_relation:
-      entry_html: Қатынас %{relation_name}
     not_found:
       title: Табылмады
       type:
diff --git a/config/locales/km.yml b/config/locales/km.yml
index 98237c03f..ae4c859b1 100644
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -133,7 +133,6 @@ km:
         way: ផ្លូវ​
         relation: ទំនាក់ទំនង
     containing_relation:
-      entry_html: ទំនាក់ទំនង​ %{relation_name}
       entry_role_html: ទំនាក់ទំនង %{relation_name} (ជា %{relation_role})
     not_found:
       sorry: សូមទោស រកមិនឃើញ %{type}%{id}​ ទេ។
diff --git a/config/locales/kn.yml b/config/locales/kn.yml
index 632c96561..dabdf6f74 100644
--- a/config/locales/kn.yml
+++ b/config/locales/kn.yml
@@ -237,8 +237,6 @@ kn:
       type:
         way: ರಸ್ತೆ
         relation: ಸಂಬಂಧ
-    containing_relation:
-      entry_html: ಸಂಬಂಧ %{relation_name}
     not_found:
       title: ಸಿಗಲಿಲ್ಲ
       sorry: 'ಕ್ಷಮಿಸಿ, %{type} #%{id} ಸಿಗುತ್ತಿಲ್ಲ.'
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index aaf9f098d..75fb9dbd8 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -374,7 +374,6 @@ ko:
         way: 길
         relation: 관계
     containing_relation:
-      entry_html: 관계 %{relation_name}
       entry_role_html: (%{relation_role}로서) 관계 %{relation_name}
     not_found:
       title: 찾을 수 없음
@@ -2378,7 +2377,7 @@ ko:
       upload_trace: 궤적 올리기
       all_traces: 모든 궤적
       my_traces: 내 발자취
-      traces_from: '%{user}님의 공개 GPS 궤적'
+      traces_from_html: '%{user}님의 공개 GPS 궤적'
       remove_tag_filter: 태그 필터 제거
     destroy:
       scheduled_for_deletion: 삭제 계획중인 궤적
@@ -2738,9 +2737,9 @@ ko:
     navigation:
       all_blocks: 모든 차단
       blocks_on_me: 나의 차단내역
-      blocks_on_user: '%{user}님의 차단내역'
+      blocks_on_user_html: '%{user}님의 차단내역'
       blocks_by_me: 내가 차단한 내역
-      blocks_by_user: '%{user}님이 차단한 내역'
+      blocks_by_user_html: '%{user}님이 차단한 내역'
       block: '#%{id} 차단'
       new_block: 최근 차단
   user_mutes:
diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index deab2c5c1..8d02e9c3b 100644
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -354,7 +354,6 @@ ku-Latn:
         way: Rê
         relation: Eleqe
     containing_relation:
-      entry_html: Eleqe %{relation_name}
       entry_role_html: Eleqe %{relation_name} (wekî %{relation_role})
     not_found:
       title: Nehate dîtin
@@ -2177,7 +2176,7 @@ ku-Latn:
       upload_trace: Şopek GPSê bar bike
       all_traces: Temamê Şopan
       my_traces: Şopên min
-      traces_from: Şopên Giştî ji %{user}
+      traces_from_html: Şopên Giştî ji %{user}
       remove_tag_filter: Parzûna etîketê rake
     destroy:
       scheduled_for_deletion: Şop ji bo jêbirinê hate plankirin
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index be03792e5..a1bcbdb99 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -346,7 +346,6 @@ lb:
         way: Wee
         relation: Relatioun
     containing_relation:
-      entry_html: Relatioun %{relation_name}
       entry_role_html: Relatioun %{relation_name} (als %{relation_role})
     not_found:
       title: Net fonnt
@@ -2107,7 +2106,7 @@ lb:
       wiki_page: Wiki-Säit
       all_traces: All Spuren
       my_traces: Meng Spueren
-      traces_from: Ëffentlech Spuere vum %{user}
+      traces_from_html: Ëffentlech Spuere vum %{user}
       remove_tag_filter: Tag-Filter ewechhuelen
     destroy:
       scheduled_for_deletion: Fir d'Läsche bestëmmt Spuer
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index b8b1f7b30..55ab98698 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -419,7 +419,6 @@ lt:
         way: Kelias
         relation: Ryšys
     containing_relation:
-      entry_html: Ryšys %{relation_name}
       entry_role_html: Ryšys %{relation_name} (kaip %{relation_role})
     not_found:
       title: Nerasta
@@ -2536,7 +2535,7 @@ lt:
       upload_trace: Įkelti pėdsaką
       all_traces: Visi pėdsakai
       my_traces: Mano GPS pėdsakai
-      traces_from: Vieši naudotojo %{user} pėdsakai
+      traces_from_html: Vieši naudotojo %{user} pėdsakai
       remove_tag_filter: Pašalinti žymų filtrą
     destroy:
       scheduled_for_deletion: Trasa, numatyta ištrinimui
@@ -2946,9 +2945,9 @@ lt:
     navigation:
       all_blocks: Visi blokavimai
       blocks_on_me: Mano blokavimai
-      blocks_on_user: '%{user} blokavimai'
+      blocks_on_user_html: '%{user} blokavimai'
       blocks_by_me: Mano sukurti blokavimai
-      blocks_by_user: '%{user} sukurti blokavimai'
+      blocks_by_user_html: '%{user} sukurti blokavimai'
       block: 'Blokavimas #%{id}'
       new_block: Naujas blokavimas
   user_mutes:
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 405c47dcb..3cc3fe8b1 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -280,7 +280,6 @@ lv:
         way: LÄ«nija
         relation: Relācija
     containing_relation:
-      entry_html: Relācija %{relation_name}
       entry_role_html: Relācija %{relation_name} (kā %{relation_role})
     not_found:
       sorry: 'Atvainojiet, %{type} ar id #%{id} nevarējām atrast.'
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index f64385a10..aff5cfc22 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -365,7 +365,6 @@ mk:
         way: Пат
         relation: Однос
     containing_relation:
-      entry_html: Однос %{relation_name}
       entry_role_html: Однос %{relation_name} (како %{relation_role})
     not_found:
       title: Не е најдено
@@ -2581,7 +2580,7 @@ mk:
       upload_trace: Подигни трага
       all_traces: Сите траги
       my_traces: Мои траги
-      traces_from: Јавни траги од %{user}
+      traces_from_html: Јавни траги од %{user}
       remove_tag_filter: Отстрани филтер за ознаки
     destroy:
       scheduled_for_deletion: Трагата е закажана за бришење
@@ -2990,9 +2989,9 @@ mk:
     navigation:
       all_blocks: Сите блокови
       blocks_on_me: Добиени блокови
-      blocks_on_user: Блокови за %{user}
+      blocks_on_user_html: Блокови за %{user}
       blocks_by_me: Извршени болокови
-      blocks_by_user: Блокови од %{user}
+      blocks_by_user_html: Блокови од %{user}
       block: Блок бр. %{id}
       new_block: Нов блок
   user_mutes:
diff --git a/config/locales/mo.yml b/config/locales/mo.yml
index 0dd8e0ef6..846afd851 100644
--- a/config/locales/mo.yml
+++ b/config/locales/mo.yml
@@ -117,7 +117,6 @@ mo:
         way: Кале
         relation: Релацие
     containing_relation:
-      entry_html: Релация %{relation_name}
       entry_role_html: Релация %{relation_name} (ын ролул %{relation_role})
     not_found:
       type:
diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 1f1f7da6f..801fad8d4 100644
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -227,7 +227,6 @@ mr:
         way: मार्ग
         relation: संबंध
     containing_relation:
-      entry_html: संबंध %{relation_name}
       entry_role_html: संबंध %{relation_name} (%{relation_role} म्हणून)
     not_found:
       sorry: 'क्षमा असावी, %{type} #%{id} सापडले नाही.'
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 1ba56971f..cbb0cd37f 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -294,7 +294,6 @@ ms:
         way: Jalan
         relation: Hubungan
     containing_relation:
-      entry_html: Hubungan %{relation_name}
       entry_role_html: Hubungan %{relation_name} (sebagai %{relation_role})
     not_found:
       title: Tidak Dijumpai
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index c24f75051..01e32571f 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -354,7 +354,6 @@ nb:
         way: Linje
         relation: Relasjon
     containing_relation:
-      entry_html: Relasjon %{relation_name}
       entry_role_html: Relasjon %{relation_name} (som %{relation_role})
     not_found:
       title: Ikke funnet
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index b6a7bf7a0..9c1179408 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -292,7 +292,6 @@ ne:
         way: बाटो
         relation: सम्बन्ध
     containing_relation:
-      entry_html: सम्बन्ध %{relation_name}
       entry_role_html: सम्बन्ध %{relation_name} (as %{relation_role})
     not_found:
       title: फेला परेन
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index b065f0145..80aa25e97 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -429,7 +429,6 @@ nl:
         way: Weg
         relation: Relatie
     containing_relation:
-      entry_html: Relatie %{relation_name}
       entry_role_html: Relatie %{relation_name} (als %{relation_role})
     not_found:
       title: Kon niet gevonden worden
@@ -2672,7 +2671,7 @@ nl:
       upload_trace: Traject uploaden
       all_traces: Alle trajecten
       my_traces: Mijn trajecten
-      traces_from: Openbare trajecten van %{user}
+      traces_from_html: Openbare trajecten van %{user}
       remove_tag_filter: Labelfilter verwijderen
     destroy:
       scheduled_for_deletion: Traject staat op de lijst voor verwijdering
@@ -3086,9 +3085,9 @@ nl:
     navigation:
       all_blocks: Alle blokkades
       blocks_on_me: Blokkades voor u
-      blocks_on_user: Blokkades voor %{user}
+      blocks_on_user_html: Blokkades voor %{user}
       blocks_by_me: Blokkades door u
-      blocks_by_user: Blokkades door %{user}
+      blocks_by_user_html: Blokkades door %{user}
       block: 'Blokkade #%{id}'
       new_block: Nieuwe blokkade
   user_mutes:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index c8c922764..468da74f5 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -334,7 +334,6 @@ nn:
         way: Veg
         relation: Relasjon
     containing_relation:
-      entry_html: Relasjon %{relation_name}
       entry_role_html: Relasjon %{relation_name} (som %{relation_role})
     not_found:
       title: Ikkje funne
diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 01ac78d52..3d06d9cf7 100644
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -302,7 +302,6 @@ nqo:
         way: ߛߌߟߊ
         relation: ߕߍߓߊ߯ߦߊ
     containing_relation:
-      entry_html: ߕߍߓߊ߯ߦߊ %{relation_name}
       entry_role_html: ߕߍߓߊ߯ߦߊ %{relation_role} %{relation_name} ߘߌ߫
     not_found:
       title: ߡߊ߫ ߛߐ߬ߘߐ߲߫
@@ -1525,7 +1524,7 @@ nqo:
       upload_trace: ߜߋ߬ߙߋ ߘߏ߫ ߟߊߦߟߍ߬
       all_traces: ߜߋ߬ߙߋ ߟߎ߬ ߓߍ߯
       my_traces: ߒ ߝߏ߲߬ߝߏ߲ ߠߎ߬
-      traces_from: ߜߍߘߐ߫ ߜߙߋ ߟߎ߬ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫
+      traces_from_html: ߜߍߘߐ߫ ߜߙߋ ߟߎ߬ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫
     destroy:
       scheduled_for_deletion: ߜߋ߬ߙߋ ߟߐ߯ߟߊߟߌ ߖߏ߰ߛߌ߬ ߞߊ߲ߡߊ߬
     offline_warning:
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index e1f9da2e2..27c20f748 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -352,7 +352,6 @@ oc:
         way: Linha
         relation: Relacion
     containing_relation:
-      entry_html: Relacion %{relation_name}
       entry_role_html: Relacion %{relation_name} (per %{relation_role})
     not_found:
       title: S'es pas trobat
@@ -2069,7 +2068,7 @@ oc:
       upload_trace: Mandar una traça
       all_traces: Totei lei traças
       my_traces: Mei traças GPS
-      traces_from: Traças GPS publicas de %{user}
+      traces_from_html: Traças GPS publicas de %{user}
       remove_tag_filter: Elimina lo filtre d'etiquetas
     destroy:
       scheduled_for_deletion: Pista prevista per la supression
diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 9df3f0be9..0236ca7c9 100644
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -351,7 +351,6 @@ pa:
         way: ਰਾਹ
         relation: ਸਬੰਧ
     containing_relation:
-      entry_html: ਸਬੰਧ %{relation_name}
       entry_role_html: ਸਬੰਧ %{relation_name} (%{relation_role} ਵਜੋਂ)
     not_found:
       title: ਨਹੀਂ ਲੱਭਿਆ
@@ -1712,7 +1711,7 @@ pa:
       upload_trace: ਕੋਈ ਖੁਰਾ-ਖੋਜ ਚੜ੍ਹਾਉ
       all_traces: ਸਾਰੇ ਖੁਰਾ-ਖੋਜ
       my_traces: ਮੇਰੇ ਖੁਰਾ-ਖੋਜ
-      traces_from: '%{user} ਤੋਂ ਜਨਤਕ ਖੁਰਾ-ਖੋਜ'
+      traces_from_html: '%{user} ਤੋਂ ਜਨਤਕ ਖੁਰਾ-ਖੋਜ'
     georss:
       title: OpenStreetMap GPS ਖੁਰਾ-ਖੋਜ
     description:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 9860de76a..9db815388 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -463,7 +463,6 @@ pl:
         way: Linia
         relation: Relacja
     containing_relation:
-      entry_html: Relacja %{relation_name}
       entry_role_html: Relacja %{relation_name} (jako %{relation_role})
     not_found:
       title: Nie znaleziono
@@ -2687,7 +2686,7 @@ pl:
       upload_trace: Wyślij ślad
       all_traces: Wszystkie ślady
       my_traces: Moje ślady GPS
-      traces_from: Publiczne ślady GPS użytkownika %{user}
+      traces_from_html: Publiczne ślady GPS użytkownika %{user}
       remove_tag_filter: Usuń filtr tagów
     destroy:
       scheduled_for_deletion: Ślad oczekuje na usunięcie
@@ -3112,9 +3111,9 @@ pl:
     navigation:
       all_blocks: Wszystkie blokady
       blocks_on_me: Blokady nałożone na mnie
-      blocks_on_user: Blokady na %{user}
+      blocks_on_user_html: Blokady na %{user}
       blocks_by_me: Blokady nałożone przeze mnie
-      blocks_by_user: Blokady nałożone przez %{user}
+      blocks_by_user_html: Blokady nałożone przez %{user}
       block: Blokada nr %{id}
       new_block: Nowy blok
   user_mutes:
diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index a36e67b0f..7c325bb30 100644
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -314,7 +314,6 @@ pnb:
         way: راہ
         relation: سمبندھ
     containing_relation:
-      entry_html: سمبندھ «⁠%{relation_name}⁠»
       entry_role_html: سمبندھ «⁠%{relation_name}⁠» وچ «⁠%{relation_role}⁠⁠» رول
     not_found:
       title: کجھ نہیں لبھیا
@@ -1684,7 +1683,7 @@ pnb:
       upload_trace: کھرا چڑھایو
       all_traces: سارے کھرے کھوجاں
       my_traces: میرے کھرے
-      traces_from: «%{user}» دے عوام کھرے
+      traces_from_html: «%{user}» دے عوام کھرے
       remove_tag_filter: فلٹر ہٹاؤ
     georss:
       title: کھرے کھوجاں
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index fe0ded915..1a5f2f122 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -161,7 +161,7 @@ pt-PT:
         longitude: Longitude
         public: Público
         description: Descrição
-        gpx_file: Enviar ficheiro GPX
+        gpx_file: Escolher ficheiro GPX
         visibility: Visibilidade
         tagstring: Etiquetas
       message:
@@ -409,7 +409,6 @@ pt-PT:
         way: Linha
         relation: Relação
     containing_relation:
-      entry_html: Relação %{relation_name}
       entry_role_html: Relação %{relation_name} (como %{relation_role})
     not_found:
       title: Não encontrado
@@ -470,12 +469,23 @@ pt-PT:
     timeout:
       sorry: Lamentamos, mas o histórico do nó com o id %{id} demorou muito para ser
         obido.
+  ways:
+    timeout:
+      sorry: Os dados para a linha com o id %{id} levaram demasiado tempo a ser carregados.
   old_ways:
     not_found:
       sorry: 'Desculpe, não foi possível encontrar #%{id} versão %{version}.'
+    timeout:
+      sorry: O histórico da linha com o id %{id} levou demasiado tempo a ser carregado.
+  relations:
+    timeout:
+      sorry: Os dados para a relação com o id %{id} levaram demasiado tempo a ser
+        carregados.
   old_relations:
     not_found:
       sorry: 'Desculpe, a relação #%{id} versão %{version} não foi encontrada.'
+    timeout:
+      sorry: O histórico da relação com o id %{id} levou demasiado tempo a ser carregado.
   changeset_comments:
     feeds:
       comment:
@@ -1692,17 +1702,21 @@ pt-PT:
       befriend_them: Também podes adicioná-lo como amigo em %{befriendurl}.
       befriend_them_html: Também podes adicionar este utilizador como amigo em %{befriendurl}.
     gpx_description:
-      description_with_tags: 'Parece que o teu ficheiro GPX %{trace_name} com a descrição
-        %{trace_description} e as seguintes etiquetas: %{tags}'
-      description_with_tags_html: 'Parece que o teu ficheiro GPX %{trace_name} com
-        a descrição %{trace_description} e as etiquetas: %{tags}'
-      description_with_no_tags: Parece que o teu ficheiro GPX %{trace_name} com a
+      description_with_tags: 'Parece que o teu ficheiro %{trace_name} com a descrição
+        %{trace_description} e as etiquetas: %{tags}'
+      description_with_tags_html: 'Parece que o teu ficheiro %{trace_name} com a descrição
+        %{trace_description} e as etiquetas: %{tags}'
+      description_with_no_tags: Parece que o teu ficheiro %{trace_name} com a descrição
+        %{trace_description} e sem etiquetas
+      description_with_no_tags_html: Parece que o teu ficheiro %{trace_name} com a
         descrição %{trace_description} e sem etiquetas
-      description_with_no_tags_html: Parece que o teu ficheiro GPX %{trace_name} com
-        a descrição %{trace_description} e sem etiquetas
     gpx_failure:
       hi: Olá, %{to_user}.
-      failed_to_import: 'falhou na importação. Eis o erro:'
+      failed_to_import: 'não pôde ser importado como ficheiro de rota GPS. Verifica
+        se o teu ficheiro é um ficheiro GPX válido ou um arquivo com ficheiro(s) GPX
+        no formato suportado (.tar.gz, .tar.bz2, .tar, .zip, .gpx.gz, .gpx.bz2). Será
+        que existe algum problema de formato ou sintaxe com o ficheiro? Este é o erro
+        de importação:'
       more_info: Podes encontrar mais informações sobre falhas de importação de ficheiros
         GPX e como as evitar em %{url}.
       more_info_html: Podes encontrar mais informações sobre falhas de importação
@@ -1886,7 +1900,7 @@ pt-PT:
         one: '%{count} mensagem silenciada'
         other: Tens %{count} mensagens silenciadas
     reply:
-      wrong_user: Estás autenticado como `%{user}', mas a mensagem a que pretendes
+      wrong_user: Iniciaste sessão como `%{user}', mas a mensagem a que pretendes
         responder não foi enviada para esse utilizador. Por favor, entra na conta
         correta para poderes responder.
     show:
@@ -1895,7 +1909,7 @@ pt-PT:
       unread_button: Marcar como não lida
       destroy_button: Eliminar
       back: Voltar
-      wrong_user: Estás autenticado como `%{user}', mas a mensagem que pediste para
+      wrong_user: Iniciaste sessão como `%{user}', mas a mensagem que pediste para
         ler não foi enviada por ou para esse utilizador. Por favor, entra na conta
         correta para poderes ler a mensagem.
     sent_message_summary:
@@ -2436,6 +2450,9 @@ pt-PT:
           hospital: Hospital
           building: Edifício importante
           station: Estação ferroviária
+          railway_halt: Paragem ferroviária
+          subway_station: Estação de metro
+          tram_stop: Paragem de elétrico
           summit: Cume
           peak: Pico
           tunnel: Linha tracejada = túnel
@@ -2606,7 +2623,7 @@ pt-PT:
       upload_trace: Enviar rota GPS
       all_traces: Todas as Rotas
       my_traces: As Minhas Rotas
-      traces_from: Rotas Públicas de %{user}
+      traces_from_html: Rotas Públicas de %{user}
       remove_tag_filter: Eliminar filtro de etiqueta
     destroy:
       scheduled_for_deletion: Rota programada para eliminação
@@ -2794,6 +2811,7 @@ pt-PT:
       informal_translations: traduções informais
       continue: Continuar
       declined: https://wiki.openstreetmap.org/wiki/Pt:Contributor_Terms_Declined
+      cancel: Cancelar
       you need to accept or decline: Por favor, lê e, em seguida, aceita ou recusa
         os novos Termos do Contribuidor para continuar.
       legale_select: 'País de residência:'
@@ -2912,13 +2930,13 @@ pt-PT:
         ao teu ID nas tuas definições de utilizador.
   user_role:
     filter:
-      not_a_role: A expressão `%{role}' não é um cargo válido.
+      not_a_role: O texto `%{role}' não corresponde a um cargo válido.
       already_has_role: O utilizador já tem o cargo %{role}.
       doesnt_have_role: O utilizador não tem o cargo %{role}.
       not_revoke_admin_current_user: Não foi possível retirar os direitos de administrador
         do atual utilizador.
     grant:
-      are_you_sure: Tens a certeza de que pretendes conceder o cargo `%{role}' ao
+      are_you_sure: Tens a certeza de que pretendes atribuir o cargo `%{role}' ao
         utilizador `%{name}'?
     revoke:
       are_you_sure: Tens a certeza de que pretendes retirar o cargo `%{role}' ao utilizador
@@ -3022,9 +3040,9 @@ pt-PT:
     navigation:
       all_blocks: Todos os bloqueios
       blocks_on_me: Quem me bloqueou
-      blocks_on_user: Bloqueios a %{user}
+      blocks_on_user_html: Bloqueios a %{user}
       blocks_by_me: Os meus bloqueios
-      blocks_by_user: Bloqueios de %{user}
+      blocks_by_user_html: Bloqueios de %{user}
       block: 'Bloqueio #%{id}'
       new_block: Novo Bloqueio
   user_mutes:
@@ -3066,6 +3084,11 @@ pt-PT:
       description: Descrição
       created_at: Criada em
       last_changed: Última alteração
+      apply: Aplicar
+      all: Todas
+      open: Abrir
+      closed: Encerrada
+      status: Estado
     show:
       title: 'Nota: %{id}'
       description: Descrição
@@ -3084,6 +3107,9 @@ pt-PT:
       report: denunciar esta nota
       anonymous_warning: Esta nota inclui comentários de utilizadores anónimos que
         devem ser confirmados por fonte independente.
+      discussion: Discussão
+      subscribe: Subscrever
+      unsubscribe: Cancelar subscrição
       hide: Esconder
       resolve: Marcar como resolvida
       reactivate: Reabrir
@@ -3112,6 +3138,8 @@ pt-PT:
       add: Adicionar Nota
     notes_paging_nav:
       showing_page: Página %{page}
+      next: Próxima
+      previous: Anterior
   javascripts:
     close: Fechar
     share:
@@ -3307,6 +3335,7 @@ pt-PT:
       empty: Não existem supressões para mostrar.
       heading: Lista de supressões
       title: Lista de supressões
+      new: Nova redação
     new:
       heading: Introduza a informação da nova supressão
       title: A criar uma nova supressão
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 3e1789eeb..5a819de18 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -430,7 +430,6 @@ pt:
         way: Linha
         relation: Relação
     containing_relation:
-      entry_html: Relação %{relation_name}
       entry_role_html: Relação %{relation_name} (como %{relation_role})
     not_found:
       title: Não encontrado
@@ -2656,7 +2655,7 @@ pt:
       upload_trace: Enviar uma trilha
       all_traces: Todos os traços
       my_traces: Minhas trilhas
-      traces_from: Traços públicos de %{user}
+      traces_from_html: Traços públicos de %{user}
       remove_tag_filter: Remova o filtro de marcações
     destroy:
       scheduled_for_deletion: Trilha marcada para ser apagada
@@ -3068,9 +3067,9 @@ pt:
     navigation:
       all_blocks: Todos os bloqueios
       blocks_on_me: Bloqueios sobre mim
-      blocks_on_user: Bloqueios em %{user}
+      blocks_on_user_html: Bloqueios em %{user}
       blocks_by_me: Bloqueios por mim
-      blocks_by_user: Bloqueios por %{user}
+      blocks_by_user_html: Bloqueios por %{user}
       block: 'Bloqueio #%{id}'
       new_block: Novo bloqueio
   user_mutes:
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 9350e4ee5..4601eb5e4 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -399,7 +399,6 @@ ro:
         way: Cale
         relation: Relație
     containing_relation:
-      entry_html: Relația %{relation_name}
       entry_role_html: Relația %{relation_name} (ca %{relation_role})
     not_found:
       title: Nu a fost găsit
@@ -2574,7 +2573,7 @@ ro:
       upload_trace: Încărcați urma
       all_traces: Toate track-urile
       my_traces: Înregistrările mele GPS
-      traces_from: Traseele GPS publice de la %{user}
+      traces_from_html: Traseele GPS publice de la %{user}
       remove_tag_filter: Eliminați filtrul de etichete
     destroy:
       scheduled_for_deletion: Traseul este programat pentru ștergere
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 5bbdf567b..86b9b6eb2 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -12,6 +12,7 @@
 # Author: Alexey zakharenkov
 # Author: Amire80
 # Author: Andrewsh
+# Author: Anton Khorev
 # Author: Ashed
 # Author: Banonotit
 # Author: BushmanK
@@ -513,8 +514,7 @@ ru:
         way: Линия
         relation: Отношение
     containing_relation:
-      entry_html: Отношение %{relation_name}
-      entry_role_html: Отношение %{relation_name} (в роли %{relation_role})
+      entry_role_html: '%{relation_name} (в роли %{relation_role})'
     not_found:
       title: Не найдено
       sorry: 'К сожалению, %{type} #%{id} не найден.'
@@ -2102,6 +2102,9 @@ ru:
       traces:
         older: Более старые треки
         newer: Более новые треки
+      user_blocks:
+        older: Более старые блокировки
+        newer: Более новые блокировки
       users:
         older: Участники с большим стажем
         newer: Новые участники
@@ -2626,7 +2629,7 @@ ru:
       upload_trace: Загрузить треки
       all_traces: Все треки
       my_traces: Мои треки
-      traces_from: Общедоступные трассировки от %{user}
+      traces_from_html: Общедоступные трассировки от %{user}
       remove_tag_filter: Удалить фильтр тегов
     destroy:
       scheduled_for_deletion: Запланировано к удалению
@@ -3025,6 +3028,10 @@ ru:
       description: Описание
       created_at: Создана
       last_changed: Изменена
+      apply: Применить
+      all: Все
+      open: Незакрытые
+      closed: Закрытые
     show:
       title: 'Заметка: %{id}'
       description: Описание
@@ -3068,6 +3075,8 @@ ru:
       add: Добавить заметку
     notes_paging_nav:
       showing_page: Страница %{page}
+      next: Следующая
+      previous: Предыдущая
   javascripts:
     close: Закрыть
     share:
diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index 60bc6b0f6..8a989acac 100644
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -163,7 +163,6 @@ sat:
         way: ᱦᱚᱨ
         relation: ᱥᱟᱹᱜᱟᱹᱭ
     containing_relation:
-      entry_html: ᱥᱟᱹᱜᱟᱹᱭ %{relation_name}
       entry_role_html: ᱥᱟᱹᱜᱟᱹᱭ %{relation_name} (as %{relation_role})
     not_found:
       title: ᱵᱟᱝ ᱧᱟᱢ ᱞᱮᱱᱟ
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index effa01792..2de82f03a 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -365,7 +365,6 @@ sc:
         way: Lìnia
         relation: Relata
     containing_relation:
-      entry_html: Relata %{relation_name}
       entry_role_html: Relata %{relation_name} (comente %{relation_role})
     not_found:
       title: No agatadu
@@ -2486,7 +2485,7 @@ sc:
       upload_trace: Càrriga una rasta
       all_traces: Totu sas rastas
       my_traces: Sas rastas meas
-      traces_from: Rastas pùblicas de %{user}
+      traces_from_html: Rastas pùblicas de %{user}
       remove_tag_filter: Boga su filtru de etichetas
     destroy:
       scheduled_for_deletion: Rasta programmada pro s'iscantzelladura
diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index a39c4316f..850d9d5a2 100644
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -291,7 +291,6 @@ scn:
         way: Caminu
         relation: Rilazzioni
     containing_relation:
-      entry_html: Rilazzioni %{relation_name}
       entry_role_html: Rilazzioni %{relation_name} (comu %{relation_role})
     not_found:
       title: Senza truvatu
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 15509a1c5..a12a62cfc 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -134,7 +134,6 @@ sco:
         way: Wey
         relation: Relation
     containing_relation:
-      entry_html: Relation %{relation_name}
       entry_role_html: Relation %{relation_name} (as %{relation_role})
     not_found:
       sorry: 'Sorry, %{type} #%{id} could nae be foond.'
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 1ff111748..5a4472b60 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -415,7 +415,6 @@ sk:
         way: Cesta
         relation: Relácia
     containing_relation:
-      entry_html: Relácia %{relation_name}
       entry_role_html: Relácia %{relation_name} (ako %{relation_role})
     not_found:
       title: Nenájdené
@@ -2473,7 +2472,7 @@ sk:
       upload_trace: Nahrať stopu
       all_traces: VÅ¡etky stopy
       my_traces: Moje stopy
-      traces_from: Verejné stopy od %{user}
+      traces_from_html: Verejné stopy od %{user}
       remove_tag_filter: Odstrániť filter značiek
     destroy:
       scheduled_for_deletion: Stopa plánovaná na vymazanie
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 1a17de400..5a31955f6 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -412,7 +412,6 @@ sl:
         way: Pot
         relation: Relacija
     containing_relation:
-      entry_html: Relacija %{relation_name}
       entry_role_html: Relacija %{relation_name} (kot %{relation_role})
     not_found:
       title: Ni najdeno
@@ -2580,7 +2579,7 @@ sl:
       upload_trace: Naloži sled GPS
       all_traces: Vse sledi
       my_traces: Moje sledi
-      traces_from: Javne sledi uporabnika %{user}
+      traces_from_html: Javne sledi uporabnika %{user}
       remove_tag_filter: Odstrani filter oznak
     destroy:
       scheduled_for_deletion: Sled bo izbrisana
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 1d1874966..37686e786 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -186,7 +186,6 @@ sq:
         way: Rruga
         relation: Lidhja
     containing_relation:
-      entry_html: Lidhja %{relation_name}
       entry_role_html: Lidhja %{relation_name} (sikur %{relation_role})
     not_found:
       sorry: 'Na vjen keq, %{type} #%{id} nuk mund të gjendet.'
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 0e72e3dda..5b2fbfd14 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -157,7 +157,6 @@ sr-Latn:
         way: Putanja
         relation: Odnos
     containing_relation:
-      entry_html: Odnos %{relation_name}
       entry_role_html: Odnos %{relation_name} (kao %{relation_role})
     not_found:
       sorry: Žao nam je, ali %{type} s IB %{id} nije pronađen.
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 2a6d11089..686541447 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -336,8 +336,7 @@ sr:
         way: Линија
         relation: Однос
     containing_relation:
-      entry_html: Однос %{relation_name}
-      entry_role_html: Однос %{relation_name} (као %{relation_role})
+      entry_role_html: '%{relation_name} (као %{relation_role})'
     not_found:
       title: Није нађено
       sorry: 'Нажалост, %{type} #%{id} није пронађен.'
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 21f21f5cc..5f124b293 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -412,7 +412,6 @@ sv:
         way: Sträcka
         relation: Relation
     containing_relation:
-      entry_html: Relation %{relation_name}
       entry_role_html: Relation %{relation_name} (som %{relation_role})
     not_found:
       title: Hittades inte
@@ -2621,7 +2620,7 @@ sv:
       upload_trace: Ladda upp GPS-spår
       all_traces: Alla spår
       my_traces: Mina spår
-      traces_from: Offentliga GPS-spår från %{user}
+      traces_from_html: Offentliga GPS-spår från %{user}
       remove_tag_filter: Ta bort taggfilter
     destroy:
       scheduled_for_deletion: GPS-spår schemalagt för radering
@@ -3036,9 +3035,9 @@ sv:
     navigation:
       all_blocks: Alla blockeringar
       blocks_on_me: Blockeringar på mig
-      blocks_on_user: Blockeringar på %{user}
+      blocks_on_user_html: Blockeringar på %{user}
       blocks_by_me: Blockeringar av mig
-      blocks_by_user: Blockeringar av %{user}
+      blocks_by_user_html: Blockeringar av %{user}
       block: 'Blockering #%{id}'
       new_block: Ny blockering
   user_mutes:
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index faeb0d1b2..41a463869 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -223,7 +223,6 @@ ta:
         way: வழி
         relation: தொடர்பு
     containing_relation:
-      entry_html: தொடர்பு %{relation_name}
       entry_role_html: தொடர்பு %{relation_name} (%{relation_role} ஆக)
     not_found:
       title: காணப்படவில்லை
diff --git a/config/locales/te.yml b/config/locales/te.yml
index b3e90c3d2..49d0fd69a 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -339,7 +339,6 @@ te:
         way: దారి
         relation: సంబంధం
     containing_relation:
-      entry_html: '%{relation_name} సంబంధం'
       entry_role_html: '%{relation_name} సంబంధం (%{relation_role} లాగా)'
     not_found:
       title: కనబడలేదు
@@ -2034,7 +2033,7 @@ te:
       upload_trace: ఓ ట్రేసును ఎక్కించండి
       all_traces: ట్రేసులన్నీ
       my_traces: నా ట్రేసులు
-      traces_from: '%{user} గారి బహిరంగ ట్రేసులు'
+      traces_from_html: '%{user} గారి బహిరంగ ట్రేసులు'
       remove_tag_filter: ట్యాగు వడపోతను తీసెయ్యి
     destroy:
       scheduled_for_deletion: ఈ ట్రేసు తొలగింపు కోసం వేచి ఉంది
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 62dff464f..19e3c8483 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -343,7 +343,6 @@ th:
         way: เส้นทาง
         relation: ความสัมพันธ์
     containing_relation:
-      entry_html: ความสัมพันธ์%{relation_name}
       entry_role_html: ความสัมพันธ์%{relation_name} (ในฐานะ%{relation_role})
     not_found:
       title: ไม่พบข้อมูล
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 81d7a3899..2df1597c6 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -308,7 +308,6 @@ tl:
         way: Daan
         relation: Kaugnayan
     containing_relation:
-      entry_html: Kaugnayan %{relation_name}
       entry_role_html: Kaugnayan %{relation_name} (bilang %{relation_role})
     not_found:
       title: Hindi Matagpuan
@@ -1722,7 +1721,7 @@ tl:
       tagged_with: tinatakan ng %{tags}
       upload_trace: Magkargang paitaas ng isang bakas
       all_traces: Lahat ng mga Bakas
-      traces_from: Pangmadlang Pagbakas mula kay %{user}
+      traces_from_html: Pangmadlang Pagbakas mula kay %{user}
     destroy:
       scheduled_for_deletion: Itinakda ang bakas para sa pagtatanggal
     offline_warning:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 2640125c2..bff10101e 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -414,7 +414,6 @@ tr:
         way: Yol
         relation: İlişki
     containing_relation:
-      entry_html: İlişki %{relation_name}
       entry_role_html: İlişki %{relation_name} (%{relation_role} olarak)
     not_found:
       title: Bulunamadı
@@ -2619,7 +2618,7 @@ tr:
       upload_trace: GPS izi gönder
       all_traces: Tüm İzler
       my_traces: GPS Ä°zlerim
-      traces_from: '%{user} kullanıcısına ait herkese açık izler'
+      traces_from_html: '%{user} kullanıcısına ait herkese açık izler'
       remove_tag_filter: Etiket Filtresini Kaldır
     destroy:
       scheduled_for_deletion: İz, silme işlemi için ayarlandı
@@ -3032,9 +3031,9 @@ tr:
     navigation:
       all_blocks: Tüm Engellemeler
       blocks_on_me: Engellendiklerim
-      blocks_on_user: '%{user} kişisinin engelleri'
+      blocks_on_user_html: '%{user} kişisinin engelleri'
       blocks_by_me: Engellediklerim
-      blocks_by_user: '%{user} tarafından engellenenler'
+      blocks_by_user_html: '%{user} tarafından engellenenler'
       block: 'Engel #%{id}'
       new_block: Yeni Engel
   user_mutes:
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index 5fd4c4f9f..efdbb1a9a 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -350,7 +350,6 @@ tt:
         way: Юл
         relation: Мөнәсәбәт
     containing_relation:
-      entry_html: Мөнәсәбәт %{relation_name}
       entry_role_html: Мөнәсәбәт %{relation_name} (%{relation_role} сыйфатында)
     not_found:
       title: Табылмады
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index abf7d1f32..12fbcd199 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -449,7 +449,6 @@ uk:
         way: Лінія
         relation: Зв’язок
     containing_relation:
-      entry_html: Зв’язок %{relation_name}
       entry_role_html: Зв’язок %{relation_name} (як %{relation_role})
     not_found:
       title: Не знайдено
@@ -2688,7 +2687,7 @@ uk:
       upload_trace: Надіслати GPS-трек на сервер
       all_traces: Всі GPS-треки
       my_traces: Мої GPS-треки
-      traces_from: Загальнодоступні GPS треки %{user}
+      traces_from_html: Загальнодоступні GPS треки %{user}
       remove_tag_filter: Прибрати фільтри
     destroy:
       scheduled_for_deletion: Заплановано для вилучення
@@ -3122,9 +3121,9 @@ uk:
     navigation:
       all_blocks: Всі блокування
       blocks_on_me: Мої блокування
-      blocks_on_user: Блокування для %{user}
+      blocks_on_user_html: Блокування для %{user}
       blocks_by_me: Заблокований(а) мною
-      blocks_by_user: Блокування, що їх наклав %{user}
+      blocks_by_user_html: Блокування, що їх наклав %{user}
       block: Блокування №%{id}
       new_block: Нове блокування
   user_mutes:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 1aabe2195..3f31c152a 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -373,7 +373,6 @@ vi:
         way: Lối
         relation: Quan hệ
     containing_relation:
-      entry_html: Quan hệ %{relation_name}
       entry_role_html: 'Quan hệ %{relation_name} (vai trò: %{relation_role})'
     not_found:
       title: Không Tìm thấy
@@ -2390,7 +2389,7 @@ vi:
       upload_trace: Tải lên tuyến đường
       all_traces: Tất cả các Tuyến đường
       my_traces: Tuyến đường của Tôi
-      traces_from: Tuyến đường Công khai của %{user}
+      traces_from_html: Tuyến đường Công khai của %{user}
       remove_tag_filter: Loại bỏ Bộ lọc Thẻ
     destroy:
       scheduled_for_deletion: Tuyến đường chờ được xóa
@@ -2784,9 +2783,9 @@ vi:
     navigation:
       all_blocks: Tất cả các Tác vụ Cấm
       blocks_on_me: Tác vụ Cấm Tôi
-      blocks_on_user: Tác vụ Cấm %{user}
+      blocks_on_user_html: Tác vụ Cấm %{user}
       blocks_by_me: Tác vụ Cấm bởi Tôi
-      blocks_by_user: Tác vụ Cấm bởi %{user}
+      blocks_by_user_html: Tác vụ Cấm bởi %{user}
       block: Tác vụ cấm số %{id}
   user_mutes:
     index:
diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml
index 772cd9d0d..3c1882f2d 100644
--- a/config/locales/xmf.yml
+++ b/config/locales/xmf.yml
@@ -309,7 +309,6 @@ xmf:
         way: რზა
         relation: ურთიართობა
     containing_relation:
-      entry_html: ურთიართობა %{relation_name}
       entry_role_html: ურთიართობა %{relation_name} (მუჭოთ %{relation_role})
     not_found:
       title: ვეგორჷ
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 2a6a9a026..d76499919 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -423,7 +423,6 @@ zh-CN:
         way: 路径
         relation: 关系
     containing_relation:
-      entry_html: 关系 %{relation_name}
       entry_role_html: 关系 %{relation_name} (作为 %{relation_role})
     not_found:
       title: 未找到
@@ -2429,7 +2428,7 @@ zh-CN:
       upload_trace: 上传轨迹
       all_traces: 所有轨迹
       my_traces: 我的轨迹
-      traces_from: 来自%{user}的公开轨迹
+      traces_from_html: 来自%{user}的公开轨迹
       remove_tag_filter: 移除标签过滤器
     destroy:
       scheduled_for_deletion: 计划删除的轨迹
@@ -2797,9 +2796,9 @@ zh-CN:
     navigation:
       all_blocks: 所有封禁
       blocks_on_me: 对我的封禁
-      blocks_on_user: 对%{user}的封禁
+      blocks_on_user_html: 对%{user}的封禁
       blocks_by_me: 由我做出的封禁
-      blocks_by_user: 由%{user}做出的封禁
+      blocks_by_user_html: 由%{user}做出的封禁
       block: 封禁#%{id}
       new_block: 新封禁
   user_mutes:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 193fd8b15..7552d4882 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -378,7 +378,6 @@ zh-TW:
         way: 路徑
         relation: 關聯
     containing_relation:
-      entry_html: 關聯 %{relation_name}
       entry_role_html: 關聯 %{relation_name} (作為 %{relation_role})
     not_found:
       title: 找不到
@@ -2399,7 +2398,7 @@ zh-TW:
       upload_trace: 上傳軌跡
       all_traces: 所有軌跡
       my_traces: 我的軌跡
-      traces_from: 來自 %{user} 的公開軌跡
+      traces_from_html: 來自 %{user} 的公開軌跡
       remove_tag_filter: 移除標籤篩選
     destroy:
       scheduled_for_deletion: 軌跡已被排程刪除
@@ -2769,9 +2768,9 @@ zh-TW:
     navigation:
       all_blocks: 所有封鎖
       blocks_on_me: 對我的封鎖
-      blocks_on_user: 對%{user}的封鎖
+      blocks_on_user_html: 對%{user}的封鎖
       blocks_by_me: 由我做出的封鎖
-      blocks_by_user: 由%{user}做出的封鎖
+      blocks_by_user_html: 由%{user}做出的封鎖
       block: 封鎖#%{id}
       new_block: 新封鎖
   user_mutes:
diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb
index 4cf0ab69a..4162223d1 100644
--- a/test/helpers/browse_helper_test.rb
+++ b/test/helpers/browse_helper_test.rb
@@ -66,7 +66,7 @@ class BrowseHelperTest < ActionView::TestCase
     assert_equal "<s>test</s>", deleted_output
   end
 
-  def test_element_class
+  def test_element_icon
     node = create(:node, :with_history, :version => 2)
     node_v1 = node.old_nodes.find_by(:version => 1)
     node_v2 = node.old_nodes.find_by(:version => 2)
@@ -76,60 +76,35 @@ class BrowseHelperTest < ActionView::TestCase
     add_old_tags_selection(node_v2)
     add_old_tags_selection(node_v1)
 
-    assert_equal "node", element_class("node", create(:node))
-    assert_equal "node", element_class("node", create(:node, :deleted))
-
-    assert_equal "node building yes shop gift tourism museum", element_class("node", node)
-    assert_equal "node building yes shop gift tourism museum", element_class("node", node_v2)
-    assert_equal "node", element_class("node", node_v1)
-  end
-
-  def test_element_title
-    node = create(:node, :with_history, :version => 2)
-    node_v1 = node.old_nodes.find_by(:version => 1)
-    node_v2 = node.old_nodes.find_by(:version => 2)
-    node_v1.redact!(create(:redaction))
-
-    add_tags_selection(node)
-    add_old_tags_selection(node_v2)
-    add_old_tags_selection(node_v1)
-
-    assert_equal "", element_title(create(:node))
-    assert_equal "", element_title(create(:node, :deleted))
-
-    assert_equal "building=yes, shop=gift, and tourism=museum", element_title(node)
-    assert_equal "building=yes, shop=gift, and tourism=museum", element_title(node_v2)
-    assert_equal "", element_title(node_v1)
-  end
-
-  def test_icon_tags
-    node = create(:node, :with_history, :version => 2)
-    node_v1 = node.old_nodes.find_by(:version => 1)
-    node_v2 = node.old_nodes.find_by(:version => 2)
-    node_v1.redact!(create(:redaction))
+    icon = element_icon("node", create(:node))
+    icon_dom = Rails::Dom::Testing.html_document_fragment.parse(icon)
+    assert_dom icon_dom, "img:root", :count => 1 do
+      assert_dom "> @title", 0
+    end
 
-    add_tags_selection(node)
+    icon = element_icon("node", create(:node, :deleted))
+    icon_dom = Rails::Dom::Testing.html_document_fragment.parse(icon)
+    assert_dom icon_dom, "img:root", :count => 1 do
+      assert_dom "> @title", 0
+    end
 
-    tags = icon_tags(node)
-    assert_equal 3, tags.count
-    assert_includes tags, %w[building yes]
-    assert_includes tags, %w[tourism museum]
-    assert_includes tags, %w[shop gift]
+    icon = element_icon("node", node)
+    icon_dom = Rails::Dom::Testing.html_document_fragment.parse(icon)
+    assert_dom icon_dom, "img:root", :count => 1 do
+      assert_dom "> @title", "building=yes, shop=gift, and tourism=museum"
+    end
 
-    add_old_tags_selection(node_v2)
-    add_old_tags_selection(node_v1)
+    icon = element_icon("node", node_v2)
+    icon_dom = Rails::Dom::Testing.html_document_fragment.parse(icon)
+    assert_dom icon_dom, "img:root", :count => 1 do
+      assert_dom "> @title", "building=yes, shop=gift, and tourism=museum"
+    end
 
-    tags = icon_tags(node_v2)
-    assert_equal 3, tags.count
-    assert_includes tags, %w[building yes]
-    assert_includes tags, %w[tourism museum]
-    assert_includes tags, %w[shop gift]
-
-    tags = icon_tags(node_v1)
-    assert_equal 3, tags.count
-    assert_includes tags, %w[building yes]
-    assert_includes tags, %w[tourism museum]
-    assert_includes tags, %w[shop gift]
+    icon = element_icon("node", node_v1)
+    icon_dom = Rails::Dom::Testing.html_document_fragment.parse(icon)
+    assert_dom icon_dom, "img:root", :count => 1 do
+      assert_dom "> @title", 0
+    end
   end
 
   private
diff --git a/test/helpers/note_helper_test.rb b/test/helpers/note_helper_test.rb
index bee1cdc2c..8b8173694 100644
--- a/test/helpers/note_helper_test.rb
+++ b/test/helpers/note_helper_test.rb
@@ -8,8 +8,25 @@ class NoteHelperTest < ActionView::TestCase
     date = Time.utc(2014, 3, 5, 21, 37, 45)
     user = create(:user)
 
-    assert_match %r{^Created by anonymous <time title=" 5 March 2014 at 21:37" datetime="2014-03-05T21:37:45Z">.* ago</time>$}, note_event("opened", date, nil)
-    assert_match %r{^Resolved by <a href="/user/#{ERB::Util.u(user.display_name)}">#{user.display_name}</a> <time title=" 5 March 2014 at 21:37" datetime="2014-03-05T21:37:45Z">.* ago</time>$}, note_event("closed", date, user)
+    note_event_dom = Rails::Dom::Testing.html_document_fragment.parse "<div>#{note_event('opened', date, nil)}</div>"
+    assert_dom note_event_dom, ":root", :text => /^Created by anonymous .* ago$/ do
+      assert_dom "> a", :count => 0
+      assert_dom "> time", :count => 1 do
+        assert_dom "> @title", "5 March 2014 at 21:37"
+        assert_dom "> @datetime", "2014-03-05T21:37:45Z"
+      end
+    end
+
+    note_event_dom = Rails::Dom::Testing.html_document_fragment.parse "<div>#{note_event('closed', date, user)}</div>"
+    assert_dom note_event_dom, ":root", :text => /^Resolved by #{user.display_name} .* ago$/ do
+      assert_dom "> a", :count => 1, :text => user.display_name do
+        assert_dom "> @href", "/user/#{ERB::Util.u(user.display_name)}"
+      end
+      assert_dom "> time", :count => 1 do
+        assert_dom "> @title", "5 March 2014 at 21:37"
+        assert_dom "> @datetime", "2014-03-05T21:37:45Z"
+      end
+    end
   end
 
   def test_note_author
@@ -17,8 +34,17 @@ class NoteHelperTest < ActionView::TestCase
     user = create(:user)
 
     assert_equal "", note_author(nil)
+
     assert_equal "deleted", note_author(deleted_user)
-    assert_equal "<a href=\"/user/#{ERB::Util.u(user.display_name)}\">#{user.display_name}</a>", note_author(user)
-    assert_equal "<a href=\"http://test.host/user/#{ERB::Util.u(user.display_name)}\">#{user.display_name}</a>", note_author(user, :only_path => false)
+
+    note_author_dom = Rails::Dom::Testing.html_document_fragment.parse note_author(user)
+    assert_dom note_author_dom, "a:root", :text => user.display_name do
+      assert_dom "> @href", "/user/#{ERB::Util.u(user.display_name)}"
+    end
+
+    note_author_dom = Rails::Dom::Testing.html_document_fragment.parse note_author(user, :only_path => false)
+    assert_dom note_author_dom, "a:root", :text => user.display_name do
+      assert_dom "> @href", "http://test.host/user/#{ERB::Util.u(user.display_name)}"
+    end
   end
 end