Merge 16110:16216 from trunk.

diff --cc config/locales/en.yml
Simple merge

diff --cc config/locales/is.yml
index 5de75c96ce4b0cb61ede6969eeea0262220c1d16,17429c7ef2a836c04da76360dbb52ecf48c5b8e6..a0919446113be9060fa9b567d0d06afbce8831f7
--- 1/config/locales/is.yml
--- 2/config/locales/is.yml
+++ b/config/locales/is.yml
@@@ -80,22 -84,9 +84,22 @@@ is
      changeset:
        title: "Breytingarsett"
        changeset: "Breytingarsett:"
-       download: "Niðurhala breytingunni á {{changeset_xml_link}} sniði eða á {{osmchange_xml_link}} sniði"
-       changesetxml: "Breytingarsetts XML"
-       osmchangexml: "osmChange XML"
+       download: "Niðurhala breytingunni á {{changeset_xml_link}} eða á {{osmchange_xml_link}}"
+       changesetxml: "Breytingarsetts XML sniði"
+       osmchangexml: "osmChange XML sniði"
 +    changeset_navigation:
 +      user:
 +        name: "{{user}}"
 +        name_tooltip: "Skoða breytingarsett eftir {{user}}"
 +        prev: "← {{id}}"
 +        prev_tooltip: "Fyrri breytingarsett eftir {{user}}"
 +        next: "{{id}} →"
 +        next_tooltip: "Næsta breytingarsett eftir {{user}}"
 +      all:
 +        prev: "← {{id}}"
 +        next: "{{id}} →"
 +        prev_tooltip: "Fyrra breytingarsett"
 +        next_tooltip: "Næsta breytingarsett"
      changeset_details:
        created_at: "Búið til:"
        closed_at: "Lokað:"

diff --cc config/routes.rb
Simple merge