From: Tom Hughes <tom@compton.nu>
Date: Wed, 29 Mar 2023 18:30:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3985'
X-Git-Tag: live~1310
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/0d56dab481c0eeb2f4c89c753ded93c4ffd3af08?hp=2f3c2cdb44def797f1b3107ae166c77e3eee26d2

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 8fbea003b..feeb4e980 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,8 +86,8 @@ GEM
     autoprefixer-rails (10.4.13.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.731.0)
-    aws-sdk-core (3.170.1)
+    aws-partitions (1.735.0)
+    aws-sdk-core (3.171.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
@@ -95,7 +95,7 @@ GEM
     aws-sdk-kms (1.63.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.119.1)
+    aws-sdk-s3 (1.119.2)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
@@ -148,7 +148,7 @@ GEM
     config (4.1.0)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
-    connection_pool (2.3.0)
+    connection_pool (2.4.0)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -198,7 +198,7 @@ GEM
       dry-initializer (~> 3.0)
       dry-schema (>= 1.12, < 2)
       zeitwerk (~> 2.6)
-    erb_lint (0.3.1)
+    erb_lint (0.4.0)
       activesupport
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
@@ -440,7 +440,7 @@ GEM
       rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.27.0)
+    rubocop-ast (1.28.0)
       parser (>= 3.2.1.0)
     rubocop-capybara (2.17.1)
       rubocop (~> 1.41)
@@ -473,7 +473,7 @@ GEM
       sprockets-rails
       tilt
     secure_headers (6.5.0)
-    selenium-webdriver (4.8.1)
+    selenium-webdriver (4.8.3)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
diff --git a/app/helpers/changesets_helper.rb b/app/helpers/changesets_helper.rb
index 5773240ff..9d46de120 100644
--- a/app/helpers/changesets_helper.rb
+++ b/app/helpers/changesets_helper.rb
@@ -21,14 +21,10 @@ module ChangesetsHelper
     end
 
     if params.key?(:display_name)
-      t "browse.#{action}_html",
-        :time => time,
-        :title => title
+      t "browse.#{action}_ago_html", :time_ago => tag.abbr(time, :title => title)
     else
-      t "browse.#{action}_by_html",
-        :time => time,
-        :title => title,
-        :user => changeset_user_link(changeset)
+      t "browse.#{action}_ago_by_html", :time_ago => tag.abbr(time, :title => title),
+                                        :user => changeset_user_link(changeset)
     end
   end
 
diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb
index 8aa5b64c7..9eb6b5bfe 100644
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -13,10 +13,10 @@
 
 <ul class="list-unstyled">
   <li>
-    <%= t "browse.#{common_details.visible? ? :edited : :deleted}_by_html",
-          :time => time_ago_in_words(common_details.timestamp, :scope => :"datetime.distance_in_words_ago"),
-          :user => changeset_user_link(common_details.changeset),
-          :title => l(common_details.timestamp) %>
+    <%= t "browse.#{common_details.visible? ? :edited : :deleted}_ago_by_html",
+          :time_ago => tag.abbr(time_ago_in_words(common_details.timestamp, :scope => :"datetime.distance_in_words_ago"),
+                                :title => l(common_details.timestamp)),
+          :user => changeset_user_link(common_details.changeset) %>
   </li>
   <li>
     <%= t "browse.in_changeset" %>
diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 4045c0b48..3c5ba7de0 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -38,9 +38,9 @@
             <% if comment.visible %>
               <li id="c<%= comment.id %>">
                 <small class='text-muted'>
-                  <%= t(".commented_by_html",
-                        :when => friendly_date_ago(comment.created_at),
-                        :exact_time => l(comment.created_at),
+                  <%= t(".comment_by_html",
+                        :time_ago => tag.abbr(friendly_date_ago(comment.created_at),
+                                              :title => l(comment.created_at)),
                         :user => link_to(comment.author.display_name, user_path(comment.author))) %>
                   <% if current_user and current_user.moderator? %>
                     — <span class="action-button" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_hide_url(comment.id) %>"><%= t("javascripts.changesets.show.hide_comment") %></span>
@@ -51,9 +51,9 @@
             <% elsif current_user and current_user.moderator? %>
               <li id="c<%= comment.id %>">
                 <small class='text-muted'>
-                  <%= t(".hidden_commented_by_html",
-                        :when => friendly_date_ago(comment.created_at),
-                        :exact_time => l(comment.created_at),
+                  <%= t(".hidden_comment_by_html",
+                        :time_ago => tag.abbr(friendly_date_ago(comment.created_at),
+                                              :title => l(comment.created_at)),
                         :user => link_to(comment.author.display_name, user_path(comment.author))) %>
                   — <span class="action-button text-muted" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_unhide_url(comment.id) %>"><%= t("javascripts.changesets.show.unhide_comment") %></span>
                  </small>
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 0b9336538..da00b5fea 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -61,13 +61,13 @@
           <td><%= link_to reportable_title(issue.reportable), reportable_url(issue.reportable) %></td>
           <td><%= link_to issue.reported_user.display_name, user_path(issue.reported_user) if issue.reported_user %></td>
           <td>
+            <% time_ago_tag = tag.abbr(time_ago_in_words(issue.updated_at, :scope => :"datetime.distance_in_words_ago"),
+                                       :title => l(issue.updated_at)) %>
             <% if issue.user_updated %>
-              <%= t ".last_updated_time_user_html", :user => link_to(issue.user_updated.display_name, user_path(issue.user_updated)),
-                                                    :time => time_ago_in_words(issue.updated_at, :scope => :"datetime.distance_in_words_ago"),
-                                                    :title => l(issue.updated_at) %>
+              <%= t ".last_updated_time_ago_user_html", :user => link_to(issue.user_updated.display_name, user_path(issue.user_updated)),
+                                                        :time_ago => time_ago_tag %>
             <% else %>
-              <%= t ".last_updated_time_html", :time => time_ago_in_words(issue.updated_at, :scope => :"datetime.distance_in_words_ago"),
-                                               :title => l(issue.updated_at) %>
+              <%= time_ago_tag %>
             <% end %>
           </td>
         </tr>
diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb
index 12d9a0608..277fb1384 100644
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -4,7 +4,10 @@
       <div class='row'>
         <div class='col-sm-7 user-image'></div>
         <div class='col-sm-5 px-5 py-3 byosm'>
-          <p class='h5 text-white text-nowrap'><%= t ".copyright_html" %></p>
+          <p class='h5 text-white text-nowrap'>
+            <%= t ".heading_html", :copyright => tag.span(t(".copyright_symbol_html")),
+                                   :br => tag.br %>
+          </p>
         </div>
       </div>
       <div class='row'>
@@ -22,16 +25,44 @@
       <% end %>
 
       <%= render :layout => "about_section", :locals => { :icon => "community", :title => "community_driven" } do %>
-        <p><%= t "site.about.community_driven_html", :diary_path => diary_entries_path %></p>
+        <p>
+          <%= t "site.about.community_driven_1_html", :osm_blog_link => link_to(t("site.about.community_driven_osm_blog"),
+                                                                                t("site.about.community_driven_osm_blog_url")),
+                                                      :user_diaries_link => link_to(t("site.about.community_driven_user_diaries"),
+                                                                                    diary_entries_path),
+                                                      :community_blogs_link => link_to(t("site.about.community_driven_community_blogs"),
+                                                                                       t("site.about.community_driven_community_blogs_url")),
+                                                      :osm_foundation_link => link_to(t("site.about.community_driven_osm_foundation"),
+                                                                                      t("site.about.community_driven_osm_foundation_url")) %>
+        </p>
       <% end %>
 
       <%= render :layout => "about_section", :locals => { :id => "open-data", :icon => "open", :title => "open_data" } do %>
-        <p><%= t "site.about.open_data_html", :copyright_path => copyright_path %></p>
+        <p>
+          <%= t "site.about.open_data_1_html", :open_data => tag.i(t("site.about.open_data_open_data")),
+                                               :copyright_license_link => link_to(t("site.about.open_data_copyright_license"),
+                                                                                  copyright_path) %></p>
       <% end %>
 
       <%= render :layout => "about_section", :locals => { :id => "legal", :icon => "legal", :title => "legal" } do %>
-        <p><%= t "site.about.legal_1_html" %></p>
-        <p><%= t "site.about.legal_2_html" %></p>
+        <p>
+          <%= t "site.about.legal_1_1_html", :openstreetmap_foundation_link => link_to(t("site.about.legal_1_1_openstreetmap_foundation"),
+                                                                                       t("site.about.legal_1_1_openstreetmap_foundation_url")),
+                                             :terms_of_use_link => link_to(t("site.about.legal_1_1_terms_of_use"),
+                                                                           t("site.about.legal_1_1_terms_of_use_url")),
+                                             :aup_link => link_to(t("site.about.legal_1_1_aup"),
+                                                                  t("site.about.legal_1_1_aup_url")),
+                                             :privacy_policy_link => link_to(t("site.about.legal_1_1_privacy_policy"),
+                                                                             t("site.about.legal_1_1_privacy_policy_url")) %>
+        </p>
+        <p>
+          <%= t "site.about.legal_2_1_html", :contact_the_osmf_link => link_to(t("site.about.legal_2_1_contact_the_osmf"),
+                                                                               t("site.about.legal_2_1_contact_the_osmf_url")) %>
+        </p>
+        <p>
+          <%= t "site.about.legal_2_2_html", :registered_trademarks_link => link_to(t("site.about.legal_2_2_registered_trademarks"),
+                                                                                    t("site.about.legal_2_2_registered_trademarks_url")) %>
+        </p>
       <% end %>
 
       <%= render :layout => "about_section", :locals => { :id => "partners", :icon => "partners", :title => "partners" } do %>
diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb
index e94fad402..d9521716d 100644
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -39,47 +39,168 @@
 
 <% I18n.with_locale @locale do %>
   <%= tag.div :lang => @locale, :dir => t("html.dir") do %>
-    <p><%= t ".legal_babble.intro_1_html" %></p>
-    <p><%= t ".legal_babble.intro_2_html" %></p>
-    <p><%= t ".legal_babble.intro_3_1_html" %></p>
+    <p>
+      <%= t ".legal_babble.introduction_1_html",
+            :registered_trademark_link => tag.sup(link_to(t(".legal_babble.introduction_1_registered_trademark_html"),
+                                                          :anchor => "trademarks")),
+            :open_data => tag.i(t(".legal_babble.introduction_1_open_data")),
+            :odc_odbl_link => link_to(t(".legal_babble.introduction_1_odc_odbl"),
+                                      t(".legal_babble.introduction_1_odc_odbl_url")),
+            :osm_foundation_link => link_to(t(".legal_babble.introduction_1_osm_foundation"),
+                                            t(".legal_babble.introduction_1_osm_foundation_url")) %>
+    </p>
+    <p>
+      <%= t ".legal_babble.introduction_2_html",
+            :legal_code_link => link_to(t(".legal_babble.introduction_2_legal_code"),
+                                        t(".legal_babble.introduction_2_legal_code_url")) %>
+    </p>
+    <p>
+      <%= t ".legal_babble.introduction_3_html",
+            :creative_commons_link => link_to(t(".legal_babble.introduction_3_creative_commons"),
+                                              t(".legal_babble.introduction_3_creative_commons_url")) %>
+    </p>
 
     <h3><%= t ".legal_babble.credit_title_html" %></h3>
     <p><%= t ".legal_babble.credit_1_html" %></p>
-    <p><%= t ".legal_babble.credit_2_1_html" %></p>
-    <p><%= t ".legal_babble.credit_3_1_html" %></p>
-    <p><%= t ".legal_babble.credit_4_html" %></p>
+    <ul>
+      <li><%= t ".legal_babble.credit_2_1" %></li>
+      <li><%= t ".legal_babble.credit_2_2" %></li>
+    </ul>
+    <p>
+      <%= t ".legal_babble.credit_3_html",
+            :attribution_guidelines_link => link_to(t(".legal_babble.credit_3_attribution_guidelines"),
+                                                    t(".legal_babble.credit_3_attribution_guidelines_url")) %>
+    </p>
+    <p>
+      <%= t ".legal_babble.credit_4_1_html",
+            :this_copyright_page_link => link_to(t(".legal_babble.credit_4_1_this_copyright_page"),
+                                                 copyright_path) %>
+    </p>
     <p><%= image_tag("attribution_example.png",
                      :alt => t(".legal_babble.attribution_example.alt"),
                      :border => 0,
                      :title => t(".legal_babble.attribution_example.title")) %></p>
 
     <h3><%= t ".legal_babble.more_title_html" %></h3>
-    <p><%= t ".legal_babble.more_1_html" %></p>
-    <p><%= t ".legal_babble.more_2_html" %></p>
+    <p>
+      <%= t ".legal_babble.more_1_1_html",
+            :osmf_licence_page_link => link_to(t(".legal_babble.more_1_1_osmf_licence_page"),
+                                               t(".legal_babble.more_1_1_osmf_licence_page_url")) %>
+    </p>
+    <p>
+      <%= t ".legal_babble.more_2_1_html",
+            :api_usage_policy_link => link_to(t(".legal_babble.more_2_1_api_usage_policy"),
+                                              t(".legal_babble.more_2_1_api_usage_policy_url")),
+            :tile_usage_policy_link => link_to(t(".legal_babble.more_2_1_tile_usage_policy"),
+                                               t(".legal_babble.more_2_1_tile_usage_policy_url")),
+            :nominatim_usage_policy_link => link_to(t(".legal_babble.more_2_1_nominatim_usage_policy"),
+                                                    t(".legal_babble.more_2_1_nominatim_usage_policy_url")) %>
+    </p>
 
     <h3><%= t ".legal_babble.contributors_title_html" %></h3>
     <p><%= t ".legal_babble.contributors_intro_html" %></p>
     <ul id="contributors">
-      <li><%= t ".legal_babble.contributors_at_html" %></li>
-      <li><%= t ".legal_babble.contributors_au_html" %></li>
-      <li><%= t ".legal_babble.contributors_ca_html" %></li>
-      <li><%= t ".legal_babble.contributors_fi_html" %></li>
-      <li><%= t ".legal_babble.contributors_fr_html" %></li>
-      <li><%= t ".legal_babble.contributors_nl_html" %></li>
-      <li><%= t ".legal_babble.contributors_nz_html" %></li>
-      <li><%= t ".legal_babble.contributors_si_html" %></li>
-      <li><%= t ".legal_babble.contributors_es_html" %></li>
-      <li><%= t ".legal_babble.contributors_za_html" %></li>
-      <li><%= t ".legal_babble.contributors_gb_html" %></li>
+      <li>
+        <%= t ".legal_babble.contributors_at_credit_html",
+              :austria => tag.strong(t(".legal_babble.contributors_at_austria")),
+              :stadt_wien_link => link_to(t(".legal_babble.contributors_at_stadt_wien"),
+                                          t(".legal_babble.contributors_at_stadt_wien_url")),
+              :cc_by_link => link_to(t(".legal_babble.contributors_at_cc_by"),
+                                     t(".legal_babble.contributors_at_cc_by_url")),
+              :land_vorarlberg_link => link_to(t(".legal_babble.contributors_at_land_vorarlberg"),
+                                               t(".legal_babble.contributors_at_land_vorarlberg_url")),
+              :cc_by_at_with_amendments_link => link_to(t(".legal_babble.contributors_at_cc_by_at_with_amendments"),
+                                                        t(".legal_babble.contributors_at_cc_by_at_with_amendments_url")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_au_credit_html",
+              :australia => tag.strong(t(".legal_babble.contributors_au_australia")),
+              :geoscape_australia_link => link_to(t(".legal_babble.contributors_au_geoscape_australia"),
+                                                  t(".legal_babble.contributors_au_geoscape_australia_url")),
+              :cc_licence_link => link_to(t(".legal_babble.contributors_au_cc_licence"),
+                                          t(".legal_babble.contributors_au_cc_licence_url")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_ca_credit_html",
+              :canada => tag.strong(t(".legal_babble.contributors_ca_canada")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_fi_credit_html",
+              :finland => tag.strong(t(".legal_babble.contributors_fi_finland")),
+              :nlsfi_license_link => link_to(t(".legal_babble.contributors_fi_nlsfi_license"),
+                                             t(".legal_babble.contributors_fi_nlsfi_license_url")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_fr_credit_html",
+              :france => tag.strong(t(".legal_babble.contributors_fr_france")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_nl_credit_html",
+              :netherlands => tag.strong(t(".legal_babble.contributors_nl_netherlands")),
+              :and_link => link_to(t(".legal_babble.contributors_nl_and"),
+                                   t(".legal_babble.contributors_nl_and_url")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_nz_credit_html",
+              :new_zealand => tag.strong(t(".legal_babble.contributors_nz_new_zealand")),
+              :linz_data_service_link => link_to(t(".legal_babble.contributors_nz_linz_data_service"),
+                                                 t(".legal_babble.contributors_nz_linz_data_service_url")),
+              :cc_by_link => link_to(t(".legal_babble.contributors_nz_cc_by"),
+                                     t(".legal_babble.contributors_nz_cc_by_url")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_si_credit_html",
+              :slovenia => tag.strong(t(".legal_babble.contributors_si_slovenia")),
+              :gu_link => link_to(t(".legal_babble.contributors_si_gu"),
+                                  t(".legal_babble.contributors_si_gu_url")),
+              :mkgp_link => link_to(t(".legal_babble.contributors_si_mkgp"),
+                                    t(".legal_babble.contributors_si_mkgp_url")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_es_credit_html",
+              :spain => tag.strong(t(".legal_babble.contributors_es_spain")),
+              :ign_link => link_to(t(".legal_babble.contributors_es_ign"),
+                                   t(".legal_babble.contributors_es_ign_url")),
+              :scne_link => link_to(t(".legal_babble.contributors_es_scne"),
+                                    t(".legal_babble.contributors_es_scne_url")),
+              :cc_by_link => link_to(t(".legal_babble.contributors_es_cc_by"),
+                                     t(".legal_babble.contributors_es_cc_by_url")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_za_credit_html",
+              :south_africa => tag.strong(t(".legal_babble.contributors_za_south_africa")),
+              :ngi_link => link_to(t(".legal_babble.contributors_za_ngi"),
+                                   t(".legal_babble.contributors_za_ngi_url")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_gb_credit_html",
+              :united_kingdom => tag.strong(t(".legal_babble.contributors_gb_united_kingdom")) %>
+      </li>
     </ul>
-    <p><%= t ".legal_babble.contributors_footer_1_html" %></p>
+    <p>
+      <%= t ".legal_babble.contributors_2_html",
+            :contributors_page_link => link_to(t(".legal_babble.contributors_2_contributors_page"),
+                                               t(".legal_babble.contributors_2_contributors_page_url")) %>
+    </p>
     <p><%= t ".legal_babble.contributors_footer_2_html" %></p>
 
     <h3><%= t ".legal_babble.infringement_title_html" %></h3>
     <p><%= t ".legal_babble.infringement_1_html" %></p>
-    <p><%= t ".legal_babble.infringement_2_html" %></p>
+    <p>
+      <%= t ".legal_babble.infringement_2_1_html",
+            :takedown_procedure_link => link_to(t(".legal_babble.infringement_2_1_takedown_procedure"),
+                                                t(".legal_babble.infringement_2_1_takedown_procedure_url")),
+            :online_filing_page_link => link_to(t(".legal_babble.infringement_2_1_online_filing_page"),
+                                                t(".legal_babble.infringement_2_1_online_filing_page_url")) %>
+    </p>
 
-    <h3><%= t ".legal_babble.trademarks_title_html" %></h3>
-    <p><%= t ".legal_babble.trademarks_1_html" %></p>
+    <h3 id="trademarks">
+      <%= t ".legal_babble.trademarks_title" %>
+    </h3>
+    <p>
+      <%= t ".legal_babble.trademarks_1_1_html",
+            :trademark_policy_link => link_to(t(".legal_babble.trademarks_1_1_trademark_policy"),
+                                              t(".legal_babble.trademarks_1_1_trademark_policy_url")) %>
+    </p>
   <% end %>
 <% end %>
diff --git a/config/locales/af.yml b/config/locales/af.yml
index 89fb70b81..44aaed53c 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -1627,11 +1627,6 @@ af:
         mapping_link: begin karteer
       legal_babble:
         title_html: Kopiereg en lisensie
-        intro_2_html: Dit staan u vry om ons data te kopieer, versprei, versend of
-          aan te pas, mits u erkenning aan OpenStreetMap en die bydraers gee. Indien
-          u ons data wysig of daarop voortbou, mag u dit slegs in gevolge dieselfde
-          lisensie versprei. Die volledige <a href="http://opendatacommons.org/licenses/odbl/1.0/">regsteks</a>
-          verduidelik u regte en verantwoordelikhede.
         credit_title_html: Hoe om na OpenStreetMap te verwys
         contributors_title_html: Ons bydraers
         infringement_title_html: Kopieregoortreding
diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 924b8b871..c2255548b 100644
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -698,8 +698,6 @@ aln:
       failed_to_import: 'nuk arriti të importit. Këtu është gabim:'
       subject: '[OpenStreetMap] te re dështimit Import'
     gpx_success:
-      loaded_successfully: ngarkuar me sukses me %{trace_points} nga një jetë e mundur
-        %{possible_points} piket.
       subject: '[OpenStreetMap] Import sukses te re'
     signup_confirm:
       subject: '[OpenStreetMap] Konfirmoje email adresën tonde'
@@ -838,18 +836,6 @@ aln:
         mapping_link: fillo hartografimin
       legal_babble:
         title_html: Copyright
-        intro_1_html: |-
-          OpenStreetMap is <i>open data</i>, licensed under the <a
-          href="http://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL).
-        intro_2_html: |-
-          Ju jeni të lirë ta kopjoni, shpërndani, përcjell dhe përshtatur hartat tona
-            dhe të dhënat, për aq kohë sa ju e kreditit OpenStreetMap e saj
-            kontribuesve. Nëse ju ndryshoni ose me ndërtimin e hartave tona ose të dhëna, ju
-            mund të shpërndani rezultat vetëm në bazë të licencës të njëjtën.
-            <Plotë një
-            href = "http://creativecommons.org/licenses/by-sa/2.0/legalcode"> ligjore
-            <Kod / a> shpjegon të drejtat tuaja dhe të përgjegjësive.
         credit_title_html: Si të kreditit OpenStreetMap
         credit_1_html: |-
           Nëse jeni duke përdorur harta imazhe OpenStreetMap, ne kërkojmë që
@@ -857,25 +843,7 @@ aln:
             kontribuesit, CC BY-SA ". Nëse jeni duke përdorur të dhëna vetëm në hartë,
             ne kerkojme "Organizimi i të dhënave © kontribuesit OpenStreetMap,
             CC BY-SA ".
-        credit_2_1_html: |-
-          Ku të jetë e mundur, duhet të jetë OpenStreetMap hyperlinked në <a
-            href = "http://www.openstreetmap.org/"> http://www.openstreetmap.org/ </ a>
-            dhe CC BY-SA për <a
-            href = "http://creativecommons.org/licenses/by-sa/2.0/"> http://creativecommons.org/licenses/by-sa/2.0/ </ a>. Nëse
-            ju jeni duke përdorur një të mesme, ku lidhjet nuk janë të mundshme (p.sh. një
-            shtypura punë), ne ju sugjerojmë lexuesit tuaj të drejtpërdrejtë të
-            www.openstreetmap.org (ndoshta duke zgjeruar
-            'OpenStreetMap' në këtë adresë të plotë) dhe të
-            www.creativecommons.org.
         more_title_html: Gjetja më shumë
-        more_1_html: |-
-          Lexo më shumë lidhje me përdorimin e të dhënave tona në <a
-            href = "http://wiki.openstreetmap.org/wiki/Legal_FAQ"> Ligjore
-            FAQ </ a>.
-        more_2_html: |-
-          OSM janë kontribuesit kujtoi kurrë për të shtuar të dhënat nga ndonjë
-            Burime copyright (p.sh. Google Maps apo të shtypura harta) pa
-            lejen shprehimisht nga mbajtësit të drejtën e autorit.
         contributors_title_html: kontribuesit tona
         contributors_intro_html: |-
           licencë CC BY-SA jonë kërkon që ju të "japin origjinal
@@ -886,22 +854,6 @@ aln:
             agjenci ose burim kryesor ka qenë i përfshirë në
             OpenStreetMap, ai mund të jetë e arsyeshme për kredi nga ana e tyre direkt
             riprodhimin e kreditit e tyre apo duke i lidhur me të në këtë faqe.
-        contributors_au_html: |-
-          <strong> Australi </ strong>: Përmban të dhëna të bazuara periferi
-             në Zyra Australiane e Statistikave të dhënave.
-        contributors_ca_html: |-
-          <strong> Kanada </ strong>: Përmban të dhëna nga
-             GeoBase ®, GeoGratis (© Departamenti i Natyrore
-             Burimet Kanada), CanVec (Departamenti i Natyrore ©
-             Burimet Kanada), dhe StatCan (Divizioni Gjeografia,
-             Statistika Kanada).
-        contributors_nz_html: |-
-          <strong> Zelanda e Re </ strong>: Përmban të dhëna me burim nga
-             Zelanda e Re Toka e informacionit. Crown Copyright rezervuara.
-        contributors_gb_html: |-
-          <strong> Mbretëria e Bashkuar </ strong>: Përmban të pajisjeve
-             Anketa të dhënat © Crown copyright bazës së të dhënave dhe të drejtë
-             2010.
         contributors_footer_2_html: |2-
             Përfshirja e të dhënave në OpenStreetMap nuk do të thotë që origjinal
             dhënave miraton ofrues OpenStreetMap, ofron çdo garanci ose
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 819155d07..100e31a5d 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1402,8 +1402,6 @@ ar:
       subject: '[خريطة الشارع المفتوحة] فشل استيراد جي بي إكس'
     gpx_success:
       hi: مرحبًا %{to_user}،
-      loaded_successfully: تم تحميل بنجاح %{trace_points} نقطة من أصل %{possible_points}
-        نقطة ممكنة.
       subject: '[خريطة الشارع المفتوحة] نجاح استيراد جي بي إكس'
     signup_confirm:
       subject: '[خريطة الشارع المفتوحة] مرحبا بك في خريطة الشارع المفتوحة'
@@ -1704,103 +1702,16 @@ ar:
         mapping_link: ابدأ التخطيط
       legal_babble:
         title_html: حقوق النشر والترخيص
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup>  عبارة عن <i> بيانات مفتوحة</i>، ومرخصة تحت <a
-          href="https://opendatacommons.org/licenses/odbl/">رخصة قاعدة بيانات حرة</a> (ODbL)
-          بواسطة <a href="https://osmfoundation.org/">مؤسسة خريطة الشارع المفتوحة</a> (OSMF).
-        intro_2_html: "أنت حر في نسخ، وتوزيع، ونقل وتطويع بياناتنا، \nطالما أنك تقيد
-          خريطة الشارع المفتوحة\nوالمساهمين فيها، إذا عدلت أو بنيت على بياناتنا، \nفلا
-          يحق لك توزيع النتيجة إلا تحت نفس الترخيص، و\n<a href=\"https://opendatacommons.org/licenses/odbl/1.0/\">الكود
-          القانوني</a> الكامل يشرح حقوقك ومسؤولياتك."
-        intro_3_1_html: |-
-          يتم  ترخيص رسم الخرائط في بلاط خرائطنا، ووثائقنا
-          بموجب ترخيص <a href="https://creativecommons.org/licenses/by-sa/2.0/">رخصة المشاع الإبداعي: النسبة-الترخيص بالمثل 2.0</a> (CC BY-SA).
         credit_title_html: كيفية النسبة لخريطة الشارع المفتوحة
         credit_1_html: 'عندما تستخدم بيانات OpenStreetMap، فأنت مطالب بالقيام بالأمرين
           التاليين:'
-        credit_2_1_html: "يجب أيضا أن توضح أن البيانات متوفرة بموجب ترخيص\nقاعدة البيانات
-          المفتوحة، وفي حالة استخدام بلاط خرائطنا، يتم \nترخيص رسم الخرائط كـCC BY-SA،
-          يمكنك القيام بذلك عن طريق الربط بـ\n<a href=\"https://www.openstreetmap.org/copyright\">صفحة
-          حقوق الطبع والنشر هذه</a>.\nبدلا من ذلك، وكشرط إذا كنت تقوم بتوزيع خريطة
-          الشارع المفتوحة في \nنموذج بيانات، فيمكنك التسمية والربط مباشرةً إلى الترخيص(التراخيص).
-          في وسائل الإعلام\nحيث الروابط غير ممكنة (مثل الأعمال المطبوعة)، نقترح عليك
-          \nتوجيه القراء إلى openstreetmap.org (ربما عن طريق توسيع \n'OpenStreetMap'
-          إلى هذا العنوان الكامل)، وإلى opendatacommons.org، \nوإذا كان ذلك مناسبا،
-          إلى creativecommons.org."
-        credit_4_html: 'للحصول على الخريطة الإلكترونية للتصفح; يجب أن يظهر الائتمان
-          في زاوية من الخريطة، مثلا:'
         attribution_example:
           alt: مثال على كيفية إسناد خريطة الشارع المفتوحة على صفحة ويب
           title: مثال الإسناد
         more_title_html: معرفة المزيد
-        more_1_html: |-
-          اقرأ المزيد حول استخدام بياناتنا ، وكيفية اعتمادنا ، على <a
-          href = "https://osmfoundation.org/Licence"> صفحة ترخيص OSMF </a>
-        more_2_html: "على الرغم من أن خريطة الشارع المفتوحة عبارة عن بيانات مفتوحة،
-          إلا أنه لا يمكننا توفير \nواجهة برمجة تطبيقات خريطة حرة للأطراف الثالثة،
-          \nراجع <a href=\"https://operations.osmfoundation.org/policies/api/\">سياسة
-          استخدام واجهة برمجة التطبيقات</a>،\nو<a href=\"https://operations.osmfoundation.org/policies/tiles/\">سياسة
-          استخدام البلاط</a>،\nو<a href=\"https://operations.osmfoundation.org/policies/nominatim/\">سياسة
-          الاستخدام حسب الاسم</a> لدينا."
         contributors_title_html: المساهمين
         contributors_intro_html: "مساهمونا هم آلاف الأفراد، نوفر أيضا \nبيانات مرخصة
           بشكلٍ مفتوح من وكالات الخرائط الوطنية \nوغيرها من المصادر، من بينها:"
-        contributors_at_html: |-
-          <strong> النمسا </ strong>: يحتوي على بيانات من
-          <a href="https://data.wien.gv.at/"> Stadt Wien </a> (under
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de"> CC BY </a>) ،
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm"> Land Vorarlberg </a> and
-          Land Tirol (ضمن <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/"> CC BY AT مع التعديلات </a>).
-        contributors_au_html: |-
-          <strong>أستراليا</strong>: تحتوي على البيانات المستمدة من
-          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a>
-          المرخصة بواسطة كومنولث أستراليا تحت
-          <a href="https://creativecommons.org/licenses/by/4.0/">رخصة المشاع الإبداعي: النسبة-الترخيص بالمثل 4.0</a>.
-        contributors_ca_html: |-
-          <strong> كندا </ strong>: يحتوي على بيانات من
-          GeoBase & reg ؛، GeoGratis (& copy؛ Department of Natural
-          موارد كندا) ، CanVec (& نسخ ؛ قسم الطبيعية
-          الموارد الكندية) ، و StatCan (قسم الجغرافيا ،
-          إحصائيات كندا).
-        contributors_fi_html: |-
-          <strong> فنلندا </ strong>: تحتوي على بيانات من
-          مسح الأراضي الوطني لقاعدة بيانات طبوغرافية فنلندا
-          ومجموعات البيانات الأخرى ، تحت
-          <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1"> ترخيص NLSFI </a>.
-        contributors_fr_html: |-
-          <strong> فرنسا </ strong>: تحتوي على بيانات مصدرها
-          الاتجاه العام لمقاطعة Impôts.
-        contributors_nl_html: |-
-          <strong> هولندا </ strong>: تحتوي على & نسخ؛ والبيانات ، 2007
-          (<a href="https://www.and.com"> www.and.com </a>)
-        contributors_nz_html: |-
-          <strong> نيوزيلندا </ strong>: يحتوي على بيانات مصدرها
-          <a href="https://data.linz.govt.nz/"> LINZ Data Service </a> و
-          مرخص لإعادة استخدامها تحت
-          <a href="https://creativecommons.org/licenses/by/4.0/"> CC BY 4.0 </a>.
-        contributors_si_html: |-
-          <strong> سلوفينيا </ strong>: تحتوي على بيانات من
-          <a href="http://www.gu.gov.si/en/"> Authority Survey and Mapping Authority </a> and
-          <a href="http://www.mkgp.gov.si/en/"> وزارة الزراعة والغابات والأغذية </a>
-          (معلومات عامة من سلوفينيا).
-        contributors_es_html: |-
-          <strong>es </strong>: تحتوي على بيانات مصدرها
-          المعهد الجغرافي الوطني الإسباني (<a href="http://www.ign.es/">IGN</a>) و
-          النظام الوطني لرسم الخرائط (<a href="http://www.scne.es/">SCNE</a>)
-          مرخصة لإعادة الاستخدام بموجب <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: |-
-          <strong> جنوب إفريقيا </ strong>: يحتوي على بيانات مصدرها
-          <a href="http://www.ngi.gov.za/"> المديرية العامة:
-          National Geo-Spatial Information </a>، State copyright reserved.
-        contributors_gb_html: |-
-          <strong>المملكة المتحدة</ strong>: تحتوي على
-          بيانات مسح الأجهزة الحربية وحقوق تأليف ونشر التاج وقاعدة البيانات الحقوق
-          2010-19.
-        contributors_footer_1_html: |-
-          لمزيد من التفاصيل عن هذه ، وغيرها من المصادر التي تم استخدامها
-          للمساعدة في تحسين OpenStreetMap ، يرجى الاطلاع على <a
-          أ href = "https://wiki.openstreetmap.org/wiki/Contributors"> المساهمون
-          الصفحة </a> على OpenStreetMap Wiki.
         contributors_footer_2_html: |-
           إدراج البيانات في OpenStreetMap لا يعني أن الأصلي
           مزود البيانات يؤيد OpenStreetMap ، يوفر أي ضمان ، أو
@@ -1810,17 +1721,6 @@ ar:
           يتم تذكير المساهمين OSM لا لإضافة البيانات من أي
           المصادر المحمية بحقوق الطبع والنشر (مثل خرائط Google أو الخرائط المطبوعة) بدون
           إذن صريح من أصحاب حقوق النشر.
-        infringement_2_html: |-
-          إذا كنت تعتقد أن المواد المحمية بحقوق الطبع والنشر غير ملائمة
-          إضافة إلى قاعدة بيانات OpenStreetMap أو هذا الموقع ، يرجى الرجوع
-          إلى <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure"> إزالة الموقع
-          الإجراء </a> أو الملف مباشرة في موقعنا
-          <a href="https://dmca.openstreetmap.org/"> صفحة الإيداع عبر الإنترنت </a>.
-        trademarks_title_html: <span id="trademarks"></span>علامات تجارية
-        trademarks_1_html: OpenStreetMap ، وشعار العدسة المكبرة وحالة الخريطة هي علامات
-          تجارية مسجلة لمؤسسة OpenStreetMap. إذا كانت لديك أسئلة حول استخدامك للعلامات
-          ، فيرجى الاطلاع على <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">
-          سياسة العلامات التجارية </a>.
     index:
       js_1: إما أنك تستخدم متصفحا لا يدعم جافا سكريبت، أو أنك عطلت استعمال جافا سكريبت.
       js_2: خريطة الشارع المفتوحة تستخدم جافا سكريبت لخريطتها المنزلقة.
diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index e06f6deb7..d907de026 100644
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -632,8 +632,6 @@ arz:
       failed_to_import: 'فشل الاستيراد. الخطأ هو:'
       subject: '[خريطه الشارع المفتوحة] فشل استيراد جى بى إكس'
     gpx_success:
-      loaded_successfully: تم تحميل بنجاح %{trace_points} نقطه من أصل %{possible_points}
-        نقطه ممكنه.
       subject: '[خريطه الشارع المفتوحة] نجاح استيراد جى بى إكس'
     signup_confirm:
       subject: '[خريطه الشارع المفتوحه] اهلا بيك فى اوبن ستريت ماب'
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index a6335e2bc..cfa513e60 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1262,10 +1262,6 @@ ast:
       failed_to_import: 'falló la importación. Esti ye''l fallu:'
       subject: '[OpenStreetMap] fallu d''importación GPX'
     gpx_success:
-      loaded_successfully:
-        one: cargóse correutamente con %{trace_points} de 1 puntu posible.
-        other: cargóse correutamente con %{trace_points} de %{possible_points} puntos
-          posibles.
       subject: '[OpenStreetMap] importación GPX correuta'
     signup_confirm:
       subject: '[OpenStreetMap] Bienllegáu a OpenStreetMap'
@@ -1552,93 +1548,16 @@ ast:
         mapping_link: principiar col mapéu
       legal_babble:
         title_html: Drechos d'autor y llicencia
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> son <i>datos abiertos</i>, baxo llicencia <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) de la <a
-          href="https://osmfoundation.org/">Fundación OpenStreetMap</a> (OSMF).
-        intro_2_html: Puedes copiar, distribuir, tresmitir y adautar los nuesos datos
-          de mou llibre, mentanto deas reconocimientu a OpenStreetMap y a los sos
-          collaboradores. Si camudes o crees conteníu sobre los nuesos datos, namái
-          podrás distribuir el resultáu baxo la mesma llicencia. El <a href="https://opendatacommons.org/licenses/odbl/1.0/">códigu
-          llegal</a> completu t'esplica los tos drechos y obligaciones.
-        intro_3_1_html: La nuesa documentación úfrese baxo la llicencia <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Reconocimientu-CompartirIgual 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Cómo dar reconocimientu a OpenStreetMap
         credit_1_html: Riquimos qu'uses el créditu &ldquo;&copy; Collaboradores d'OpenStreetMap&rdquo;.
-        credit_2_1_html: |-
-          Tamién tienes de dexar claro que los datos tan disponibles baxo la llicencia Open Database License (ODbL), y si utilices los nuesos mosaicos de mapa, que la cartografía tien llicencia CC BY-SA. Puedes facelo enllazando a <a href="https://www.openstreetmap.org/copyright">esta páxina de drechos d'autor</a>.
-          Alternativamente, y como requisitu si distribues OSM en forma de datos, pues nomar y enllazar direutamente a les llicencies. En medios onde los enllaces nun seyan posibles (por exemplu, obres imprentaes), suxerímoste dirixir a los llectores a openstreetmap.org (espandiendo 'OpenStreetMap' a esta dirección completa, seique), a opendatacommons.org y, si ye'l casu, a creativecommons.org.
-        credit_3_1_html: |-
-          Los mosaicos del mapa del &ldquo;estilu estándar&rdquo; de www.openstreetmap.org son una Obra Producida de la Fundación OpenStreetMap usando datos d'OpenStreetMap baxo llicencia Open Database License. Si tas usando estos mosaicos, usa la siguiente atribución:
-          &ldquo;Mapa base y datos d'OpenStreetMap y de la Fundación OpenStreetMap&rdquo;.
-        credit_4_html: |-
-          Nun mapa electrónicu navegable, los créditos tendríen d'apaecer na esquina del mapa.
-          Por casu:
         attribution_example:
           alt: Exemplu de cómo dar reconocimientu a OpenStreetMap nuna páxina web
           title: Exemplu de reconocimientu
         more_title_html: Pa saber más
-        more_1_html: |-
-          Llei más tocante a cómo utilizar los nuesos datos, y cómo danos créditu, na <a
-          href="https://osmfoundation.org/Licence">páxina de Llicencia de la OSMF</a>.
-        more_2_html: |-
-          Anque OpenStreetMap son datos abiertos, nun podemos ufrir una API de mapes de baldre pa desendolcadores d'aplicaciones pa terceros.
-          Llei la nuesa <a href="https://operations.osmfoundation.org/policies/api/">Política d'usu de la API</a> (n'inglés),
-          <a href="https://operations.osmfoundation.org/policies/tiles/">Política d'usu del mosaicu</a> (n'inglés)
-          y <a href="https://operations.osmfoundation.org/policies/nominatim/">Política d'usu de Nominatim</a> (n'inglés tamién).
         contributors_title_html: Los nuesos collaboradores
         contributors_intro_html: 'Los nuesos collaboradores son miles de persones.
           Incluimos tamién datos con llicencia abierta d''axencies cartográfiques
           nacionales y d''otres fontes, ente elles:'
-        contributors_at_html: |-
-          <strong>Austria</strong>: Contien datos de
-          <a href="https://data.wien.gv.at/">Stadt Wien</a> (baxo
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> y
-          Land Tirol (baxo <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT con enmiendes</a>).
-        contributors_au_html: |-
-          <strong>Australia</strong>: Contien datos de barrios basaos en datos de Australian Bureau of
-          Statistics.
-        contributors_ca_html: |-
-          <strong>Canadá</strong>: Contien datos de GeoBase&reg;, GeoGratis (&copy; Department of Natural
-          Resources Canada), CanVec (&copy; Department of Natural
-          Resources Canada), y StatCan (Geography Division,
-          Statistics Canada).
-        contributors_fi_html: |-
-          <strong>Finlandia</strong>: Contien datos de la base de datos topográfica de la National Land Survey de Finlandia
-          y otros conxuntos de datos, baxo la <a href="http://www.maanmittauslaitos.fi/en/opendata-licence-version1">Llicencia NLSFI</a>.
-        contributors_fr_html: '<strong>Francia</strong>: Contien datos sacaos de Direction
-          Générale des Impôts.'
-        contributors_nl_html: |-
-          <strong>Paises Baxos</strong>: Contien datos &copy; AND, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: '<strong>Nueva Zelanda</strong>: Contien datos de la
-          fonte <a href="https://data.linz.govt.nz/">LINZ Data Service</a> con reutilización
-          autorizada baxo la llicencia <a href="https://creativecommons.org/licenses/by/4.0/">CC
-          BY 4.0</a>.'
-        contributors_si_html: |-
-          <strong>Eslovenia</strong>: Contien datos de la
-          <a href="http://www.gu.gov.si/en/">Autoridá Topográfica y Cartográfica</a> y del
-          <a href="http://www.mkgp.gov.si/en/">Ministeriu d'Agricultura, Silvicultura y Alimentación</a>
-          (información pública d'Eslovenia).
-        contributors_es_html: '<strong>España</strong>: Contien datos provenientes
-          del Institutu Xeográficu Nacional (<a href="http://www.ign.es/">IGN</a>)
-          y del Sistema Cartográficu Nacional (<a href="http://www.scne.es/">SCNE</a>),
-          llicenciaos pa la reutilización baxo <a href="https://creativecommons.org/licenses/by/4.0/">CC
-          BY 4.0</a>.'
-        contributors_za_html: |-
-          <strong>Sudáfrica</strong>: Contien datos sacaos de
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, State copyright reserved.
-        contributors_gb_html: |-
-          <strong>Reinu Uníu</strong>: Contien datos de Ordnance Survey © Crown copyright and database right
-           2010-19.
-        contributors_footer_1_html: |-
-          Pa más detalles d'estes, y otres fontes que s'usaron p'ayudar a
-          ameyorar OpenStreetMap, por favor, llei la <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">Páxina
-          de los collaboradores</a> na Wiki d'OpenStreetMap.
         contributors_footer_2_html: La inclusión de datos n'OpenStreetMap nun significa
           que'l fornidor de los datos orixinales sofite OpenStreetMap, ufra garantía
           dala o aceute dalguna responsabilidá.
@@ -1647,16 +1566,6 @@ ast:
           datos que vengan d'una fonte con drechos d'autor acutaos (p. ex. de Google
           Maps o mapes impresos) ensin el permisu esplícitu de los dueños de los drechos
           d'autor.
-        infringement_2_html: Si crees que s'amestó de mou inapropiáu material con
-          drechos d'autor a la base de datos d'OpenStreetMap o a esti sitiu, consulta'l
-          nuesu <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">procedimientu
-          de retirada de datos</a> o pidilo direutamente nel nuesu <a href="https://dmca.openstreetmap.org/">formulariu
-          en llinia</a>.
-        trademarks_title_html: <span id="trademarks"></span>Marques rexistraes
-        trademarks_1_html: OpenStreetMap, el logotipu de la lente y «State of the
-          Map» son marques rexistraes de la Fundación OpenStreetMap. Si tienes entrugues
-          tocante al usu de les marques, consulta la nuesa <a href="http://wiki.osmfoundation.org/wiki/Trademark_Policy">política
-          de marques rexistraes</a>.
     index:
       js_1: O tas usando un restolador ensin sofitu pa JavaScript, o tienes JavaScript
         desactiváu.
diff --git a/config/locales/az.yml b/config/locales/az.yml
index f65f12921..681717074 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -946,26 +946,12 @@ az:
         mapping_link: kartoqrafiyalaşdırmağa başla
       legal_babble:
         title_html: Müəllif hüquqları və Lisenziyalar
-        intro_1_html: |-
-          OpenStreetMap <a
-          href="http://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) lisenziyası üzrə istifadə olunan <i>açıq məlumatlardan</i> ibarətdir.
         credit_title_html: OpenStreetMap-ə Necə istinad etmək olar
         attribution_example:
           alt: Nümunə üçün, veb-səhifədən OpenStreetMap-ə necə istinad vermək
           title: Müəllifin göstərilməsinin nümunəsi
         more_title_html: Daha ətraflı öyrən
         contributors_title_html: Kimlər bizim layihəyə töhfə verir
-        contributors_ca_html: <strong>Kanada</strong> GeoBase ®, GeoGratis (© Kanadanın
-          Təbii Ehtiyatlar Departamenti), CanVec (© Kanadanın Təbii Ehtiyatlar Departamenti)
-          və StatCan (Kanadanın Statistika şöbəsinin, Coğrafiya bölməsi) tərəfindən
-          məlumatlar.
-        contributors_fr_html: '<strong>Fransa</strong>: Baş Vergi İdarəsi tərəfindən
-          məlumatlar.'
-        contributors_nz_html: <strong>Yeni Zelandiya</strong> Yeni Zelandiyanın torpaq
-          resursları haqqında məlumatlardan. Crown Copyright reserved.
-        contributors_gb_html: <strong>Böyük Britaniya Krallığı</strong> Ordnance Survey
-          © Crown copyright tərəfindən məlumatlar. Verilənlər bazasına icazə 2010-12.
         infringement_title_html: Müəllif hüquqlarının pozulması
     index:
       shortlink: Qısa keçid
diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 7799d1f18..898f50bd9 100644
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -933,11 +933,6 @@ be-Tarask:
       failed_to_import: 'немагчыма імпартаваць. Адбылася памылка:'
       subject: '[OpenStreetMap] памылка імпарту GPX'
     gpx_success:
-      loaded_successfully:
-        one: пасьпяхова загружаны з %{trace_points} з 1 магчымага пункту.
-        few: пасьпяхова загружаныя %{trace_points} пункты з магчымых %{possible_points}.
-        many: пасьпяхова загружаныя %{trace_points} пунктаў з магчымых %{possible_points}.
-        other: пасьпяхова загружаныя %{trace_points} пунктаў з магчымых %{possible_points}.
       subject: '[OpenStreetMap] імпарт GPX адбыўся пасьпяхова'
     signup_confirm:
       subject: '[OpenStreetMap] Вітаем у OpenStreetMap'
@@ -1103,63 +1098,14 @@ be-Tarask:
         mapping_link: пачаць стварэньне мапы
       legal_babble:
         title_html: Аўтарскія правы і ліцэнзія
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> — <i>вольныя зьвесткі</i>, ліцэнзаваныя паводле <a
-          href="https://opendatacommons.org/licenses/odbl/">ліцэнзіі Адкрытых базаў зьвестак Адкрытых агульных зьвестак</a> (ODbL) <a
-          href="https://osmfoundation.org/">Фундацыяй OpenStreetMap Foundation</a> (OSMF).
-        intro_2_html: Вы можаце капіяваць, распаўсюджваць, перадаваць і зьмяняць нашыя
-          зьвесткі да той пары, пакуль вы спасылаецеся на OpenStreetMap і яе ўдзельнікаў.
-          Калі вы зьмяняеце ці выкарыстоўваеце нашыя зьвесткі, вы можаце распаўсюджваць
-          вынікі толькі на ўмовах такой жа ліцэнзіі. Поўны <a href="https://opendatacommons.org/licenses/odbl/1.0/">тэкст
-          ліцэнзіі</a> растлумачыць вам правы і адказнасьці.
         credit_title_html: Як спасылацца на OpenStreetMap
         credit_1_html: 'Карыстаючыся зьвесткамі OpenStreetMap, вы павінны выканаць
           дзьве ўмовы:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Згадаць OpenStreetMap, пазначыўшы нашую нататку пра аўтарскае права.</li>
-            <li>Выразна зазначыць, што зьвесткі даступныя пад ліцэнзіяй Open Database License.</li>
-          </ul>
-        credit_3_1_html: Для паведамленьня пра аўтарскія правы маем розныя патрабаваньні
-          ў залежнасьці ад таго, як вы карыстаецеся нашымі зьвесткамі. Напрыклад,
-          калі вы стварылі праглядальную мапу, друкаваную мапу ці статычную выяву,
-          будуць дзейнічаць розныя правілы. Дэтальнае апісаньне патрабаваньняў можна
-          знайсьці на <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Кіраўніцтве
-          атрыбуцыямі</a>.
         more_title_html: Даведацца болей
-        more_1_html: Даведайцеся болей пра выкарыстаньне нашых зьвестак і пра спасыланьне
-          на нас на <a href="https://osmfoundation.org/Licence">старонцы ліцэнзіі
-          OSMF</a>.
-        more_2_html: |-
-          Хоць OpenStreetMap ёсьць адкрытымі зьвесткамі, мы ня здольныя прадаставіць бяскоштны API мапаў для староньніх распрацоўнікаў. Глядзіце нашыя <a href="https://operations.osmfoundation.org/policies/api/">правілы карыстаньня API</a>, <a href="https://operations.osmfoundation.org/policies/tiles/">правілы карыстаньня частак мапаў</a>
-          і <a href="https://operations.osmfoundation.org/policies/nominatim/">правілы карыстаньня Nominatim</a>.
         contributors_title_html: Нашыя ўдзельнікі
         contributors_intro_html: 'Нашы аўтары — гэта тысячы асобаў. Мы таксама ўключаем
           зьвесткі з вольнай ліцэнзіяй ад нацыянальных картаграфічных службаў і зь
           іншых крыніц, сярод іх:'
-        contributors_at_html: |-
-          <strong>Аўстрыя</strong>: утрымлівае зьвесткі <a href="https://data.wien.gv.at/">гораду Вены</a> (на ўмовах
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>), а таксама земляў <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Форарльбэрг</a> і
-          Тыроль (на ўмовах <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT з дапаўненьнямі</a>).
-        contributors_au_html: |-
-          <strong>Аўстралія</strong>: Уключана ці распрацавана з выкарыстаньнем адміністрацыйных граніцаў &copy;
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a>
-          ліцэнзаваных Аўстралійскаю супольнасьцю паводле міжнароднай ліцэнзіі <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 (CC BY 4.0)</a>.
-        contributors_ca_html: |-
-          <strong>Канада</strong>: Утрымлівае зьвесткі
-          GeoBase&reg;, GeoGratis (&copy; Дэпартамэнта прыродных рэсурсаў
-          Канады), CanVec (&copy; Дэпартамэнта прыродных рэсурсаў
-          Канады), і StatCan (Статыстычнага падразьдзяленьня Канады).
-        contributors_fr_html: |-
-          <strong>Францыя</strong>: Утрымлівае зьвесткі
-          Галоўнага падатковага ўпраўленьня.
-        contributors_nz_html: '<strong>Новая Зэляндыя</strong>: утрымлівае зьвесткі
-          з <a href="https://data.linz.govt.nz/">LINZ Data Service</a> і ліцэнзаваныя
-          для паўторнага выкарыстаньня паводле <a href="https://creativecommons.org/licenses/by/4.0/">CC
-          BY 4.0</a>.'
-        contributors_gb_html: '<strong>Вялікабрытанія</strong>: утрымлівае зьвесткі
-          апытаньня Ordnance &copy; Каралеўскія аўтарскія правы і правы на базу зьвестак
-          2010—2019.'
         contributors_footer_2_html: |-
           Уключэньне зьвестак у OpenStreetMap не азначае, што пастаўшчыкі пачатковых зьвестак
           якім-небудзь чынам падтрымліваюць OpenStreetMap, прадстаўляюць гарантыі, ці
diff --git a/config/locales/be.yml b/config/locales/be.yml
index a5f137ca2..f550b7614 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1311,12 +1311,6 @@ be:
       failed_to_import: 'збой імпарту. Адбылася памылка:'
       subject: '[OpenStreetMap] Збой імпарту GPX'
     gpx_success:
-      loaded_successfully:
-        one: паспяхова загружаны (%{trace_points} з магчымага 1 пункта).
-        few: паспяхова загружаны (%{trace_points} з магчымых %{possible_points} пунктаў).
-        many: паспяхова загружаны (%{trace_points} з магчымых %{possible_points} пунктаў).
-        other: паспяхова загружаны (%{trace_points} з магчымых %{possible_points}
-          пунктаў).
       subject: '[OpenStreetMap] Паспяховы імпарт GPX'
     signup_confirm:
       subject: '[OpenStreetMap] Сардэчна запрашаем у OpenStreetMap'
@@ -1605,96 +1599,18 @@ be:
         mapping_link: пачаць маляваць карту
       legal_babble:
         title_html: Аўтарскія правы і ліцэнзія
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> - гэта <i>адкрытыя дадзеныя</i>, што распаўсюджваюцца  па ліцэнзіі <a href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL) сіламі <a
-          href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
-        intro_2_html: "Вы можаце капіраваць, распаўсюджваць, перадаваць і змяняць
-          нашыя  дадзеныя да той пары пакуль Вы спасылаецеся на OpenStreetMap і яе
-          ўдзельнікаў. Калі Вы змяняеце ці выкарыстоўваеце нашыя дадзеныя, Вы можаце
-          распаўсюджваць вынікі толькі на ўмовах такой жа ліцэнзіі. Поўны \n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">тэкст
-          ліцэнзіі</a> растлумачыць Вам правы і абавязкі."
-        intro_3_1_html: "Наша дакументацыя распаўсюджваюцца на ўмовах <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Ліцэнзіі
-          Creative \nCommons Attribution-ShareAlike 2.0</a> (CC-BY-SA 2.0)."
         credit_title_html: Як спасылацца на OpenStreetMap
         credit_1_html: |-
           Мы патрабуем, каб выкарыстоўвалася спасылка &ldquo;&copy; OpenStreetMap
           contributors&rdquo;.
-        credit_2_1_html: Вы павінны таксама даваць дакладна разумець, што дадзеныя
-          даступныя на ўмовах Open Database License, а ў выпадку, калі вы карыстаецеся
-          графічнымі картамі з нашага сервера, на іх распаўсюджваюцца ўмовы CC-BY-SA.
-          Вы можаце зрабіць гэта падаўшы спасылкі на <a href="http://www.openstreetmap.org/copyright">гэтую
-          старонку з тлумачэннем лiцэнзiйных патрабаванняў</a>. Ці  для выканання
-          нашых патрабаванняў пры распаўсюдзе дадзеных OSM вы можаце непасрэдна ўказваць
-          назву ліцэнзіі(й) і спасылкі на яе(іх) тэкст. Пры выкарыстанні носьбітамі,
-          дзе выкарыстанне гіпертэкставых спасылак немагчыма (напрыклад друкаваныя
-          матэрыялы), мы прапануем спасылацца непасрэдна на openstreetmap.org (або
-          пашыраючы "OpenStreetMap" да гэтага поўнага адраса), opendatacommons.org,
-          а калі трэба, і на creativecommons.org.
-        credit_4_html: "Для электронных карт, згадка пра крыніцу дадзеных павінна
-          знаходзіцца ў куце карты. \nНапрыклад:"
         attribution_example:
           alt: Прыклад таго, як трэба спасылацца на OpenStreetMap на старонцы
           title: Прыклад спасылкі
         more_title_html: Даведацца больш
-        more_1_html: |-
-          Даведайцеся больш аб выкарыстанні нашых дадзеных і аб тым, як паказваць нас як крыніцу паходжання дадзеных на <a
-          href="http://osmfoundation.org/Licence">старонцы OSMF Licence</a> і <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">адказах на прававыя пытанні</a>.
-        more_2_html: Хоць даныя OpenStreetMap з’яўляюцца адкрытымі данымі, мы не ў
-          стане прадастаўляць бясплатны картаграфічны API для іншых распрацоўшчыкаў.
-          Азнаёмцеся з нашымі <a href="https://operations.osmfoundation.org/policies/api/">Правіламі
-          выкарыстання API</a>, <a href="https://operations.osmfoundation.org/policies/tiles/">Правіламі
-          выкарыстання графічных карт</a> і <a href="https://operations.osmfoundation.org/policies/nominatim/">Правіламі
-          выкарыстання сэрвісу Nominatim</a>.
         contributors_title_html: Нашы ўдзельнікі
         contributors_intro_html: 'Нашымі ўдзельнікамі з''яўляюцца тысячы людзей. Мы
           таксама ўключаем дадзеныя ад нацыянальных картаграфічных агенцтваў, якія
           распаўсюджваюцца на ўмовах адкрытых ліцэнзій, сярод іх:'
-        contributors_at_html: "<strong>Аўстрыя</strong>: Змяшчае звесткі\n<a href=\"http://data.wien.gv.at/\">горада
-          Вены</a> на ўмовах\n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC
-          BY</a>, <a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">зямлі
-          Форарльберг</a> і \nзямлі Тыроль (на ўмовах <a href=\"http://www.tirol.gv.at/applikationen/e-Government/data/nutzungsbedingungen/\">CC
-          BY AT з дадаткамі</a>)."
-        contributors_au_html: |-
-          <strong>Аўстралія</strong>: Змяшчае дадзеныя атрыманыя ад
-          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a>
-          ліцэнзаваныя Commonwealth of Australia пад
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_ca_html: |-
-          <strong>Канада</strong>: Змяшчае звесткі
-          GeoBase&reg;, GeoGratis (&copy; Дэпартамента прыродных рэсурсаў
-          Канады), CanVec (&copy; Дэпартамента прыродных рэсурсаў
-          Канады), і StatCan (Статыстычнага падраздзялення Канады).
-        contributors_fi_html: "<strong>Фінляндыя</strong>: змяшчае дадзеныя з тапаграфічнай
-          базы дадзеных Нацыянальнай зямельнай службы Фінляндыі і іншыя наборы дадзеных
-          на ўмовах ліцэнзіі \n<a href=\"http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501\">NLSFI</a>."
-        contributors_fr_html: |-
-          <strong>Францыя</strong>: Змяшчае дадзеныя атрыманыя ад
-          Direction Générale des Impôts.
-        contributors_nl_html: |-
-          <strong>Нідэрланды</strong>: Змяшчае даныя &copy; AND, 2007
-          (<a href="http://www.and.com">www.and.com</a>)
-        contributors_nz_html: '<strong>Новая Зеландыя</strong>: Змяшчае звесткі з
-          <a href="https://data.linz.govt.nz/">LINZ Data Service</a> пад ліцэнзіяй
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.'
-        contributors_si_html: '<strong>Славенія</strong>: змяшчае дадзеныя <a href="http://www.gu.gov.si/en/">Геадэзічнай
-          управы</a> і <a href="http://www.mkgp.gov.si/en/">Міністэрства сельскай
-          гаспадаркі, лясной гаспадаркі і харчавання</a> (публічная інфармацыя Славеніі).'
-        contributors_es_html: |-
-          <strong>Іспанія</strong>: Змяшчае дадзеныя атрыманыя ад
-          Spanish National Geographic Institute (<a href="http://www.ign.es/">IGN</a>) і
-          National Cartographic System (<a href="http://www.scne.es/">SCNE</a>)
-          ліцэнзаваныя для паўторнага выкарыстання пад <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: |-
-          <strong>Паўднёвая Афрыка</strong>: Змяшчае дадзеныя з
-          <a href="http://www.ngi.gov.za/">Chief Directorate: National Geo-Spatial Information</a>, State copyright reserved.
-        contributors_gb_html: |-
-          <strong>Вялікабрытанія</strong>: Змяшчае звесткі Ordnance
-          Survey &copy; Crown copyright and database right
-          2010-19.
-        contributors_footer_1_html: Дадатковую інфармацыю аб гэтых і іншых крыніцах,
-          якія былі выкарыстаныя для паляпшэння карты OpenStreetMap, можна атрымаць
-          на старонцы <a href="http://wiki.openstreetmap.org/wiki/Contributors">Удзельнікі
-          </a> на Вікі OpenStreetMap.
         contributors_footer_2_html: |-
           Уключэнне дадзеных у OpenStreetMap не азначае, што пастаўшчыкі пачатковых дадзеных
           якім-небудзь чынам падтрымліваюць OpenStreetMap, прадстаўляюць гарантыі, ці
@@ -1703,16 +1619,6 @@ be:
         infringement_1_html: Удзельнікі супольнасці OSM павінны заўсёды памятаць пра
           тое, што забараняецца дадаваць дадзеныя з любых абароненых аўтарскім правам
           крыніц (напрыклад, з Google Maps або з друкаваных карт) без дазволу праваўладальнікаў.
-        infringement_2_html: Калі вы лічыце, што абаронены аўтарскім правам матэрыял
-          быў недарэчна дададзены ў базу дадзеных OpenStreetMap або да гэтага сайту,
-          азнаёмціся з нашым <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">парадкам
-          выдалення такіх дадзеных</a> або скарыстайцеся непасрэдна нашай <a href="https://dmca.openstreetmap.org/">старонкай
-          для онлайн зваротаў</a>.
-        trademarks_title_html: <span id="trademarks"></span>Таварныя знакі
-        trademarks_1_html: OpenStreetMap і лагатып з лупаю з'яўляюцца зарэгістраванымі
-          таварнымі знакамі фонду OpenStreetMap. Калі ў вас есць пытанні аб выкарыстанні
-          знакаў, калі ласка, адпраўце Вашыя пытанні <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">рабочай
-          групе па ліцэнзіі</a>.
     index:
       js_1: Вы карыстаецеся вандроўнікам без падтрымкі JavaScript.
       js_2: OpenStreetMap выкарыстоўвае JavaScript для адлюстравання карты на сайце.
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 4ae7d83e1..a1f492b87 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1468,15 +1468,7 @@ bg:
         credit_title_html: Как да кредитирате OpenStreetMap
         more_title_html: Открийте повече
         contributors_title_html: Нашите сътрудници
-        contributors_fr_html: |-
-          <strong>Франция</strong>: Съдържа данни от
-          Главната данъчна дирекция.
         infringement_title_html: Нарушаване на авторските права
-        trademarks_title_html: <span id="trademarks"></span>Търговски марки
-        trademarks_1_html: OpenStreetMap и логото с лупата са регистрирани търговски
-          марки на фондация OpenStreetMap. Ако имате въпроси относно използването
-          на тези знаци, моля изпратете Вашите въпроси на <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">работната
-          група по лиценза</a>.
     index:
       js_2: OpenStreetMap използва JavaScript за своята статична карта.
       permalink: Постоянна връзка
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index dc03e47a9..be4e55e35 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -1429,6 +1429,7 @@ bn:
       heading: আপনার ইমেইল দেখুন!
       introduction_1: আমরা আপনাকে একটি নিশ্চিতকরণ ইমেইল পাঠিয়েছি।
       button: নিশ্চিত করুন
+      click_here: এখানে ক্লিক করুন
     confirm_resend:
       failure: ব্যবহারকারী %{name}-কে পাওয়া যায়নি।
     confirm_email:
@@ -1558,6 +1559,7 @@ bn:
       logout_button: প্রস্থান
   shared:
     markdown_help:
+      heading_html: '%{kramdown_link} দিয়ে পার্স করা হয়েছে'
       headings: শিরোনামগুলি
       heading: শিরোনাম
       subheading: উপশিরোনাম
@@ -1598,23 +1600,12 @@ bn:
         mapping_link: মানচিত্রকরণ শুরু করুন
       legal_babble:
         title_html: কপিরাইট ও লাইসেন্স
-        intro_1_html: |-
-          ওপেনস্ট্রিটম্যাপ<sup><a href="#trademarks">&reg;</a></sup> একটি <i>মুক্ত উপাত্ত</i> যা <a
-          href="https://osmfoundation.org/">ওপেনস্ট্রিটম্যাপ ফাউন্ডেশন কর্তৃক</a> (OSMF) <a
-          href="https://opendatacommons.org/licenses/odbl/">মুক্ত উপাত্ত কমন্স মুক্ত তথ্যভিত লাইসেন্সের</a> (ODbL) আওতায় লাইসেন্সকৃত।
-        intro_3_1_html: আমাদের নথিপত্র <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.bn">ক্রিয়েটিভ
-          কমন্স অ্যাট্রিবিউশন-শেয়ারএলাইক ২.০</a> (সিসি বাই-এসএ ২.০) লাইসেন্সের অধীনে
-          লাইসেন্সকৃত।
         credit_title_html: ওপেনস্ট্রিটম্যাপকে কীভাবে কৃতিত্ব দিবেন
         attribution_example:
           title: আরোপণ উদাহরণ
         more_title_html: আরও খুঁজা হচ্ছে
-        more_1_html: |-
-          আমাদের উপাত্ত ব্যবহার, ও আমাদেরকে কৃতিত্ব প্রদানের পদ্ধতি সম্পর্কে জানতে <a
-          href="http://osmfoundation.org/Licence">OSMF লাইসেন্সের পাতা</a> দেখুন।
         contributors_title_html: আমাদের অবদানকারীগণ
         infringement_title_html: কপিরাইট লঙ্ঘন
-        trademarks_title_html: <span id="trademarks"></span>ট্রেডমার্ক
     index:
       js_1: আপনি এমন একটি ব্রাউজার ব্যবহার করছেন যা জাভাস্ক্রিপ্ট সমর্থন করে না অথবা
         আপনি জাভাস্ক্রিপ্ট অক্ষম করেছেন।
@@ -1683,6 +1674,8 @@ bn:
         title: সংস্থার জন্য
       wiki:
         title: ওপেনস্ট্রিটম্যাপ উইকি
+    potlatch:
+      change_preferences: এখানে আপনার পছন্দ পরিবর্তন করুন
     any_questions:
       title: কোনও প্রশ্ন?
     sidebar:
@@ -1880,6 +1873,7 @@ bn:
       read_tou: আমি ব্যবহারের শর্তাবলী পড়েছি এবং সম্মত
       consider_pd: উপরোক্ত ছাড়াও, আমি আমার অবদানগুলিকে পাবলিক ডোমেনে বলে মনে করি৷
       consider_pd_why: এটি কী?
+      informal_translations: অনানুষ্ঠানিক অনুবাদ
       continue: অব্যাহত রাখুন
       decline: প্রত্যাখ্যান করুন
       you need to accept or decline: অনুগ্রহ করে পড়ুন এবং তারপরে চালিয়ে যেতে নতুন
diff --git a/config/locales/br.yml b/config/locales/br.yml
index d7b191d78..981cfa70a 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -1573,10 +1573,6 @@ br:
       subject: '[OpenStreetMap] fazi e-pad an enporzhiadur GPX'
     gpx_success:
       hi: Demat %{to_user},
-      loaded_successfully:
-        one: karget ervat gant %{trace_points} diwar 1 poent posupl.
-        two: karget ervat gant %{trace_points}
-        other: karget ervat gant %{trace_points} diwar %{possible_points} poent posupl.
       subject: '[OpenStreetMap] Graet eo an enporzhiadenn GPX'
     signup_confirm:
       subject: '[OpenStreetMap] Degemer mat en OpenStreetMap'
@@ -1908,90 +1904,17 @@ br:
         mapping_link: kregiñ da gemer perzh
       legal_babble:
         title_html: Copyright hag aotre-implijout
-        intro_1_html: |-
-          OpenStreetMap <sup><a href="#trademarks">&reg;</a></sup>  zo <i>dindan un aotre-implijout digor</i>, href "htpps : //Open Data
-          Commons Open Database License</a> (ODbL)gant <sup><a href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
-        intro_2_html: "Dieub oc'h da eilañ, da skignañ, da gas ha da azasaat hor c'hartennoù
-          hag hor roadennoù, gant ma root kred da OpenStreetMap ha d'e genlabourerien.
-          Ma kemmit pe ma implijit hor c'hartennoù pe hor roadennoù e labourioù all,ne
-          c'hallit ket skignañ ar re-se dindan un aotre-implijout all. En \n<a href=\"https://opendatacommons.org/licenses/odbl/1.0/\">legal\ncode</a>
-          e kavot munudoù ho kwirioù hag ho teverioù."
-        intro_3_1_html: |-
-          Emañ tammoù hor c'hartennoù hag hon teulioù dindan an aotre-implijout <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA 2.0).
         credit_title_html: Penaos reiñ kred da OpenStreetMap
         credit_1_html: 'Pa implijit titouroù OpenStreetMap e rankit ober an daou dra-mañ:'
-        credit_2_1_html: |-
-          Pa vez posupl e tle OpenStreetMap bezañ ur gourliamm war-du <a
-            href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>
-            ha CC BY-SA war-du <a
-            href="https://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a>.
-            Ma'z implijit ur skor ma ne c'haller ket krouiñ liammoù (da skouer :
-            un destenn moullet), ez aliomp ac'hanoc'h da gas ho lennerien da
-            www.openstreetmap.org (marteze en ur astenn
-            &lsquo;OpenStreetMap&rsquo; ar chomlec'h klok) ha da
-            www.creativecommons.org.
-        credit_4_html: |-
-          Evit ur gartenn elektronek a c'haller merdeiñ enni e tlefe ar c'hred dont war wel e korn ar gartenn.
-          Da skouer :
         attribution_example:
           alt: Skouer eus penaos deverkañ OpenStreetMap war ur bajenn web
           title: Skouer deverkadur
         more_title_html: Titouroù ouzhpenn
-        more_1_html: Ma fell deoc'h kaout muioc'h a ditouroù diwar-benn adimplij hor
-          roadennoù, lennit  <a href="https://osmfoundation.org/Licence"> Licence
-          OSMF Licence page</a> hag ar gumuniezh <a
-        more_2_html: "Daoust da OpenStreetMap bezañ un hollad roadennoù digor, n'omp
-          ket evit pourchas un API digoust evit an dredeourien.\n   Sellit ouzh hor
-          <a href=\"https://operations.osmfoundation.org/policies/api/\"></a> reolennoù
-          evit implijout an API</a>, \n  Sellit ouzh hor <a href=\"https://operations.osmfoundation<a
-          href=\"https://operations.osmfoundation.org/policies/tiles/\">reolennoù
-          evit implijout an teolennoù</a>, ha\n<a href=\"https://operations.osmfoundation.org/policies/nominatim/\">reolennoù
-          evit implijout Nominatin</a>"
         contributors_title_html: Hor c'henlabourerien
         contributors_intro_html: 'Miliadoù a hiniennoù a labour ganimp. Ebarzhiñ a
           reomp ivez roadennoù digor eus ajañsoù kartennañ hag eus mamennoù all, hag
           en o zouez :'
-        contributors_at_html: |-
-          <strong>Aostria</strong> : Ennañ roadennoù eus
-          <a href="https://data.wien.gv.at/">Stadt Wien</a> (dindan
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>.</li>
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> ha
-          Land Tirol (dindan <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT gant enkemmadoù</a>).
-        contributors_au_html: |-
-          <strong>Australia</strong>: Ennañ ar roadennoù diwar-benn an bannlevioù
-             diazezet war roadennoù Australian Bureau of Statistics.
-        contributors_ca_html: |-
-          <strong>Kanada</strong> : Ennañ roadennoù eus
-             GeoBase&reg;, GeoGratis (&copy; Department of Natural
-             Resources Canada), CanVec (&copy; Department of Natural
-             Resources Canada), ha StatCan (Geography Division,
-             Statistics Canada).
-        contributors_fi_html: |-
-          <strong>Finland</strong>: Ennañ ez eus roadennoù eus diaz roadennoù Ensellerezh Broadel Tiriad hag holladoù roadennoù all, dindan an
-          <a href="https://www.maanmittauslaitos.fi/en/NLS_opendata_licence_version1_20120501">aotre-implij NLSFI</a>.
-        contributors_fr_html: '<strong>Frañs</strong> : Ennañ roadennoù eus Renerezh
-          Hollek an Tailhoù.'
-        contributors_nl_html: |-
-          <strong>Netherlands</strong> : Contains &copy; AND data, 2007
-            (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>Zeland-Nevez</strong> : Ennañ roadennoù eus
-             <a href="https://data.linz.govt.nz/">servij roadennoù LINZ</a> hag evit adimplijout, dindan aotre <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: |-
-          <Strong>Slovenia</strong>: zo enni roadennoù eus <a href="http://www.gu.gov.si/en/">Aotrouniezh steuñvidigezh ha Kartografiezh </a> hag eus <a href="http://www.mkgp.gov.si/en/">Ministrerezh al Labour-douar, ar C'hoadeier hag  ar Boued</a>
-          (titouroù foran eus Slovenia)
-        contributors_za_html: |-
-          <strong>Afrika ar Su</strong> : Ennañ roadennoù eus
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, State copyright reserved.
-        contributors_gb_html: |-
-          <strong>Rouantelezh-Unanet</strong> : Ennañ roadennoù eus Ordnance
-          Survey data &copy; Crown copyright and database right 2010-19.
-        contributors_footer_1_html: |-
-          ↓Evit muioc'h a vunudoù diwar-benn ar re-se, hag ar mammennoù all a zo bet implijet da sikour da wellaat OpenStreetMap, sellit ouzh ar <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">Bajenn Skoazellerien</a> e Wiki OpenStreetMap.
+        contributors_fr_france: Bro-C'hall
         contributors_footer_2_html: Enlakaat roadennoù e OpenStreetMap ne empleg ket
           ez aprou ar bourchaserien orin a endalc'had OpenStreetMap, na ne bourchasont,
           na ne waratomp pe na ne zegemeront ne vern pe atebegezh e vefe.
@@ -2000,16 +1923,6 @@ br:
           Degas a reomp da soñj da genlabourerien OSM ne zleont morse lakaat roadennoù a zeu
           eus mammennoù dindan wirioù (da sk. : Google Maps pe kartennoù moullet) hep aotre
           ezpleg ar re zo ar gwirioù-aozer ganto.
-        infringement_2_html: ma kredit ez eus bet ouzhpennet danvez dindan aotre-implijout
-          e gaou da diaz roadennoù OpenStreetMat pe d'al lec'hienn-mañ, roit an dra-se
-          da c'houzout d'hon <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">argerzh
-          dizober</a>, mar plij, pe skrivit war-eeun war hor <a href="https://dmca.openstreetmap.org/">furmskrid
-          enlinenn</a>.
-        trademarks_title_html: <span id="merkoù"></span>Merkoù
-        trademarks_1_html: Openstreet, al logo brasaer ha State of the Map zo merkoù
-          marilhet gant OpenStreetMap Foundation. M'ho pez goulennoù da sevel diwar-benn
-          implij ar merkoù-se, sellit ouzh <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark
-          Policy</a>, mar plij.
     index:
       js_1: Pe emaoc'h oc'h implijout ur merdeer ha ne skor ket JavaScript, pe hoc'h
         eus diweredekaet JavaScript.
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 5db03add3..171cfdce5 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -919,9 +919,6 @@ bs:
       failed_to_import: 'Import nije uspio. Evo greške:'
       subject: '[OpenStreetMap] GPX Import nije uspio'
     gpx_success:
-      loaded_successfully: |-
-        uspješno učitano sa %{trace_points} od mogućih
-        %{possible_points} tačaka.
       subject: '[OpenStreetMap] GPX Import uspješan'
     signup_confirm:
       subject: '[OpenStreetMap] Dobrodošli na OpenStreetMap'
@@ -1101,72 +1098,18 @@ bs:
         mapping_link: počnite sa ucrtavanjem
       legal_babble:
         title_html: Autorska prava i dozvola
-        intro_1_html: |2-
-             OpenStreetMap su <i>otvoreni podaci</i>, licencirani pod <a
-          href="http://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License dozvolom</a> (ODbL).
-        intro_2_html: Slobodni ste kopirati, distribuirati, prenositi i adaptirati
-          naše podatke sve dok navodite OpenStreetMap i njegove doprinosioce kao izvor.
-          Ako izmijenite ili nadogradite naše podatke, možete distribuirati rezultate
-          samo pod istom licencom. Puni <a href="http://opendatacommons.org/licenses/odbl/1.0/">pravni
-          tekst</a> objašnjava Vaša prava i odgovornosti.
-        intro_3_1_html: |-
-          Kartografija u našim dijelovima karte, i naša dokumentacija, su licencirani pod <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> licencom (CC-BY-SA).
         credit_title_html: Kako navesti zasluge OpenStreetMap projekta kao izvora
         credit_1_html: |-
           Tražimo da koristite navedete zasluge &ldquo;&copy; OpenStreetMap
           contributors&rdquo;.
-        credit_2_1_html: Gdje je moguće, OpenStreetMap treba biti kao hyperlink na
-          <a href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>and
-          CC BY-SA to <a href="http://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a>.
-          Ako koristite medij gdje linkovi nisu mogući (npr. tiskane karte), predlažemo
-          da uputite vaše čitatelje na www.openstreetmap.org (proširenjem na &lsquo;OpenStreetMap&rsquo;
-          za ovo punu adresu) i na www.creativecommons.org.
-        credit_4_html: 'Za pretraživu elektronsku kartu, navođenje zasluge se treba
-          pojaviti u uglu karte. Naprimjer:'
         attribution_example:
           alt: Primjer kako se navodi zasluga projekta OpenStreetMap na web stranici
           title: Primjer navođenja zasluge
         more_title_html: Više o
-        more_1_html: Čitajte više o korištenju naših podataka na <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
-          FAQ</a>.
-        more_2_html: |-
-          Iako su OpenStreetMap podaci otvoreni, mi ne možemo ponuditi besplatni API karte za druge developere (third party).
-          Vidjeti naše <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">Politika korištenja API</a>,
-          <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Politika korištenja dijelova karte</a>
-          i <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Politika korištenja usluge Nominatim</a>.
         contributors_title_html: Naši korisnici - doprinosioci
         contributors_intro_html: 'Naši doprinosioci su hiljade osoba. Mi takođe uključujemo
           podatke sa otvorenom dozvolom iz nacionalnih kartografskih agencija i drugih
           izvora, među njima:'
-        contributors_at_html: |-
-          <strong>Austrija</strong>: Sadrži podatke sa <a href="http://data.wien.gv.at/">Stadt Wien</a> (under
-          <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> i
-          Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT sa amandmanima</a>).
-        contributors_ca_html: '<strong>Kanada</strong>: Sadrži podatke iz GeoBase&reg;,
-          GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy;
-          Department of Natural Resources Canada), i StatCan (Geography Division,
-          Statistics Canada).'
-        contributors_fr_html: '<strong>Francuska</strong>: Sadrži podatke sa Direction
-          Générale des Impôts.'
-        contributors_nl_html: |-
-          <strong>Holandija</strong>: Sadrži &copy; AND data, 2007
-          (<a href="http://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>Novi Zeland</strong>: Sadrži podatke izvorno iz
-             Land Information New Zealand. Crown Copyright reserved.
-        contributors_za_html: |-
-          <strong>Južna Afrika</strong>: Sadrži podatke sa <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, State copyright reserved.
-        contributors_gb_html: |-
-          <strong>Velika Britanija</strong>: Sadrži podatke Ordnance
-             Survey data &copy; Crown copyright and database right
-             2010.
-        contributors_footer_1_html: |-
-          Za dalje detalje o ovome, i drugim izvorima koji su korišteni da bi poboljšali OpenStreetMap, molimo pogledajte <a
-          href="http://wiki.openstreetmap.org/wiki/Contributors">Stranica doprinosilaca</a> na Wiki OpenStreetMap.
         contributors_footer_2_html: '  Uvrštenje podataka u OpenStreetMap ne podrazumjeva
           da se izvorni davatelj podataka podržava OpenStreetMap, pruža bilo kakvu
           garanciju, ili prihvata bilo kakve obaveze.'
@@ -1174,10 +1117,6 @@ bs:
         infringement_1_html: OSM doprinosioci se podsjećaju da nikada ne dodaju podatke
           sa bilo kojeg izvora koji zadržava autorska prava (npr. Google Maps ili
           printane karte) bez eksplicitne dozvole od strane autora.
-        infringement_2_html: Ako vjerujete da je zaštićeni materijal bio dodan bazi
-          podataka OpenStreetMapa ili ovoj veb-stranici, molimo da pogledate našu
-          <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">proceduru
-          skidanja</a> ili uložite prigovor direktno na našu <a href="https://dmca.openstreetmap.org/">stranicu</a>.
     index:
       js_1: Koristite internet preglednik koji ne podržava JavaScript, ili ste onemogućili
         JavaScript.
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 1dffc259c..71521d058 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -339,7 +339,6 @@ ca:
       delete_account: Suprimeix el compte...
     go_public:
       heading: Edició pública
-      find_out_why_html: (%{link}).
       make_edits_public_button: Fes totes les meves modificacions públiques
     update:
       success_confirm_needed: Informació de l'usuari ha actualitzat correctament.
@@ -1617,10 +1616,6 @@ ca:
       subject: '[OpenStreetMap] Error d''importació de GPX'
     gpx_success:
       hi: Hola %{to_user},
-      loaded_successfully:
-        one: carregat correctament amb %{trace_points} d'un total d'un punt possible.
-        other: carregat correctament amb %{trace_points} d'un total de %{possible_points}
-          punts possibles.
       subject: '[OpenStreetMap] Importació de GPX correcta'
     signup_confirm:
       subject: '[OpenStreetMap] OpenStreetMap us dona la benvinguda'
@@ -1976,90 +1971,17 @@ ca:
         mapping_link: Comença a cartografiar
       legal_babble:
         title_html: Drets d'autor i llicència
-        intro_1_html: |-
-          L'OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> són <i>dades obertes</i>, publicades sota la <a
-          href="http://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) per la <a
-          href="http://osmfoundation.org/">Fundació OpenStreetMap</a> (OSMF).
-        intro_2_html: "Sou lliure de copiar, distribuir, comunicar públicament i fer
-          obres derivades de les nostres dades, sempre que especifiqueu que són obra
-          d'OpenStreetMap i els seus col·laboradors. Si modifiqueu o amplieu les\nnostres
-          dades, només podreu distribuir l'obra \nresultant amb la mateixa llicència.
-          El\n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">codi legal</a>
-          complet explica detalladament els vostres drets i responsabilitats."
-        intro_3_1_html: La nostra documentació és disponible sota llicència <a href="http://creativecommons.org/licenses/by-sa/2.0/">Text
-          de la llicència de Creative Commons Reconeixement-Compartir Igual 2.0</a>(CC-BY-SA).
         credit_title_html: Com atribuir autoria a OpenStreetMap
         credit_1_html: 'Allà on utilitzeu les dades de l''OpenStreetMap, cal que feu
           les dues coses següents:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Doneu crèdit a OpenStreetMap mostrant-ne l'avís de copyright.</li>
-            <li>Deixeu clar que les dades són disponibles sota l'Open Database License.</li>
-          </ul>
-        credit_3_1_html: Per a l'avís de copyright, tenim diferents requisits sobre
-          com cal mostrar-lo depenent de com feu servir les nostres dades. Per exemple,
-          s'apliquen diferents regles depenent de si heu creat un mapa navegable,
-          un mapa imprès o una imatge estàtica. Per a més detalls, podeu consultar
-          les <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">directrius
-          d'atribució</a>.
-        credit_4_html: |-
-          Per tal de fer patent que les dades es troben sota l'Open
-          Database License, podeu enllaçar <a href="https://www.openstreetmap.org/copyright">aquesta pàgina de copyright</a>. Alternativament, i com a requisit si esteu distribuint l'OSM en un formulari de dades, podeu anomenar i enllaçar directament les llicències. En aquells llocs on els enllaços no siguin possibles (p. ex., en material imprès), us suggerim que dirigiu als lectors a openstreetmap.org (possible estenent 'OpenStreetMap' a aquesta adreça sencera) i a opendatacommons.org. En aquest exemple, l'atribució apareix a la cantonada del mapa.
         attribution_example:
           alt: Exemple de com atribuir l'autoria a OpenStreetMap en una pàgina web
           title: Exemple d'atribució d'autoria
         more_title_html: Saber-ne més
-        more_1_html: |-
-          Per a més informació sobre com utilitzar les nostres dades i com atribuir-ne l'autoria, visiteu la <a
-          href="http://osmfoundation.org/Licence">pàgina de llicència de la OSMF</a>.
-        more_2_html: Encara que les dades d'OpenStreetMap són dades obertes, no podem
-          oferir una API gratuïta a tercers. Vegeu la <a href="https://operations.osmfoundation.org/policies/api/">política
-          d'ús de l'API</a>, la <a href="https://operations.osmfoundation.org/policies/tiles/">política
-          d'ús de les tessel·les</a> i la <a href="https://operations.osmfoundation.org/policies/nominatim/">política
-          d'ús de Nominatim</a>.
         contributors_title_html: Els nostres col·laboradors
         contributors_intro_html: 'Els nostres col·laboradors són milers de persones.
           També incloem dades amb llicència oberta de les agències públiques de cartografia
           i d''altres fonts, entre elles:'
-        contributors_at_html: '<strong>Àustria</strong>: conté dades de <a href="http://data.wien.gv.at/">Stadt
-          Wien</a> (sota <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC
-          BY</a>), el <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
-          Voralberg</a> i el Land Tirol (sota <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC
-          BY AT amb correccions</a>).'
-        contributors_au_html: '<strong>Austràlia</strong>: Conté dades de <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA
-          Autralia Limited</a> publicades per Commonwealth of Australia sota els termes
-          de <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.'
-        contributors_ca_html: '<strong>Canadà</strong>: conté dades de GeoBase ®,
-          GeoGratis (© Departament de Recursos Naturals del Canadà), CanVec (© Departament
-          de Recursos Naturals del Canadà) i StatCan (Divisió de Geografia, Institut
-          d''Estadística del Canadà).'
-        contributors_fi_html: '<strong>Finlàndia</strong>: Conté dades de la base
-          de dades topogràfica del National Land Survey of Finland i d''altres bases
-          de dades sota la <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">llicència
-          NLSFI</a>.'
-        contributors_fr_html: |-
-          <strong>França</strong>: conté dades de la
-          Direction Générale des Impôts.
-        contributors_nl_html: '<strong>Països Baixos</strong>: Conté &copy; dades
-          d''Automotive Navigation Data (AND), 2007 (<a href="http://www.and.com">www.and.com</a>)'
-        contributors_nz_html: '<strong>Nova Zelanda</strong>: Conté dades de <a href="https://data.linz.govt.nz/">
-          LINZ Data Service</a> amb permís per a reutilització sota <a href="https://creativecommons.org/licenses/by/4.0/"></a>.'
-        contributors_si_html: '<strong>Eslovènia</strong>: Conté dades de l''<a href="http://www.gu.gov.si/en/">Autoritat
-          de Topografia i Cartografia</a> i del <a href="http://www.mkgp.gov.si/en/">Ministeri
-          d''Agricultura, Silvicultura i Alimentació</a> (informació pública d''Eslovènia).'
-        contributors_es_html: |-
-          <strong>Espanya</strong>: Conté dades de l'Institut Geogràfic Nacional espanyol(<a href="http://www.ign.es/">IGN</a>) i del Sistema Cartogràfic Nacional (<a href="http://www.scne.es/">SCNE</a>)
-          amb llicència per a reutilització sota <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: |-
-          <strong>Sud-àfrica</strong>: conté dades del
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, drets d'autor reservats per l'estat.
-        contributors_gb_html: '<strong>Regne Unit</strong>: Conté dades de l''Ordnance
-          Survey &copy; Drets d''autor de la Corona i de la base de dades 2010-19.'
-        contributors_footer_1_html: |-
-          Per a més detalls sobre aquesta i d'altres fonts que han estat utilitzades per millorar els mapes de l'OpenStreetMap, visiteu la pàgina dedicada als <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">Col·laboradors</a> del wiki d'OSM.
         contributors_footer_2_html: La inclusió de dades a l'OpenStreetMap no implica
           que el proveïdor original de les dades dona suport a l'OpenStreetMap, proporciona
           cap garantia o accepta cap responsabilitat.
@@ -2068,16 +1990,6 @@ ca:
           d'afegir dades de cap font amb drets d'autor registrats (com Google Maps
           o mapes impresos per exemple) sense tenir una autorització explícita dels
           titulars dels drets d'autor.
-        infringement_2_html: Si penseu que hi ha material protegit per drets d'autor
-          que ha estat afegit a la base de dades d'OpenStreetMap o a aquest web, si
-          us plau aneu a la pàgina web dedicada al <a href="http://wiki.osmfoundation.org/wiki/License/Takedown_procedure">Procediment
-          per eliminar dades protegides pels drets d'autor</a> o empleneu aquest <a
-          href="https://dmca.openstreetmap.org/">formulari en línia</a>.
-        trademarks_title_html: <span id="trademarks"></span>Marques registrades
-        trademarks_1_html: OpenStreetMap, el logotip de la lupa i «State of the Map»
-          són marques registrades de la Fundació OpenStreetMap. Si teniu preguntes
-          sobre l’ús de les marques, consulteu la <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">política
-          de marques registrades</a>.
     index:
       js_1: O bé esteu utilitzant un navegador no compatible amb JavaScript o bé teniu
         JavaScript deshabilitat.
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 063402a5b..08801b3da 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1648,9 +1648,6 @@ cs:
       subject: '[OpenStreetMap] Neúspěšný import GPX'
     gpx_success:
       hi: Ahoj %{to_user},
-      loaded_successfully:
-        one: se úspěšně nahrál s %{trace_points} z možného 1 bodu.
-        other: se úspěšně nahrál s %{trace_points} z možných %{possible_points} bodů.
       subject: '[OpenStreetMap] Úspěšný import GPX'
     signup_confirm:
       subject: '[OpenStreetMap] Vítejte v OpenStreetMap'
@@ -2007,100 +2004,17 @@ cs:
         mapping_link: začít mapovat
       legal_babble:
         title_html: Autorská práva a licence
-        intro_1_html: OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> jsou
-          <i>svobodná data</i>, která za podmínek <a href="https://opendatacommons.org/licenses/odbl/">Open
-          Data Commons Open Database License</a> (ODbL) nabízí nadace <a href="https://osmfoundation.org/">OpenStreetMap
-          Foundation</a> (OSMF).
-        intro_2_html: Smíte kopírovat, distribuovat, sdělovat veřejnosti a upravovat
-          naše data, pokud jako zdroj uvedete OpenStreetMap a jeho přispěvatele. Pokud
-          naše data budete upravovat nebo je použijete ve svém díle, musíte výsledek
-          šířit pod stejnou licencí. Vaše práva a povinnosti jsou vysvětleny v plném
-          <a href="https://opendatacommons.org/licenses/odbl/1.0/">licenčním ujednání</a>.
-        intro_3_1_html: |-
-          Naše dokumentace je pod licencí
-          <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Jak uvádět OpenStreetMap
         credit_1_html: 'Pokud používáte data OpenStreetMap, máte povinnost učinit
           následující dvě věci:'
-        credit_2_1_html: |-
-          <ul>
-           <li>Uvést jako původ OpenStreetMap uvedením naší informace o autorských právech.</li>
-           <li>Jasně uvést, že data jsou dostupná za podmínek Open Database License.</li>
-          </ul>
-        credit_3_1_html: |-
-          Co se týká uvedení autorských práv, liší se naše požadavky podle toho,
-          jak naše data používáte. Různá pravidla například platí, když tvoříte
-          interaktivní mapu, tištěnou mapu nebo statický obrázek. Podrobné
-          informace k požadavkům naleznete
-          v <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Pokynech
-          k uvádění původu</a>.
-        credit_4_html: |-
-          Aby bylo zřejmé, že jsou data dostupná za podmínek Open
-          Database License, můžete odkázat na
-          <a href="https://www.openstreetmap.org/copyright">tuto stránku
-          k autorským právům</a>. Jinou možností – a povinností v případě,
-          že OSM šíříte v datové podobě, můžete uvést a odkázat přímo
-          na licenci. Ve formě, ve které odkazování není možné (např.
-          v tištěných dílech), navrhujeme, abyste čtenáře nasměřovali
-          na openstreetmap.org (např. rozšířením „OpenStreetMap“ na
-          tuto celou adresu) a opendatacommons.org.
-          V tomto příkladu se informace o zdroji objevuje v rohu mapy.
         attribution_example:
           alt: Příklad, jak uvádět autorství OpenStreetMap na webové stránce
           title: Příklad uvedení autorství
         more_title_html: Další informace
-        more_1_html: O používání našich dat a způsobu uvádění autorství se můžete
-          dočíst více na <a href="https://osmfoundation.org/Licence">licenční stránce
-          OSMF</a>.
-        more_2_html: |-
-          Přestože OpenStreetMap tvoří svobodná data, nemůžeme zdarma poskytovat třetím stranám mapové API.
-          Vizte naše <a href="https://operations.osmfoundation.org/policies/api/">Pravidla použití API</a>, <a href="https://operations.osmfoundation.org/policies/tiles/">Pravidla použití dlaždic</a> a <a href="https://operations.osmfoundation.org/policies/nominatim/">Pravidla použití Nominatimu</a>.
         contributors_title_html: Naši přispěvatelé
         contributors_intro_html: 'Našimi přispěvateli jsou tisíce jednotlivců. Také
           zahrnujeme svobodně licencovaná data z národních zeměměřických úřadů a dalších
           zdrojů, mimo jiné:'
-        contributors_at_html: '<strong>Rakousko</strong>: Obsahuje data od <a href="https://data.wien.gv.at/">města
-          Vídně</a> pod <a href="https://creativecommons.org/licenses/by/3.0/at/deed.cs">CC
-          BY</a>), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">země
-          Vorarlbersko</a> a země Tyrolsko (pod <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC
-          BY AT s dodatky</a>).'
-        contributors_au_html: '<strong>Austrálie</strong>: Zahrnuje nebo využívá Administrative
-          Boundaries © <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape
-          Australia</a>, které Commonwealth of Australia poskytuje za podmínek <a
-          href="https://creativecommons.org/licenses/by/4.0/deed.cs">licence Creative
-          Commons Uveďte původ 4.0 Mezinárodní (CC BY 4.0)</a>.'
-        contributors_ca_html: '<strong>Kanada</strong>: Obsahuje data z GeoBase&reg;,
-          GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy;
-          Department of Natural Resources Canada) a StatCan (Geography Division, Statistics
-          Canada).'
-        contributors_fi_html: '<strong>Finsko</strong>: Obsahuje data z topografické
-          databáze a dalších zdrojů finského národního zeměměřického úřadu (Maanmittauslaitos)
-          dostupná pod <a href="https://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">licencí
-          NLSFI</a>.'
-        contributors_fr_html: '<strong>Francie</strong>: Obsahuje data pocházející
-          z Direction Générale des Impôts.'
-        contributors_nl_html: '<strong>Nizozemsko</strong>: Obsahuje &copy; AND data,
-          2007 (<a href="https://www.and.com">www.and.com</a>)'
-        contributors_nz_html: '<strong>Nový Zéland</strong>: Obsahuje data ze zdroje
-          <a href="https://data.linz.govt.nz/">LINZ Data Service</a> pod licencí <a
-          href="https://creativecommons.org/licenses/by/4.0/">CC 4.0</a>.'
-        contributors_si_html: '<strong>Slovinsko</strong>: Obsahuje data <a href="http://www.gu.gov.si/">Zeměměřického
-          a mapovacího úřadu</a> a <a href="http://www.mkgp.gov.si/">Ministerstva
-          zemědělství, lesnictví a potravin</a> (veřejné informace o Slovinsku).'
-        contributors_es_html: '<strong>Španělsko</strong>: Obsahuje data od španělského
-          Národního geografického institutu (<a href="http://www.ign.es/">IGN</a>
-          a Národního kartografického systému (<a href="http://www.scne.es/">SCNE</a>),
-          licencovaná pod <a href="https://creativecommons.org/licenses/by/4.0/deed.cs">CC
-          BY 4.0</a>.'
-        contributors_za_html: |-
-          <strong>Jihoafrická republika</strong>: Obsahuje data pocházející z <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, State copyright reserved.
-        contributors_gb_html: '<strong>Spojené království</strong>: Obsahuje data
-          Ordnance Survey &copy; Crown copyright a právo k databázi 2010–19.'
-        contributors_footer_1_html: |-
-          Další podrobnosti o těchto a dalších zdrojích, které se používaly pro vylepšení OpenStreetMap, najdete na <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">stránce Contributors</a> na wiki OpenStreetMap.
         contributors_footer_2_html: Zahrnutí dat do OpenStreetMap neznamená, že původní
           poskytovatel dat podporuje OpenStreetMap, nabízí jakoukoli záruku nebo přijímá
           jakoukoli zodpovědnost.
@@ -2108,16 +2022,6 @@ cs:
         infringement_1_html: Přispěvatelům OSM připomínáme, že by nikdy neměli přidávat
           data ze zdrojů chráněných autorským právem (např. Google Maps či tištěné
           mapy) bez výslovného svolení držitelů práv.
-        infringement_2_html: Pokud si myslíte, že byl do databáze OpenStreetMap nebo
-          na tento server neoprávněně vložen autorskoprávně chráněný obsah, postupujte
-          podle našeho <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">postupu
-          pro odstranění</a> nebo přímo podejte výzvu pomocí <a href="https://dmca.openstreetmap.org/">on-line
-          formuláře</a>.
-        trademarks_title_html: <span id="trademarks"></span>Ochranné známky
-        trademarks_1_html: OpenStreetMap, jeho logo s lupou a State of the Map jsou
-          zapsané ochranné známky OpenStreetMap Foundation. Pokud máte dotazy ohledně
-          vašeho používání těchto známek, zašlete své dotazy <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">pracovní
-          skupině pro licencování</a>.
     index:
       js_1: Buď používáte prohlížeč bez podpory JavaScriptu, nebo máte JavaScript
         zakázaný.
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 6c7aee7f1..aeb4dc327 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1247,22 +1247,11 @@ cy:
         mapping_link: dechrau mapio
       legal_babble:
         title_html: Hawlfraint a Thrwydded
-        intro_1_html: |-
-          Mae OpenStreetMap yn <i>data agored</i>, dan drwydded <a
-          href="http://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL).
-        intro_3_1_html: |-
-          Trwyddedir ein dofenaeth ar drwydded
-          <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Sut i gydnabod OpenStreetMap
         attribution_example:
           title: Enghraifft o gydnabyddiaeth
         more_title_html: Darganfod rhagor
         contributors_title_html: Ein cyfrannwyr
-        contributors_gb_html: '<strong>Y Deyrnas Gyfunol</strong>: Cynhwysir data
-          a thestun gan yr Arolwg Ordnans; hawlfraint y Goron a hawl cronfa ddata
-          2010-19.'
         infringement_title_html: Torrwyd yr hawlfraint
     index:
       permalink: Dolen barhaol
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 0db261c1a..44bccc7ad 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1615,9 +1615,6 @@ da:
       subject: '[OpenStreetMap] GPX-importering mislykkedes'
     gpx_success:
       hi: Hej %{to_user},
-      loaded_successfully:
-        one: indlæst med %{trace_points} ud af 1 muligt punkt.
-        other: indlæst med %{trace_points} ud af %{possible_points} mulige punkter.
       subject: '[OpenStreetMap] GPX-importering lykkedes'
     signup_confirm:
       subject: '[OpenStreetMap] Velkommen til OpenStreetMap'
@@ -1975,109 +1972,18 @@ da:
         mapping_link: begynde kortlægningen
       legal_babble:
         title_html: Ophavsret og licens
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> er <i>Ã¥bne data</i>, licenseret under <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) af <a
-          href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
-        intro_2_html: "Du kan frit kopiere, distribuere, overføre og tilpasse vores
-          data, \nså længe du angiver OpenStreetMap og dets\nbidragsydere som kilde.
-          Hvis du ændrer eller bygger på vores\ndata, må du kun distribuere resultatet
-          under den samme licens. Den\nfulde <a\nhref=\"https://opendatacommons.org/licenses/odbl/1.0/\">juridiske
-          tekst</a>\nforklarer dine rettigheder og pligter."
-        intro_3_1_html: Vores dokumentation er licenseret under <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.da">Creative
-          Commons Kreditering-Deling på samme vilkår 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Kildeangivelse og OpenStreetMap
         credit_1_html: 'NÃ¥r du bruger OpenStreetMap-data, er du forpligtet til at
           gøre følgende to ting:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Giv OpenStreetMap kredit ved at vise vores ophavsretsmeddelelse.</li>
-            <li>Gør det klart, at dataene er tilgængelige under Open Database License.</li>
-          </ul>
-        credit_3_1_html: Vi har forskellige krav til ophavsretsmeddelelsen om, hvordan
-          den skal vises, afhængigt af hvordan du bruger vores data. For eksempel
-          gælder der forskellige regler for, hvordan ophavsretsmeddelelsen skal vises,
-          afhængigt af, om du har oprettet et kort, der er interaktivt, et trykt kort
-          eller et statisk billede. Alle oplysninger om krav kan findes i <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Retningslinjer
-          for kildeangivelse</a>.
-        credit_4_html: For at gøre det klart, at dataene er tilgængelige under Open
-          Database License, kan du linke til <a href="https://www.openstreetmap.org/copyright">denne
-          copyright-side</a>.Alternativt, og som et krav, hvis du distribuerer OSM
-          i dataform, kan du navngive og linke direkte til licensen/licenserne. I
-          medier, hvor links ikke er mulige (f.eks. trykte værker), foreslår vi, at
-          du henviser dine læsere til openstreetmap.org (evt. ved at udvide "OpenStreetMap"
-          til denne fulde adresse) og til opendatacommons.org. I dette eksempel vises
-          kreditten i hjørnet af kortet.
         attribution_example:
           alt: Eksempel på hvordan man angiver OpenStreetMap som kilde for en webside
           title: Eksempel på kildeangivelse
         more_title_html: Læs mere
-        more_1_html: |-
-          Læs mere om brug af vores data, og hvordan du krediterer os, på <a
-          href="https://osmfoundation.org/Licence">OSMF Licens-siden</a>.
-        more_2_html: |-
-          Selvom OpenStreetMap er åbne data, kan vi ikke levere et
-          gratis kort-API til tredjeparter.
-
-          Se vores <a href="https://operations.osmfoundation.org/policies/api/">Politik for brug af API</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">Politik for brug af kort-fliser</a>
-          og <a href="https://operations.osmfoundation.org/policies/nominatim/">Politik for brug af Nominatim</a>.
         contributors_title_html: Vores bidragsydere
         contributors_intro_html: |-
           Vores bidragsydere er tusinder af individer. Vi medtager også
           åbent licenseret data fra nationale kortlægningsagenturer
           og andre kilder, blandt dem:
-        contributors_at_html: |-
-          <strong>Østrig</strong>: Indeholder data fra
-          <a href="https://data.wien.gv.at/">Stadt Wien</a> (under
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Delstaten Vorarlberg</a> og
-          Delstaten Tyrol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT med tilføjelser</a>).
-        contributors_au_html: |-
-          <strong>Australien</strong>: Indeholder eller er udviklet med administrative grænser ("Administrative Boundaries") &copy;
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a>
-          licenseret af Commonwealth of Australia under
-          <a href="https://creativecommons.org/licenses/by/4.0/deed.da">Creative Commons Kreditering 4.0 International licence (CC BY 4.0)</a>.
-        contributors_ca_html: |-
-          <strong>Canada</strong>: Indeholder data fra
-          GeoBase&reg;, GeoGratis (&copy; Department of Natural
-          Resources Canada), CanVec (&copy; Department of Natural
-          Resources Canada) og StatCan (Geography Division,
-          Statistics Canada).
-        contributors_fi_html: '<strong>Finland</strong>: Indeholder data fra National
-          Land Survey af Finlands topografiske database og andre datasæt under <a
-          href="https://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1">NLSFI-licensen</a>.'
-        contributors_fr_html: |-
-          <strong>Frankrig</strong>: Indeholder data fra
-          Direction Générale des Impôts.
-        contributors_nl_html: |-
-          <strong>Holland</strong>: Indeholder &copy; AND data, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: "<strong>New Zealand</strong>: Indeholder data fra\n<a
-          href=\"https://data.linz.govt.nz/\">LINZ Data Service</a> som er \nlicenseret
-          til anvendelse under\n<a href=\"https://creativecommons.org/licenses/by/4.0/\">CC
-          BY 4.0</a>."
-        contributors_si_html: |-
-          <strong>Slovenien</strong>: Indeholder data fra
-          <a href="http://www.gu.gov.si/en/">Opmålings- og Kortlægnings-myndigheden</a> og
-          <a href="http://www.mkgp.gov.si/en/">Ministeriet for Landbrug, Skovbrug og Fødevarer</a>
-          (offentlig information Slovenien).
-        contributors_es_html: |-
-          <strong>Spanien</strong>: Indeholder data fra Spanish National Geographic Institute (<a href="http://www.ign.es/">IGN</a>) og
-          National Cartographic System (<a href="http://www.scne.es/">SCNE</a>)
-          licenseret for videre brug under <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: |-
-          <strong>Syd Afrika</strong>: Indeholder data fra
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, State copyright reserveret.
-        contributors_gb_html: |-
-          <strong>Storbritannien</strong>: indeholder Ordnance
-          Survey data &copy; Crown copyright and database right
-          2010-19.
-        contributors_footer_1_html: |-
-          For yderligere oplysninger om disse og andre kilder, der er blevet brugt for at hjælpe med at forbedre OpenStreetMap, se venligst <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">siden med bidragsydere</a> på OpenStreetMap Wiki.
         contributors_footer_2_html: |-
           Optagelse af data i OpenStreetMap indebærer ikke at den oprindelige
           dataudbyder siger god for OpenStreetMap, giver nogen garanti eller
@@ -2087,15 +1993,6 @@ da:
           OSM-bidragsydere bliver mindet om aldrig at tilføje data fra nogen
           ophavsretligt beskyttede kilder (f.eks. Google Maps eller trykte kort) uden
           eksplicit tilladelse fra ophavsret-indehaverne.
-        infringement_2_html: |-
-          Hvis du mener, at ophavsretligt beskyttet materiale uberettiget er
-           føjet til OpenStreetMap databasen eller dette websted, bedes du følge
-           vores <a hrefs="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedure til fjernelse a materiale</a> eller udfyld formular direkte på vores
-          <a href="https://dmca.openstreetmap.org/">on-line side</a>.
-        trademarks_title_html: <span id="trademarks"></span>Varemærker
-        trademarks_1_html: OpenStreetMap, forstørrelsesglas-logoet og "State of the
-          Map" er registrerede varemærker til OpenStreetMap Foundation. Hvis du har
-          spørgsmål om din brug af mærkerne, så se <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Varemærkepolitikken</a>.
     index:
       js_1: Du bruger enten en browser som ikke understøtter Javascript, eller du
         har deaktiveret Javascript.
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 3e9004af2..8bfdfc1db 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1691,10 +1691,6 @@ de:
       subject: '[OpenStreetMap] GPX-Import Fehler'
     gpx_success:
       hi: Hallo %{to_user},
-      loaded_successfully:
-        one: mit %{trace_points} von 1 möglichem Punkt erfolgreich geladen.
-        other: mit %{trace_points} von %{possible_points} möglichen Punkten erfolgreich
-          geladen.
       subject: '[OpenStreetMap] GPX-Import erfolgreich'
     signup_confirm:
       subject: '[OpenStreetMap] Willkommen bei OpenStreetMap'
@@ -2070,102 +2066,18 @@ de:
         mapping_link: mit dem Kartieren anfangen
       legal_babble:
         title_html: Urheberrecht und Lizenz
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> sind <i>„Open Data“</i>, die gemäß der
-          <a href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database Lizenz</a>
-          (ODbL) durch die <a href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF) verfügbar sind.
-        intro_2_html: |-
-          Es steht dir frei unsere Daten zu kopieren, weiterzugeben,
-          zu übermitteln sowie anzupassen, sofern du OpenStreetMap
-          und die Mitwirkenden als Quelle angibst. Für den Fall, dass
-          du auf Basis unserer Daten Anpassungen vornimmst, oder sie
-          als Grundlage für weitere Bearbeitungen verwendest, kannst
-          du das Ergebnis auch nur gemäß der selben Lizenz weitergeben.
-          Der vollständige Lizenztext ist unter
-          <a href="https://opendatacommons.org/licenses/odbl/1.0/">Lizenz</a>
-          einsehbar und erläutert deine Rechte und Pflichten.
-        intro_3_1_html: Unsere Dokumentation ist unter der ''Creative-Commons''-Lizenz
-          <a href="https://creativecommons.org/licenses/by-sa/2.0/">„Namensnennung
-          – Weitergabe unter gleichen Bedingungen“ 2.0</a> (CC BY-SA 2.0) verfügbar.
         credit_title_html: Wie auf die Urheberschaft von OpenStreetMap hinzuweisen
           ist
         credit_1_html: 'Wenn du OpenStreetMap-Daten verwendest, musst du die folgenden
           zwei Bedingungen erfüllen:'
-        credit_2_1_html: "<ul>\n<li>Nenne OpenStreetMap, indem du unseren Urheberrechtshinweis
-          anzeigst.</li> \n<li> Mache deutlich, dass die Daten unter der Open-Database-Lizenz
-          verfügbar sind.</li> \n</ul>"
-        credit_3_1_html: Für den Urheberrechtshinweis haben wir unterschiedliche Anforderungen,
-          wie dieser angezeigt werden muss, je nachdem, wie du unsere Daten verwendest.
-          Beispielsweise gelten unterschiedliche Regeln für die Anzeige des Urheberrechtsvermerks,
-          je nachdem, ob du eine blätterbare Karte, eine gedruckte Karte oder ein
-          statisches Bild erstellt hast. Ausführliche Informationen zu den Anforderungen
-          findest du in den <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Richtlinien
-          zur Namensnennung</a>.
-        credit_4_html: |-
-          Du musst auch klarstellen, dass die Daten unter der Open-Database-Lizenz
-          verfügbar sind. Du kannst dies tun, indem du auf <a href="https://www.openstreetmap.org/copyright">diese Urheberrechtsseite</a> verlinkst.
-          Ersatzweise kannst du bzw. musst du, falls du OSM in Datenform weitergibst, die Lizenz(en) direkt verlinken und benennen. In Medien, in denen keine Links möglich sind (z. B. in gedruckten Werken), empfehlen wir dir, deine Leser direkt auf openstreetmap.org zu verweisen (möglicherweise mit dem Erweitern von „OpenStreetMap“ zur vollen Adresse), auf opendatacommons.org und, sofern zutreffend, auf creativecommons.org.
         attribution_example:
           alt: Beispiel, wie man auf OpenStreetMap auf einer Webseite hinweist
           title: Namensnennung-Beispiel
         more_title_html: Weitere Informationen
-        more_1_html: |-
-          Mehr Informationen dazu, wie unsere Daten verwendet werden können und wie man auf unsere Urheberschaft hinweist,
-          kann man auf unserer <a href="https://osmfoundation.org/Licence">OSMF-Lizenzseite</a> nachlesen.
-        more_2_html: |-
-          Obwohl OpenStreetMap „Open Data“ ist, können wir keine
-          unentgeltliche Karten-API für Drittparteien bereitstellen.
-          Siehe unsere <a href="https://operations.osmfoundation.org/policies/api/">API-Verwendungsrichtlinie</a>,
-          die <a href="https://operations.osmfoundation.org/policies/tiles/">Kachelverwendungsrichtlinie</a>
-          und die <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim-Verwendungsrichtlinie</a>.
         contributors_title_html: Unsere Mitwirkenden
         contributors_intro_html: 'Unsere Mitwirkenden sind tausende einzelne Menschen.
           Wir beziehen auch offen lizenzierte Daten von nationalen Kartenagenturen
           und anderen Quellen ein, darunter:'
-        contributors_at_html: '<strong>Österreich</strong>: Enthält Daten der <a href="https://data.wien.gv.at/">Stadt
-          Wien</a> (lizenziert gemäß <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC
-          BY AT</a>), des <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Landes
-          Vorarlberg</a> und des Landes Tirol (<a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">lizenziert
-          gemäß CC BY AT samt Erweiterungen zur Lizenz</a>).'
-        contributors_au_html: |-
-          <strong>Australien</strong>: Eingebunden oder entwickelt unter Verwendung von administrativen Grenzen &copy;
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a>
-          lizenziert durch den Commonwealth of Australia unter
-          <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International Lizenz (CC BY 4.0)</a>.
-        contributors_ca_html: '<strong>Kanada</strong>: Enthält Daten von GeoBase&reg;,
-          GeoGratis (&copy; <i>Department of Natural Resources Canada</i>), CanVec
-          (&copy; <i>Department of Natural Resources Canada</i>) und StatCan (<i>Geography
-          Division, Statistics Canada</i>).'
-        contributors_fi_html: |-
-          <strong>Finnland</strong>: Enthält Daten von der
-          topografischen Datenbank der National Land Survey of Finland
-          und andere Datensätze, unter der
-          <a href="https://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI-Lizenz</a>.
-        contributors_fr_html: '<strong>Frankreich</strong>: Enthält Daten der <i>Direction
-          Générale des Impôts</i>.'
-        contributors_nl_html: '<strong>Niederlande</strong>: Enthält, &copy; AND-Daten,
-          2007 (<a href="https://www.and.com">www.and.com</a>)'
-        contributors_nz_html: "<strong>Neuseeland</strong>: Enthält Daten aus <i>Land
-          Information New Zealand</i>\nund ist zur Wiederverwendung unter \n<a href=\"https://creativecommons.org/licenses/by/4.0/\">CC
-          BY 4.0</a> lizenziert."
-        contributors_si_html: |-
-          <strong>Slowenien</strong>: Enthält Daten aus der
-          <a href="http://www.gu.gov.si/en/">Vermessungs- und Kartierungsbehörde</a> sowie dem
-          <a href="http://www.mkgp.gov.si/en/">Ministerium für Landwirtschaft, Forsten und Ernährung</a>
-          (öffentliche Informationen von Slowenien).
-        contributors_es_html: |-
-          <strong>Spanien</strong>: Enthält Daten des
-          spanischen nationalen geografischen Instituts (<a href="http://www.ign.es/">IGN</a>) und
-          nationalen kartografischen Systems (<a href="http://www.scne.es/">SCNE</a>),
-          lizenziert zur Weiterverwendung unter <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: '<strong>Südafrika</strong>: Enthält Daten von <i><a
-          href="http://www.ngi.gov.za/">Chief Directorate: National Geo-Spatial Information</a></i>,
-          Staatliches Urheberrecht vorbehalten.'
-        contributors_gb_html: '<strong>Vereinigtes Königreich</strong>: Enthält Daten
-          des <i>Ordnance Survey</i> &copy; Urheber- und Datenbankrecht 2010-19.'
-        contributors_footer_1_html: Weitere Informationen sowie andere Datenquellen,
-          die zur Verbesserung von OpenStreetMap genutzt wurden, sind auf <a  href="https://wiki.openstreetmap.org/wiki/Contributors">der
-          Seite über die Mitwirkenden</a> im Wiki von OpenStreetMap zu finden.
         contributors_footer_2_html: Die Einbeziehung von Daten bei OpenStreetMap bedeutet
           nicht, dass der ursprüngliche Datenlieferant OpenStreetMap unterstützt,
           Gewährleistung dafür gibt oder die Haftung dafür übernimmt.
@@ -2174,16 +2086,6 @@ de:
           hin, dass keinesfalls Daten aus urheberrechtlich geschützten Quellen verwendet
           werden dürfen (z. B. Google Maps oder gedruckte Kartenwerke), ohne vorher
           die ausdrückliche Erlaubnis des Rechteinhabers erhalten zu haben.
-        infringement_2_html: |-
-          Sofern du denkst, dass urheberrechtlich geschütztes Material unerlaubterweise zur
-          OpenStreetMap-Datenbank oder dieser Webseite hinzugefügt wurde, informiere dich
-          bitte über unser <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">Verfahren
-          zum Entfernen von Inhalten</a> oder melde dies direkt mit unserem
-          <a href="https://dmca.openstreetmap.org/">Onlineformular</a>.
-        trademarks_title_html: <span id="trademarks"></span>Markenzeichen
-        trademarks_1_html: OpenStreetMap, das Lupenlogo und „State of the Map“ sind
-          eingetragene Warenzeichen der OpenStreetMap Foundation. Falls du Fragen
-          über deine Verwendung der Marken hast, lies bitte unsere <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Markenrichtlinie</a>.
     index:
       js_1: Dein Browser unterstützt kein JavaScript oder du hast es deaktiviert.
       js_2: OpenStreetMap nutzt JavaScript für die Kartendarstellung.
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index cef1264b1..34103d8f0 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -926,8 +926,6 @@ dsb:
       failed_to_import: 'njejo se dał importěrowaś. How jo zmólka:'
       subject: '[OpenStreetMap] GPX-import jo se njeraźił'
     gpx_success:
-      loaded_successfully: jo se %{trace_points} z %{possible_points} móžnych dypkow
-        zacytało.
       subject: '[OpenStreetMap] GPX-import wuspěšny'
     signup_confirm:
       subject: '[OpenStreetMap] Witaj do OpenStreetMap'
@@ -1158,77 +1156,16 @@ dsb:
         mapping_link: kartěrowanje zachopiś
       legal_babble:
         title_html: Awtorske pšawo a licenca
-        intro_1_html: |-
-          OpenStreetMap su <i>zjawne daty</i>, licencěrowane pód licencu <a
-          href="http://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database</a> (ODbL).
-        intro_2_html: Móžoš naše daty kopěrowaś, rozdźěliś, pśenjasć a pśiměriś, tak
-          dłujko ako  naspomnjejoš OpenStreetMap a jich sobustatkujucych. Jolic změnijoš
-          naše kórty abo daty abo zepěraš se na nje, móžoš wuslědk jano pód teju sameju
-          licencu rozdźěliś. Dopołny <a href="http://opendatacommons.org/licenses/odbl/1.0/">pšawniski
-          code</a> wujasnjujo twóje pšawa a zagronitosći.
-        intro_3_1_html: Kartografija w našych kórtowych kachlach a naša dokumentacija
-          stej pód licencu <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA) licencěrowanej.
         credit_title_html: Kak naspomnjeś awtorstwo OpenStreetMap
         credit_1_html: Pominamy se, až  pódawaš sobustatkujucych &ldquo;&copy; OpenStreetMap&rdquo;.
-        credit_2_1_html: Musyš teke wujasniś, až daty stoje pód licencu Open Database,
-          a, jolic naše kórtowe kachle se wužywaju, až kartografija licencěrujo se
-          pód CC-BY-SA. Móžoš to cyniś, z tym až wótkazujoš do <a href="http://www.openstreetmap.org/copyright">toś
-          togo boka awtorskego pšawa</a>. Alternatiwnje, a ako pótrěbnosć, jolic rozdźělujoš
-          OSM w datowem formje, móžoš direktnje k licencam pomjenjowaś a wótkazaś.
-          W medijach, źož wótkaze njejsu móžno (na pś. wuśišćane źěła), naraźujomy
-          śi, twójich cytarjow na openstreetmap.org (snaź z tym až rozšyrjujoš 'OpenStreetMap'
-          k toś tej połnej adresy), na opendatacommons.org a, jolic to jo relewantne,
-          na creativecommons.org dopomnjeś.
-        credit_4_html: 'Za pśepytujobnu elektronisku kórtu by měło se źěkowanje w
-          rožku kórty pokazaś. Na pśikład:'
         attribution_example:
           alt: Pśikład, kak pokazujo se na webboku na OpenStreetMap
           title: Pśipokazański pśikład
         more_title_html: Dalšne informacije
-        more_1_html: Cytaj wěcej wó wužywanju našych datow a kak dajo se nas pśipóznaś
-          pód <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Ceste pšawniske
-          pšašenja</a>.
-        more_2_html: "Lěcrownož OpenStreetMap wobstoj ze zjawnych datow, njamóžomy
-          dermotny kórtowy API za wuwijarjow tśeśich póbitowaś. \nGlědaj naše <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">pšawidła
-          za wužywanje API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Pšawidła
-          za wužywanje kachlow</a> a <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Pšawidła
-          za wužywanje Nominatim</a>."
         contributors_title_html: Naše sobustatkujuce
         contributors_intro_html: 'Naše sobustatkujuce su towzynty wósobow. Zapśimujomy
           teke daty wótwórjoneje licence z narodnych kartěrowańskich pśedewześow a
           drugich žrědłow, mjaz nimi:'
-        contributors_at_html: '<strong>Awstriska</strong>: Wopśimujo daty z <a href="http://data.wien.gv.at/">Stadt
-          Wien</a> (pód <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC
-          BY</a>), <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
-          Vorarlberg</a> a  Land Tirol (pod <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY
-          AT ze změnami</a>).'
-        contributors_au_html: '<strong>Awstralska</strong>: Wopśimujo pśedměsćańske
-          daty na zakłaźe datow awstralskego  amta za statistiku (Australian Bureau
-          of Statistics).'
-        contributors_ca_html: '<strong>Kanada</strong>: Wopśimujo daty z GeoBase&reg;,
-          GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy;
-          Department of Natural Resources Canada), a StatCan (Geography Division,
-          Statistics Canada).'
-        contributors_fi_html: '<strong>Finska</strong>: Wopśimujo daty z topografiskeje
-          datoweje banki National Land Survey of Finland a drugich datowych sajźbow,
-          pód <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI-licencu</'
-        contributors_fr_html: '<strong>Francojska</strong>: Wopśimujo daty z Direction
-          Générale des Impôts.'
-        contributors_nl_html: '<strong>Nižozemska</strong>: Wopsimujo daty &copy;
-          AND, 2007   (<a href="http://www.and.com">www.and.com</a>)'
-        contributors_nz_html: '<strong>Nowoseelandska</strong>: Wopśimujo daty ze
-          žrědłow wót Land Information New Zealand. Awtorske pšawo wuměnjone.'
-        contributors_za_html: '<strong>Pódpołdnjowa Afrika</strong>: Wopśimujo daty
-          z  <a href="http://www.ngi.gov.za/">Chief Directorate:  National Geo-Spatial
-          Information</a>, Statne awtorske pšawo wuměnjone.'
-        contributors_gb_html: '<strong>Zjadnośone kralojstwo</strong>: Wopśimujo daty
-          z Ordnance Survey (Amtske rozměrjenje kraja) &copy; Awtorske pšawo a pšawo
-          za datowe banki 2010-2012.'
-        contributors_footer_1_html: Za dalšne drobnostki za to a druge žrědła, kótarež
-          su se wužyli, aby OpenStreetMap pólěpšyli, glědaj pšošym <a href="http://wiki.openstreetmap.org/wiki/Contributors">bok
-          sobustatkujucych</a> na wikiju OpenStreetMap.
         contributors_footer_2_html: Zapśimowanje datow do OpenStreetMap njegroni,
           až póbitowaŕ originalnych datow pśipóznawa OpenStreetMap, dawa někaku garantiju
           abo pśewzejo rukowanje.
@@ -1236,11 +1173,6 @@ dsb:
         infringement_1_html: Sobustatkujucych OSM napominamy, až njedodawaju nigda
           daty ze žrědłow, kótarež su pśez awtorske pšawo šćitane (na pś. z Google
           Maps abo z wuśišćanych kórtow) bźez wurazneje dowólnosći awtorow.
-        infringement_2_html: Joli měniš, aý awtorskopšawniski šćitany material jo
-          se datowej bance OpenStreetMap abo toś tomu sedłoju bźez dowólnosći pśidał,
-          póśěguj se pšosym na našo <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">póstupowanje
-          za wótwónoźowanje wopśimjeśa</a>abo daj to direktnje na našom <a href="https://dmca.openstreetmap.org/">formularnem
-          boku</a> k wěsći.
     index:
       js_1: Pak wužywaš wobglědowak, kótaryž njepódpěra JavaScript, pak sy znjemóžnił
         JavaScript.
diff --git a/config/locales/el.yml b/config/locales/el.yml
index aadc89cd5..5f70c7505 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -340,9 +340,7 @@ el:
       heading: Δημόσια επεξεργασία
       only_public_can_edit: Από την αλλαγή του API 0.6, μόνο οι δημόσιοι χρήστες μπορούν
         να επεξεργάζονται τα δεδομένα χάρτη.
-      find_out_why_html: (%{link}).
       find_out_why: μάθετε γιατί
-      find_out_why_url: https://wiki.openstreetmap.org/wiki/Anonymous_edits
       email_not_revealed: Η διεύθυνση email σας δεν θα αποκαλυφθεί αν γίνει δημόσια.
       make_edits_public_button: Να γίνουν όλες οι επεξεργασίες μου δημόσιες
     update:
@@ -1615,9 +1613,6 @@ el:
       subject: '[OpenStreetMap] Η εισαγωγή GPX απέτυχε'
     gpx_success:
       hi: Γεια σας %{to_user},
-      loaded_successfully:
-        one: φόρτωσε επιτυχώς με %{trace_points} από 1 πιθανό σημείο.
-        other: φόρτωσε επιτυχώς με %{trace_points} από πιθανά %{possible_points} σημεία.
       subject: '[OpenStreetMap] Η εισαγωγή GPX πέτυχε'
     signup_confirm:
       subject: '[OpenStreetMap] Καλώς ήλθατε στο OpenStreetMap'
@@ -1994,106 +1989,17 @@ el:
         mapping_link: αρχίστε τη χαρτογράφηση
       legal_babble:
         title_html: Πνευματικά δικαιώματα και άδεια χρήσης
-        intro_1_html: |-
-          Το OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> είναι βάση <i>ανοικτών δεδομένων</i> αδειοδοτημένα υπό την <a href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL) από το <a
-          href="https://osmfoundation.org/">Ίδρυμα OpenStreetMap</a> (OSMF).
-        intro_2_html: Είστε ελεύθεροι να αντιγράψετε, να διανείμετε, μεταδώσετε και
-          προσαρμόσετε τα δεδομένα μας εφόσον κάνετε αναφορά στο OpenStreetMap και
-          στους συνεισφέροντές του. Εάν τροποποιήσετε ή αξιοποιήσετε τα δεδομένα μας,
-          μπορείτε να διανείμετε το αποτέλεσμα μόνο σύμφωνα με την ίδια άδεια. Ο πλήρης
-          <a href="https://opendatacommons.org/licenses/odbl/1.0/">νομικός κώδικας</a>
-          εξηγεί τα δικαιώματα και τις υποχρεώσεις.
-        intro_3_1_html: |-
-          Η τεκμηρίωση μας, αδειοδοτείται υπό την άδεια <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Πως να κάνετε αναφορά στο OpenStreetMap
         credit_1_html: 'Όπου χρησιμοποιήσετε δεδομένα του OpenStreetMap, χρειάζεται
           από σας να κάνετε τα παρακάτω πράγματα:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Δώστε πίστωση στο OpenStreetMap εμφανίζοντας τη σημείωση πνευματικών δικαιωμάτων μας.</li>
-            <li>Διευκρινίστε ότι τα δεδομένα είναι διαθέσιμα υπό την Άδεια Ανοιχτής Βάσης Δεδομένων.</li>
-          </ul>
-        credit_3_1_html: |-
-          Για τη σημείωση πνευματικών δικαιωμάτων, έχουμε διαφορετικές απαιτήσεις σχετικά με το πώς θα πρέπει να γίνεται η διαδικασία.
-          Εμφανίζεται ανάλογα με τον τρόπο που χρησιμοποιείτε τα δεδομένα μας. Για παράδειγμα, διαφορετικοί
-          κανόνες ισχύουν σχετικά με τον τρόπο εμφάνισης της ειδοποίησης πνευματικών δικαιωμάτων, ανάλογα με το αν έχετε
-          δημιουργήσει έναν χάρτη με δυνατότητα περιήγησης, έναν εκτυπωμένο χάρτη ή μια στατική εικόνα. Πλήρεις λεπτομέρειες για τις απαιτήσεις μπορούν να βρεθούν στο
-          <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Attribution
-          Guidelines</a>.
-        credit_4_html: "Για να καταστεί σαφές ότι τα δεδομένα είναι διαθέσιμα στην
-          Ανοιχτή\nΆδεια βάσης δεδομένων, μπορείτε να συνδεθείτε \n<a href=\"https://www.openstreetmap.org/copyright\">this
-          copyright page</a>.\nΑλλιώς, και ως απαίτηση εάν διανέμετε OSM σε μια\nφόρμα
-          δεδομένων, μπορείτε να ονομάσετε και να συνδέσετε απευθείας τις άδειες.
-          Στα ΜΜΕ όπου δεν είναι δυνατοί οι σύνδεσμοι (π.χ. έντυπα έργα), σας προτείνουμε
-          να\nκατευθύνετε τους αναγνώστες σας στο openstreetmap.org (ίσως επεκτείνοντας\n'OpenStreetMap'
-          σε αυτήν την πλήρη διεύθυνση) και στο opendatacommons.org.\nΣε αυτό το παράδειγμα,
-          η πίστωση εμφανίζεται στη γωνία του χάρτη."
         attribution_example:
           alt: Παράδειγμα του πως αναφέρεται το OpenStreetMap σε μια ιστοσελίδα
           title: Παράδειγμα αναφοράς δημιουργού
         more_title_html: Μαθαίνοντας περισσότερα
-        more_1_html: |-
-          Διαβάστε περισσότερα σχετικά με τη χρήση των δεδομένων μας και πώς να μας μνημονεύσετε στην
-          <a href="https://osmfoundation.org/Licence">σελίδα Άδειας OSMF</a>.
-        more_2_html: |-
-          Παρόλο που το OpenStreetMap αποτελείται από ανοικτά δεδομένα, δεν μπορούμε να προσφέρουμε ένα
-          δωρεάν API χαρτών για τρίτους προγραμματιστές.
-          Δείτε τις πολιτικές χρήσης μας για <a href="https://operations.osmfoundation.org/policies/api">το API</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles">τα πλακίδια </a>
-          και για <a href="https://operations.osmfoundation.org/policies/nominatim">το Nominatim</a>.
         contributors_title_html: Οι συνεισφέροντές μας
         contributors_intro_html: 'Οι συνεισφέροντες μας είναι χιλιάδες άτομα. Επίσης
           έχουμε περιλάβει δεδομένα ανοικτής άδειας από εθνικές υπηρεσίες χαρτογράφησης
           και άλλες πηγές, μεταξύ αυτών:'
-        contributors_at_html: |-
-          <strong>Αυστρία</strong>: Περιέχει δεδομένα από τα
-          <a href="https://data.wien.gv.at/">Stadt Wien</a> (υπό  <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> και
-          Land Tirol (υπό <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT με τροποποιήσεις</a>).
-        contributors_au_html: |-
-          <strong>Αυστραλία</strong>: Ενσωματώνει ή αναπτυγμένο χρησιμοποιώντας Διοικητικά Όρια του &copy;
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a>
-          με άδεια από την Κοινοπολιτεία της Αυστραλίας υπό
-          <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International licence (CC BY 4.0)</a>.
-        contributors_ca_html: |-
-          <strong>Καναδάς</strong>: Περιέχει δεδομένα από τα
-          GeoBase®, GeoGratis (© Τμήμα Φυσικών
-          Πόρων Καναδά), CanVec (© Τμήμα Φυσικών
-          Πόρων Καναδά) και StatCan (Γεωγραφική Διαίρεση,
-          Στατιστική Υπηρεσία Καναδά).
-        contributors_fi_html: "<strong>Φινλανδία</strong>: Περιέχει δεδομένα από το
-          National Land Survey of Finland's Topographic Database\nκαι άλλα datasets,
-          υπό την \n<a href=\"https://www.maanmittauslaitos.fi/en/opendata-licence-version1\">NLSFI
-          Άδεια</a>."
-        contributors_fr_html: '<strong>Γαλλία</strong>: Περιέχει δεδομένα που προέρχονται
-          από το Direction Générale des Impôts.'
-        contributors_nl_html: '<strong>Ολλανδία</strong>: Περιέχει δεδομένα που προέρχονται
-          από το AND &copy; 2007 (<a href="https://www.and.com">www.and.com</a>)'
-        contributors_nz_html: |-
-          <strong>Νέα Ζηλανδία</strong>: Περιέχει δεδομένα που πηγάζουν <a href="https://data.linz.govt.nz/">Υπηρεσία Δεδομένων LINZ </a> και
-          είναι αδειοδοτημένα για επαναχρησιμοποίηση υπό την άδεια
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: |-
-          <strong>Σλοβενία</strong>: Περιέχει δεδομένα από την
-          <a href="http://www.gu.gov.si/en/">Αρχή Τοπογραφίας και Χαρτογράφησης</a> και το <a href="http://www.mkgp.gov.si/en/">Υπουργείο Γεωργίας, Δασών και Τροφίμων</a>
-          (δημόσιες πληροφορίες της Σλοβενίας).
-        contributors_es_html: |-
-          <strong>Ισπανία</strong>: Περιέχει δεδομένα από το
-          εθνικό γεωγραφικό ινστιτούτο Ισπανίας (<a href="http://www.ign.es/">IGN</a>) και το
-          Εθνικό σύστημα χαρτογράφησης (<a href="http://www.scne.es/">SCNE</a>)
-          αδειοδοτημένο για χρήση υπό <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: |-
-          <strong>Νότια Αφρική</strong>: Περιέχει δεδομένα που προέρχονται από το
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, Πνευματικό δικαίωμα χώρας κατοχυρωμένο.
-        contributors_gb_html: |-
-          <strong>Ηνωμένο Βασίλειο</strong>: Περιέχει δεδομένα
-          της Ordnance Survey &copy; Crown πνευματικά δικαιώματα και δικαιώματα βάσης δεδομένων
-          2010-19.
-        contributors_footer_1_html: |-
-          Για περισσότερες λεπτομέρειες σχετικά με αυτές, και άλλες πηγές που χρησιμοποιήθηκαν
-          για να βελτιώσουν το OpenStreetMap, παρακαλούμε δείτε τη σελίδα <a href="https://wiki.openstreetmap.org/wiki/Contributors">Συνεισφέροντες</a> στο OpenStreetMap Wiki.
         contributors_footer_2_html: Η συμπερίληψη δεδομένων στο OpenStreetMap δεν
           συνεπάγεται ότι ο αρχικός πάροχος δεδομένων εγκρίνει το OpenStreetMap, παρέχει
           οποιαδήποτε εγγύηση ή αποδέχεται καμία ευθύνη.
@@ -2101,17 +2007,6 @@ el:
         infringement_1_html: Υπενθυμίζουμε στους συνεισφέροντες του OSM να μην προσθέτουν
           δεδομένα από πηγές με πνευματικά δικαιώματα (π.χ. Google Maps η έντυπους
           χάρτες) χωρίς την προηγούμενη άδεια από τους ιδιοκτήτες των δικαιωμάτων.
-        infringement_2_html: Εάν πιστεύετε ότι προστέθηκε παράνομα υλικό που προστατεύεται
-          από πνευματικά δικαιώματα στη βάση δεδομένων του OpenStreetMap ή σε αυτόν
-          τον ιστότοπο, παρακαλούμε απευθυνθείτε στη <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">διαδικασία
-          απομάκρυνσης</a> ή καταθέστε άμεσα μια αίτηση στην <a href="https://dmca.openstreetmap.org/">on-line
-          σελίδα αιτήσεων</a>.
-        trademarks_title_html: <span id="trademarks"></span>Εμπορικά σήματα
-        trademarks_1_html: Το OpenStreetMap, το λογότυπο με το μεγεθυντικό φακό και
-          το «State of the Map» είναι σήματα κατατεθέντα του Ιδρύματος OpenStreetMap.
-          Αν έχετε ερωτήσεις σχετικά με τη χρήση των σημάτων, παρακαλούμε επισκεφθείτε
-          το <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Πολιτική
-          Εμπορικών Σημάτων</a>.
     index:
       js_1: Είτε χρησιμοποιείτε πρόγραμμα περιήγησης που δεν υποστηρίζει JavaScript
         ή έχετε απενεργοποιήσει την JavaScript.
@@ -2145,7 +2040,6 @@ el:
       licence_details_html: Τα δεδομένα OpenStreetMap αδειοδοτούνται με %{odbl_link}
         (ODbL).
       odbl: Άδεια χρήσης Open Data Commons Open Database
-      odbl_url: https://opendatacommons.org/licenses/odbl/1.0/
       too_large:
         advice: 'Αν η εξαγωγή αποτυγχάνει, παρακαλούμε δοκιμάστε μία από τις πηγές
           που αναφέρονται παρακάτω:'
@@ -2243,7 +2137,6 @@ el:
     any_questions:
       title: Ερωτήσεις;
       get_help_here: Λάβετε βοήθεια εδώ
-      welcome_mat_url: https://welcome.openstreetmap.org/
     sidebar:
       search_results: Αποτελέσματα Αναζήτησης
       close: Κλείσιμο
@@ -2354,8 +2247,6 @@ el:
       rules:
         title: Κανόνες!
         imports: Εισαγωγές
-        imports_url: https://wiki.openstreetmap.org/wiki/Import/Guidelines
-        automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct
       start_mapping: Ξεκινήστε τη Χαρτογράφηση
       add_a_note:
         title: Δεν έχετε χρόνο για χαρτογράφηση; Προσθέστε μια σημείωση!
@@ -2466,7 +2357,6 @@ el:
         στο %{wiki_link}.'
       upload_new: Μεταφόρτωση νέας διαδρομής
       wiki_page: σελίδα wiki
-      wiki_page_url: https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2
       upload_trace: Αποστολή ίχνους
       all_traces: Όλα τα ίχνη
       my_traces: Τα ίχνη μου
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 8c835dd89..4cec17f77 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1194,10 +1194,6 @@ en-GB:
       failed_to_import: 'failed to import. Here is the error:'
       subject: '[OpenStreetMap] GPX Import failure'
     gpx_success:
-      loaded_successfully:
-        one: loaded successfully with %{trace_points} out of a possible 1 point.
-        other: loaded successfully with %{trace_points} out of a possible %{possible_points}
-          points.
       subject: '[OpenStreetMap] GPX Import success'
     signup_confirm:
       subject: '[OpenStreetMap] Welcome to OpenStreetMap'
@@ -1470,86 +1466,16 @@ en-GB:
         mapping_link: start mapping
       legal_babble:
         title_html: Copyright and Licence
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> is <i>open data</i>, licensed under the <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) by the  <a
-          href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
-        intro_2_html: You are free to copy, distribute,  transmit and adapt our data,
-          as long as you credit OpenStreetMap and its contributors. If you alter or
-          build upon our data, you may distribute the result only under the same licence.
-          The full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
-          code</a> explains your rights and responsibilities.
-        intro_3_1_html: "Our documentation is licensed under the \n<a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons
-          Attribution-ShareAlike 2.0</a> licence (CC BY-SA 2.0)."
         credit_title_html: How to credit OpenStreetMap
-        credit_4_html: |-
-          To make clear that the data is available under the Open
-          Database License, you may link to
-          <a href="https://www.openstreetmap.org/copyright">this copyright page</a>.
-          Alternatively, and as a requirement if you are distributing OSM in a
-          data form, you can name and link directly to the licence(s). In media
-          where links are not possible (e.g. printed works), we suggest you
-          direct your readers to openstreetmap.org (perhaps by expanding
-          'OpenStreetMap' to this full address) and to opendatacommons.org.
-          In this example, the credit appears in the corner of the map.
         attribution_example:
           alt: Example of how to attribute OpenStreetMap on a webpage
           title: Attribution example
         more_title_html: Finding out more
-        more_1_html: |-
-          Read more about using our data, and how to credit us, at the <a
-          href="https://osmfoundation.org/Licence">OSMF Licence page</a>.
-        more_2_html: |-
-          Although OpenStreetMap is open data, we cannot provide a
-          free-of-charge map API for third-parties.
-          See our <a href="https://operations.osmfoundation.org/policies/api/">API Usage Policy</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">Tile Usage Policy</a>
-          and <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Usage Policy</a>.
         contributors_title_html: Our contributors
         contributors_intro_html: |-
           Our contributors are thousands of individuals. We also include
           openly-licenced data from national mapping agencies
           and other sources, among them:
-        contributors_at_html: |-
-          <strong>Austria</strong>: Contains data from
-          <a href="http://data.wien.gv.at/">Stadt Wien</a> (under
-          <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
-          Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
-        contributors_ca_html: |-
-          <strong>Canada</strong>: Contains data from
-          GeoBase&reg;, GeoGratis (&copy; Department of Natural
-          Resources Canada), CanVec (&copy; Department of Natural
-          Resources Canada), and StatCan (Geography Division,
-          Statistics Canada).
-        contributors_fi_html: |-
-          <strong>Finland</strong>: Contains data from the
-          National Land Survey of Finland's Topographic Database
-          and other datasets, under the
-          <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI Licence</a>.
-        contributors_fr_html: '<strong>France</strong>: Contains data sourced from
-          Direction Générale des Impôts.'
-        contributors_nl_html: '<strong>Netherlands</strong>: Contains &copy; AND data,
-          2007 (<a href="http://www.and.com">www.and.com</a>)'
-        contributors_nz_html: |-
-          <strong>New Zealand</strong>: Contains data sourced from the
-          <a href="https://data.linz.govt.nz/">LINZ Data Service</a> and
-          licensed for reuse under
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: |-
-          <strong>Slovenia</strong>: Contains data from the
-          <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and
-          <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
-          (public information of Slovenia).
-        contributors_za_html: '<strong>South Africa</strong>: Contains data sourced
-          from <a href="http://www.ngi.gov.za/">Chief Directorate: National Geo-Spatial
-          Information</a>, State copyright reserved.'
-        contributors_gb_html: '<strong>United Kingdom</strong>: Contains Ordnance
-          Survey data &copy; Crown copyright and database right 2010-19.'
-        contributors_footer_1_html: For further details of these, and other sources
-          that have been used to help improve OpenStreetMap, please see the <a href="https://wiki.openstreetmap.org/wiki/Contributors">Contributors
-          page</a> on the OpenStreetMap Wiki.
         contributors_footer_2_html: Inclusion of data in OpenStreetMap does not imply
           that the original data provider endorses OpenStreetMap, provides any warranty,
           or accepts any liability.
@@ -1557,11 +1483,6 @@ en-GB:
         infringement_1_html: OSM contributors are reminded never to add data from
           any copyrighted sources (e.g. Google Maps or printed maps) without explicit
           permission from the copyright holders.
-        trademarks_title_html: <span id="trademarks"></span>Trademarks
-        trademarks_1_html: OpenStreetMap, the magnifying glass logo, and State of
-          the Map are registered trademarks of the OpenStreetMap Foundation. If you
-          have questions about your use of the marks, please see our <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark
-          Policy</a>.
     index:
       js_1: You are either using a browser that does not support JavaScript, or you
         have disabled JavaScript.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 302cebd35..f431ccde7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -300,12 +300,12 @@ en:
   browse:
     created: "Created"
     closed: "Closed"
-    created_html: "Created <abbr title='%{title}'>%{time}</abbr>"
-    closed_html: "Closed <abbr title='%{title}'>%{time}</abbr>"
-    created_by_html: "Created <abbr title='%{title}'>%{time}</abbr> by %{user}"
-    deleted_by_html: "Deleted <abbr title='%{title}'>%{time}</abbr> by %{user}"
-    edited_by_html: "Edited <abbr title='%{title}'>%{time}</abbr> by %{user}"
-    closed_by_html: "Closed <abbr title='%{title}'>%{time}</abbr> by %{user}"
+    created_ago_html: "Created %{time_ago}"
+    closed_ago_html: "Closed %{time_ago}"
+    created_ago_by_html: "Created %{time_ago} by %{user}"
+    closed_ago_by_html: "Closed %{time_ago} by %{user}"
+    deleted_ago_by_html: "Deleted %{time_ago} by %{user}"
+    edited_ago_by_html: "Edited %{time_ago} by %{user}"
     version: "Version"
     in_changeset: "Changeset"
     anonymous: "anonymous"
@@ -333,8 +333,8 @@ en:
       relation: "Relations (%{count})"
       relation_paginated: "Relations (%{x}-%{y} of %{count})"
       comment: "Comments (%{count})"
-      hidden_commented_by_html: "Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      commented_by_html: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}"
+      comment_by_html: "Comment from %{user} %{time_ago}"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
       feed:
@@ -1387,8 +1387,7 @@ en:
       status: Status
       reports: Reports
       last_updated: Last Updated
-      last_updated_time_html: "<abbr title='%{title}'>%{time}</abbr>"
-      last_updated_time_user_html: "<abbr title='%{title}'>%{time}</abbr> by %{user}"
+      last_updated_time_ago_user_html: "%{time_ago} by %{user}"
       link_to_reports: View Reports
       reports_count:
         one: "%{count} Report"
@@ -1825,7 +1824,8 @@ en:
   site:
     about:
       next: Next
-      copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
+      heading_html: "%{copyright}OpenStreetMap %{br} contributors"
+      copyright_symbol_html: "&copy;"
       used_by_html: "%{name} provides map data for thousands of websites, mobile apps, and hardware devices"
       lede_text: |
         OpenStreetMap is built by a community of mappers that contribute and maintain data
@@ -1836,35 +1836,52 @@ en:
         aerial imagery, GPS devices, and low-tech field maps to verify that OSM
         is accurate and up to date.
       community_driven_title: Community Driven
-      community_driven_html: |
+      community_driven_1_html: |
         OpenStreetMap's community is diverse, passionate, and growing every day.
         Our contributors include enthusiast mappers, GIS professionals, engineers
         running the OSM servers, humanitarians mapping disaster-affected areas,
         and many more.
-        To learn more about the community, see the
-        <a href='https://blog.openstreetmap.org'>OpenStreetMap Blog</a>,
-        <a href='%{diary_path}'>user diaries</a>,
-        <a href='https://blogs.openstreetmap.org/'>community blogs</a>, and
-        the <a href='https://www.osmfoundation.org/'>OSM Foundation</a> website.
+        To learn more about the community, see the %{osm_blog_link},
+        %{user_diaries_link}, %{community_blogs_link}, and the
+        %{osm_foundation_link} website.
+      community_driven_osm_blog: OpenStreetMap Blog
+      community_driven_osm_blog_url: https://blog.openstreetmap.org
+      community_driven_user_diaries: user diaries
+      community_driven_community_blogs: community blogs
+      community_driven_community_blogs_url: https://blogs.openstreetmap.org/
+      community_driven_osm_foundation: OSM Foundation
+      community_driven_osm_foundation_url: https://www.osmfoundation.org/
       open_data_title: Open Data
-      open_data_html: |
-        OpenStreetMap is <i>open data</i>: you are free to use it for any purpose
+      open_data_1_html: |
+        OpenStreetMap is %{open_data}: you are free to use it for any purpose
         as long as you credit OpenStreetMap and its contributors. If you alter or
         build upon the data in certain ways, you may distribute the result only
-        under the same licence. See the <a href='%{copyright_path}'>Copyright and
-        License page</a> for details.
+        under the same licence. See the %{copyright_license_link} for details.
+      open_data_open_data: open data
+      open_data_copyright_license: Copyright and License page
       legal_title: Legal
-      legal_1_html: |
+      legal_1_1_html: |
         This site and many other related services are formally operated by the
-        <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
+        %{openstreetmap_foundation_link} (OSMF)
         on behalf of the community. Use of all OSMF operated services is subject
-        to our <a href="https://wiki.osmfoundation.org/wiki/Terms_of_Use">Terms of Use</a>, <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
-        Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>.
-      legal_2_html: |
-        Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a>
+        to our %{terms_of_use_link}, %{aup_link} and our %{privacy_policy_link}.
+      legal_1_1_openstreetmap_foundation: OpenStreetMap Foundation
+      legal_1_1_openstreetmap_foundation_url: https://osmfoundation.org/
+      legal_1_1_terms_of_use: Terms of Use
+      legal_1_1_terms_of_use_url: https://wiki.osmfoundation.org/wiki/Terms_of_Use
+      legal_1_1_aup: Acceptable Use Policies
+      legal_1_1_aup_url: https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy
+      legal_1_1_privacy_policy: Privacy Policy
+      legal_1_1_privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
+      legal_2_1_html: |
+        Please %{contact_the_osmf_link}
         if you have licensing, copyright or other legal questions.
-        <br>
-        OpenStreetMap, the magnifying glass logo and State of the Map are <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">registered trademarks of the OSMF</a>.
+      legal_2_1_contact_the_osmf: contact the OSMF
+      legal_2_1_contact_the_osmf_url: https://osmfoundation.org/Contact
+      legal_2_2_html: |
+        OpenStreetMap, the magnifying glass logo and State of the Map are %{registered_trademarks_link}.
+      legal_2_2_registered_trademarks: registered trademarks of the OSMF
+      legal_2_2_registered_trademarks_url: https://wiki.osmfoundation.org/wiki/Trademark_Policy
       partners_title: Partners
     copyright:
       foreign:
@@ -1878,122 +1895,158 @@ en:
         mapping_link: start mapping
       legal_babble:
         title_html: Copyright and License
-        intro_1_html: |
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> is <i>open data</i>, licensed under the <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) by the  <a
-          href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
-        intro_2_html: |
+        introduction_1_html: |
+          OpenStreetMap%{registered_trademark_link} is %{open_data}, licensed under the
+          %{odc_odbl_link} (ODbL) by the %{osm_foundation_link} (OSMF).
+        introduction_1_registered_trademark_html: "&reg;"
+        introduction_1_open_data: open data
+        introduction_1_odc_odbl: Open Data Commons Open Database License
+        introduction_1_odc_odbl_url: https://opendatacommons.org/licenses/odbl/
+        introduction_1_osm_foundation: OpenStreetMap Foundation
+        introduction_1_osm_foundation_url: https://osmfoundation.org/
+        introduction_2_html: |
           You are free to copy, distribute, transmit and adapt our data,
           as long as you credit OpenStreetMap and its
           contributors. If you alter or build upon our data, you
           may distribute the result only under the same licence. The
-          full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
-          code</a> explains your rights and responsibilities.
-        intro_3_1_html: |
-          Our documentation is licensed under the
-          <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA 2.0).
+          full %{legal_code_link} explains your rights and responsibilities.
+        introduction_2_legal_code: legal code
+        introduction_2_legal_code_url: https://opendatacommons.org/licenses/odbl/1.0/
+        introduction_3_html: |
+          Our documentation is licensed under the %{creative_commons_link} license (CC BY-SA 2.0).
+        introduction_3_creative_commons: Creative Commons Attribution-ShareAlike 2.0
+        introduction_3_creative_commons_url: https://creativecommons.org/licenses/by-sa/2.0/
         credit_title_html: How to credit OpenStreetMap
         credit_1_html: |
           Where you use OpenStreetMap data, you are required to do the following two things:
-        credit_2_1_html: |
-          <ul>
-            <li>Provide credit to OpenStreetMap by displaying our copyright notice.</li>
-            <li>Make clear that the data is available under the Open Database License.</li>
-          </ul>
-        credit_3_1_html: |
+        credit_2_1: Provide credit to OpenStreetMap by displaying our copyright notice.
+        credit_2_2: Make clear that the data is available under the Open Database License.
+        credit_3_html: |
          For the copyright notice, we have different requirements on how this should be
          displayed, depending on how you are using our data. For example, different
          rules apply on how to show the copyright notice depending on whether you have
          created a browsable map, a printed map or a static image. Full details on the
-         requirements can be found in the
-         <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Attribution
-         Guidelines</a>.
-        credit_4_html: |
+         requirements can be found in the %{attribution_guidelines_link}.
+        credit_3_attribution_guidelines: Attribution Guidelines
+        credit_3_attribution_guidelines_url: https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines
+        credit_4_1_html: |
           To make clear that the data is available under the Open
-          Database License, you may link to
-          <a href="https://www.openstreetmap.org/copyright">this copyright page</a>.
+          Database License, you may link to %{this_copyright_page_link}.
           Alternatively, and as a requirement if you are distributing OSM in a
           data form, you can name and link directly to the license(s). In media
           where links are not possible (e.g. printed works), we suggest you
           direct your readers to openstreetmap.org (perhaps by expanding
           'OpenStreetMap' to this full address) and to opendatacommons.org.
           In this example, the credit appears in the corner of the map.
+        credit_4_1_this_copyright_page: this copyright page
         attribution_example:
           alt: Example of how to attribute OpenStreetMap on a webpage
           title: Attribution example
         more_title_html: Finding out more
-        more_1_html: |
-          Read more about using our data, and how to credit us, at the <a
-          href="https://osmfoundation.org/Licence">OSMF Licence page</a>.
-        more_2_html: |
+        more_1_1_html: Read more about using our data, and how to credit us, at the %{osmf_licence_page_link}.
+        more_1_1_osmf_licence_page: OSMF Licence page
+        more_1_1_osmf_licence_page_url: https://osmfoundation.org/Licence
+        more_2_1_html: |
           Although OpenStreetMap is open data, we cannot provide a
           free-of-charge map API for third-parties.
-          See our <a href="https://operations.osmfoundation.org/policies/api/">API Usage Policy</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">Tile Usage Policy</a>
-          and <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Usage Policy</a>.
+          See our %{api_usage_policy_link}, %{tile_usage_policy_link} and %{nominatim_usage_policy_link}.
+        more_2_1_api_usage_policy: API Usage Policy
+        more_2_1_api_usage_policy_url: https://operations.osmfoundation.org/policies/api/
+        more_2_1_tile_usage_policy: Tile Usage Policy
+        more_2_1_tile_usage_policy_url: https://operations.osmfoundation.org/policies/tiles/
+        more_2_1_nominatim_usage_policy: Nominatim Usage Policy
+        more_2_1_nominatim_usage_policy_url: https://operations.osmfoundation.org/policies/nominatim/
         contributors_title_html: Our contributors
         contributors_intro_html: |
           Our contributors are thousands of individuals. We also include
           openly-licensed data from national mapping agencies
           and other sources, among them:
-        contributors_at_html: |
-          <strong>Austria</strong>: Contains data from
-          <a href="https://data.wien.gv.at/">Stadt Wien</a> (under
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
-          Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
-        contributors_au_html: |
-          <strong>Australia</strong>: Incorporates or developed using Administrative Boundaries &copy;
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a>
-          licensed by the Commonwealth of Australia under
-          <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International licence (CC BY 4.0)</a>.
-        contributors_ca_html: |
-          <strong>Canada</strong>: Contains data from
+        contributors_at_credit_html: |
+          %{austria}: Contains data from %{stadt_wien_link} (under %{cc_by_link}), %{land_vorarlberg_link}
+          and Land Tirol (under %{cc_by_at_with_amendments_link}).
+        contributors_at_austria: Austria
+        contributors_at_stadt_wien: Stadt Wien
+        contributors_at_stadt_wien_url: https://data.wien.gv.at/
+        contributors_at_cc_by: CC BY
+        contributors_at_cc_by_url: https://creativecommons.org/licenses/by/3.0/at/deed.de
+        contributors_at_land_vorarlberg: Land Vorarlberg
+        contributors_at_land_vorarlberg_url: https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm
+        contributors_at_cc_by_at_with_amendments: CC BY AT with amendments
+        contributors_at_cc_by_at_with_amendments_url: https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/
+        contributors_au_credit_html: |
+          %{australia}: Incorporates or developed using Administrative Boundaries &copy; %{geoscape_australia_link}
+          licensed by the Commonwealth of Australia under %{cc_licence_link}.
+        contributors_au_australia: Australia
+        contributors_au_geoscape_australia: Geoscape Australia
+        contributors_au_geoscape_australia_url: https://geoscape.com.au/legal/data-copyright-and-disclaimer/
+        contributors_au_cc_licence: Creative Commons Attribution 4.0 International licence (CC BY 4.0)
+        contributors_au_cc_licence_url: https://creativecommons.org/licenses/by/4.0/
+        contributors_ca_credit_html: |
+          %{canada}: Contains data from
           GeoBase&reg;, GeoGratis (&copy; Department of Natural
           Resources Canada), CanVec (&copy; Department of Natural
           Resources Canada), and StatCan (Geography Division,
           Statistics Canada).
-        contributors_fi_html: |
-          <strong>Finland</strong>: Contains data from the
+        contributors_ca_canada: Canada
+        contributors_fi_credit_html: |
+          %{finland}: Contains data from the
           National Land Survey of Finland's Topographic Database
-          and other datasets, under the
-          <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI License</a>.
-        contributors_fr_html: |
-          <strong>France</strong>: Contains data sourced from
+          and other datasets, under the %{nlsfi_license_link}.
+        contributors_fi_finland: Finland
+        contributors_fi_nlsfi_license: NLSFI License
+        contributors_fi_nlsfi_license_url: https://www.maanmittauslaitos.fi/en/opendata-licence-version1
+        contributors_fr_credit_html: |
+          %{france}: Contains data sourced from
           Direction Générale des Impôts.
-        contributors_nl_html: |
-          <strong>Netherlands</strong>: Contains &copy; AND data, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: |
-          <strong>New Zealand</strong>: Contains data sourced from the
-          <a href="https://data.linz.govt.nz/">LINZ Data Service</a> and
-          licensed for reuse under
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: |
-          <strong>Slovenia</strong>: Contains data from the
-          <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and
-          <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
+        contributors_fr_france: France
+        contributors_nl_credit_html: |
+          %{netherlands}: Contains &copy; AND data, 2007 (%{and_link})
+        contributors_nl_netherlands: Netherlands
+        contributors_nl_and: www.and.com
+        contributors_nl_and_url: https://www.and.com
+        contributors_nz_credit_html: |
+          %{new_zealand}: Contains data sourced from the %{linz_data_service_link}
+          and licensed for reuse under %{cc_by_link}.
+        contributors_nz_new_zealand: New Zealand
+        contributors_nz_linz_data_service: LINZ Data Service
+        contributors_nz_linz_data_service_url: https://data.linz.govt.nz/
+        contributors_nz_cc_by: CC BY 4.0
+        contributors_nz_cc_by_url: https://creativecommons.org/licenses/by/4.0/
+        contributors_si_credit_html: |
+          %{slovenia}: Contains data from the %{gu_link} and %{mkgp_link}
           (public information of Slovenia).
-        contributors_es_html: |
-          <strong>Spain</strong>: Contains data sourced from the
-          Spanish National Geographic Institute (<a href="http://www.ign.es/">IGN</a>) and
-          National Cartographic System (<a href="http://www.scne.es/">SCNE</a>)
-          licensed for reuse under <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: |
-          <strong>South Africa</strong>: Contains data sourced from
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, State copyright reserved.
-        contributors_gb_html: |
-          <strong>United Kingdom</strong>: Contains Ordnance
+        contributors_si_slovenia: Slovenia
+        contributors_si_gu: Surveying and Mapping Authority
+        contributors_si_gu_url: http://www.gu.gov.si/en/
+        contributors_si_mkgp: Ministry of Agriculture, Forestry and Food
+        contributors_si_mkgp_url: http://www.mkgp.gov.si/en/
+        contributors_es_credit_html: |
+          %{spain}: Contains data sourced from the
+          Spanish National Geographic Institute (%{ign_link}) and
+          National Cartographic System (%{scne_link})
+          licensed for reuse under %{cc_by_link}.
+        contributors_es_spain: Spain
+        contributors_es_ign: IGN
+        contributors_es_ign_url: http://www.ign.es/
+        contributors_es_scne: SCNE
+        contributors_es_scne_url: http://www.scne.es/
+        contributors_es_cc_by: CC BY 4.0
+        contributors_es_cc_by_url: https://creativecommons.org/licenses/by/4.0/
+        contributors_za_credit_html: |
+          %{south_africa}: Contains data sourced from %{ngi_link}, State copyright reserved.
+        contributors_za_south_africa: South Africa
+        contributors_za_ngi: "Chief Directorate: National Geo-Spatial Information"
+        contributors_za_ngi_url: http://www.ngi.gov.za/
+        contributors_gb_credit_html: |
+          %{united_kingdom}: Contains Ordnance
           Survey data &copy; Crown copyright and database right
           2010-2023.
-        contributors_footer_1_html: |
+        contributors_gb_united_kingdom: United Kingdom
+        contributors_2_html: |
           For further details of these, and other sources that have been used
-          to help improve OpenStreetMap, please see the <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">Contributors
-          page</a> on the OpenStreetMap Wiki.
+          to help improve OpenStreetMap, please see the %{contributors_page_link} on the OpenStreetMap Wiki.
+        contributors_2_contributors_page: Contributors page
+        contributors_2_contributors_page_url: https://wiki.openstreetmap.org/wiki/Contributors
         contributors_footer_2_html: |
           Inclusion of data in OpenStreetMap does not imply that the original
           data provider endorses OpenStreetMap, provides any warranty, or
@@ -2003,15 +2056,22 @@ en:
           OSM contributors are reminded never to add data from any
           copyrighted sources (e.g. Google Maps or printed maps) without
           explicit permission from the copyright holders.
-        infringement_2_html: |
+        infringement_2_1_html: |
           If you believe that copyrighted material has been inappropriately
           added to the OpenStreetMap database or this site, please refer
-          to our <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">takedown
-          procedure</a> or file directly at our
-          <a href="https://dmca.openstreetmap.org/">on-line filing page</a>.
-        trademarks_title_html: <span id="trademarks"></span>Trademarks
-        trademarks_1_html: |
-          OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please see our <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark Policy</a>.
+          to our %{takedown_procedure_link} or file directly at our
+          %{online_filing_page_link}.
+        infringement_2_1_takedown_procedure: takedown procedure
+        infringement_2_1_takedown_procedure_url: https://wiki.osmfoundation.org/wiki/Takedown_procedure
+        infringement_2_1_online_filing_page: on-line filing page
+        infringement_2_1_online_filing_page_url: https://dmca.openstreetmap.org/
+        trademarks_title: Trademarks
+        trademarks_1_1_html: |
+          OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the
+          OpenStreetMap Foundation. If you have questions about your use of the marks, please see our
+          %{trademark_policy_link}.
+        trademarks_1_1_trademark_policy: Trademark Policy
+        trademarks_1_1_trademark_policy_url: https://wiki.osmfoundation.org/wiki/Trademark_Policy
     index:
       js_1: "You are either using a browser that does not support JavaScript, or you have disabled JavaScript."
       js_2: "OpenStreetMap uses JavaScript for its slippy map."
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 44246e8c4..c6113118a 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -188,41 +188,41 @@ eo:
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: proksimume antaÅ­ 1 horo
+        one: proksimume antaÅ­ %{count} horo
         other: proksimume antaÅ­ %{count} horoj
       about_x_months:
-        one: proksimume antaÅ­ 1 monato
+        one: proksimume antaÅ­ %{count} monato
         other: proksimume antaÅ­ %{count} monatoj
       about_x_years:
-        one: proksimume antaÅ­ 1 jaro
+        one: proksimume antaÅ­ %{count} jaro
         other: proksimume antaÅ­ %{count} jaroj
       almost_x_years:
-        one: malpli ol antaÅ­ 1 jaro
+        one: malpli ol antaÅ­ %{count} jaro
         other: malpli ol antaÅ­ %{count} jaroj
       half_a_minute: antaÅ­ duonminuto
       less_than_x_seconds:
-        one: malpli ol antaÅ­ 1 sekundo
+        one: malpli ol antaÅ­ %{count} sekundo
         other: malpli ol antaÅ­ %{count} sekundoj
       less_than_x_minutes:
-        one: malpli ol antaÅ­ 1 minuto
+        one: malpli ol antaÅ­ %{count} minuto
         other: malpli ol antaÅ­ %{count} minutoj
       over_x_years:
-        one: pli ol antaÅ­ 1 jaro
+        one: pli ol antaÅ­ %{count} jaro
         other: pli ol antaÅ­ %{count} jaroj
       x_seconds:
-        one: antaÅ­ 1 sekundo
+        one: antaÅ­ %{count} sekundo
         other: antaÅ­ %{count} sekundoj
       x_minutes:
-        one: antaÅ­ 1 minuto
+        one: antaÅ­ %{count} minuto
         other: antaÅ­ %{count} minutoj
       x_days:
-        one: antaÅ­ 1 tago
+        one: antaÅ­ %{count} tago
         other: antaÅ­ %{count} tagoj
       x_months:
-        one: antaÅ­ 1 monato
+        one: antaÅ­ %{count} monato
         other: antaÅ­ %{count} monatoj
       x_years:
-        one: antaÅ­ 1 jaro
+        one: antaÅ­ %{count} jaro
         other: antaÅ­ %{count} jaroj
   editor:
     default: Implicita (nune %{name})
@@ -322,7 +322,6 @@ eo:
         al homoj kontakti vin per la retejo, alklaku la butonon sube.
       only_public_can_edit: Ekde la ŝanĝo de API al la versio 0.6, nur publikajn uzantojn
         povas redakti map-datumojn.
-      find_out_why_html: (%{link}).
       find_out_why: sciiĝu kial
       email_not_revealed: Via retpoŝta adreso ne estos montrata post iĝi publika uzanto.
       not_reversible: Tiu ĉe ago estas neinversigebla kaj ĉiuj novaj uzantoj estas
@@ -349,10 +348,10 @@ eo:
     no_comment: (neniu komento)
     part_of: Parto de
     part_of_relations:
-      one: 1 rilato
+      one: '%{count} rilato'
       other: '%{count} rilatoj'
     part_of_ways:
-      one: 1 linio
+      one: '%{count} linio'
       other: '%{count} linioj'
     download_xml: Elŝuti XML
     view_history: Vidi historion
@@ -399,7 +398,7 @@ eo:
       history_title_html: 'Historio de rilato: %{name}'
       members: Anoj
       members_count:
-        one: 1 ano
+        one: '%{count} ano'
         other: '%{count} anoj'
     relation_member:
       entry_role_html: '%{type} %{name} kiel %{role}'
@@ -1440,7 +1439,7 @@ eo:
       last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> de %{user}
       link_to_reports: Montri raportojn
       reports_count:
-        one: 1 raporto
+        one: '%{count} raporto'
         other: '%{count} raportoj'
       reported_item: Objekto raportita
       states:
@@ -1608,9 +1607,6 @@ eo:
       subject: '[OpenStreetMap] Eraro dum enportado de GPX-dosiero'
     gpx_success:
       hi: Saluton %{to_user},
-      loaded_successfully:
-        one: estas sukcese enlegita kun %{trace_points} el 1 punkto.
-        other: estas sukcese enlegita kun %{trace_points} el %{possible_points} punktoj.
       subject: '[OpenStreetMap] GPX-dosiero enportita sukcese'
     signup_confirm:
       subject: '[OpenStreetMap] Bonvenon al OpenStreetMap'
@@ -1955,96 +1951,17 @@ eo:
         mapping_link: ekigi mapigadon
       legal_babble:
         title_html: AÅ­torrajto kaj permesilo
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> estas projekto de <i>malfermaj datumoj</i> eldonita laÅ­ la permesilo <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) de la  <a
-          href="http://osmfoundation.org/">Fondaĵo OpenStreetMap</a> (OSMF).
-        intro_2_html: Vi rajtas kopii, disdoni, transdoni kaj modifi niajn datumojn,
-          nur se vi atribuos aŭtorecon al OpenStreetMap kaj ĝiaj kontribuintoj. Se
-          vi modifos aÅ­ uzos niajn datumojn, vi povos distribui la verkon laÅ­ la sama
-          permesilo. La plena <a href="https://opendatacommons.org/licenses/odbl/1.0/">interkonsento
-          de uzado</a> klarigas viajn rajtojn kaj devojn.
-        intro_3_1_html: Nia dokumentaro estas eldonita laÅ­ la permesilo <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.eo">Krea
-          Komunaĵo Atribuite-Samkondiĉe 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Kiel atribui aÅ­torecon
         credit_1_html: 'Kiam vi uzas OpenStreetMap-datumojn, vi devas fari la jenajn
           du agojn:'
-        credit_2_1_html: |-
-          <ul>
-          <li>liveri aÅ­torecon al OpenStreetMap per vidigi nian noton pri aÅ­torrajtoj;</li>
-          <li>klere indiki, ke la datumojn estas disponeblaj laÅ­ la permesilo Open Database License.</li>
-          </ul>
-        credit_3_1_html: Depende de kiel vi uzas niajn datumojn, ni havas diversajn
-          postulojn pri la noto pri aŭtorrajtoj. Ekzemple malsamaj reguloj aplikiĝas
-          kiam vi kreas ŝoveblan mapon, statikan mapon, kaj aliaj por presitan mapon.
-          Plenaj detaloj pri la postuloj troviĝas sur la paĝo de <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">konsiloj
-          pri atribuo</a> (en la angla).
-        credit_4_html: Por klare indiki, ke la datumoj estas disponeblaj laÅ­ la permesilo
-          Open Database License, vi povas enmeti ligilon al <a href="https://www.openstreetmap.org/copyright">tiu
-          ĉi paĝo pri aŭtorrajtoj</a>. Alimaniere, se vi distribuas OSM kiel datumojn
-          vi povas enmeti nomojn kaj ligilojn al la permesiloj. Kiam ne eblas enmeti
-          ligilojn (ekzemple en paperaj materialoj), ni sugestas direkti la uzantojn
-          al openstreetmap.org (aŭ eĉ liveri la plenan ligilon de tiu ĉi retpaĝo)
-          kaj al opendatacommons.org. En la suba ekzemplo la aŭtoreco troviĝas ĉe
-          la korno de la mapo.
         attribution_example:
           alt: Ekzemplo kiel atribui OpenStreetMap sur retpaĝo
           title: Ekzemplo de aÅ­torec-atribuado
         more_title_html: Pliaj informoj
-        more_1_html: |-
-          Pliaj informoj pri uzado de niaj datumoj kaj pri kiel atribui aŭtorecon troviĝas sur la <a
-          href="https://osmfoundation.org/Licence">retpaĝo pri permesilo OSMF</a>.
-        more_2_html: Kvankam la datumoj de OpenStreetMap estas liberaj, ni ne povas
-          liveri senpagan API-on por eksteraj programistoj. Legu nian <a href="https://operations.osmfoundation.org/policies/api/">politikon
-          pri uzado de API</a>, <a href="https://operations.osmfoundation.org/policies/tiles/">politikon
-          pri uzado de kaheloj</a> kaj <a href="https://operations.osmfoundation.org/policies/nominatim/">poltikon
-          pri uzado de Nominatim</a>.
         contributors_title_html: Kunlaborantoj
         contributors_intro_html: 'Niaj kunlaborantoj estas miloj da homoj. Ni ankaÅ­
           inkludas datumoj laŭ malferma permesilo el landaj kartografiaj organizaĵoj
           kaj el aliaj fontoj, inter ili:'
-        contributors_at_html: |-
-          <strong>Aŭstrujo</strong>: enhavas datumojn de la urbo Vieno «<a href="https://www.data.gv.at/auftritte/?organisation=stadt-wien">Stadt Wien</a>» (laŭ la permesilo <a href="https://creativecommons.org/licenses/by/3.0/at/deed.eo">CC&nbsp;BY&nbsp;3.0&nbsp;AT</a>), federacia lando Vorarlbergo «<a href="https://vorarlberg.at/-/wms-dienste?article_id=32956">Land Vorarlberg</a>» kaj
-          federacia lando Tirolo «<a href="https://www.tirol.gv.at/data/">Land Tirol</a>» (laŭ la permesilo CC&nbsp;BY&nbsp;AT kun postaj ŝanĝoj).
-        contributors_au_html: '<strong>AÅ­stralio</strong>: enhavas datumojn pri administraj
-          limoj liveritaj de <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape
-          Australia</a> rajtigitaj de la Komunejo de AÅ­stralio laÅ­ la permesilo <a
-          href="https://creativecommons.org/licenses/by/4.0/deed.eo">Krea Komunaĵo
-          Atribuite 4.0 Tutmonda (CC&nbsp;BY&nbsp;4.0)</a>.'
-        contributors_ca_html: '<strong>Kanado</strong>: enhavas datumojn de GeoBase&reg;,
-          GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy;
-          Department of Natural Resources Canada), kaj StatCan (Geography Division,
-          Statistics Canada).'
-        contributors_fi_html: '<strong>Finnlando</strong>: enhavas datumojn de la
-          Topografia Datumbazo «Maastotietokanta» de la Ŝtata Ofico de Termezurado
-          de Finnlando «Maanmittauslaitos» laŭ la <a href="https://www.maanmittauslaitos.fi/avoindata-lisenssi-versio1">permesilo
-          NLSFI</a>.'
-        contributors_fr_html: '<strong>Francujo</strong>: enhavas datumojn ricevitajn
-          de la Ĝenerala Direkcio de Impostoj «Direction Générale des Impôts».'
-        contributors_nl_html: |-
-          <strong>Nederlando</strong>: enhavas datumojn de &copy;&nbsp;AND, 2007
-          (<a href="https://www.and.com">www.and.com</a>).
-        contributors_nz_html: '<strong>Nov-Zelando</strong>: enhavas datumojn de la
-          Datum-servo Land-informoj pri Nov-Zelado «<a href="https://data.linz.govt.nz/">LINZ
-          Data Service</a>» por reuzo laŭ la permesilo <a href="https://creativecommons.org/licenses/by/4.0/deed.eo">CC&nbsp;BY&nbsp;4.0</a>.'
-        contributors_si_html: |-
-          <strong>Slovenujo</strong>: enhavas datumojn de la <a href="http://www.gu.gov.si/">Ofico de Termezurado kaj Kartografio</a> kaj
-          <a href="http://www.mkgp.gov.si/">Ministerio pri Terkulturo, Arbarkulturo kaj Proviantado</a>
-          (publikaj informoj de Slovenujo).
-        contributors_es_html: '<strong>Hispanujo</strong>: enhavas datumojn de la
-          Hispana Nacia Geografia Instituto (<a href="http://www.ign.es/">IGN</a>)
-          kaj Nacia Kartografia Sistemo (<a href="http://www.scne.es/">SCNE</a>) uzeblaj
-          laÅ­ la permesilo <a href="https://creativecommons.org/licenses/by/4.0/deed.eo">CC&nbsp;BY&nbsp;4.0</a>.'
-        contributors_za_html: |-
-          <strong>Sud-Afriko</strong>: enhavas datumojn de la Ĉefa Direkcio: Nacia Terspaca Informejo «<a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>», landaj aŭtorrajtoj rezervitaj.
-        contributors_gb_html: |-
-          <strong>Unuiĝinta Reĝlando</strong>: enhavas datumojn de la Brita Kartografia Ofico «Ordnance
-          Survey» &copy;&nbsp;Crown copyright and database right 2010 - 2023.
-        contributors_footer_1_html: Pliaj informoj pri la menciitaj kaj pri aliaj
-          fontoj uzitaj por plibonigi OpenStreetMap estas disponeblaj sur la <a href="https://wiki.openstreetmap.org/wiki/Contributors">paĝo
-          pri kontribuintoj</a> en la OpenStreetMap-vikio.
         contributors_footer_2_html: Inkludo de datumoj en OpenStreetMap ne indikas,
           ke la provizanto de datumoj apogas OpenStreetMap, garantias por iu aÅ­ respondumas
           por iu.
@@ -2052,16 +1969,6 @@ eo:
         infringement_1_html: OSM-kunlaborantoj memoru, por ke neniam aldonu datumojn
           el iuj ajn fontoj protektataj de aÅ­torrajtoj (ekz. Google Maps aÅ­ paperaj
           mapoj) sen klara permeso de posedanto de aÅ­torrajtoj.
-        infringement_2_html: Se ve pensas, ke datumoj protektataj per aÅ­torrajtoj
-          estas misaldonitaj al OpenStreetMap-datumbazo aŭ al tiu ĉi retejo, legu
-          la <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">proceduron
-          de forigo de datumoj</a> (en la angla) aÅ­ plenigu la <a href="https://dmca.openstreetmap.org/">enretan
-          formularon</a>.
-        trademarks_title_html: <span id="trademarks"></span>Registritaj markoj
-        trademarks_1_html: OpenStreetMap, la bildsimbolo de lupeo kaj la nomo “State
-          of the Map” estas registritaj markoj de la Fondaĵo OpenStreetMap. Se vi
-          havas iujn demandojn pri uzado de niaj markoj, legu nian <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">politikon
-          pri varmarkoj</a>.
     index:
       js_1: Vi aŭ uzas foliumilon, kiu ne subtenas Ĝavoskripton, aŭ vi havas ĝin malaktivan.
       js_2: OpensStreetMap uzas Ĝavoskripton por montri ŝoveblan mapon.
diff --git a/config/locales/es.yml b/config/locales/es.yml
index c9a8f58a4..2ba99993a 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -395,7 +395,6 @@ es:
         botón de abajo.
       only_public_can_edit: Desde el cambio de API 0.6, solo los usuarios públicos
         pueden editar los datos de los mapas.
-      find_out_why_html: (%{link}).
       find_out_why: Encuentra por qué
       email_not_revealed: Tu dirección de correo electrónico no será revelada al hacerse
         pública.
@@ -1691,9 +1690,6 @@ es:
       subject: '[OpenStreetMap] Fallo al importar GPX'
     gpx_success:
       hi: 'Hola, %{to_user}:'
-      loaded_successfully: '{{PLURAL|one=cargado correctamente con %{trace_points}
-        de 1 punto posible.|carga exitosa con %{trace_points} de %{possible_points}
-        puntos posibles.'
       subject: '[OpenStreetMap] Éxito al importar GPX'
     signup_confirm:
       subject: '[OpenStreetMap] Bienvenido a OpenStreetMap'
@@ -2062,101 +2058,17 @@ es:
         mapping_link: comenzar a cartografiar
       legal_babble:
         title_html: Derechos de autor y licencia
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> es <i>Open Data</i> (un servicio de datos de acceso libre), con licencia <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) de la  <a
-          href="https://osmfoundation.org/">Fundación OpenStreetMap</a> (OSMF).
-        intro_2_html: Puede copiar, distribuir, transmitir y adaptar nuestros datos
-          libremente siempre y cuando de reconocimiento a OpenStreetMap y sus colaboradores.
-          Si modifica o se basa en nuestros datos, sólo puede distribuir el resultado
-          bajo la misma licencia. El <a href="https://opendatacommons.org/licenses/odbl/1.0/">código
-          legal</a> completo explica sus derechos y responsabilidades.
-        intro_3_1_html: Nuestra documentación está disponible bajo los términos de
-          la licencia <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Reconocimiento-Compartir Igual 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Cómo dar reconocimiento a OpenStreetMap
         credit_1_html: 'Cuando utilice datos de OpenStreetMap, deberá hacer las dos
           cosas siguientes:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Dar crédito a OpenStreetMap mostrando nuestro aviso de derechos de autor.</li>
-            <li>Aclarar que los datos están disponibles bajo la licencia Open Database License.</li>
-          </ul>
-        credit_3_1_html: Para el aviso de derechos de autor, tenemos diferentes requisitos
-          sobre cómo debe mostrarse en función del uso que se haga de nuestros datos.
-          Por ejemplo, se aplican diferentes normas sobre cómo mostrar el aviso de
-          copyright dependiendo de si ha creado un mapa navegable, un mapa impreso
-          o una imagen estática. Encontrará todos los detalles sobre los requisitos
-          en las <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Directrices
-          de atribución</a>.
-        credit_4_html: |-
-          Para dejar claro que los datos están disponibles bajo la licencia Open
-          Database License, puede enlazar con <a href="https://www.openstreetmap.org/copyright">esta página de derechos de autor</a>.
-          Alternativamente, y como requisito si está distribuyendo OSM en forma de datos, puede nombrar y enlazar directamente a la(s) licencia(s). En los medios donde los enlaces no son posibles (por ejemplo, obras impresas), le sugerimos que que dirija a sus lectores a openstreetmap.org (quizás ampliando 'OpenStreetMap' a esta dirección completa) y a opendatacommons.org.
-          En este ejemplo, el crédito aparece en la esquina del mapa.
         attribution_example:
           alt: Ejemplo de como dar reconocimiento a OpenStreetMap en una página web
           title: Ejemplo de atribución
         more_title_html: Para saber más...
-        more_1_html: |-
-          Encontrará más información acerca de cómo utilizar nuestros datos y cómo citarnos como fuente en la <a
-          href="https://osmfoundation.org/Licence">página de licencia de la OSMF</a>.
-        more_2_html: "A pesar de que OpenStreetMap son datos abiertos, no podemos
-          proporcionar una API de mapas gratuita para terceros. \nConsulta nuestra
-          <a href=\"https://operations.osmfoundation.org/policies/api/\">Normativa
-          de uso de la API</a>, \nla <a href=\"https://operations.osmfoundation.org/policies/tiles/\">Normativa
-          de uso de teselas</a> \ny la <a href=\"https://operations.osmfoundation.org/policies/nominatim/\">Normativa
-          de uso de Nominatim</a>."
         contributors_title_html: Nuestros colaboradores
         contributors_intro_html: 'Nuestros colaboradores son miles de personas. Incluimos
           también datos con licencia abierta de organismos cartográficos nacionales
           y otras fuentes, entre ellas:'
-        contributors_at_html: |-
-          <strong>Austria</strong>: Contiene datos de
-             <a href="https://data.wien.gv.at/">Stadt Wien</a> (bajo
-             <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> y Land Tirol (bajo licencia <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT con modificaciones</a>).
-        contributors_au_html: '<strong>Australia</strong>: Contiene o se ha desarrollado
-          usando límites administrativos de &copy; <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">Geoscape
-          Australia</a> con licencia de la Commonwealth de Australia bajo <a href="https://creativecommons.org/licenses/by/4.0/">licencia
-          Creative Commons Atribución 4.0 Internacional (CC BY 4.0)</a>.'
-        contributors_ca_html: '<strong>Canadá</strong>: contiene datos de GeoBase&reg;,
-          GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy;
-          Department of Natural Resources Canada) y StatCan (Geography Division, Statistics
-          Canada).'
-        contributors_fi_html: |-
-          <strong>Finlandia</strong>: Contiene datos de la National Land Survey de la Finland's Topographic Database
-          y otras bases de datos, bajo la <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI License</a>.
-        contributors_fr_html: '<strong>Francia</strong>: Contiene datos extraídos
-          de Direction Générale des Impôts.'
-        contributors_nl_html: |-
-          <strong>Países Bajos</strong>: Contiene datos de &copy; AND, 2007
-             (<a href="http://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>Nueva Zelanda</strong>: contiene datos provenientes del
-          <a href="https://data.linz.govt.nz/">Servicio de datos LINZ</a>, disponibles para reutilización según la licencia
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: |-
-          <strong>Eslovenia</strong>: Contiene datos del
-          <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> y
-          <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
-          (información pública de Eslovenia).
-        contributors_es_html: '<strong>España</strong>: Contiene datos provenientes
-          del Instituto Geográfico Nacional (<a href="http://www.ign.es/">IGN</a>)
-          y del Sistema Cartográfico Nacional (<a href="http://www.scne.es/">SCNE</a>),
-          licenciados para su reutilización bajo la <a href="https://creativecommons.org/licenses/by/4.0/">CC
-          BY 4.0</a>.'
-        contributors_za_html: |-
-          <strong>Sudáfrica</strong>: Contiene datos extraídos de
-          <a href="http://www.ngi.gov.za/">Chief Directorate: Información
-          Nacional Geoespacial</a>, State copyright reserved.
-        contributors_gb_html: |-
-          <strong>Reino Unido</strong>: Contiene datos de Ordnance Survey &copy; Crown copyright and database right
-           2010-19.
-        contributors_footer_1_html: Para obtener más detalles sobre estas y otras
-          fuentes que se han utilizado para ayudar a mejorar OpenStreetMap, véase
-          la <a href="https://wiki.openstreetmap.org/wiki/Contributors">página de
-          colaboradores</a> en la wiki de OpenStreetMap.
         contributors_footer_2_html: La inclusión de datos en OpenStreetMap no implica
           que el proveedor de la información original apoya a OpenStreetMap, proporciona
           alguna garantía, o acepta cualquier responsabilidad.
@@ -2165,16 +2077,6 @@ es:
           añadir información procedente de ninguna fuente con derechos de autor reservados
           (p. ej. Google Maps o mapas impresos) sin el consentimiento explícito de
           los poseedores de los derechos de autor.
-        infringement_2_html: Si cree que se ha agregado de forma inapropiada material
-          protegido por derechos de autor a la base de datos de OpenStreetMap o a
-          este sitio, consulte nuestro <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">procedimiento
-          de eliminación</a> o presente la solicitud directamente en nuestra <a href="https://dmca.openstreetmap.org/">página
-          de presentación en línea</a>.
-        trademarks_title_html: <span id="trademarks"></span>Marcas registradas
-        trademarks_1_html: OpenStreetMap, el logotipo de la lupa y State of the Map
-          son marcas registradas de Fundación OpenStreetMap. Si tiene preguntas sobre
-          su uso, consulte nuestra <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">normativa
-          de marcas registradas</a>.
     index:
       js_1: Está usando un navegador que no soporta o tiene desactivado JavaScript
       js_2: OpenStreetMap utiliza JavaScript para mostrar su mapa
@@ -2206,7 +2108,6 @@ es:
       licence_details_html: Los datos de OpenStreetMap está registrada por %{odbl_link}
         (ODbL).
       odbl: Licencia de base de datos abierta de Open Data Commons
-      odbl_url: https://opendatacommons.org/licenses/odbl/1.0/
       too_large:
         advice: 'Si la exportación anterior falla, considere utilizar una de las fuentes
           que se enumeran a continuación:'
@@ -2309,7 +2210,6 @@ es:
         %{help_link}. ¿Con una organización que hace planes para OpenStreetMap? %{welcome_mat_link}.
       get_help_here: Obtén ayuda aquí
       welcome_mat: Echa un vistazo a Welcome Mat
-      welcome_mat_url: https://welcome.openstreetmap.org/
     sidebar:
       search_results: Resultados de la búsqueda
       close: Cerrar
@@ -2429,9 +2329,7 @@ es:
           realizar otras actividades diferentes a la edición a mano, por favor, lee
           y sigue las instrucciones en %{imports_link} y %{automated_edits_link}.
         imports: Importaciones
-        imports_url: https://wiki.openstreetmap.org/wiki/Import/Guidelines
         automated_edits: Ediciones automatizadas
-        automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct
       start_mapping: Comenzar a cartografiar
       add_a_note:
         title: ¿No tiene tiempo para editar? ¡Añada una nota!
@@ -2547,7 +2445,6 @@ es:
         %{wiki_link} correspondiente.'
       upload_new: Cargue una traza nueva
       wiki_page: página del wiki
-      wiki_page_url: https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2
       upload_trace: Subir una traza
       all_traces: Todas las trazas
       my_traces: Mis trazas
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 0888bb116..fb46fa4a2 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1112,10 +1112,6 @@ et:
       failed_to_import: 'importimine ebaõnnestus. Siin on viga:'
       subject: '[OpenStreetMap] GPX importimine nurjus'
     gpx_success:
-      loaded_successfully:
-        one: laaditi üles edukalt %{trace_points} punkt võimalikust ühest punktist.
-        other: laaditi üles edukalt %{trace_points} punkti võimalikust %{possible_points}
-          punktist.
       subject: '[OpenStreetMap] GPX Importimine õnnestus'
     signup_confirm:
       subject: '[OpenStreetMap] Tere tulemast OpenStreetMapi'
@@ -1463,109 +1459,18 @@ et:
         mapping_link: alustada kaardistamist
       legal_babble:
         title_html: Autoriõigused ja litsents
-        intro_1_html: |-
-          OpenStreetMapi<sup><a href="#trademarks">&reg;</a></sup> andmed on <i>avaandmed</i>, mille
-          <a href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF) on avaldanud Open Data Commonsi litsentsi <a href="https://opendatacommons.org/licenses/odbl/">Open Database License</a> (ODbL) all.
-        intro_2_html: |-
-          Tohid andmeid vabalt kopeerida, levitada, edastada ja kohandada,
-          kui viitad OpenStreetMapile ja selle kaastöölistele.
-          Kui muudad andmeid või teed neist tuletise, siis tohid
-          tulemust levitada ainult sama litsentsi tingimustel.
-          Sinu õigusi ja kohustusi selgitab litsentsi <a href="https://opendatacommons.org/licenses/odbl/1.0/">täistekst</a>.
-        intro_3_1_html: |-
-          Meie dokumentatsioon kuulub Creative Commonsi
-          litsentsi "<a href="https://creativecommons.org/licenses/by-sa/2.0/deed.et">Autorile viitamine + jagamine samadel tingimustel 2.0</a>" (CC BY-SA 2.0) alla.
         credit_title_html: OpenStreetMapile viitamine
         credit_1_html: 'Seal, kus kasutad OpenStreetMapi andmeid, tuleb sul teha kaht
           järgmist asja:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Viidata OpenStreetMapile, kuvades meie autoriõiguse teatist.</li>
-            <li>Näidata selgelt, et andmed on saadaval litsentsi Open Database License all.</li>
-          </ul>
-        credit_3_1_html: |-
-          Nõuded selle kohta, kuidas autoriõiguse teatist kuvada, sõltuvad sellest,
-          kuidas andmeid kasutad. Näiteks kohalduvad erinevad reeglid sõltuvalt
-          sellest, kas oled teinud sirvitava kaardi, trükikaardi või staatilise pildi.
-          Kõik üksikasjad nõuete kohta leiad <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">omistamisjuhendist</a>.
-        credit_4_html: |-
-          Näitamaks selgelt, et andmed on saadaval litsentsi Open
-          Database License all, võid linkida
-          <a href="https://www.openstreetmap.org/copyright">sellele autoriõiguse leheküljele</a>.
-          Teise võimalusena ning ka nõudena, kui levitad OSM-i andmete kujul,
-          saad nimetada litsentsi(d) ja linkida otse sellele. Meediumites,
-          kus see pole võimalik (nt trükiteostes), soovitame juhatada
-          lugejad aadressidele openstreetmap.org (võid näiteks asendada nime
-          "OpenStreetMap" selle täieliku aadressiga) ja opendatacommons.org.
-          Selles näites on viide autoritele kaardi nurgas.
         attribution_example:
           alt: Näide, kuidas tunnustada OpenStreetMapi veebilehel
           title: Omistamise näide
         more_title_html: Lisateave
-        more_1_html: Loe <a href="https://osmfoundation.org/Licence">OSMF-i litsentsileheküljelt</a>
-          veel andmete kasutamise kohta ja sellest, kuidas meile viidata.
-        more_2_html: |-
-          Kuigi OpenStreetMapi andmed on avaandmed, ei saa me pakkuda
-          kaardi juures tasuta API-t kolmandatele osapooltele.
-          Vaata meie <a href="https://operations.osmfoundation.org/policies/api/">API kasutusreegleid</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">kaardipaanide kasutusreegleid</a>
-          ja <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatimi kasutusreegleid</a>.
         contributors_title_html: Meie kaastöölised
         contributors_intro_html: |-
           Meie kaastöölised on tuhanded üksikisikud. Samuti oleme kaasanud
           vabalt litsentseeritud andmeid riiklikest kaardistusteenistustest
           ja muudest allikatest, sealhulgas:
-        contributors_at_html: "<strong>Austria</strong>: Sisaldab andmeid\n<a href=\"https://data.wien.gv.at/\">Viini
-          linnast</a> \n(<a href=\"https://creativecommons.org/licenses/by/3.0/at/deed.de\">CC
-          BY</a> tingimustel),\n<a href=\"https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Vorarlbergi
-          liidumaast</a> ja\nTirooli liidumaast (<a href=\"https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC
-          BY AT tingimustel koos õiendustega</a>)."
-        contributors_au_html: "<strong>Austraalia</strong>: Sisaldab andmeid või on
-          tuletatud andmetest, mille allikas on \n<a href=\"https://geoscape.com.au/legal/data-copyright-and-disclaimer/\">Geoscape
-          Australia</a>\nja mille kasutust lubab Austraalia Ühendus rahvusvahelise
-          litsentsi \n<a href=\"https://creativecommons.org/licenses/by/4.0/deed.et\">\"Autorile
-          viitamine 4.0\" (CC BY 4.0)</a> tingimustel."
-        contributors_ca_html: |-
-          <strong>Kanada</strong>: Sisaldab andmekogude
-          GeoBase&reg;, GeoGratis (&copy; Kanada loodusvarade
-          ministeerium), CanVec (&copy; Kanada loodusvarade
-          ministeerium) ja StatCan (Kanada statistikaameti
-          geograafia osakond) andmeid.
-        contributors_fi_html: |-
-          <strong>Soome</strong>: Sisaldab andmeid, mis on pärit
-          Soome riikliku maa-ameti topograafia andmekogust
-          ja teistest andmestikest. Andmed on kasutatavad <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI litsentsi</a> tingimustel.
-        contributors_fr_html: '<strong>Prantsusmaa</strong>: Sisaldab kaardiandmeid,
-          mis on pärit maksuametist (Direction Générale des Impôts).'
-        contributors_nl_html: |-
-          <strong>Holland</strong>: Sisaldab ettevõtte &copy; AND andmeid
-          (2007, <a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: "<strong>Uus-Meremaa</strong>: Sisaldab teenuse \n<a
-          href=\"https://data.linz.govt.nz/\">LINZ Data Service</a> andmeid, mis on
-          kasutatavad litsentsi\n<a href=\"https://creativecommons.org/licenses/by/4.0/deed.et\">CC
-          BY 4.0</a> tingimustel."
-        contributors_si_html: |-
-          <strong>Sloveenia</strong>: Sisaldab
-          <a href="http://www.gu.gov.si/en/">mõõdistus- ja kaardistusteenistuse</a> ning
-          <a href="http://www.mkgp.gov.si/en/">põllu-, metsa- ja toidumajandusministeeriumi</a> andmeid
-          (Sloveenia avalik informatsioon).
-        contributors_es_html: "<strong>Hispaania</strong>: Sisaldab Hispaania riikliku
-          geograafiainstituudi (<a href=\"http://www.ign.es/\">IGN</a>) ja \nriikliku
-          kartograafiasüsteemi (<a href=\"http://www.scne.es/\">SCNE</a>) andmeid,
-          mis on kasutatavad litsentsi \n<a href=\"https://creativecommons.org/licenses/by/4.0/deed.et\">CC
-          BY 4.0</a> tingimustel."
-        contributors_za_html: |-
-          <strong>LAV</strong>: Sisaldab andmeid allikast
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, õigused kuuluvad riigile.
-        contributors_gb_html: |-
-          <strong>Suurbritannia</strong>: Sisaldab Ordnance
-          Survey andmeid &copy; krooni autoriõigus ja andmebaasi õigused kaitstud
-          2010–2019.
-        contributors_footer_1_html: |-
-          Täpsemat teavet nendest ja teistest allikatest, mida on kasutatud
-          OpenStreetMapi täiendamiseks, leiad
-          <a href="https://wiki.openstreetmap.org/wiki/Contributors">kaastööliste leheküljelt</a> OpenStreetMapi vikis.
         contributors_footer_2_html: |-
           Andmete kasutamine OpenStreetMapi koosseisus ei tähenda, et
           algsete andmete pakkuja toetab OpenStreetMapi, pakub mingit tagatist või
@@ -1575,15 +1480,6 @@ et:
           OSM-i kaastöölistele on öeldud, et nad ei lisaks kunagi andmeid,
           mis pärinevad autoriõigusega kaitstud allikatest (nt Google Maps või trükikaardid),
           kui neil puudub autoriõiguse valdaja selgesõnaline luba.
-        infringement_2_html: |-
-          Kui usud, et OpenStreetMapi andmebaasi või sellele saidile on lisatud sobimatult
-          autoriõigusega kaitstud materjali, siis palun juhindu
-          <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">eemaldamise protseduurist</a>
-          või täida <a href="https://dmca.openstreetmap.org/">vastaval leheküljel</a> vorm, et kaebus esitada.
-        trademarks_title_html: <span id="trademarks"></span>Kaubamärgid
-        trademarks_1_html: OpenStreetMap, suurendusklaasi logo ja State of the Map
-          on OpenStreetMap Foundationi registreeritud kaubamärgid. Kui sul on nende
-          märkide kasutamise kohta küsimusi, siis vaata meie <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">kaubamärgireegleid</a>.
     index:
       js_1: Kasutad kas brauserit, mis ei toeta JavaScripti, või oled JavaScripti
         keelanud.
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 206f50eca..053c38970 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1611,8 +1611,6 @@ eu:
       subject: '[OpenStreetMap] GPX Inportazioan porrota'
     gpx_success:
       hi: Kaixo %{to_user},
-      loaded_successfully: '%{trace_points} puntuekin %{possible_points} puntuetatik
-        arrakastaz kargatu da.'
       subject: '[OpenStreetMap] GPX Inportazioan arrakasta'
     signup_confirm:
       subject: '[OpenStreetMap] Ongi etorri OpenStreetMap-era'
@@ -1968,91 +1966,17 @@ eu:
         mapping_link: kartografiarekin hasi
       legal_babble:
         title_html: Egile-eskubideak eta lizentzia
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup><i> irekitako datua multzoa </i> da, <a
-          href = "http://opendatacommons.org/licenses/odbl/">Datu irekiak
-          Commons Open Database Lizentzia </a> (ODbL) <a
-          href = "http://osmfoundation.org/"> darama OpenStreetMap Fundazioaren babespean </a> (OSMF).
-        intro_2_html: |-
-          Kopiatu, banatu, transmititu eta gure datuak egokitzeko baimena duzu, betiere kredituetan OpenStreetMap eta bere
-          laguntzaileak sartuz. Zure datuak aldatzen edo erauzten badituzu, lizentzia horren azpian soilik banatzea gerta daiteke. <a href="http://opendatacommons.org/licenses/odbl/1.0/"> legal
-          kodeak </a> zure eskubideak eta erantzukizunak azaltzen ditu.
-        intro_3_1_html: |-
-          Gure dokumentazioa
-           <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Aitortu-PartekatuBerdin 2.0</a> lizentziapean (CC BY-SA 2.0) banatzen da.
         credit_title_html: OpenStreetMap nola kreditatu
         credit_1_html: 'OpenStreetMap datuak erabiltzen dituzun lekuetan, bi gauza
           hauek egin behar dituzu:'
-        credit_2_1_html: "<ul>\n<li> Eman kreditua OpenStreetMap-i gure copyright-oharra
-          erakutsiz.</li> \n<li> Argi utzi datuak Open Database Lizentziapean eskuragarri
-          daudela.</li> \n</ul>"
-        credit_3_1_html: |-
-          Copyright oharrerako, nola
-          bistaratu behar den baldintza desberdinak ditugu, gure datuak nola erabiltzen ari zarenaren arabera. Esaterako, copyright-oharra erakusteko arau desberdinak aplikatzen dira mapa arakagarri bat, mapa inprimatua edo irudi estatiko bat sortu duzunaren arabera. Baldintzei buruzko xehetasun guztiak <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Atribuzio Gidalerroak</a> atalean aurki daitezke.
-        credit_4_html: |-
-          Datuak Open Database Lizentziapean eskuragarri daudela argi uzteko, <a href="https://www.openstreetmap.org/copyright">copyright orri hau</a> esteka dezakezu.
-          Bestela, eta derrigorrezkoa da OSM datu moduan banatzen ari bazara, zuzenean lizentzia(k) izendatu eta esteka dezakezu. Estekak posible ez diren eukarrietan (adibidez, inprimatutako lanak), irakurleak openstreetmap.org-era (agian 'OpenStreetMap' helbide oso honetara zabalduz) eta opendatacommons.org-era zuzentzea gomendatzen dizugu.
-          Adibide honetan, kreditua maparen izkinan agertzen da.
         attribution_example:
           alt: Web-orri batean OpenStreetMap nola esleitu erakusteko adibidea
           title: Eskuduntza adibidea
         more_title_html: Jakin ezazu gehiago
-        more_1_html: |-
-          Irakurri gehiago gure datuak erabiltzeari buruz, eta nola gu kreditatu, hemen:<a
-          href="http://osmfoundation.org/Licence">OSMF Licence page</a>.
-        more_2_html: |-
-          OpenStreetMap datuak irekita dauden arren, ezin dugu eman
-          aplikazio libreko maparen APIa hirugarrenentzat.
-          Ikusi gure <a href="https://operations.osmfoundation.org/policies/api/"> API erabileraren gidalerroak </a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/"> Tile erabileraren gidalerroak </a>
-          eta <a href="https://operations.osmfoundation.org/policies/nominatim/"> Nominatim Erabilera-gidalerroak aztertzeko</a>.
         contributors_title_html: Gure kolaboratzaileak
         contributors_intro_html: |-
           Gure laguntzaileen taldea milaka pertsonek osatzen dute. Horrez gain, nazio mailan aginte publikoko lizentziak
           dituzten mapak eta beste iturri batzuk eskeintzen ditugu, besteak beste:
-        contributors_at_html: |-
-          <strong>Austria</strong>: Honako iturrietatik ateratako datuak ditu:
-          <a href="http://data.wien.gv.at/">Stadt Wien</a> (<a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a> lizentziapean),
-          <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> eta
-          Land Tirol (<a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT zuzenketekin</a> lizentziapean).
-        contributors_ca_html: |-
-          <strong>Canada</strong>: Datuak
-          GeoBase&reg;, GeoGratis (&copy; Department of Natural
-          Resources Canada), CanVec (&copy; Department of Natural
-          Resources Canada), eta StatCan (Geography Division,
-          Statistics Canada) biltegietatik hartzen ditu.
-        contributors_fi_html: |-
-          <strong>Finland</strong>: Datuak hemendik hartzen ditu: Finlandiako topografia datu-baseko inkesta nazionala
-          eta beste datubase batzuk, honen azpian:
-          <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI License</a>.
-        contributors_fr_html: '<strong>Frantzia</strong>: Direction Générale des Impôts-etik
-          ateratako datuak ditu.'
-        contributors_nl_html: |-
-          <strong>Herbehereak</strong>: Contains &copy; AND data, 2007
-          (<a href="http://www.and.com">www.and.com</a>)
-        contributors_nz_html: '<strong>Zeelanda Berria</strong>: <a href="https://data.linz.govt.nz/">LINZ
-          datu zerbitzuko</a> datuak biltzen ditu, <a href="https://creativecommons.org/licenses/by/4.0/">CC
-          BY 4.0</a> lizentziaren arabera berrerabili daitezkeenak.'
-        contributors_si_html: |-
-          <strong>Eslovenia</strong>: datuak biltzen ditu
-          <a href="http://www.gu.gov.si/en/"> Burutzea eta Mapping Agintaritzatik </a> eta
-          <a href="http://www.mkgp.gov.si/en/"> Nekazaritza, Basogintza eta Elikadura Ministeriotik</a>
-          (Esloveniako informazio publikoa).
-        contributors_es_html: |-
-          <strong>Espainia</strong>: Espainiako Institutu Geografiko Nazionaletik (<a href="http://www.ign.es/">IGN</a>) eta
-          Sistema Kartografiko Nazionaletik (<a href="http://www.scne.es/">SCNE</a>) jasotako datuak daude, berrerabiltzeko baimendua <a href="https://creativecommons.org/licenses/by/4.0/deed.eu">CC BY 4.0</a> lizentziapean.
-        contributors_za_html: |-
-          <strong> Hego Afrika </strong>:
-          <a href="http://www.ngi.gov.za/"> Zuzendaritza Nagusia datuen jatorria:
-          Geo-Lurralde Informazio Nazionala </a>, Estatuko copyright erreserbatuta.
-        contributors_gb_html: |-
-          <strong>Erresuma Batua</strong>: Ordnance
-          Inkestaren datuak eta kopiak biltzen ditu; Crown copyright eta datu-basearen eskubidea 2010-19.
-        contributors_footer_1_html: |-
-          OpenStreetMap hobetzen laguntzeko lagundu dutenen xehetasun gehiago eta erabilitako beste iturri batzuk ezagutzeko, mesedez OpenStreetMap Wikian ikusi <a
-          href="http://wiki.openstreetmap.org/wiki/Contributors">Contributors
-          page</a>.
         contributors_footer_2_html: |-
           OpenStreetMap-en datuak sartzeak ez du beharrez jatorrizko
           datu-hornitzaileak OpenStreetMap onartzea baieztatzen, edozein berme ematen, edota inolako erantzukizunik onartzen.
@@ -2060,15 +1984,6 @@ eu:
         infringement_1_html: |-
           OSMren laguntzaileek ez dute inolako daturik gehitu behar
           copyright iturrietatik (adibidez, Google Maps edo inprimatutako mapak) copyright-jabeen baimen espliziturik gabe.
-        infringement_2_html: |-
-          Uste baduzu copyrighta duen materiala modu ezegokian gehitu zaiola OpenStreetMap datu-baseari edo gune honi, mesedez jo gure <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">desegite
-          prozedurara</a> edo zuzenean bete gure
-          <a href="https://dmca.openstreetmap.org/">on-line deklarazio orria</a>.
-        trademarks_title_html: <span id="trademarks"></span>Marka komertzialak
-        trademarks_1_html: OpenStreetMap, lupa-logotipoa eta Maparen egoera OpenStreetMap
-          Fundazioaren marka erregistratuak dira. Marka erabiltzeari buruzko galderarik
-          baduzu, bidali zure galderak <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">
-          Lizentzia-lan taldera</a>.
     index:
       js_1: Javascript onartzen ez duen arakatzailea erabiltzen ari zara edo JavaScript
         desgaitu duzu.
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index c2638f248..792ad4cc4 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1540,10 +1540,6 @@ fa:
       subject: '[OpenStreetMap] ‫شکست درون‌برد GPX‬'
     gpx_success:
       hi: ‫سلام %{to_user}،‬
-      loaded_successfully:
-        one: با موفقیت و با %{trace_points} نقطه از 1 نقطهٔ ممکن بار شده است.
-        other: با موفقیت و با %{trace_points} نقطه از %{possible_points} نقطهٔ ممکن
-          بار شده است.
       subject: '[OpenStreetMap] ‫موفقیت درون‌برد GPX‬'
     signup_confirm:
       subject: '[OpenStreetMap] به اوپن‌استریت‌مپ خوش آمدید'
@@ -1903,95 +1899,17 @@ fa:
         mapping_link: شروع به نقشه‌کشی
       legal_babble:
         title_html: حق نشر و پروانه
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup>  <i><abbr title="Open Data"></abbr>دادهٔ باز</i> است و از سوی  <a
-          href="https://osmfoundation.org/">بنیاد OpenStreetMap</a> ‏(OSMF) تحت پروانهٔ <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> ‏(ODbL) قرار دارد.
-        intro_2_html: تا زمانی که از OpenStreetMap و مشارکت‌کنندگان آن یاد کنید، برای
-          کپی‌برداری، توزیع، انتقال و اقتباس (از) داده‌های ما آزاد هستید. اگر داده‌های
-          ما را تغییر دهید یا بر پایهٔ آن‌ها تولید کنید، باید نتایج را فقط تحت همان
-          مجوز توزیع کنید. نسخهٔ کامل <a href="http://opendatacommons.org/licenses/odbl/1.0/">بایدونبایدهای
-          قانونی</a> حقوق و وظایف شما را توضیح می‌دهد.
-        intro_3_1_html: |-
-          مستندات ما تحت پروانهٔ <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0) است.
         credit_title_html: چگونه از OpenStreetMap یاد کنیم
         credit_1_html: 'جایی که دارید از داده‌های اوپن‌استریت‌مپ استفاده می‌کنید،
           لازم است دو کار زیر را انجام دهید:'
-        credit_2_1_html: |-
-          <ul>
-            <li>ارائهٔ اعبار به اوپن‌استریت‌مپ با نمایش اطلاعیهٔ کپی‌رایت‌مان.</li>
-            <li>مشخص کنید که داده‌ها تحت پروانهٔ آزاد پایگاه داده هستند.</li>
-          </ul>
-        credit_3_1_html: بنا بر شیوهٔ استفادهٔ شما از دادهٔ ما، برای چگونگی نمایش
-          اطلاعیهٔ حق نشر نیازمندی‌های مختلفی داریم. برای مثال، بسته به اینکه نقشه‌ای
-          که ساخته‌اید مرورکردنی باشد، چاپی باشد یا تصویری ثابت باشد، قوائد مختلفی
-          برای نحوهٔ نمایش اطلاعایهٔ حق نشر در نظر گرفته‌ایم. جزئیات کامل این نیازمندی‌ها
-          را می‌توانید در <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">رهنمودهای
-          انتساب</a> ببینید.
-        credit_4_html: |-
-          در یک نقشهٔ الکترونیکی قابل مرور، یادکرد باید در گوشهٔ نقشه ظاهر شود.
-          برای مثال:
         attribution_example:
           alt: مثالی از شیوهٔ انتساب به OpenStreetMap در صفحهٔ وبی.
           title: مثال انتساب
         more_title_html: کسب اطلاعات بیشتر
-        more_1_html: برای اطلاعات بیشتر دربارهٔ استفاده از داده‌های ما و چگونگی یادکرد
-          ما <a href="https://osmfoundation.org/Licence">صفحهٔ پروانهٔ بنیاد OSM</a>
-          را بخوانید.
-        more_2_html: اگرچه اوپن‌استریت‌مپ دادهٔ آزاد است، اما نمی‌توانیم API نقشه
-          را به‌رایگان در اختیار توسعه‌دهندگان ثالث قرار دهیم. <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">سیاست
-          استفاده از API </a> ، <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">سیاست
-          استفاده از کاشی‌ها</a> و <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">سیاست
-          استفاده از Nominatim</a> را ببینید.
         contributors_title_html: همکاران ما
         contributors_intro_html: 'مشارکت‌کنندگانی که با ما همکاری می‌کنند هزاران شخص
           هستند. داده‌هایی با پروانهٔ آزاد از سازمان‌های نقشه‌برداری ملی و دیگر منابع
           را نیز در کنار آن‌ها داریم، از جمله:'
-        contributors_at_html: "<strong>اتریش</strong>: شامل داده‌هایی از \n<a href=\"https://data.wien.gv.at/\">Stadt
-          Wien</a> (تحت پروانهٔ <a href=\"https://creativecommons.org/licenses/by/3.0/at/deed.de\">CC
-          BY</a>)،\n<a href=\"https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land
-          Vorarlberg</a> و\nLand Tirol (تحت پروانهٔ <a href=\"https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC
-          BY AT همراه با چند الحاقیه</a>)."
-        contributors_au_html: |-
-          <strong>استرالیا</strong>: شامل داده‌هایی با منبع <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a>
-          که از سوی کشور مشترک‌المنافع استرالیا تحت پروانهٔ
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a> قرار دارد.
-        contributors_ca_html: "<strong>کانادا</strong>: شامل داده‌هایی از \nGeoBase&reg;،‏
-          GeoGratis (&copy; Department of Natural\nResources Canada)،‏ CanVec (&copy;
-          Department of Natural\nResources Canada) و StatCan (Geography Division,\nStatistics
-          Canada)."
-        contributors_fi_html: "<strong>فنلاند</strong>: شامل داده‌هایی از \nNational
-          Land Survey of Finland's Topographic Database\nو سایر مجموعه‌داده‌ها، تحت
-          \n<a href=\"https://www.maanmittauslaitos.fi/en/opendata-licence-version1\">پروانهٔ
-          NLSFI</a>."
-        contributors_fr_html: |-
-          <strong>فرانسه</strong>: شامل داده‌هایی با منبع
-          Direction Générale des Impôts.
-        contributors_nl_html: |-
-          <strong>هلند</strong>: شامل داده‌های &copy; AND،‏ ۲۰۰۷
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: "<strong>نیوزیلند</strong>: شامل داده‌هایی با منبع \n<a
-          href=\"https://data.linz.govt.nz/\">LINZ Data Service</a> و\nتحت پروانهٔ
-          \n<a href=\"https://creativecommons.org/licenses/by/4.0/\">CC BY 4.0</a>
-          برای استفادهٔ مجدد."
-        contributors_si_html: |-
-          <strong>اسلوونی</strong>: شامل داده‌هایی از <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> و
-          <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
-          (اطلاعات عمومی اسلوونی).
-        contributors_es_html: |-
-          <strong>اسپانیا</strong>: شامل داده‌هایی از Spanish National Geographic Institute (<a href="http://www.ign.es/">IGN</a>) و  National Cartographic System (<a href="http://www.scne.es/">SCNE</a>)
-          تحت پروانهٔ <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a> برای استفادهٔ مجدد.
-        contributors_za_html: "<strong>آفریقای جنوبی</strong>: شامل داده‌هایی از \n<a
-          href=\"http://www.ngi.gov.za/\">Chief Directorate:\nNational Geo-Spatial
-          Information</a>، حق نشر State محفوظ است."
-        contributors_gb_html: |-
-          <strong>پادشاهی بریتانیا</strong>: شامل داده‌های Ordnance
-          Survey &copy;‏ حق نشر و حق پایگاه داده Crown‏ ۲۰۱۰-۱۹.
-        contributors_footer_1_html: |-
-          برای اطلاعات بیشتر درباره این‌ها و سایر منابعی که برای پیشرفت اوپن‌استریت‌مپ استفاده شده، لطفاً <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">صفحهٔ مشارکت‌کنندگان</a> را در ویکی ببینید.
         contributors_footer_2_html: ورود داده در OpenStreetMap به این معنی نیست که
           فراهم‌کنندهٔ اصلی داده OpenStreetMap را تأیید می‌کند، ضمانتی می‌دهد، یا
           مسئولیتی می‌پذیرد.
@@ -1999,15 +1917,6 @@ fa:
         infringement_1_html: به مشارکت‌کنندگان OSM یادآوری شده است که هرگز از منابع
           دارای حق نشر داده اضافه نکنند (مثلاً نقشه‌های گوگل یا نقشه‌های چاپی)، مگر
           با اجازهٔ صریح و آشکار از صاحبان حق نشر.
-        infringement_2_html: اگر بر این باورید که دادهٔ مشمول حق نشر به‌طور نامناسبی
-          به پایگاه دادهٔ OpenStreetMap  یا به این وبگاه افزوده شده، لطفاً به <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">روندنامهٔ
-          حذف</a> مراجعه کنید یا دادخواست خود را مستقیماً در <a href="https://dmca.openstreetmap.org/">صفحهٔ
-          دادخواهی برخط</a> تسلیم کنید.
-        trademarks_title_html: <span id="trademarks"></span>نشان‌های تجاری
-        trademarks_1_html: OpenStreetMap،‏ نشان‌وارهٔ ذره‌بین‌دار و State of the Map
-          نشان‌های تجاری ثبت‌شده و متعلق به بنیاد OpenStreetMap هستند. برای یافتن
-          پاسخ پرسش‌های خود دربارهٔ استفاده از این نشان‌ها، لطفاً <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">سیاست‌نامهٔ
-          نشان تجاری</a> را ببینید.
     index:
       js_1: شما در حال استفاده از مرورگری هستید که جاوااسکریپت را پشتیبانی نمی‌کند،
         یا جاوااسکریپت را غیرفعال کرده‌اید.
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 8e0d37ca4..9e96be81c 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1602,10 +1602,6 @@ fi:
       subject: '[OpenStreetMap] GPX-tuonti epäonnistui'
     gpx_success:
       hi: Hei %{to_user}!
-      loaded_successfully:
-        one: '%{trace_points} pistettä mahdollisesta 1 pisteestä ladattu onnistuneesti.'
-        other: ' {trace_points} pistettä  mahdollisista %{possible_points} ladattu
-          onnistuneesti pisteestä.'
       subject: '[OpenStreetMap] GPX-tuonti onnistui'
     signup_confirm:
       subject: '[OpenStreetMap] Tervetuloa OpenStreetMapiin'
@@ -1951,97 +1947,19 @@ fi:
         mapping_link: aloittaa kartoituksen
       legal_babble:
         title_html: Tekijänoikeus ja lisenssi
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> on <i>avointa dataa</i>, jonka <a
-          href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF) on lisensoinut <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database -lisenssillä</a> (ODbL).
-        intro_2_html: "OpenStreetMapin karttoja ja tietoja voi kopioida, levittää,
-          välittää ja mukauttaa, \nkunhan OpenStreetMap ja sen tekijät mainitaan.
-          Jos karttoja tai tietoja muutetaan tai kehitetään, niitä saa levittää vain
-          samalla lisenssillä.\n<a href=\"https://opendatacommons.org/licenses/odbl/1.0/\">Lakitekstissä</a>
-          mainitaan levittäjän oikeudet ja velvollisuudet."
-        intro_3_1_html: |-
-          Dokumentaatio on lisensoitu <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.fi">Creative
-          Commons Nimeä-JaaSamoin 2.0</a> -lisenssillä (CC-BY-SA 2.0).
         credit_title_html: OpenStreetMapin mainitseminen
         credit_1_html: OpenStreetMapin sisältöä levitettäessä on mainittava teksti
           &quot;&copy; OpenStreetMapin tekijät&quot; tai sen englanninkielinen vastine
           &quot;&copy; OpenStreetMap contributors&quot;.
-        credit_2_1_html: "Levittäjän tulee tehdä selväksi, että aineisto on saatavilla
-          Open Database -lisenssillä\nja kartta-aineisto CC-BY-SA-lisenssillä. Tämä
-          voidaan tehdä sijoittamalla sivulle linkki\n<a href=\"https://www.openstreetmap.org/copyright\">tälle
-          tekijänoikeussivulle</a>. \nJos linkkien käyttö ei ole mahdollista (esimerkiksi
-          paperille tulostettu aineisto),\nsuosittelemme ohjaamaan lukijat osoitteisiin
-          www.openstreetmap.org, opendatacommons.org ja tarvittaessa myös creativecommons.org."
-        credit_3_1_html: |-
-          &ldquo;Standardityylin&rdquo; karttalaatat osoitteessa www.openstreetmap.org ovat
-          OpenStreetMap Foundationin luomia teoksia ja ne on luotu käyttäen OpenStreetMapin
-          dataa, joka on julkaistu Open Database License -lisenssillä. Tätä karttatyyliä
-          käytettäessä tulee tehdä samat lähdemaininnat kuin kartta-aineiston käytön
-          yhteydessä.
-        credit_4_html: 'Sivustolle upotetun interaktiivisen karttaikkunan tulee sisältää
-          tekijän nimi kartan alaosassa:'
         attribution_example:
           alt: Esimerkki siitä, miten nimetä OpenStreetMap nettisivulla
           title: Nimeämisesimerkki
         more_title_html: Lisätietoja
-        more_1_html: |-
-          Lue lisää aineiston käyttämisestä ja tekijöiden mainitsemisesta <a
-          href="https://osmfoundation.org/Licence">OSM-säätiön lisensointiohjeesta</a>.
-        more_2_html: "Vaikka OpenStreetMap on avointa dataa, emme voi tarjota maksutonta
-          karttarajapintaa (API) kolmannen osapuolen kehittäjille.\n\nTutustu <a href=\"https://operations.osmfoundation.org/policies/api/\">karttarajapinnan
-          käyttöehtoihin</a>,\n<a href=\"https://operations.osmfoundation.org/policies/tiles/\">kartta-aineiston
-          käyttöehtoihin</a> ja \n<a href=\"https://operations.osmfoundation.org/policies/nominatim/\">Nominatimin
-          käyttöehtoihin</a>."
         contributors_title_html: Tekijät
         contributors_intro_html: |-
           Tekijöinämme on tuhansia yksityishenkilöitä. Olemme myös sisällyttäneet
           vapaasti lisensoitua dataa kansallisilta kartoitustoimistoilta
           ja muista lähteistä, muun muassa:
-        contributors_at_html: |-
-          <strong>Itävalta</strong>: Sisältää karttatietoja
-          <a href="https://data.wien.gv.at/">Stadt Wienistä</a> (<a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY -lisenssillä</a>),
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlbergista</a> ja
-          Land Tirolista (<a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT -lisenssillä tietyin muutoksin</a>).
-        contributors_au_html: |-
-          <strong>Australia</strong>: Sisältää kaupunginosatietoja
-             Australian Bureau of Statisticsilta.
-        contributors_ca_html: |-
-          <strong>Kanada</strong>: Sisältää karttatietoja
-             GeoBasesta ®, GeoGratisista (© Department of Natural
-             Resources Canada), CanVecista (© Department of Natural
-             Resources Canada), ja StatCanista (Geography Division,
-             Statistics Canada).
-        contributors_fi_html: '<strong>Suomi</strong>: Sisältää karttatietoja Maanmittauslaitoksen
-          maastotietokannasta ja muista lähteistä <a href="https://www.maanmittauslaitos.fi/avoindata_lisenssi_versio1_20120501">Maanmittauslaitoksen
-          lisenssin</a> mukaisesti.'
-        contributors_fr_html: |-
-          <strong>Ranska</strong>: Sisältää karttatietoja
-             Direction Générale des Impôtsista.
-        contributors_nl_html: |-
-          <strong>Alankomaat</strong>: Sisältää &copy; AND-karttatietoja vuodelta 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>Uusi-Seelanti</strong>: Sisältää karttatietoja <a href="https://data.linz.govt.nz/">LINZ-tietopalvelusta</a>, jotka on lisensoitu jatkokäyttöä varten
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a> -lisenssillä.
-        contributors_si_html: "<strong>Slovenia</strong>: Sisältää \n<a href=\"http://www.gu.gov.si/en/\">Maanmittaus-
-          ja kartoitusviranomaisen</a> sekä\n<a href=\"http://www.mkgp.gov.si/en/\">Maatalous-,
-          metsä- ja ruokaministeriön</a> tuottamia karttatietoja\n(Slovenian julkista
-          karttamateriaalia)."
-        contributors_es_html: |-
-          <strong>Espanja</strong>: Sisältää karttatietoja Espanjan kansallisesta maantieteellisestä instituutista (<a href="http://www.ign.es/">IGN</a>) ja
-          kansallisesta kartografiajärjestelmästä (<a href="http://www.scne.es/">SCNE</a>)
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a> -lisenssillä.
-        contributors_za_html: |-
-          <strong>Etelä-Afrikka</strong>: Sisältää karttatietoja
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Informationista</a>, kaikki oikeudet pidätetään.
-        contributors_gb_html: |-
-          <strong>Iso-Britannia</strong>: Sisältää Ordnance Surveyn
-          keräämiä karttatietoja © Kruunun tekijänoikeuden ja tietokantojen käyttöoikeuden vuosilta 2010-2023.
-        contributors_footer_1_html: |-
-          Täydellinen lista OpenStreetMapin tukijoista löytyy OpenStreetMapin wikistä <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">Avustajat-sivulta</a>.
         contributors_footer_2_html: |-
           Tietojen sisältyminen OpenStreetMapiin ei tarkoita, että tietojen antaja
           ottaa kantaa OpenStreetMapiin tai vastuuta tietojen oikeellisuudesta.
@@ -2049,15 +1967,6 @@ fi:
         infringement_1_html: |-
           OpenStreetMapin kartoittajia muistutetaan, että kopioiminen tekijänoikeuksien alaisista teoksista
           (esimerkiksi Google-kartoista tai paperikartoista) ilman tekijänoikeuden haltijan nimenomaista lupaa on kielletty.
-        infringement_2_html: Jos kuka tahansa OpenStreetMapin käyttäjä epäilee, että
-          karttatietoja on otettu luvattomasta lähteestä OpenStreetMapin karttatietoihin
-          tai sivustolle, siitä tulee tehdä <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">poistopyyntö</a>
-          tai <a href="https://dmca.openstreetmap.org/">ilmoittaa suoraan</a>.
-        trademarks_title_html: <span id="trademarks"></span>Tavaramerkit
-        trademarks_1_html: OpenStreetMap, suurennuslasilogo ja State of the Map ovat
-          OpenStreetMap-säätiön rekisteröityjä tavaramerkkejä. Tutustu ohjeeseen <a
-          href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">tavaramerkkien
-          käytöstä.</a>
     index:
       js_1: Selain ei tue JavaScriptiä tai sen suorittaminen on estetty.
       js_2: OpenStreetMap tarvitsee JavaScriptin liikuteltavaan karttaan.
diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index 26861b38c..2218b31b5 100644
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -799,30 +799,10 @@ fit:
         mapping_link: aloittaa kartoituksen
       legal_babble:
         title_html: Tekijänoikeus ja lisensi
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> oon <i>avointa taattaa</i>, jonka <a
-          href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF) oon lisensoinut <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database -lisensillä</a> (ODbL).
-        intro_2_html: "OpenStreetMapin karttoja ja tietoja voi kopioida, levittää,
-          välittää ja mukauttaa, \nkunhan OpenStreetMap ja sen tekijät mainitaan.
-          Jos karttoja tai tietoja muutethaan tai kehitethään, niitä saa levithää
-          vain samalla lisensilä.\n<a href=\"https://opendatacommons.org/licenses/odbl/1.0/\">Lakitekstissä</a>
-          mainitaan levittäjän oikeudet ja velvollisuudet."
-        intro_3_1_html: |-
-          Kartta-aineisto ja dokumentaatio oon lisensoitu <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.fi">Creative
-          Commons Nimeä-Jaa samoin 2.0</a> -lisensillä (CC-BY-SA).
         credit_title_html: OpenStreetMapin mainitseminen
         credit_1_html: OpenStreetMapin sisältöä levitettäessä oon mainittava teksti
           &quot;&copy; OpenStreetMapin tekijät&quot; tai sen engelskankielinen vastine
           &quot;&copy; OpenStreetMap contributors&quot;.
-        credit_2_1_html: "Levittäjän tulee tehdä selväksi, ette aineisto oon saatavilla
-          Open Database -lisensillä\nja kartta-aineisto CC-BY-SA-lisensillä. Tämä
-          voidaan tehdä sijoittamalla sivule länkki\n<a href=\"https://www.openstreetmap.org/copyright\">tälle
-          tekijänoikeussivule</a>. \nJos länkkien käyttö ei ole mahollista (esimerkiksi
-          paperille printattu aineisto),\nsuosittelemme ohjaamaan lukijat atresseihin
-          www.openstreetmap.org, opendatacommons.org ja tarvittaessa myös creativecommons.org."
-        credit_4_html: 'Sivustolle upotetun interaktiivisen karttaikkunan tulee sisältää
-          tekijän nimi kartan alaosassa:'
         attribution_example:
           alt: Esimerkki siitä, miten nimetä OpenStreetMap nettisivula
           title: Nimeämisesimerkki
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 2979020e8..bae968fdf 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -4,6 +4,7 @@
 # Author: 0x010C
 # Author: Ajeje Brazorf
 # Author: Alno
+# Author: Amire80
 # Author: Boniface
 # Author: Cantons-de-l'Est
 # Author: Cquoi
@@ -254,41 +255,41 @@ fr:
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: il y a environ une heure
+        one: il y a environ %{count} heure
         other: il y a environ %{count} heures
       about_x_months:
-        one: il y a environ un mois
+        one: il y a environ %{count} mois
         other: il y a environ %{count} mois
       about_x_years:
-        one: il y a environ un an
+        one: il y a environ %{count} an
         other: il y a environ %{count} ans
       almost_x_years:
-        one: il y a presque un an
+        one: il y a presque %{count} an
         other: il y a presque %{count} ans
       half_a_minute: il y a une demi-minute
       less_than_x_seconds:
-        one: il y a moins d’une seconde
+        one: il y a moins de %{count} seconde
         other: il y a moins de %{count} secondes
       less_than_x_minutes:
-        one: il y a moins d’une minute
+        one: il y a moins de %{count} minute
         other: il y a moins de %{count} minutes
       over_x_years:
-        one: il y a plus d’un an
+        one: il y a plus de %{count} an
         other: il y a plus de %{count} ans
       x_seconds:
-        one: il y a une seconde
+        one: il y a %{count} seconde
         other: il y a %{count} secondes
       x_minutes:
-        one: il y a une minute
+        one: il y a %{count} minute
         other: il y a %{count} minutes
       x_days:
-        one: hier
+        one: il y a %{count} jour
         other: il y a %{count} jours
       x_months:
-        one: il y a un mois
-        other: il y a %{count} mois
+        one: il y a %{count}}} mois
+        other: il y a %{count}}} mois
       x_years:
-        one: l’année dernière
+        one: il y a %{count} an
         other: il y a %{count} ans
   editor:
     default: Par défaut (actuellement %{name})
@@ -395,7 +396,6 @@ fr:
         site Web, cliquez sur le bouton ci-dessous.
       only_public_can_edit: Depuis le basculement à l’API 0.6, seuls les utilisateurs
         publics peuvent modifier les données cartographiques
-      find_out_why_html: (%{link}).
       find_out_why: découvrez pourquoi
       find_out_why_url: https://wiki.openstreetmap.org/wiki/FR:Modifications_anonymes
       email_not_revealed: Votre adresse de courriel ne sera pas révélée en rendant
@@ -425,17 +425,15 @@ fr:
     no_comment: (aucun commentaire)
     part_of: Partie de
     part_of_relations:
-      one: 1 relation
+      one: '%{count} relation'
       other: '%{count} relations'
     part_of_ways:
-      one: 1 chemin
+      one: '%{count} chemin'
       other: '%{count} chemins'
     download_xml: Télécharger en XML
     view_history: Voir l’historique
     view_details: Afficher les détails
     location: 'Emplacement :'
-    common_details:
-      coordinates_html: '%{latitude}, %{longitude}'
     changeset:
       title: 'Groupe de modifications : %{id}'
       belongs_to: Auteur
@@ -475,10 +473,9 @@ fr:
       history_title_html: 'Historique de la relation : %{name}'
       members: Membres
       members_count:
-        one: 1 membre
+        one: '%{count} membre'
         other: '%{count} membres'
     relation_member:
-      entry_html: '%{type} %{name}'
       entry_role_html: '%{type} %{name} avec le rôle %{role}'
       type:
         node: Nœud
@@ -731,7 +728,6 @@ fr:
         osm_nominatim_reverse_html: Résultats venant de <a href="https://nominatim.openstreetmap.org/">Nominatim
           sur OpenStreetMap</a>
     search_osm_nominatim:
-      prefix_format: '%{name}'
       prefix:
         aerialway:
           cable_car: Téléphérique
@@ -1527,8 +1523,7 @@ fr:
       last_updated_time_user_html: à <abbr title="%{title}">%{time}</abbr> par %{user}
       link_to_reports: Afficher les rapports
       reports_count:
-        zero: Aucun rapport
-        one: Un rapport
+        one: '%{count} rapport'
         other: '%{count} rapports'
       reported_item: Élément signalé
       states:
@@ -1538,8 +1533,7 @@ fr:
     show:
       title: Problème %{status} nº %{issue_id}
       reports:
-        zero: Aucun rapport
-        one: 1 rapport
+        one: '%{count} rapport'
         other: '%{count} rapports'
       report_created_at: Signalé la première fois à %{datetime}
       last_resolved_at: Dernière résolution à %{datetime}
@@ -1610,9 +1604,6 @@ fr:
       successful_report: Votre rapport a bien été enregistré
       provide_details: Veuillez fournir les détails requis
   layouts:
-    project_name:
-      title: OpenStreetMap
-      h1: OpenStreetMap
     logo:
       alt_text: Logo d’OpenStreetMap
     home: Aller à votre domicile
@@ -1702,14 +1693,13 @@ fr:
       failed_to_import: 'n’a pas pu être importé. Voici l’erreur :'
       more_info_html: Vous trouverez plus d’informations sur les échecs d’import GPX
         et comment les éviter à l’adresse %{url}.
-      import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures
       subject: '[OpenStreetMap] Échec de l’import GPX'
     gpx_success:
       hi: Bonjour %{to_user},
-      loaded_successfully:
-        one: s’est chargé correctement avec %{trace_points} du seul point possible.
-        other: s’est chargé correctement avec %{trace_points} des %{possible_points}
-          points possibles.
+      loaded:
+        one: s’est chargé correctement avec %{trace_points} dd %{count} point possible.
+        other: s’est chargé correctement avec %{trace_points} des %{count} points
+          possibles.
       subject: '[OpenStreetMap] Import GPX réussi'
     signup_confirm:
       subject: '[OpenStreetMap] Bienvenue dans OpenStreetMap'
@@ -2009,8 +1999,6 @@ fr:
   shared:
     markdown_help:
       heading_html: Analysé avec %{kramdown_link}
-      kramdown_url: https://kramdown.gettalong.org/quickref.html
-      kramdown: kramdown
       headings: Titres
       heading: Titre
       subheading: Sous-titre
@@ -2083,99 +2071,141 @@ fr:
         mapping_link: commencer à contribuer
       legal_babble:
         title_html: Droits d’auteur et licence
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">®</a></sup> est un ensemble de <i>données ouvertes</i>, disponibles sous la licence libre <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL) accordée par la <a
-          href="https://osmfoundation.org/">Fondation OpenStreetMap</a> (OSMF).
-        intro_2_html: |-
+        introduction_1_html: |-
+          OpenStreetMap%{registered_trademark_link} est en %{open_data}, sous licence 
+          %{odc_odbl_link} (ODbL) par la %{osm_foundation_link} (OSMF).
+        introduction_1_registered_trademark_html: ®
+        introduction_1_open_data: données libres
+        introduction_1_odc_odbl: Licence de base de données ouverte Open Data Commons
+          (ODbL)
+        introduction_1_odc_odbl_url: https://opendatacommons.org/licenses/odbl/summary/
+        introduction_1_osm_foundation: Fondation OpenStreetMap
+        introduction_2_html: |-
           Vous êtes libre de copier, distribuer, transmettre et adapter nos données,
-          à condition que vous créditiez OpenStreetMap et ses
-          contributeurs. Si vous modifiez ou utilisez nos données dans d’autres œuvres dérivées, vous
-          ne pouvez distribuer celles-ci que sous la même licence. Le <a href="https://opendatacommons.org/licenses/odbl/1.0/">texte
-          légal</a> complet détaille vos droits et responsabilités.
-        intro_3_1_html: "Notre documentation est disponible sous la licence \n<a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons
-          paternité – partage à l’identique 2.0</a> (CC-BY-SA 2.0)."
+          à condition que vous créditiez OpenStreetMap et ses contributeurs.
+          Si vous modifiez ou utilisez nos données dans d’autres œuvres dérivées,
+          vous ne pouvez distribuer celles-ci que sous la même licence. Le
+          %{legal_code_link} complet détaille vos droits et responsabilités.
+        introduction_2_legal_code: texte juridique
+        introduction_3_html: Notre documentation est sous licence %{creative_commons_link}
+          (CC BY-SA 2.0).
+        introduction_3_creative_commons: Licence Creative Commons Attribution – Partage
+          à l’identique v2.0
+        introduction_3_creative_commons_url: https://creativecommons.org/licenses/by-sa/2.0/deed.fr
         credit_title_html: Comment créditer OpenStreetMap
         credit_1_html: 'Lorsque vous utilisez des données d’OpenStreetMap, vous devez
           effectuer les deux choses suivantes :'
-        credit_2_1_html: |-
-          <ul>
-            <li>Créditez OpenStreetMap en affichant notre notice de copyright.</li>
-            <li>Affichez clairement que les données sont disponibles sous la licence ODbL (<i>Open Database License</i>).</a>.
-          </ul>
-        credit_3_1_html: Pour la notice relative aux droits d’auteurs (<i>copyright</i>),
+        credit_2_1: Donnez crédit à OpenStreetMap en affichant notre avis des droits
+          d’auteur.
+        credit_2_2: Indiquez clairement que les données sont disponibles sous la Licence
+          Open Database.
+        credit_3_html: Pour l’avis relatif aux droits d’auteurs (<em lang="en">copyright</em>),
           nous avons différentes exigences sur la manière dont cela doit être affiché,
           selon comment dont vous utilisez nos données. Par exemple, différentes règles
-          s’appliquent sur la façon d’afficher la notice de copyright, qui dépend
-          de si vous avez créé une carte navigable, une carte imprimée ou une image
-          statique. Pour plus de détails sur ces exigences, consultez les <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Directives
-          d’attribution</a>.
-        credit_4_html: |-
-          Pour afficher clairement que les données sont disponibles sous la licence OdBL (<i>Open
-          Database License</i>, vous pouvez apposer un lien vers <a href="https://www.openstreetmap.org/copyright">cette page de copyright</a>. Autrement, et c’est une exigence si vous distribuez OSM sous forme de données, vous pouvez nommer la ou les licence(s) demandées et vous lier à elle(s). Sur des médias où les liens sont impossibles (par exemple des œuvres imprimées), nous suggérons que vous dirigiez vos lecteurs vers openstreetmap.org (probablement en étendant « OpenStreetMap » en son adresse complète) et vers opendatacommons.org. Dans cet exemple, la ligne d’attribution apparaît clairement dans un coin de la carte.
+          s’appliquent sur la façon d’afficher cet avis, qui dépend de si vous avez
+          créé une carte navigable, une carte imprimée ou une image statique. Pour
+          plus de détails sur ces exigences, consultez les %{attribution_guidelines_link}.
+        credit_3_attribution_guidelines: Directives d’attribution
+        credit_4_1_html: |-
+          Pour afficher clairement que les données sont disponibles sous la Licence OdBL
+          (<em lang="en">Open Database License</i>), vous pouvez apposer un lien
+          vers %{this_copyright_page_link}. Autrement, et il s’agit d’une exigence si vous distribuez OSM sous
+          forme de données, vous pouvez nommer la ou les licence(s) demandées et vous lier à elle(s).
+          Sur des médias où les liens sont impossibles (par exemple des œuvres imprimées), nous vous
+          suggérons de diriger vos lecteurs vers openstreetmap.org (probablement en étendant
+          « OpenStreetMap » en son adresse complète) et vers opendatacommons.org.
+          Dans cet exemple, la ligne d’attribution apparaît clairement dans un coin de la carte.
+        credit_4_1_this_copyright_page: cette page de copyright
         attribution_example:
           alt: Exemple d’attribution d’OpenStreetMap sur une page Internet
           title: Exemple d’attribution
         more_title_html: Pour trouver plus d’informations
-        more_1_html: |-
-          Pour obtenir plus d’informations sur la façon de réutiliser nos données et de nous créditer, veuillez lire la <a
-          href="https://osmfoundation.org/Licence"> Licence OSMF</a> et le <a
-          href="https://wiki.openstreetmap.org/wiki/Legal_FAQ">FAQ Légal</a>.
-        more_2_html: |-
-          Bien qu’OpenStreetMap soit un jeu de données libres et ouvertes, nous ne pouvons pas fournir une
-          API gratuite et en libre accès pour les tierces personnes.
-          Veuillez vous référer à notre <a href="https://operations.osmfoundation.org/policies/api/">politique d’utilisation de l’API</a>,
-          à notre <a href="https://operations.osmfoundation.org/policies/tiles/">politique d’utilisation des tuiles</a>
-          et à la <a href="https://operations.osmfoundation.org/policies/nominatim/">politique d’utilisation de Nominatim</a>.
+        more_1_1_html: En savoir plus sur l’utilisation de nos données et comment
+          nous créditer sur la %{osmf_licence_page_link}.
+        more_1_1_osmf_licence_page: page de Licence de la Fondation OSM
+        more_2_1_html: |-
+          Bien qu’OpenStreetMap soit des données ouvertes, nous ne pouvons pas fournir une
+          API cartographique gratuite pour des tiers.
+          Consultez nos %{api_usage_policy_link}, %{tile_usage_policy_link} et %{nominatim_usage_policy_link}.
+        more_2_1_api_usage_policy: Politique d’utilisation de l’API
+        more_2_1_tile_usage_policy: Politique d’utilisation des tuiles graphiques
+        more_2_1_nominatim_usage_policy: Politique d’utilisation de Nominatim
         contributors_title_html: Nos contributeurs
         contributors_intro_html: 'Nos contributeurs sont des milliers de personnes.
           Nous incluons également des données publiées sous licence ouverte par des
           agences nationales de cartographie et par d’autres sources, notamment :'
-        contributors_at_html: |-
-          <strong>Autriche</strong> : contient des données sur la <a href="https://data.wien.gv.at/">ville de Vienne</a> (sous
-          licence <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>), la
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">région du Vorarlberg</a> et la
-          région du Tyrol (sous licence <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT avec amendements</a>).
-        contributors_au_html: |-
-          <strong>Australie</strong> : incorpore ou développé en utilisant les Limites administratives ©
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a> publiées sous la licence
-          <a href="https://creativecommons.org/licenses/by/4.0/">Creative licence internationale Commons Attribution 4.0 (CC BY 4.0)</a>.
-        contributors_ca_html: '<strong>Canada</strong> : contient des données de <em>GeoBase</em>®,
-          <em>GeoGratis</em> (© Département des Ressources naturelles du Canada),
-          <em>CanVec</em> (© Département des Ressources naturelles du Canada) et <em>StatCan</em>
-          (Division Géographie, Statistiques du Canada).'
-        contributors_fi_html: '<strong>Finlande</strong> : contient des données de
-          la Base de données topographique de l’Inspection nationale du territoire
-          de Finlande et d’autres ensembles de données, sous <a href="https://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">licence
-          NLSFI</a>.'
-        contributors_fr_html: '<strong>France</strong> : contient des données de la
-          <em>Direction générale des finances publiques</em> (anciennement la <em>Direction
-          générale des impôts</em>).'
-        contributors_nl_html: '<strong>Pays-Bas</strong> : contient des données © <abbr
-          title="Automotive Navigation Data">AND</abbr>, 2007 (<a href="https://www.and.com/">www.and.com</a>).'
-        contributors_nz_html: '<strong>Nouvelle-Zélande</strong> : contient des données
-          provenant du <a href="https://data.linz.govt.nz/">service de données LINZ</a>
-          et, pour la réutilisation, sous licence <a href="https://creativecommons.org/licenses/by/4.0/">CC
-          BY 4.0</a>.'
-        contributors_si_html: '<strong>Slovénie</strong> : contient des données de
-          l’<a href="http://www.gu.gov.si/en/">Autorité de Planification et de Cartographie</a>
-          et du <a href="http://www.mkgp.gov.si/en/">Ministère de l’Agriculture, de
-          la Forêt et de l’Alimentation</a> (informations publiques de la Slovénie).'
-        contributors_es_html: '<strong>Espagne</strong> : contient des données fournies
-          par l’Institut Géographique National Espagnol (<a href="http://www.ign.es/">IGN</a>)
-          et le Système Cartographique National (<a href="http://www.scne.es/">SCNE</a>)
-          sous licence <a href="https://creativecommons.org/licenses/by/4.0/">CC BY
-          4.0</a> pour la réutilisation.'
-        contributors_za_html: '<strong>Afrique du Sud</strong> : contient des données
-          issues de la <a href="http://www.ngi.gov.za/">Direction principale des Informations
-          Géospatiales Nationales</a>, copyright de l’État réservé.'
-        contributors_gb_html: '<strong>Royaume-Uni</strong> : contient des données
-          issues de l’<em>Ordnance Survey</em> © 2010–2023 Droits d’auteurs et de
-          la base de données de la Couronne.'
-        contributors_footer_1_html: Pour plus de détails sur celles-ci et sur les
-          autres sources utilisées pour aider à améliorer OpenStreetMap, consultez
-          la page des <a href="https://wiki.openstreetmap.org/wiki/Contributors">contributeurs</a>
-          sur le wiki d’OpenStreetMap.
+        contributors_at_credit_html: |-
+          %{austria} : contient des données de %{stadt_wien_link} (sous %{cc_by_link}), %{land_vorarlberg_link}
+          et du Land du Tirol (sous %{cc_by_at_with_amendments_link}).
+        contributors_at_austria: Autriche
+        contributors_at_stadt_wien: Ville de Vienne
+        contributors_at_cc_by: CC BY
+        contributors_at_cc_by_url: https://creativecommons.org/licenses/by/3.0/at/deed.fr
+        contributors_at_land_vorarlberg: Land de Vorarlberg
+        contributors_at_cc_by_at_with_amendments: CC BY AT avec amendements
+        contributors_at_cc_by_at_with_amendments_url: https://www.tirol.gv.at/sicherheit/geoinformationen-karten/
+        contributors_au_credit_html: |-
+          %{australia} : incorpore ou est développé à l'aide des Limites administratives © %{geoscape_australia_link}
+          sous licence du Commonwealth d’Australie sous %{cc_licence_link}.
+        contributors_au_australia: Australie
+        contributors_au_geoscape_australia: Geoscape Australie
+        contributors_au_cc_licence: licence Creative Commons Attribution 4.0 International
+          (CC BY 4.0)
+        contributors_au_cc_licence_url: https://creativecommons.org/licenses/by/4.0/deed.fr
+        contributors_ca_credit_html: |-
+          %{canada} : contient des données de GeoBase®,
+          GéoGratis (© Ministère des Ressources naturelles Canada),
+          CanVec (© Ministère des Ressources naturelles Canada) et
+          StatCan (Division de la géographie, Statistiques Canada).
+        contributors_ca_canada: Canada
+        contributors_fi_credit_html: |-
+          %{finland} : contient des données de la 
+          Base de données topographiques de l’Arpentage du territoire national de la Finlande
+          et d'autres ensembles de données, sous la %{nlsfi_license_link}.
+        contributors_fi_finland: Finlande
+        contributors_fi_nlsfi_license: Licence NLSFI
+        contributors_fr_credit_html: '%{france} : contient des données de la <em>Direction
+          générale des finances publiques</em> (anciennement la <em>Direction générale
+          des impôts</em>).'
+        contributors_fr_france: France
+        contributors_nl_credit_html: '%{netherlands} : contient des données © AND,
+          2007 (%{and_link})'
+        contributors_nl_netherlands: Pays-Bas
+        contributors_nl_and_url: https://www.and.com/
+        contributors_nz_credit_html: |-
+          %{new_zealand} : contient des données provenant du %{linz_data_service_link}
+          et réutilisables sous licence %{cc_by_link}.
+        contributors_nz_new_zealand: Nouvelle-Zélande
+        contributors_nz_linz_data_service: Service de données LINZ
+        contributors_nz_cc_by: CC BY 4.0
+        contributors_nz_cc_by_url: https://creativecommons.org/licenses/by/4.0/deed.fr
+        contributors_si_credit_html: |-
+          %{slovenia} : contient des données provenant de l’%{gu_link} et du %{mkgp_link}
+           (informations publiques de Slovénie).
+        contributors_si_slovenia: Slovénie
+        contributors_si_gu: Autorité d’arpentage et de cartographie
+        contributors_si_mkgp: Ministère de l’Agriculture, des Forêts et de l’Alimentation
+        contributors_es_credit_html: |-
+          %{spain} : contient des données provenant de
+          l’Institut géographique national espagnol (%{ign_link}) et du
+          Système cartographique national (%{scne_link})
+          réutilisables sous licence %{cc_by_link}.
+        contributors_es_spain: Espagne
+        contributors_es_ign: IGN.es
+        contributors_es_cc_by: CC BY 4.0
+        contributors_es_cc_by_url: https://creativecommons.org/licenses/by/4.0/deed.fr
+        contributors_za_credit_html: '%{south_africa} : contient des données provenant
+          de la %{ngi_link}, droits d’auteur réservés à l’État.'
+        contributors_za_south_africa: Afrique du Sud
+        contributors_za_ngi: 'Direction générale : Information géospatiale nationale'
+        contributors_gb_credit_html: |-
+          %{united_kingdom} : contient des données issues de l’<em>Ordnance Survey</em>
+          © 2010–2023 Droits d’auteurs et de la base de données de la Couronne.
+        contributors_gb_united_kingdom: Royaume-Uni
+        contributors_2_html: |-
+          Pour plus de détails sur ceux-ci et sur d’autres sources qui ont été utilisées pour aider à améliorer
+          OpenStreetMap, veuillez consulter la %{contributors_page_link} sur le wiki d’OpenStreetMap.
+        contributors_2_contributors_page: Page des contributeurs
         contributors_footer_2_html: L’inclusion de données dans OpenStreetMap n’implique
           pas que les fournisseurs d’origine du contenu approuvent OpenStreetMap,
           ni qu’ils garantissent ou acceptent quelque responsabilité que ce soit.
@@ -2185,17 +2215,19 @@ fr:
           (copyright) ou des droits voisins (par ex. <em>Google Maps</em> ou des cartes
           imprimées) sans autorisation explicite de la part des détenteurs de ces
           droits.
-        infringement_2_html: Si vous pensez que des données ont été ajoutées à la
-          base de données OpenStreetMap ou à ce site en violation des droits d’auteur,
-          veuillez vous référer à notre <a href="https://wiki.osmfoundation.org/wiki/License/Takedown_procedure">procédure
-          de retrait de données</a> ou notifiez-nous directement à travers notre <a
-          href="https://dmca.openstreetmap.org/">formulaire en ligne</a>.
-        trademarks_title_html: <span id="trademarks"></span>Marques de commerce
-        trademarks_1_html: OpenStreetMap, le logo avec la loupe et ''State of the
-          Map'' sont des marques déposées de l’OpenStreetMap Foundation. Si vous avez
-          des questions à propos de l’utilisation de ces marques, merci de consulter
-          notre <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">règlement
-          concernant les marques déposées</a>.
+        infringement_2_1_html: |-
+          Si vous pensez que du matériel protégé par des droits d’auteur a été ajouté de manière
+          inappropriée à la base de données OpenStreetMap ou à ce site, veuillez vous
+          référer à notre %{takedown_procedure_link} ou déposer directement sur notre
+          %{online_filing_page_link}.
+        infringement_2_1_takedown_procedure: procédure de retrait
+        infringement_2_1_online_filing_page: page de signalement en ligne
+        trademarks_title: Marques de commerce
+        trademarks_1_1_html: |-
+          OpenStreetMap, le logo en forme de loupe et State of the Map sont des marques déposées de la
+          Fondation OpenStreetMap. Si vous avez des questions sur votre utilisation des marques, veuillez
+          consulter notre %{trademark_policy_link}.
+        trademarks_1_1_trademark_policy: Politique relative aux marques
     index:
       js_1: JavaScript n’est pas pris en charge par le navigateur que vous utilisez,
         ou bien vous l’avez désactivé.
@@ -2215,7 +2247,6 @@ fr:
         vous ne rendiez vos modifications publiques. Vous pouvez rendre vos modifications
         publiques à partir de votre %{user_page}.
       user_page_link: page utilisateur
-      anon_edits_html: (%{link})
       anon_edits_link_text: Trouvez pourquoi ici.
       id_not_configured: iD n’a pas été configuré
       no_iframe_support: Votre navigateur ne prend pas en charge les ''iframes HTML'',
@@ -2232,7 +2263,6 @@ fr:
       licence_details_html: Les données OpenStreetMap sont sous licence %{odbl_link}
         (ODbL).
       odbl: Licence de base de données ouverte Open Data Commons (ODbL)
-      odbl_url: https://opendatacommons.org/licenses/odbl/1.0/
       too_large:
         advice: 'Si l’export ci-dessus échoue, veuillez envisager l’utilisation de
           l’une des sources listées ci-dessous :'
@@ -2288,7 +2318,6 @@ fr:
           approprié.
         copyright: page relative aux droits d’auteur
         working_group: groupe de travail de la Fondation OSM
-        working_group_url: https://wiki.osmfoundation.org/wiki/Working_Groups
     help:
       title: Obtenir de l’aide
       introduction: OpenStreetMap propose plusieurs ressources pour apprendre à travailler
@@ -2303,7 +2332,6 @@ fr:
         title: Guide du débutant
         description: Guide maintenu par la communauté pour les débutants.
       help:
-        url: https://help.openstreetmap.org/
         title: Forum d’aide
         description: Poser une question ou chercher des réponses sur le site de questions-et-réponses
           d’OpenStreetMap.
@@ -2312,7 +2340,6 @@ fr:
         description: Poser une question ou discuter de questions intéressantes sur
           un large éventail de listes de diffusion thématiques ou régionales.
       community:
-        url: https://community.openstreetmap.org/
         title: Forum de la communauté
         description: Un lieu partagé pour les conversations sur OpenStreetMap.
       irc:
@@ -2338,7 +2365,6 @@ fr:
         dans un navigateur web.
       desktop_application_html: Vous pouvez toujours utiliser Potlatch en %{download_link}.
       download: téléchargeant l’application de bureau pour Mac et Windows
-      download_url: https://www.systemed.net/potlatch/
       id_editor_html: Sinon, vous pouvez définir votre éditeur par défaut à iD, lequel
         fonctionne dans votre navigateur web comme le faisait Potlatch auparavant.
         %{change_preferences_link}
@@ -2351,7 +2377,6 @@ fr:
         %{help_link}. Vous êtes d’une organisation qui crée des plans pour OpenStreetMap ? %{welcome_mat_link}.
       get_help_here: Obtenez de l’aide ici
       welcome_mat: Découvrez le Tapis de bienvenue
-      welcome_mat_url: https://welcome.openstreetmap.org/
     sidebar:
       search_results: Résultats de la recherche
       close: Fermer
@@ -2516,7 +2541,6 @@ fr:
           Il n’est pas nécessaire d’établir formellement un groupe dans la même mesure que les chapitres locaux.
           En effet, de nombreux groupes existent avec beaucoup de succès en tant que rassemblement informel de personnes ou en tant que groupe communautaire. Chacun peut en créer ou en rejoindre un. En savoir plus sur la %{communities_wiki_link}.
         communities_wiki: page wiki des communautés
-        communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group
   traces:
     visibility:
       private: Privé (partagé anonymement, points non ordonnés)
@@ -2738,7 +2762,6 @@ fr:
       no_applications_html: Avez-vous une application que vous aimeriez inscrire pour
         son utilisation avec nous via le standard %{oauth2} ? Vous devez inscrire
         votre application avant qu’elle puisse faire des requêtes OAuth à ce service.
-      oauth_2: OAuth 2
       new: Inscrire une nouvelle application
       name: Nom
       permissions: Autorisations
@@ -3013,17 +3036,19 @@ fr:
       time_past_html: Terminé à %{time}.
       block_duration:
         hours:
-          one: 1 heure
+          one: '%{count} heure'
           other: '%{count} heures'
         days:
-          one: 1 jour
+          one: '%{count} jour'
           other: '%{count} jours'
         weeks:
-          one: 1 semaine
+          one: '%{count} semaine'
           other: '%{count} semaines'
-        months: '%{count} mois'
+        months:
+          one: '%{count} mois'
+          other: '%{count} mois'
         years:
-          one: 1 année
+          one: '%{count} année'
           other: '%{count} années'
     blocks_on:
       title: Blocages de « %{name} »
@@ -3089,7 +3114,6 @@ fr:
       reopened_by_anonymous_html: Réactivée par un utilisateur anonyme, <abbr title="%{exact_time}">%{when}</abbr>
       hidden_by_html: Masquée par %{user}, <abbr title="%{exact_time}">%{when}</abbr>
       report: signaler cette note
-      coordinates_html: '%{latitude}, %{longitude}'
       anonymous_warning: Cette note comprend des commentaires d’utilisateurs anonymes,
         qui devraient être vérifiés de façon indépendante.
       hide: Masquer
@@ -3147,10 +3171,10 @@ fr:
       locate:
         title: Afficher mon emplacement
         metersPopup:
-          one: Vous êtes à moins d’un mètre de ce point
+          one: Vous êtes à moins de %{count} mètre de ce point
           other: Vous êtes à moins de %{count} mètres de ce point
         feetPopup:
-          one: Vous êtes à moins d’un pied de ce point
+          one: Vous êtes à moins de %{count} pied de ce point
           other: Vous êtes à moins de %{count} pieds de ce point
       base:
         standard: Standard
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 5d8142be9..db0877982 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -953,6 +953,7 @@ fur:
     help: Jutori
     about: Informazions
     copyright: Copyright
+    communities: Comunitâts
     community: Comunitât
     community_blogs: Blogs de comunitât
     community_blogs_title: Blogs di bande dai membris de comunitât OpenStreetMap
@@ -981,8 +982,6 @@ fur:
       see_their_profile: Tu puedis viodi il sô profîl su %{userurl}.
       befriend_them: Tu puedis ancje zontâlu/le come amì su %{befriendurl}.
     gpx_success:
-      loaded_successfully: al sedi stât cjamât cun sucès, cun %{trace_points} suntun
-        totâl di %{possible_points} ponts pussibii.
       subject: '[OpenStreetMap] Impuartazion GPX completade cun sucès'
     signup_confirm:
       subject: '[OpenStreetMap] Benvignût in OpenStreetMap'
@@ -1330,6 +1329,8 @@ fur:
       start_mapping: Scomence a mapâ
       add_a_note:
         title: No tu âs timp par fâ i cambiaments? Zonte une note!
+    communities:
+      title: Comunitâts
   traces:
     new:
       visibility_help: ce vuelial dî?
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index fb1f5a009..90d3871ff 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1558,9 +1558,6 @@ fy:
       subject: '[OpenStreetMap] GPX ymportearjen mislearre'
     gpx_success:
       hi: Goeie %{to_user},
-      loaded_successfully:
-        one: goed opladen is mei %{trace_points} punt fan maksimaal 1.
-        other: goed opladen is mei %{trace_points} punten fan maksimaal %{possible_points}.
       subject: '[OpenStreetMap] GPX ymportearjen slagge'
     signup_confirm:
       subject: '[OpenStreetMap] Wolkom by OpenStreetMap'
@@ -1919,121 +1916,18 @@ fy:
         mapping_link: mei kaartmeitsjen úteinsette
       legal_babble:
         title_html: Auteursrjochten en lisinsje
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> is <i>iepen data</i>, en troch de  <a
-          href="https://osmfoundation.org/">OpenStreetMap-stifting</a> (OSMF) beskikber steld ûnder de <a
-          href="https://opendatacommons.org/licenses/odbl/">Iepen
-          Databank-lisinsje</a> (ODbL) fan Open Data Commons.
-        intro_2_html: |-
-          It stiet jo frij ús data te kopiearjen, te fersprieden, út te stjoeren en oan te passen,
-          salang't jo OpenStreetMap en syn
-          bydragers mar neame. At jo ús data feroarje of ferwurkje, meie jo
-          it resultaat inkeld ûnder deselde lisinsje ferspriede. De
-          folsleine <a href="https://opendatacommons.org/licenses/odbl/1.0/">juridyske
-          tekst</a> jout in útlis oer jo rjochten en plichten.
-        intro_3_1_html: |-
-          Us dokumintaasje is beskikber ûnder de lisinsje
-          <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Nammefermelding-Lyk diele 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Hoe moat OpenStreetMap neamd wurde
         credit_1_html: 'Dêr wêr''t jo OpenStreetMap-data brûke, binne jo ferplichte
           en doch de neikommende twa dingen:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Jou in taskriuwing oan OpenStreetMap troch ús auteursrjochtefernijing sjen te litten.</li>
-            <li>Meitsje dúdlik dat de data beskikber is ûnder de Iepen Databank-lisinsje.</li>
-          </ul>
-        credit_3_1_html: "Oan 'e auteursrjochtefernijing stelle wy oare easken hoe't
-          dy werjûn wurde \nmoat, ôfhinklik fan hoe't jo ús data brûke. Der jilde
-          bygelyks oare \nregels foar it sjen litten fan 'e auteursrjochtefernijing,
-          ôfhinklik fan oft jo \nin trochklikbere digitale kaart, in printe kaart
-          of in statysk ôfbyld makke hawwe. Alle bysûnderheden oer de \neasken fine
-          jo yn 'e \n<a href=\"https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines\">Rjochtlinen
-          foar \nNammefernijing</a>."
-        credit_4_html: |-
-          Om dúdlik te meitsjen dat de data beskikber is ûnder de Iepen
-          Databank-lisinsje, kinne jo nei
-          <a href="https://www.openstreetmap.org/copyright">dizze auteursrjochteside</a> ferwize.
-          As alternatyf, en as eask at jo OSM yn
-          datafoarm ferspriede, kinne jo de lisinsje(s) streekrjocht neame en keppelje. Yn media
-          dêr't keppelings net mooglik binne (bgl. printwurk) is ús suggestje dat jo
-          jo lêzers trochferwize nei openstreetmap.org (faaks troch
-          'OpenStreetMap' út te skriuwen as dat adres) en nei opendatacommons.org.
-          Yn dit foarbyld stiet de nammefernijing yn 'e hoeke fan 'e kaart.
         attribution_example:
           alt: Foarbyld fan hoe't OpenStreetMap op in webside neamd wurdt
           title: Foarbyld nammefermelding
         more_title_html: Mear te witten komme
-        more_1_html: |-
-          Lês mear oer it brûken fan ús data, en hoe't wy fermeld wurde moatte, op 'e <a
-          href="https://osmfoundation.org/Licence">Lisinsjeside fan 'e OSMF</a>.
-        more_2_html: |-
-          Hoewol't OpenStreetMap iepen data is, kinne wy net
-          fergees in kaart-API foar tredden leverje.
-          Sjoch ús <a href="https://operations.osmfoundation.org/policies/api/">API-gebrûksbelied</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">Gebrûksbelied foar Kaartstikken</a>
-          en <a href="https://operations.osmfoundation.org/policies/nominatim/">Gebrûksbelied fan Nominatim</a>.
         contributors_title_html: Us bydragers
         contributors_intro_html: |-
           Us bydragers binne tûzenen yndividuën. Wy nimme ek
           data mei iepen lisinsjes op fan nasjonale kaartagintskippen
           en oare boarnen, dêrûnder:
-        contributors_at_html: |-
-          <strong>Eastenryk</strong>: Befettet data fan
-          <a href="https://data.wien.gv.at/">Stadt Wien</a> (ûnder
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> en
-          Land Tirol (ûnder <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT mei amendeminten</a>).
-        contributors_au_html: |-
-          <strong>Austraalje</strong>: Omfettet of ûntwikkele mei Administrative Boundaries &copy;
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Austraalje</a>
-          troch it Mienebêst fan Austraalje beskikber steld ûnder de lisinsje
-          <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Nammefermelding 4.0 Ynternasjonaal (CC BY 4.0)</a>.
-        contributors_ca_html: |-
-          <strong>Kanada</strong>: Befettet data fan
-          GeoBase&reg;, GeoGratis (&copy; Departemint fan Natuerlike
-          Helpboarnen Kanada), CanVec (&copy; Departemint fan Natuerlike
-          Helpboarnen Kanada), en StatCan (Geografy-difyzje,
-          Statistiken Kanada).
-        contributors_fi_html: |-
-          <strong>Finlân</strong>: Befettet data út 'e
-          Topografyske Databank en oare datasets fan 'e
-          Nasjonale Lânmjitting fan Finlân, ûnder de
-          <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI-lisinsje</a>.
-        contributors_fr_html: |-
-          <strong>Frankryk</strong>: Befettet data mei as boarne
-          Direction Générale des Impôts.
-        contributors_nl_html: |-
-          <strong>Nederlân</strong>: Befettet &copy; AND data, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>Nij-Seelân</strong>: Befettet data mei as boarne de
-          <a href="https://data.linz.govt.nz/">LINZ Data Service</a> en
-          werbrûkber ûnder de lisinsje
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: |-
-          <strong>Sloveenje</strong>: Befettet data fan 'e
-          <a href="http://www.gu.gov.si/en/">Lânmjittings- en Kartearringsautoriteit</a> en it
-          <a href="http://www.mkgp.gov.si/en/">Ministearje fan Lânbou, Boskbou en Fiedsel</a>
-          (iepenbiere ynformaasje fan Sloveenje).
-        contributors_es_html: |-
-          <strong>Spanje</strong>: Befettet data mei as boarne it
-          Spaansk Nasjonaal Geografysk Ynstitút (<a href="http://www.ign.es/">IGN</a>) en it
-          Nasjonaal Kartografysk Systeem (<a href="http://www.scne.es/">SCNE</a>)
-          werbrûkber ûnder de lisinsje <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: |-
-          <strong>Súd-Afrika</strong>: Befettet data mei as boarne
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, Steatsauteursrjochten foarbeholden.
-        contributors_gb_html: |-
-          <strong>Feriene Keninkryk</strong>: Befettet data fan Ordnance
-          Survey &copy; Auteurs- en databankrjochten fan 'e Kroan
-          2010-19.
-        contributors_footer_1_html: |-
-          Besjoch de <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">Bydragers-side</a>
-          op 'e OpenStreetMap-wiki foar fierdere ynformaasje oer dizze, en oare boarnen dy't brûkt binne
-          om OpenStreetMap foarút te helpen.
         contributors_footer_2_html: |-
           It opnimmen fan data yn OpenStreetMap betsjut net dat de oanbieder fan 'e oarspronklike
           data efter OpenStreetMap stiet, ien of oare garânsje jout, of
@@ -2043,16 +1937,6 @@ fy:
           OSM-bydragers wurde derop wiisd nea data ta te heakjen fan
           boarnen mei auteursrjochten (bgl. Google Maps as printe kaarten) sûnder
           de útdruklike tastimming fan 'e auteursrjochthawwers.
-        infringement_2_html: |-
-          At jo miene dat der materiaal mei auteursrjochten ûnrjochtlik
-          oan 'e OpenStreetMap-databank of dit webstee taheakke is, rieplachtsje dêrfoar
-          ús <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">wiskproseduere</a>,
-          of tsjinje it drekst yn op ús
-          <a href="https://dmca.openstreetmap.org/">side mei in webformulier</a>.
-        trademarks_title_html: <span id="trademarks"></span>Hannelsmerken
-        trademarks_1_html: OpenStreetMap, it fergrutglês-logo en 'State of the Map'
-          binne registrearre hannelsmerken fan 'e OpenStreetMap-stifting. At jo fragen
-          hawwe oer jo gebrûk fan 'e merken, besjoch dan ús <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Hannelsmerkebelied</a>.
     index:
       js_1: Jo brûke ôf in webblêder dy't gjin JavaScript stipet, ôf jo hawwe JavaScript
         útskeakele.
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index f9c1dfb9b..b72b7f252 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -1151,8 +1151,6 @@ ga:
       failed_to_import: ', theip ar an iompórtáil. Seo an earráid:'
       subject: '[OpenStreetMap] Theip ar Iompórtáil GPX'
     gpx_success:
-      loaded_successfully: ', lódáladh é gan fhadhb le %{trace_points} as %{possible_points}
-        pointe féideartha.'
       subject: '[OpenStreetMap] Iompórtáladh an GPX'
     signup_confirm:
       subject: '[OpenStreetMap] Fáilte go OpenStreetMap'
@@ -1422,74 +1420,18 @@ ga:
         mapping_link: dul i mbun léarscáilithe
       legal_babble:
         title_html: Cóipcheart agus Ceadúnas
-        intro_1_html: |-
-          <i>Sonraí oscailte</i> atá i gceist le OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup>, atá ceadúnaithe faoi <a
-          href="https://opendatacommons.org/licenses/odbl/">Cheadúnas Bunachar Sonraí Oscailte</a> (ODbL) de chuid Open Data Commons ag <a
-          href="https://osmfoundation.org/">Fondúireacht OpenStreetMap</a> (OSMF).
-        intro_2_html: Tá saoirse agat ár gcuid sonraí a chóipeáil, a dháileadh, a
-          tharchur agus a oiriúnú, a fhad agus a thugann tú creidiúint do OpenStreetMap
-          agus dá rannchuiditheoirí. Má athraíonn tú ár gcuid sonraí nó má thógann
-          tú orthu, ní fhéadfaidh tú an toradh sin a dháileadh ach faoin gceadúnas
-          céanna. Tá míniú ar do chearta agus ar do fhreagrachtaí sa <a href="https://opendatacommons.org/licenses/odbl/1.0/">chód
-          dlíthiúil</a> iomlán.
-        intro_3_1_html: Tá ár ndoiciméadú ceadúnaithe faoin gceadúnas <a href="https://creativecommons.org/licenses/by-sa/2.0/">Sannta-Comhroinnte
-          Comhionann 2.0 de chuid Creative Commons</a> (CC BY-SA 2.0).
         credit_title_html: Conas OpenStreetMap a lua
         credit_1_html: Ceanglaímid ort an lua &ldquo;&copy;Rannchuiditheoirí OpenStreetMap&rdquo;
           a úsáid.
-        credit_2_1_html: Ní mór duit a chinntiú freisin go bhfuil soiléir go bhfuil
-          na sonraí ar fáil faoin gCeadúnas Bunachar sonraí Oscailte agus, má úsáideann
-          tú na tíleanna léarscáile atá againn, go bhfuil an chartagrafaíocht ceadúnaithe
-          mar CC BY-SA. Is féidir leat é sin a dhéanamh ach nasc a dhéanamh chuig
-          an bh<a href="https://www.openstreetmap.org/copyright">fógra cóipchirt seo</a>.
-          Mar mhalairt air sin, agus is gá duit é seo a dhéanamh má rud é gur i bhfoirm
-          sonraí atá OSM á dháileadh agat, is féidir leat an ceadúnaí/na ceadúnaithe
-          a ainmniú agus nasc a dhéanamh chuige/chucu go díreach. I meáin nach féidir
-          naisc a dhéanamh (m.sh. saothair chlóite), molaimid duit do léitheoirí a
-          threorú chuig openstreetmap.org (d'fhéadfá é sin a dhéanamh ach an seoladh
-          iomlán seo a thabhairt in áit 'OpenStreetMap'), chuig opendatacommons.org,
-          agus, más ábhartha, chuig creativecommons.org.
-        credit_4_html: |-
-          I gcás léarscáil leictreonach is féidir a bhrabhsáil, ba cheart an lua a bheith le feiceáil i gcúinne na léarscáile.
-          Mar shampla:
         attribution_example:
           alt: Sampla den bhealach chun OpenStreetMap a lua ar shuíomh gréasáin
           title: Lua samplach
         more_title_html: Tuilleadh eolais
-        more_1_html: Is féidir leat tuilleadh eolais a fháil faoinár sonraí a úsáid,
-          agus faoin gcaoi chun muid a lua, ag <a href="https://osmfoundation.org/Licence">leathanach
-          ceadúnais Fhondúireacht OSM</a>.
-        more_2_html: |-
-          Cé gur sonraí oscailte iad sonraí OpenStreetMap, ní féidir linn API saor in aisce den léarscáil a sholáthar do thríú páirtithe.
-          Féach ár b<a href="https://operations.osmfoundation.org/policies/api/">Polasaí Úsáide don API</a>,<a href="https://operations.osmfoundation.org/policies/tiles/">an Polasaí maidir le Tíleanna a úsáid</a> agus <a href="https://operations.osmfoundation.org/policies/nominatim/">an Polasaí maidir le Nominatim a úsáid</a>.
         contributors_title_html: Ár rannchuiditheoirí
-        contributors_at_html: |-
-          <strong>An Ostair</strong>: Tá sonraí ann ó
-          <a href="https://data.wien.gv.at/">Stadt Wien</a> (faoi
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> agus ó
-          Land Tirol (faoi <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT le leasuithe</a>).
-        contributors_ca_html: "<strong>Ceanada</strong>: Tá sonraí ann ó \nGeoBase&reg;,
-          GeoGratis (&copy; Department of Natural\nResources Canada), CanVec (&copy;
-          Department of Natural\nResources Canada), and StatCan (Geography Division,\nStatistics
-          Canada)."
-        contributors_fi_html: '<strong>An Fhionlainn</strong>: Tá sonraí ann ó Bhunachar
-          Sonraí Topagrafaíochta an Maanmittauslaitos (Suirbhéireacht Náisiúnta Talún
-          na Fionlainne) agus ó thacair sonraí eile, faoin g<a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">Ceadúnas
-          NLSFI</a>.'
-        contributors_fr_html: '<strong>An Fhrainc</strong>: Tá sonraí ann a fuarthas
-          ón Direction Générale des Impôts.'
-        contributors_nl_html: |-
-          <strong>An Ísiltír</strong>: Tá &copy; Sonraí AND, 2007 ann
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_footer_1_html: |-
-          Chun tuilleadh sonraí a fháil fúthu seo, agus faoi na sonraí eile a úsáideadh ar mhaithe le OpenStreetMap a fheabhsú, féach  <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">leathanach na Rannchuiditheoirí</a> ar Vicí OpenStreetMap.
         infringement_title_html: Sárú cóipchirt
         infringement_1_html: Meabhraítear do rannchuiditheoirí OSM gan sonraí ó aon
           fhoinse atá faoi chóipcheart (m.sh. Google Maps nó léarscáileanna clóite)
           a chur leis riamh gan cead a fháil go sainráite ó na sealbhóirí cóipchirt.
-        trademarks_title_html: <span id="trademarks"></span>Trádmharcanna
     index:
       js_1: Tá tú ag úsáid brabhsálaí nach dtacaíonn le JavaScript, é sin nó tá JavaScript
         díchumasaithe agat.
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index b98cff011..ea359d4d5 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -995,9 +995,6 @@ gd:
       failed_to_import: 'ion-phortachadh. Seo a'' mhearachd:'
       subject: '[OpenStreetMap] Dh''fhàillig le ion-phortadh GPX'
     gpx_success:
-      loaded_successfully: gun deach am faidhle GPX agad a luchdachadh gu soirbheachail
-        le %{trace_points} a-mach às an uiread de %{possible_points} p(h)uing(ean)
-        a ghabhas.
       subject: '[OpenStreetMap] Shoirbhich le ion-phortadh GPX'
     signup_confirm:
       subject: '[OpenStreetMap] Fàilte gu OpenStreetMap'
@@ -1271,104 +1268,20 @@ gd:
         mapping_link: tòiseachadh air an obair-mhapa
       legal_babble:
         title_html: Còir-lethbhreac agus ceadachas
-        intro_1_html: '''S e <i>dàta fosgailte</i> a tha san OpenStreetMap<sup><a
-          href="#trademarks">&reg;</a></sup> fo cheadachas <a href="http://opendatacommons.org/licenses/odbl/">Open
-          Data Commons Open Database License</a> (ODbL) le <a href="http://osmfoundation.org/">Fonndas
-          OpenStreetMap</a> (OSMF).'
-        intro_2_html: |-
-          Faodaidh tu lethbhreacan a dhèanamh dhen dàta againn, a sgaoileadh,
-          a thar-chur agus atharrachadh gu saor, cho fad 's a bheir thu urram
-          dha OpenStreetMap agus a cho-thabhartaichean. Ma nì thu atharrachadh
-          air an dàta againn no ma thogas tu rudeigin eile leis, faodaidh tu
-          an toradh a sgaoileadh fon aon cheadachas. Mìnichidh an
-          <a href="http://opendatacommons.org/licenses/odbl/1.0/">còd laghail</a>
-          slàn dè na còirichean agus na dleastanasan a tha agad.
-        intro_3_1_html: |-
-          Tha am mapachadh sna leacan mapa againn agus an docamaideadh againn
-          fo cheadachas <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).
         credit_title_html: Mar a bheir thu urram dha OpenStreetMap
         credit_1_html: |-
           Tha e riatanach gun chleachd thu &ldquo;&copy; OpenStreetMap
           contributors&rdquo; mar urram.
-        credit_2_1_html: |-
-          Feumaidh tu mìneachadh gu soilleir cuideachd gu bheil an dàta ri fhaighinn
-          fo cheadachas Open Database License, agus ma chleachdas tu na leacan mapa
-          againn gu bheil am mapachadh fo cheadachas CC BY-SA. Faodaidh tu seo
-          a dhèanamh le ceangal gun
-          <a href="http://www.openstreetmap.org/copyright">duilleag na còrach-lethbhreac seo</a>.
-          Mar roghainn eile agus gu riatanach ma sgaoileas tu OSM 'na dhàta,
-          's urrainn dhut an ceadachas/na ceadachasan ainmeachadh agus ceangal dìreach
-          a dhèanamh dhaibh. Ann am meadhanan far nach gabh ceangal a dhèanamh (can
-          stuthan clò-bhuailte), mholamaid gun stiùirich thu an luchd-leughaidh gu
-          openstreetmap.org (dh'fhaoidte gun leudaich thu 'OpenStreetMap' leis
-          an t-seòladh shlàn seo), gu opendatacommons.org agus ma tha seo iomchaidh gu
-          creativecommons.org.
-        credit_4_html: |-
-          airson mapa leatronaigeach a ghabhas rùrachadh, bu chòir dhan urram a nochdadh air
-          oisean a' mhapa. Mar eisimpleir:
         attribution_example:
           alt: Ball-eisimpleir air mar a bheir thu urram dha OpenStreetMap air duilleag-lìn
           title: Ball-eisimpleir air urram
         more_title_html: Barrachd fiosrachaidh
-        more_1_html: |-
-          Leugh barrachd air mar a chleachdas tu an dàta againn agus mar a
-          bheir thu urram dhuinn air <a href="http://osmfoundation.org/Licence">duilleag a' cheadachais OSMF</a> agus <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">CÀBHA laghail</a> sa choimhearsnachd.
-        more_2_html: |-
-          Ged as e dàta saor a tha san OpenStreetMap, chan urrainn dhuinn API mapa an-asgaidh a thoirt do threas-phàrtaidhean.
-          Faic <a href="https://operations.osmfoundation.org/policies/api/">poileasaidh cleachdadh an API</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">poileasaidh cleachdadh nan leacagan</a>
-          agus <a href="https://operations.osmfoundation.org/policies/nominatim/">poileasaidh cleachdadh Nominatim</a> againn.
         contributors_title_html: Na co-thabhartaicheean againn
         contributors_intro_html: |-
           'S e mìltean de dhaoine a tha sna co-thabhartaichean againn.
           Gabhaidh sinn a-steach dàta fo cheadachas fosgailte aig buidhnean
           mapachaidh nàiseanta agus tùsan eile, agus tha an fheadhainn a leanas
           'nam measg:
-        contributors_at_html: |-
-          <strong>An Ostair</strong>: Gabhaidh seo a-steach dàta o
-          <a href="http://data.wien.gv.at/">Stadt Wien</a> (fo cheadachas
-          <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> agus
-          Land Tirol (fo cheadachas <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT le atharraichean</a>).
-        contributors_ca_html: |-
-          <strong>Canada</strong>: Gabhaidh seo a-steach dàta o
-          GeoBase&reg;, GeoGratis (&copy; Department of Natural
-          Resources Canada), CanVec (&copy; Department of Natural
-          Resources Canada), agus StatCan (Geography Division,
-          Statistics Canada).
-        contributors_fi_html: |-
-          <strong>An Fhionnlann</strong>: Gabhaidh seo a-steach dàta on
-          National Land Survey of Finland's Topographic Database
-          agud seataichean-dàta eile fo cheadachas
-          <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI License</a>.
-        contributors_fr_html: |-
-          <strong>An Fhraing</strong>: Gabhaidh seo a-steach dàta o
-          Direction Générale des Impôts.
-        contributors_nl_html: |-
-          <strong>Na Tìrean Ìsle</strong>: Gabhaidh seo a-steach dàta o &copy; AND, 2007
-          (<a href="http://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>Sealann Nuadh</strong>: Gabhaidh seo a-steach dàta o
-          Land Information New Zealand. Còir-lethbhreac a' Chrùin glèidhte.
-        contributors_si_html: |-
-          <strong>An t-Slòbhain</strong>: Gabhaidh seo a-steach dàta o
-          <a href="http://www.gu.gov.si/en/">Ùghdarras Suirbhidheadh agus Mapachaidh</a> agus
-          <a href="http://www.mkgp.gov.si/en/">Ministreachd an Àiteachais, na Coilltearachd agus a' Bhidhe</a>
-          (fiosrachadh poblach na Slòbhaine).
-        contributors_za_html: |-
-          <strong>Afraga a Deas</strong>: Gabhaidh seo a-steach dàta o
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, coir-lethbhreac na Stàite glèidhte.
-        contributors_gb_html: |-
-          <strong>An Rìoghachd Aonaichte</strong>: Gabhaidh seo a-steach dàta Ordnance
-          Survey &copy; còir-lethbhreac a' Chrùin agus dlighe stòir-dàta
-          2010-12.
-        contributors_footer_1_html: |-
-          Airson barrachd fiosrachaidh air an fheadhainn seo agus air barrachd
-          thùsan a chaidh a chleachdadh a chum piseachadh OpenStreetMap, thoir
-          sùil air <a href="http://wiki.openstreetmap.org/wiki/Contributors">Duilleag nan co-thabhartaichean</a>
-          air uicidh OpenStreetMap.
         contributors_footer_2_html: Ma thèid dàta a ghabhail a-steach ann an OpenStreetMap,
           chan eil e fillte a-staigh gun do chuir an solaraiche dàta tùsail aonta
           ri OpenStreetMap, gun toireadh e barantas sam bith seachad no gum biodh
@@ -1378,10 +1291,6 @@ gd:
           nach cuir iad dàta o thùs fo chòir-lethbhreac ri OSM (can Google Maps no
           mapaichean clò-bhuailte) idir ach ma fhuair iad cead soilleir o shealbhadairean
           na còrach-lethbhreac.
-        infringement_2_html: |-
-          Ma tha thu dhen bheachd gun deach stuth fo chòir-lethbhreac a chur ri stòr-dàta OpenStreetMap no an làrach-lìn seo ann an dòigh nach eil iomchaidh, thoir sùil air a' <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">mhodh toirt air falbh</a> againn no faidhlich e gu dìreach air an
-          <a href="https://dmca.openstreetmap.org/">duilleag faidhlidh air loidhne</a> againn.
-        trademarks_title_html: <span id="trademarks"></span>Comharran-malairt
     index:
       js_1: Tha thu a' chleachdadh brabhsair nach cuir taic ri JavaScript no chuir
         thu JavaScript à comas.
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 5fe170c6e..25d87a14f 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1580,9 +1580,6 @@ gl:
       subject: '[OpenStreetMap] Importación GPX errónea'
     gpx_success:
       hi: Ola %{to_user},
-      loaded_successfully:
-        one: cargado con %{trace_points} de entre un 1 punto posíbel.
-        other: cargado con %{trace_points} de entre %{possible_points} puntos posíbeis.
       subject: '[OpenStreetMap] Importación GPX correcta'
     signup_confirm:
       subject: '[OpenStreetMap] Dámoslle a benvida ao OpenStreetMap'
@@ -1946,108 +1943,17 @@ gl:
         mapping_link: comezar a contribuír
       legal_babble:
         title_html: Dereitos de autoría e licenza
-        intro_1_html: "O OpenStreetMap <sup><a href=\"#trademarks\">&reg;</a></sup>
-          está dispoñíbel baixo <i>datos abertos</i> e atópase baixo a <a\nhref=\"https://opendatacommons.org/licenses/odbl/\">Open
-          Data\nCommons Open Database License</a> (ODbL) da  <a\t\nhref=\"https://osmfoundation.org/\">Fundación
-          do OpenStreetMap</a> (OSMF)."
-        intro_2_html: |-
-          Es libre de copiar, distribuír, transmitir e adaptar os nosos datos,
-          na medida en que acredites o OpenStreetMap e mailos seus
-          contribuíntes. Se alteras ou constrúes a partir dos nosos datos, terás
-          que distribuír o resultado baixo a mesma licenza. O
-          <a href="https://opendatacommons.org/licenses/odbl/1.0/">texto
-          legal</a> ó completo explica os teus dereitos e responsabilidades.
-        intro_3_1_html: |-
-          A nosa documentación está licenciada baixo a licenza <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0).
         credit_title_html: De que xeito acreditar o OpenStreetMap
         credit_1_html: 'Aló onde uses datos de OpenStreetMap, debes facer dúas cousas:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Dar crédito a OpenStreetMap amosando o noso aviso de dereitos de autoría.</li>
-            <li>Deixar claro que os datos están dispoñibles baixo a licenza Open Database.</li>
-          </ul>
-        credit_3_1_html: Para amosar o aviso de dereitos de autoría, temos diferentes
-          requisitos dependendo de como usas os nosos datos. Por exemplo, existen
-          distintas regras en función de se creaches un mapa explorable, un mapa impreso
-          ou unha imaxe estática. Podes atopar todos os detalles na <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">guía
-          de recoñecemento</a>.
-        credit_4_html: Para deixares claro que os datos están dispoñibles baixo a
-          licenza Open Database, podes deixar unha ligazón a <a href="https://www.openstreetmap.org/copyright">esta
-          páxina</a>. Como alternativa, e requisito se estás distribuíndo OSM en forma
-          de datos, podes nomear e ligar directamente a(s) licenza(s). En medios nos
-          que non é posible incluír ligazóns (por exemplo, libros impresos), suxerimos
-          dirixir aos lectores a openstreetmap.org (se cadra, ampliando 'OpenStreetMap'
-          a este enderezo completo) e a opendatacommons.org. Neste exemplo, os créditos
-          aparecen no curruncho do mapa.
         attribution_example:
           alt: Exemplo de como recoñecer o OpenStreetMap nunha páxina web
           title: Exemplo de recoñecemento
         more_title_html: Máis información
-        more_1_html: |-
-          Descobra máis sobre como empregar os nosos datos e de que xeito acreditarnos na <a
-          href="https://osmfoundation.org/Licence">páxina de licenza do OSMF</a>.
-        more_2_html: |-
-          Malia que o OpenStreetMap é de datos abertos, non podemos fornecer un
-          mapa API de balde ós desenvolvedores.
-          Vexa a <a href="https://operations.osmfoundation.org/policies/api/">política de uso da API</a>,
-          a <a href="https://operations.osmfoundation.org/policies/tiles/">política de uso das teselas</a>
-          e a <a href="https://operations.osmfoundation.org/policies/nominatim/">política de uso do Nominatim</a>.
         contributors_title_html: Os nosos contribuíntes
         contributors_intro_html: |-
           Os nosos contribuíntes son milleiros de persoas. Tamén incluímos
           datos baixo licenzas abertas de axencias nacionais de cartografía
           e outras fontes, entre elas:
-        contributors_at_html: |-
-          <strong>Austria:</strong> Contén datos de <a href="https://data.wien.gv.at/">Stadt Wien</a> (baixo a licenza
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> e
-          Land Tirol (baixo a licenza <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT con emendas</a>).
-        contributors_au_html: |-
-          <strong>Australia:</strong> Contén ou desenvolveuse usando límites administrativos de &copy;
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a>, licenciado pola Commonwealth de Australia baixo a <a href="https://creativecommons.org/licenses/by/4.0/">licenza Creative Commons Attribution 4.0 International (CC BY 4.0)</a>.
-        contributors_ca_html: |-
-          <strong>Canadá:</strong> Contén datos de
-          GeoBase&reg;, GeoGratis (&copy; Department of Natural
-          Resources Canada), CanVec (&copy; Department of Natural
-          Resources Canada) e StatCan (Geography Division,
-          Statistics Canada).
-        contributors_fi_html: |-
-          <strong>Finlandia:</strong> Contén datos da
-          National Land Survey of Finland's Topographic Database
-          e outros conxuntos de datos, baixo a
-          <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">licenza NLSFI</a>.
-        contributors_fr_html: |-
-          <strong>Francia:</strong> Contén datos con orixe na
-          Direction Générale des Impôts.
-        contributors_nl_html: |-
-          <strong>Países Baixos:</strong> Contén datos de &copy; AND, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: <strong>Nova Zelandia:</strong> Contén fontes de datos
-          do <a href="https://data.linz.govt.nz/">Servizo de datos LINZ</a>, dispoñibles
-          para a súa reutilización baixo a <a href="https://creativecommons.org/licenses/by/4.0/">CC
-          BY 4.0</a>.
-        contributors_si_html: |-
-          <strong>Eslovenia:</strong> Contén datos da
-          <a href="http://www.gu.gov.si/en/">Autoridade de Planificación e de Cartografía</a> e do
-          <a href="http://www.mkgp.gov.si/en/">Ministerio de Agricultura, Bosques e Alimentación</a>
-          (información pública de Eslovenia).
-        contributors_es_html: |-
-          <strong>España:</strong> Contén datos orixinarios do Instituto Nacional Xeográfico Español (<a href="http://www.ign.es/">IGN</a>) e o
-          Sistema Cartográfico Nacional (<a href="http://www.scne.es/">SCNE</a>), dispoñibles para a súa reutilización baixo a <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: |-
-          <strong>Suráfrica:</strong> Contén datos con orixe no
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, dereitos de autor do estado reservados.
-        contributors_gb_html: |-
-          <strong>Reino Unido:</strong> Contén datos da Ordnance
-          Survey &copy; Dereitos de autor e da base de datos da Coroa
-          2010-19.
-        contributors_footer_1_html: |-
-          Para obter máis información sobre estas e outras fontes usadas
-          para axudar na mellora do OpenStreetMap, bota unha ollada á <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">páxina dos
-          contribuíntes</a> no wiki do OpenStreetMap.
         contributors_footer_2_html: |-
           A inclusión de datos no OpenStreetMap non implica que o que
           orixinalmente forneceu os datos apoie o OpenStreetMap,
@@ -2057,17 +1963,6 @@ gl:
           Lembramos ós contribuíntes do OSM que nunca engadan datos de
           fontes con dereitos de autor (por exemplo, o Google Maps ou mapas impresos) sen
           o permiso explícito dos posuidores deses dereitos.
-        infringement_2_html: |-
-          Se pensas que se engadiu material protexido de xeito inapropiado
-          á base de datos do OpenStreetMap ou a este sitio, consulta
-          o noso <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">procedemento
-          para desbotar datos</a> ou deixa unha notificación na nosa
-          <a href="https://dmca.openstreetmap.org/">enquisa en liña</a>.
-        trademarks_title_html: <span id="trademarks"></span>Marcas rexistradas
-        trademarks_1_html: O OpenStreetMap, o logotipo coa lupa e ''State of the Map''
-          son marcas rexistradas da Fundación OpenStreetMap. Se ten algunha pregunta
-          sobre o emprego das marcas, consulta a nosa <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">política
-          de marcas</a>.
     index:
       js_1: Estás a usar un navegador que non soporta o JavaScript ou telo desactivado.
       js_2: O OpenStreetMap emprega JavaScript para o seu mapa estático e dinámico.
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 4bc814544..2bb47954d 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -188,7 +188,7 @@ he:
           ניידים ילידיים ויישומי דף אחד אינם סודיים)
         redirect_uri: להשתמש בשורה אחת לכתובת URI
       trace:
-        tagstring: מופרד בפסיקים
+        tagstring: מופרדים בפסיקים
       user_block:
         reason: הסיבה שבגינה המשתמש נחסם. נא לכתוב משהו הגיוני ורגוע ולתת כמה שיותר
           פרטים על המצב. נא לזכור שלא כל המשתמשים מבינים את העגה המקצועית של הקהילה
@@ -1477,6 +1477,8 @@ he:
       link_to_reports: הצגת דיווחים
       reports_count:
         one: דיווח אחד
+        two: '%{count} דיווחים'
+        many: '%{count} דיווחים'
         other: '%{count} דיווחים'
       reported_item: פריט שדווח
       states:
@@ -1640,11 +1642,11 @@ he:
       subject: '[אופן סטריט מאפ OpenStreetMap] שגיאה בייבוא GPX'
     gpx_success:
       hi: שלום %{to_user},
-      loaded_successfully:
-        one: נקלט כראוי עם %{trace_points} מתוך נקודה אחת אפשרית.
-        two: נקלט כראוי עם %{trace_points} מתוך %{possible_points} נקודות אפשריות.
-        many: נקלט כראוי עם %{trace_points} מתוך %{possible_points} נקודות אפשריות.
-        other: נקלט כראוי עם %{trace_points} מתוך %{possible_points} נקודות אפשריות.
+      loaded:
+        one: נטען בהצלחה עם  נקודה אחת אפשרית.
+        two: נטען בהצלחה עם %{trace_points} נקודות מתוך %{count} נקודות אפשריות.
+        many: נטען בהצלחה עם %{trace_points} נקודות מתוך %{count} נקודות אפשריות.
+        other: נטען בהצלחה עם %{trace_points} נקודות מתוך %{count} נקודות אפשריות.
       subject: '[אופן סטריט מאפ OpenStreetMap] ייבוא GPX הצליח'
     signup_confirm:
       subject: '[אופן סטריט מאפ OpenStreetMap] ברוך בואך לאופן סטריט מאפ'
@@ -1987,113 +1989,51 @@ he:
         mapping_link: להתחיל למפות
       legal_babble:
         title_html: זכויות יוצרים ורישיון
-        intro_1_html: |-
-          מיזם OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> הוא <i>נתונים פתוחים</i>, שמתפרסמים לפי רישיון <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database</a>  (ר״ת ODbL) על־ידי <a
-          href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (ר״ת OSMF).
-        intro_2_html: |-
+        introduction_1_html: |-
+          OpenStreetMap%{registered_trademark_link} הוא מיזם %{open_data}, שמתפרסמים לפי תנאי רישיון
+          %{odc_odbl_link} (ר״ת ODbL) על־ידי %{osm_foundation_link} (ר״ת OSMF).
+        introduction_1_open_data: נתונים פתוחים
+        introduction_1_odc_odbl: רישיון מסד נתונים פתוח של Open Data Commons
+        introduction_1_osm_foundation: קרן אופן סטריט מאפ
+        introduction_2_html: |-
           אתם חופשיים להעתיק, להפיץ, לשדר ולהתאים את הנתונים שלנו,
           כל עוד אתם נותנים ייחוס ל־OpenStreetMap
           ולתורמים למיזם. אם אתם משנים את הנתונים או את המפות שלנו או מסתמכים עליהם כדי ליצור משהו חדש,
           מותר לכם להפיץ את התוצאות רק לפי תנאי אותו הרישיון.
-          <a href="https://opendatacommons.org/licenses/odbl/1.0/">המסמך
-          המשפטי</a> המלא מסביר את זכויותיכם ואת תחומי האחריות שלכם.
-        intro_3_1_html: |-
-          התיעוד שלנו מוגש בכפוף
-          לרישיון <a href="https://creativecommons.org/licenses/by-sa/2.0/">קריאייטיב
-          קומונז ייחוס–שיתוף־זהה 2.0</a> license (בקיצור  CC-BY-SA 2.0).
+          %{legal_code_link} המלא מסביר את זכויותיכם ואת תחומי האחריות שלכם.
+        introduction_2_legal_code: המסמך המשפטי
+        introduction_3_html: התיעוד שלנו מתפרסם לפי תנאי רישיון %{creative_commons_link}
+          (ר״ת CC BY-SA 2.0).
+        introduction_3_creative_commons: קריאייטיב קומונז–ייחוס–שיתוף זהה 2.0
+        introduction_3_creative_commons_url: https://creativecommons.org/licenses/by-sa/2.0/deed.he
         credit_title_html: איך לתת ייחוס ל־OpenStreetMap
         credit_1_html: 'בעת שימוש בנתונים של OpenStreetMap, חובה לעשות את שני הדברים
           הבאים:'
-        credit_2_1_html: |-
-          <ul>
-            <li>לתת קרדיט ל־OpenStreetMap באמצעות הצגת הודעת זכויות היוצרים שלנו.</li>
-            <li>להבהיר שהנתונים זמינים לפי תנאי Open Database License.</li>
-          </ul>
-        credit_3_1_html: |-
+        credit_2_1: יש לתת קרדיט ל־OpenStreetMap על־ידי הצגת הודעת זכויות היוצרים
+          שלנו.
+        credit_2_2: יש להבהיר שהנתונים זמינים לפי רישיון מסד נתונים פתוח.
+        credit_3_html: |-
           לגבי הודעת זכויות היוצרים, יש לנו דרישות שונות לגבי איך זה צריך להיות
           מוצג, בהתאם לאופן שבו עשית שימוש בנתונים שלנו. למשל, כללים שונים
-          חלים על אופן הצגת הודעת זכויות היוצרים – תלוי אם יש לך
-          יצרו מפה ניתנת לעיון, מפה מודפסת, או תמונה סטטית. פרטים מלאים על
-          דרישות ניתן למצוא בדף
-          <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">הנחיות
-          ייחוס</a>.
-        credit_4_html: |-
-          כדי להבהיר שהנתונים זמינים לפי תנאי Open Database License , באפשרותך לקשר ל<a href="https://www.openstreetmap.org/copyright">דף זכויות היוצרים הזה</a>.
+          חלים על אופן הצגת הודעת זכויות היוצרים – תלוי אם
+          יצרת מפה ניתנת לעיון, מפה מודפסת, או תמונה סטטית. פרטים מלאים על
+          דרישות ניתן למצוא בדף %{attribution_guidelines_link}.
+        credit_3_attribution_guidelines: הנחיות ייחוס
+        credit_4_1_html: |-
+          כדי להבהיר שהנתונים זמינים לפי תנאי רישיון מסד הנתונים הפתוח, באפשרותך לקשר ל%{this_copyright_page_link}.
           לחלופין, וכדרישה אם OSM מופץ על־ידיך בצורת נתונים, באפשרותך לתת שם ולקשר ישירות לרישיון (או רישיונות). באמצעי אחסון שבהם קישורים אינם אפשריים (למשל עבודות מודפסות), אנו מציעים לך להפנות את הקוראים שלך לאתר openstreetmap.org (אולי על‏‏־ידי הרחבת
           "OpenStreetMap" לכתובת המלאה הזאת) ולאתר opendatacommons.org.
           בדוגמה הזאת, הקרדיט מופיע בפינת המפה.
+        credit_4_1_this_copyright_page: דף זכויות היוצרים הזה
         attribution_example:
           alt: דוגמה לצורה הנכונה לתת ייחוס ל־OpenStreetMap באתר האינטרנט
           title: דוגמה לייחוס
         more_title_html: איך למצוא מידע נוסף
-        more_1_html: |-
-          קִראו עוד על שימוש בנתונים שלנו ועל דרכים לייחס אלינו יצירות נגזרות ב<a
-          href="http://osmfoundation.org/Licence">דף רישיון OSMF</a>.
-        more_2_html: |-
-          אף־על־פי ש־OpenStreetMap הוא מיזם נתונים פתוחים, איננו יכולים לספק
-          API מפות בחינם לכל צד שלישי.
-          ר׳ את דפי המדיניות שלנו: <a href="https://operations.osmfoundation.org/policies/api/">המדיניות השימוש ב־API</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">מדיניות השימוש באריחים</a>
-          ו<a href="https://operations.osmfoundation.org/policies/nominatim/">מדיניות השימוש בנומינטים</a>.
         contributors_title_html: התורמים שלנו
         contributors_intro_html: |-
           התורמים שלנו הם אלפי אנשים. אנו גם כוללים
           נתונים ברישיון פתוח מסוכנויות מיפוי לאומות
           וממקורות אחרים, בהם:
-        contributors_at_html: |-
-          <strong>אוסטריה</strong>: מכיל נתונים
-          מ<a href="https://data.wien.gv.at/">עיריית וינה</a> לפי תנאי
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>,
-          מ<a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">מדינת פורארלברג</a>
-          וממדינת טירול (לפי <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT עם תיקונים</a>).
-        contributors_au_html: |-
-          <strong>אוסטרליה</strong>: מכיל או מפותח באמצעות Administrative Boundaries &copy;
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a>
-          ברישיון שניתן על־ידי חבר העמים האוסטרלי לפי תנאי
-          <a href="https://creativecommons.org/licenses/by/4.0/">רישיון קריאייטיב קומונז ייחוס 4.0 בין־לאומי (CC BY 4.0)</a>.
-        contributors_ca_html: |-
-          <strong>קנדה</strong>: מכיל נתונים
-          מ־GeoBase&reg;&rlm;, GeoGratis&rlm; (&copy;&rlm; Department of Natural
-          Resources Canada)&rlm;, CanVec&rlm; (&copy;&rlm; Department of Natural
-          Resources Canada), ו־StatCan&rlm; (Geography Division,
-          Statistics Canada).
-        contributors_fi_html: |-
-          <strong>פינלנד</strong>: מכיל מידע ממסד נתונים טופוגרפיים של פינלנד וממקורות מידע אחרים, תחת
-          <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">רישיון NLSFI</a>.
-        contributors_fr_html: |-
-          <strong>צרפת</strong>: מכיל נתונים שהגיעו במקור
-          ממנהלת המסים הכללית (Direction Générale des Impôts).
-        contributors_nl_html: |-
-          <strong>הולנד</strong>: מכיל &copy; נתונים מ־ AND&rlm;, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>ניו זילנד</strong>: מכיל נתונים שהגיעו במקור
-          מ־<a href="https://data.linz.govt.nz/">LINZ Data Service</a>
-          וניתן רישיון לשימוש חוזר לפי תנאי
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: |-
-          <strong>סלובניה</strong>: מכיל נתונים מ<a href="http://www.gu.gov.si/en/">הרשות למדידת־קרקעות ולמיפוי</a> ומ<a href="http://www.mkgp.gov.si/en/">משרד החקלאות, היערנות והמזון</a>
-          (מידע ציבורי של סלובניה).
-        contributors_es_html: |-
-          <strong>ספרד</strong>: מכיל נתונים שסופקו על ידי
-          המכון הגאוגרפי הלאומי של ספרד (<a href="http://www.ign.es/">IGN</a>) ועל ידי
-          מערכת המיפוי הלאומית (<a href="http://www.scne.es/">SCNE</a>)
-          שמותר להשתמש בהן תחת תנאי <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: |-
-          <strong>דרום אפריקה</strong>: מכיל נתונים שהגיעו
-          מ־<a href="http://www.ngi.gov.za/">מִנהל כללי:
-          מידע גאו־מרחבי לאומי</a>, זכות יוצרים ממלכתית שמורה.
-        contributors_gb_html: |-
-          <strong>הממלכה המאוחדת</strong>: מכיל נתוני סקר מדידות
-          &copy; זכויות הכתר וזכויות מסדי נתונים
-          2010–2023.
-        contributors_footer_1_html: |-
-          למידע נוסף על מקורות אלה ואחרים ששימשו
-          לשיפור OpenStreetMap, נא לראות את <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">דף
-          התורמים</a> בוויקי של OpenStreetMap.
         contributors_footer_2_html: |-
           הכללה של נתונים ב־OpenStreetMap אינה אומרת שהספק המקורי
           של הנתוהים תומך ב־OpenStreetMap, לוקח על עצמו אחריות כלשהי, או
@@ -2103,17 +2043,6 @@ he:
           אנו מזכירים לתורמים ל־OSM לעולם לא להוסיף נתונים משום מקור
           שמוגבל בזכויות יוצרים (למשל מפות גוגל או מפות מודפסות) ללא
           אישור מפורש מבעלי הזכויות.
-        infringement_2_html: |-
-          אם נראה לך שחומר שמוגבל בזכויות יוצרים נוסף באופן לא הולם
-          אל מסד הנתונים של OpenStreetMap או אל האתר הזה, נא לפנות
-          אל <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">נוהל
-          ההסרה</a> שלנו או כתבו תלונה ישירות
-          <a href="https://dmca.openstreetmap.org/">בדף התלונות המקוון שלנו</a>.
-        trademarks_title_html: <span id="trademarks"></span>סימנים מסחריים
-        trademarks_1_html: OpenStreetMap, סמל הזכוכית המגדלת ו־State of the Map הם
-          סימנים מסחריים של קרן OpenStreetMap. אם יש לך שאלות על השימוש שלך בסימנים,
-          ר' את <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">מדיניות
-          הסימנים המסחריים שלנו</a>.
     index:
       js_1: הדפדפן שבו אתה משתמש אינו תומך ב־JavaScript, או שכיבית את השימוש ב־JavaScript.
       js_2: אתר OpenStreetMap משתמש ב־JavaScript למפה המחליקה.
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 7034a3bc2..6ec6a5ac5 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1098,9 +1098,6 @@ hr:
       failed_to_import: 'Import nije uspio. Ovdje je greška:'
       subject: '[OpenStreetMap] GPX Import nije uspio'
     gpx_success:
-      loaded_successfully: |-
-        uspješno učitano sa %{trace_points} od mogućih
-        %{possible_points} točaka.
       subject: '[OpenStreetMap] GPX Import uspješan'
     signup_confirm:
       subject: '[OpenStreetMap] Dobrodošli na OpenStreetMap'
@@ -1343,101 +1340,17 @@ hr:
         mapping_link: počnite kartirati
       legal_babble:
         title_html: Autorska prava i Dozvola
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> sadrži <i>otvorene podatke</i>, licencirane pod <a
-          href="http://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) licencom od strane <a
-          href="http://osmfoundation.org/">OpenStreetMap zaklade</a> (OSMF).
-        intro_2_html: Slobodni ste kopirati, distribuirati, prenositi i adaptirati
-          naše podatke, dokle god navodite OpenStreetMap i njegove doprinositelje
-          kao izvor. Ako izmijenite ili nadogradite naše podatke, možete distribuirati
-          rezultate samo pod istom licencijom. Puni <a href="http://opendatacommons.org/licenses/odbl/1.0/">pravni
-          tekst</a> objašnjava vaša prava i obveze.
-        intro_3_1_html: Naša dokumentacija licencirana je pod <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> licencijom (CC BY-SA 2.0).
         credit_title_html: Kako iskazati zasluge OpenStreetMap-a
         credit_1_html: 'Tamo gdje koristite OpenStreetMap podatke, morate učiniti
           sljedeće dvije stvari:'
-        credit_2_1_html: "<ul>\n  <li>Označite da je zaslužan OpenStreetMap prikazivanjem
-          naše obavijesti o autorskim pravima.</li> \n  <li>Objasnite da su podaci
-          dostupni pod \"Open Database License\".</li> \n</ul>"
-        credit_3_1_html: |-
-          Imamo različite zahtjeve o tome kako treba prikazivati oznake o autorskim pravima, ovisno o tome kako koristite naše podatke. Na primjer, vrijede različita
-          pravila o tome kako prikazati obavijest o autorskim pravima ovisno o tome jeste li
-          stvorili dinamičku kartu koju možete pregledavati na internetskoj stranici, tiskani zemljovid ili statičnu sliku. Sve pojedinosti o zahtjevima mogu se pronaći u <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">smjernicama o atribuciji</a>.
-        credit_4_html: "Kako biste razjasnili da su podaci dostupni pod \"Open\nDatabase
-          License\", možete postaviti poveznicu na\n<a href=\"https://www.openstreetmap.org/copyright\">ovu
-          stranicu o autorskim pravima</a>.\n\nAlternativno, a kao nužna potreba ako
-          distribuirate OSM u\nformi podataka, možete možete postaviti poveznicu izravno
-          na\ntekst licence(i). Ako oblik medija ne omogućuje korištenje poveznica
-          (npr. tiskana djela), predlažemo da uputite Vaše čitatelje na openstreetmap.org
-          (označava točno adresu web stranice umjesto samo ime projekta - 'OpenStreetMap')
-          i na opendatacommons.org. \nU ovom primjeru atribucija se pojavljuje u kutu
-          karte."
         attribution_example:
           alt: Primjer kako atribuirati OpenStreetMap na web stranici
           title: Primjer atribucije
         more_title_html: Saznaj više
-        more_1_html: |-
-          Pročitaj više o korištenju naših podataka i kako iskazati zasluge na <a
-          href="http://osmfoundation.org/Licence">stranici OSMF Licence</a>.
-        more_2_html: |-
-          Iako su podaci karte OpenStreetMap slobodni podaci, ne možemo pružiti besplatni API trećim stranama.
-          Vidi naša <a href="https://operations.osmfoundation.org/policies/api/">pravila korištenja API-a</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">pravila korištenja kvadratića karte</a>
-          i <a href="https://operations.osmfoundation.org/policies/nominatim/">Pravila korištenja Nominatim-a</a>.
         contributors_title_html: Naši doprinositelji
         contributors_intro_html: 'Sudionici projekta su tisuće individualaca. Projekt
           također uključuje podatke pod slobodnim licencama od nacionalnih kartografskih
           agencija i drugih izvora, među kojima su:'
-        contributors_at_html: |-
-          <strong>Austrija</strong> : Sadrži podatke iz
-           <a href="https://data.wien.gv.at/">Stadt Wien</a> (pod
-           <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-           <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> i
-          Land Tirol (pod <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT s izmjenama i dopunama</a>).
-        contributors_au_html: "<strong>Australija</strong> : uključuje ili razvija
-          korištenjem administrativnih granica ©\n <a href=\"https://geoscape.com.au/legal/data-copyright-and-disclaimer/\">Geoscape
-          Australia</a> \nlicenciran od strane Commonwealtha Australije pod\n <a href=\"https://creativecommons.org/licenses/by/4.0/\">Creative
-          Commons Attribution 4.0 International licence (CC BY 4.0)</a>."
-        contributors_ca_html: |-
-          <strong>Kanada</strong>: Sadrži podatke iz
-             GeoBase&reg;, GeoGratis (&copy; Department of Natural
-             Resources Canada), CanVec (&copy; Department of Natural
-             Resources Canada) i StatCan (Geography Division,
-             Statistics Canada).
-        contributors_fi_html: |-
-          <strong>Finska</strong> : Sadrži podatke iz
-          National Land Survey of Finland's Topographic Database
-          i drugih skupova podataka, pod
-           <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI licencom</a>.
-        contributors_fr_html: |-
-          <strong>Francuska</strong> : Sadrži podatke iz
-          Direction Générale des Impôts.
-        contributors_nl_html: |-
-          <strong>Nizozemska</strong> : Sadrži © AND data, 2007
-          ( <a href="https://www.and.com">www.and.com</a> )
-        contributors_nz_html: '<strong>Novi Zeland</strong>: Sadrži podatke iz izvora
-          <a href="https://data.linz.govt.nz/">LINZ Data Service</a> koji su licencirani
-          za ponovnu upotrebu pod <a href="https://creativecommons.org/licenses/by/4.0/">CC
-          BY 4.0</a> licencijom.'
-        contributors_si_html: "<strong>Slovenija</strong> : Sadrži podatke iz\n <a
-          href=\"http://www.gu.gov.si/en/\">Geodetske uprave</a> i\n <a href=\"http://www.mkgp.gov.si/en/\">Ministarstva
-          poljoprivrede, Å¡umarstva i prehrane</a> \n (javne informacije Slovenije)."
-        contributors_es_html: |-
-          <strong>Španjolska</strong> : Sadrži podatke dobivene od
-          Spanish National Geographic Institute (<a href="http://www.ign.es/">IGN</a>) i
-          National Cartographic System (<a href="http://www.scne.es/">SCNE</a>)
-          licenciranih za ponovnu upotrebu pod <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: |-
-          <strong>Južna Afrika</strong>: Sadrži podatke iz
-           <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, državna autorska prava zadržana.
-        contributors_gb_html: '<strong>Ujedinjeno Kraljevstvo</strong>: Sadrži podatke
-          iz Ordnance Survey data &copy; Crown copyright and database right 2010-19.'
-        contributors_footer_1_html: Za daljnje pojedinosti o ovim i drugim izvorima
-          koji su korišteni za poboljšanje OpenStreetMapa, pogledajte <a href="https://wiki.openstreetmap.org/wiki/Contributors">Contributors
-          page</a> na OpenStreetMap Wiki-u.
         contributors_footer_2_html: Uvrštavanje podataka u OpenStreetMap ne podrazumijeva
           da izvorni davatelj podataka podržava OpenStreetMap, pruža bilo kakvo jamstvo,
           ili prihvaća bilo kakve obveze.
@@ -1445,16 +1358,6 @@ hr:
         infringement_1_html: Suradnike OSM-a podsjećamo da nikada ne dodaju podatke
           iz bilo kakvih izvora zaštićenih autorskim pravima (npr. Google karte ili
           tiskane karte) bez izričitog dopuštenja nositelja autorskih prava.
-        infringement_2_html: Ako smatrate da je materijal zaštićen autorskim pravom
-          neprimjereno dodan u bazu podataka OpenStreetMap ili na ove stranice, pogledajte
-          naš <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">postupak
-          za uklanjanje</a> ili pritužbu pošaljite izravno na <a href="https://dmca.openstreetmap.org/">on-line
-          stranici za podnošenje zahtjeva</a>.
-        trademarks_title_html: <span id="trademarks"></span>Robni žigovi
-        trademarks_1_html: OpenStreetMap, logotip u obliku povećala i State of the
-          Map registrirani su žigovi OpenStreetMap Foundationa. Ako imate pitanja
-          o vašem korištenju žigova, pogledajte našu <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Politiku
-          zaštitnih znakova</a> .
     index:
       js_1: Koristite internet preglednik koji ne podržava JavaScript, ili vam je
         isključen JavaScript.
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 2a2e53563..fa670b60d 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -1491,8 +1491,6 @@ hsb:
       subject: '[OpenStreetMap] Zmylk při imporće GPX'
     gpx_success:
       hi: Witaj %{to_user},
-      loaded_successfully: '%{trace_points} z %{possible_points} móžnych dypkow bu
-        wuspěšnje importowane.'
       subject: '[OpenStreetMap] GPX-import wuspěšny'
     signup_confirm:
       subject: '[OpenStreetMap] Witaj k OpenStreetMap'
@@ -1839,81 +1837,16 @@ hsb:
         mapping_link: z kartěrowanjom započeć
       legal_babble:
         title_html: Awtorske prawo a licenca
-        intro_1_html: |-
-          OpenStreetMap su <i>zjawne daty</i>, licencowane pod licencu <a
-          href="http://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database</a> (ODbL) wot <a
-          href="http://osmfoundation.org/">załožby OpenStreetMap</a> (OSMF).
-        intro_2_html: Směš naše daty kopěrować, rozdźělić, přenjesć a přiměrić, dołhož
-          OpenStreetMap a jeho sobuskutkowacych naspominaš. Jeli změniš naše daty
-          abo zepěraš so na nje, móžeš wuslědk jenož pod samsnej licencu rozdźělić.
-          Dospołny <a href="http://opendatacommons.org/licenses/odbl/1.0/">tekst licency</a>
-          wujasnja twoje prawa a winowatosće.
-        intro_3_1_html: Naša dokumentacija je pod licencu <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0) licencowana.
         credit_title_html: Kak ma so na awtorstwo OpenStreetMap pokazać
         credit_1_html: Žadamy sej wužiwanje pokazki „&copy; sobuskutkowacy OpenStreetMap“.
-        credit_2_1_html: Dyrbiš tež wujasnić, zo steja daty pod licencu Open Database,
-          a, jelizo wužiwaš naše kartowe kachlički, zo je kartografija pod CC-BY-SA
-          licencowana. Móžeš to činić wotkazujo na stronu <a href="http://www.openstreetmap.org/copyright">www.openstreetmap.org/copyright</a>.
-          Alternatiwnje, a winowatostnje, jeli OSM w formje datow dale dawaš, móžeš
-          direktnje na licency wotkazać a je mjenować. W medijach, hdźež wotkazy móžne
-          njejsu (na př. ćišćane dźěła), doporučimy tebi, twojich čitarjow na openstreetmap.org
-          (snadź rozšěrjejo 'OpenStreetMap' k połnej adresy), na opendatacommons.org
-          a, jeli přitrjechi, na creativecommons.org skedźbnić.
-        credit_4_html: 'Za přepytujomnu elektronisku kartu měła so pokazka w róžku
-          karty jewić. Na přikład:'
         attribution_example:
           alt: Přikład, kak so na webstronje na OpenStreetMap pokazuje
           title: Přikład za mjenowanje na webstronje z elektroniskej kartu
         more_title_html: Dalše informacije
-        more_1_html: |-
-          Wjace informacijow wo wužiwanju našich datow a kak hodźi so na nas pokazować namakaš na <a
-          href="http://osmfoundation.org/Licence">stronje OSMF wo licencach</a>.
-        more_2_html: "Byrnjež wobstejał OpenStreetMap ze zjawnych datow, njemóžemy
-          darmotnu kartowu API za třećich poskićić. \nHlej naše <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">prawidła
-          za wužiwanje API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">prawidła
-          za wužiwanje kachličkow</a> a <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">prawidła
-          za wužiwanje Nominatim</a>."
         contributors_title_html: Naši sobuskutkowacy
         contributors_intro_html: 'Naši sobuskutkowacy su tysacy jednotliwcow. Zapřijamy
           tež wotewrjenje licencowane daty narodnych kartowych agenturow a z druhich
           žórłow, mjez nimi:'
-        contributors_at_html: '<strong>Awstriska</strong>: Wobsahuje daty z <a href="http://data.wien.gv.at/">Stadt
-          Wien</a> (pod <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC
-          BY</a>), <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
-          Vorarlberg</a> a Land Tirol (pod <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY
-          AT ze změnami</a>).'
-        contributors_au_html: '<strong>Awstralska</strong>: Wobsahuje předměšćanske
-          daty na zakładźe datow Awstralskeho  zarjada za statistiku (Australian Bureau
-          of Statistics).'
-        contributors_ca_html: '<strong>Kanada</strong>: Wobsahuje daty z GeoBase&reg;,
-          GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy;
-          Department of Natural Resources Canada), a StatCan (Geography Division,
-          Statistics Canada).'
-        contributors_fi_html: '<strong>Finska</strong>: Wobsahuje daty z topografiskeje
-          datoweje banki National Land Survey of Finland a druhich datowych sadźbow,
-          pod <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI-licencu</'
-        contributors_fr_html: '<strong>Francoska</strong>: Wobsahuje daty z Direction
-          Générale des Impôts.'
-        contributors_nl_html: '<strong>Nižozemska</strong>: Wobsahuje daty &copy;
-          AND data, 2007   (<a href="http://www.and.com">www.and.com</a>)'
-        contributors_nz_html: "<strong>Nowoseelandska</strong>: Wobsahuje daty ze
-          słužby \n<a href=\"https://data.linz.govt.nz/\">Land Information New Zealand</a>
-          a \nje za zasowužiwanje pod \n<a href=\"https://creativecommons.org/licenses/by/4.0/\">CC
-          BY 4.0</a> licencowane."
-        contributors_si_html: '<strong>Słowjenska</strong>: Wobsahuje daty ze <a href="http://www.gu.gov.si/en/">zarjada
-          za krajměrjenje a kartěrowanje</a> kaž tež z <a href="http://www.mkgp.gov.si/en/">ministerstwa
-          za ratarstwo, lěsnistwo a zežiwjenje</a> (zjawne informacije Słowjenskeje).'
-        contributors_za_html: '<strong>Južna Afrika</strong>: Wobsahuje daty z <a
-          href="http://www.ngi.gov.za/">Chief Directorate:   National Geo-Spatial
-          Information</a>, Statne awtorske prawo wuměnjene.'
-        contributors_gb_html: '<strong>Zjednoćene kralestwo</strong>: Wobsahuje daty
-          z Ordnance Survey (Zarjadniske krajměrjenstwo) &copy; Awtorske prawo a prawo
-          za datowe banki 2010-2019.'
-        contributors_footer_1_html: Za dalše podrobnosće za to a druhe žórła, kotrež
-          su so wužili, zo bychu OpenStreetMap polěpšili, hlej prošu <a href="http://wiki.openstreetmap.org/wiki/Contributors">stronu
-          sobuskutkowarjow</a> na wikiju OpenStreetMap.
         contributors_footer_2_html: Zapřijimanje datow do OpenStreetMap njerěka, zo
           poskićowar originalnych datow OpenStreetMap připóznawa, někajku garantiju
           dodawa abo rukowanje přewozmje.
@@ -1921,16 +1854,6 @@ hsb:
         infringement_1_html: Sobuskutkowacych OSM namołwjamy, zo ženje daty ze žórłow,
           kotrež su přez awtorske prawo škitane (na př. z Google Maps abo z wućišćanych
           kartow) bjez wurazneje dowolnosće awtorow  njepřidawaja.
-        infringement_2_html: Jeli měniš, zo awtorskoprawnisce škitany material je
-          so datowej bance OpenStreetMap abo tutomu sydłu bjez dowolnosće přidał,
-          poćahuj so prošu na naše <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">postupowanje
-          za wotstronjenje wobsaha</a>abo zdźěl to direktnje na našej <a href="https://dmca.openstreetmap.org/">formularnej
-          stronje</a>.
-        trademarks_title_html: <span id="trademarks"></span>markowe znamjo
-        trademarks_1_html: OpenStreetMap, logo z lupu a staw karty su registrowane
-          znamjenja załožby OpenStreetMap. Maš-li prašenja wo wužiwanju znamjo, pósćel
-          je prošu <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">dźěłowej
-          skupinje "licency"</a>.
     index:
       js_1: Pak wužiwaš wobhladowak, kotryž JavaScript njepodpěruje, pak sy JavaScript
         znjemóžnił.
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index b5b79dc0f..e98b1dd7c 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -199,41 +199,41 @@ hu:
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: nagyjából 1 órával ezelőtt
+        one: nagyjából %{count} órával ezelőtt
         other: mintegy %{count} órával ezelőtt
       about_x_months:
-        one: nagyjából 1 hónappal ezelőtt
+        one: nagyjából %{count} hónappal ezelőtt
         other: mintegy %{count} hónappal ezelőtt
       about_x_years:
-        one: nagyjából 1 éve
-        other: nagyjából %{count} éve
+        one: nagyjából %{count} évvel ezelőtt
+        other: nagyjából %{count} évvel ezelőtt
       almost_x_years:
-        one: majdnem 1 évvel ezelőtt
+        one: majdnem %{count} évvel ezelőtt
         other: majdnem %{count} évvel ezelőtt
       half_a_minute: fél perccel ezelőtt
       less_than_x_seconds:
-        one: kevesebb mint 1 másodperccel ezelőtt
+        one: kevesebb mint %{count} másodperccel ezelőtt
         other: kevesebb mint %{count} másodperccel ezelőtt
       less_than_x_minutes:
-        one: kevesebb mint 1 perccel ezelőtt
+        one: kevesebb mint %{count} perccel ezelőtt
         other: kevesebb mint %{count} perccel ezelőtt
       over_x_years:
-        one: több mint 1 éve
-        other: több mint %{count} éve
+        one: több mint %{count} évvel ezelőtt
+        other: több mint %{count} évvel ezelőtt
       x_seconds:
-        one: 1 másodperccel ezelőtt
+        one: '%{count} másodperccel ezelőtt'
         other: '%{count} másodperccel ezelőtt'
       x_minutes:
-        one: 1 perccel ezelőtt
+        one: '%{count} perccel ezelőtt'
         other: '%{count} perccel ezelőtt'
       x_days:
-        one: 1 napja
-        other: '%{count} napja'
+        one: '%{count} nappal ezelőtt'
+        other: '%{count} nappal ezelőtt'
       x_months:
-        one: 1 hónappal ezelőtt
+        one: '%{count} hónappal ezelőtt'
         other: '%{count} hónappal ezelőtt'
       x_years:
-        one: 1 évvel ezelőtt
+        one: '%{count} évvel ezelőtt'
         other: '%{count} évvel ezelőtt'
   editor:
     default: Alapértelmezett (jelenleg %{name})
@@ -335,9 +335,7 @@ hu:
         léphessenek Veled a webhelyen keresztül, kattints az alábbi gombra.
       only_public_can_edit: A 0.6-os API-váltás óta csak nyilvános felhasználó szerkeszthet
         térképadatokat.
-      find_out_why_html: (%{link}).
       find_out_why: olvasd el, miért
-      find_out_why_url: https://wiki.openstreetmap.org/wiki/Anonymous_edits
       email_not_revealed: Az e-mail-címed nem fog nyilvánosságra kerülni.
       not_reversible: Ez a művelet nem vonható vissza, és most már minden új felhasználó
         alapértelmezés szerint nyilvános.
@@ -363,10 +361,10 @@ hu:
     no_comment: (nincs hozzászólás)
     part_of: 'Része ennek:'
     part_of_relations:
-      one: 1 kapcsolat
+      one: '%{count} kapcsolat'
       other: '%{count} kapcsolat'
     part_of_ways:
-      one: 1 vonal
+      one: '%{count} vonal'
       other: '%{count} vonal'
     download_xml: XML letöltése
     view_history: Előzmények megtekintése
@@ -411,7 +409,7 @@ hu:
       history_title_html: '%{name} kapcsolat előzményei'
       members: Tagok
       members_count:
-        one: 1 tag
+        one: '%{count} tag'
         other: '%{count} tag'
     relation_member:
       entry_role_html: '%{type} %{name} mint %{role}'
@@ -1457,7 +1455,7 @@ hu:
       last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> %{user} által
       link_to_reports: Bejelentések megtekintése
       reports_count:
-        one: 1 bejelentés
+        one: '%{count} bejelentés'
         other: '%{count} bejelentés'
       reported_item: Jelentett elem
       states:
@@ -1626,10 +1624,6 @@ hu:
       subject: '[OpenStreetMap] Sikertelen GPX importálás'
     gpx_success:
       hi: Szia %{to_user}!
-      loaded_successfully:
-        one: sikeresen betöltődött a lehetséges 1 pontból %{trace_points} ponttal.
-        other: sikeresen betöltődött a lehetséges %{possible_points} pontból %{trace_points}
-          ponttal.
       subject: '[OpenStreetMap] Sikeres GPX importálás'
     signup_confirm:
       subject: '[OpenStreetMap] Üdvözlünk az OpenStreetMapen'
@@ -1988,94 +1982,21 @@ hu:
         mapping_link: kezdheted a térképezést
       legal_babble:
         title_html: Szerzői jog és licenc
-        intro_1_html: |-
-          Az OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> egy <i>szabad adathalmaz</i>, amelyet az <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> licenc (ODbL) alatt tett közzé az <a
-          href="https://osmfoundation.org/">OpenStreetMap Alapítvány</a> (OSMF).
-        intro_2_html: |2-
-            Szabadon másolhatod, terjesztheted, továbbíthatod és átdolgozhatod adatainkat mindaddig, amíg feltünteted az OpenStreetMapet és közreműködőit. Ha módosítod vagy felhasználod az adatainkat, akkor az eredményt is csak azonos licenccel terjesztheted. A teljes <a
-            href="https://opendatacommons.org/licenses/odbl/1.0/">jogi
-            szabályzat</a> ismerteti a jogaidat és kötelezettségeidet.
-        intro_3_1_html: Dokumentációnkra a <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.hu">Creative
-          Commons „Nevezd meg! – Így add tovább!” 2.0</a> (CC BY-SA) licenc vonatkozik.
+        introduction_3_creative_commons_url: https://creativecommons.org/licenses/by-sa/2.0/deed.hu
         credit_title_html: Hogyan kell feltüntetned az OpenStreetMapet?
         credit_1_html: 'Ahol az OpenStreetMap adatait használja, ott kérjük tüntesse
           fel az alább felsoroltakat:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Biztosítson forrásmegjelölést az OpenStreetMap számára azzal, hogy megjeleníti a szerzői jogi közleményünket.</li>
-            <li>Tegye egyértelművé, hogy az adatok az Open Database License (Nyílt Adatbázis Licenc) alapján állnak rendelkezésre.</li>
-          </ul>
-        credit_3_1_html: |-
-          A szerzői jog megjelölésére különböző követelmények vonatkoznak annak függvényében, hogy hogyan használod az adatainkat. Például, különböző szabályok vonatkoznak arra, hogy hogyan kell megjelölni a szerzői jogot egy böngészhető térképen, egy nyomtatott térképen vagy egy állóképen. A követelmények részletes leírásáért olvassa el az <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Attribution
-          Guidelines</a>-t.
-        credit_4_html: |-
-          Annak egyértelművé tétele érdekében, hogy az adatok az Open Database License (Nyílt adatbázis licenc) alatt elérhetőek, hivatkozz <a href="https://www.openstreetmap.org/copyright">erre a szerzői jogi oldalra</a>.
-          Alternatív megoldásként és követelményként ha az OSM-et adat formában terjeszted, akkor közvetlenül is megnevezheted és hivatkozhatsz a licenc(ek)re. Az olyan helyzetekben ahol a hivatkozás nem lehetséges (pl. nyomtatott munkák), javasoljuk, hogy az olvasóidat közvetlenül irányítsd hozzánk az openstreetmap.org (vagy csak "OpenStreetMap") megjelöléssel és az opendatacommons.org-ra.
-          Ebben a példában a megjelölés a térkép sarkán jelenik meg.
         attribution_example:
           alt: Példa arra, hogyan jelenjen meg az OpenStreetMap-re való hivatkozás
             egy weboldalon
           title: Példa egy hivatkozásra
         more_title_html: Tudj meg többet!
-        more_1_html: |-
-          További információ adataink használatáról az <a
-          href="https://osmfoundation.org/License">OSMF Licenc lapon</a>.
-        more_2_html: |-
-          Habár az OpenStreetMap egy nyílt adatforrás, nem tudunk ingyenes térkép API elérést biztosítani a harmadik feleknek.
-
-          Lásd az <a href="https://operations.osmfoundation.org/policies/tiles/">API Felhasználási Irányelveinket</a>, a <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Csempe Felhasználási Irányelveinket</a> és a <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Felhasználási Irányelveinket</a>.
         contributors_title_html: Közreműködőink
         contributors_intro_html: 'Több ezer egyéni közreműködőnk van. További, szabadon
           elérhető adatokat is felhasználunk nemzeti térkép intézetektől és más forrásokból,
           többek között:'
-        contributors_at_html: |-
-          <strong>Ausztria</strong>: adatokat tartalmaz a következő forrásból:
-             <a href="https://data.wien.gv.at/">Bécs városa</a>
-             <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a> licenc alatt.
-        contributors_au_html: '<strong>Ausztrália</strong>: A Commonwealth of Australia
-          által a <a href="https://creativecommons.org/licenses/by/4.0/">Creative
-          Commons Attribution 4.0 International licenc (CC BY 4.0)</a> alapján engedélyezett
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape
-          Australia</a> Administrative Boundaries &copy; (közigazgatási határok) felhasználásával
-          készült vagy azt tartalmazza.'
-        contributors_ca_html: |-
-          <strong>Kanada</strong>: adatokat tartalmaz a következő forrásokból:
-             GeoBase&reg;, GeoGratis (&copy; Department of Natural
-             Resources Canada), CanVec (&copy; Department of Natural
-             Resources Canada), and StatCan (Geography Division,
-             Statistics Canada).
-        contributors_fi_html: "<strong>Finnország</strong>: Adatokat tartalmaz a következő
-          forrásokból: \nNational Land Survey of Finland's Topographic Database\nés
-          más adatforrások <a href=\"https://www.maanmittauslaitos.fi/en/opendata-licence-version1\"></a>NLSFI
-          licenc alatt."
-        contributors_fr_html: '<strong>Franciaország</strong>: adatokat tartalmaz
-          a következő forrásból: Direction Générale des Impôts.'
-        contributors_nl_html: |-
-          <strong>Hollandia</strong>: adatokat tartalmaz innen: Automotive Navigation Data, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: '<strong>Új-Zéland</strong>: adatokat tartalmaz a következő
-          forrásból: <a href="https://data.linz.govt.nz/">LINZ Data Service</a>, újrafelhasználható
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a> licenc
-          szerint.'
-        contributors_si_html: '<strong>Szlovénia</strong>: Tartalmaz adatokat a <a
-          href="http://www.gu.gov.si/en/">Földmérési és Térképészeti Hatóságtól</a>
-          és a <a href="http://www.mkgp.gov.si/en/">Földművelési, Erdőgazdálkodási
-          és Élelmezésügyi Minisztériumtól</a> (nyilvános információk Szlovéniában).'
-        contributors_es_html: '<strong>Spanyolország</strong>: A Spanyol Nemzeti Geográfiai
-          Intézet (<a href="http://www.ign.es/">IGN</a>) és Nemzeti Kartográfiai Rendszer
-          (<a href="http://www.scne.es/">SCENE</a>) adataiból származtatott adatokat
-          tartalmaz a <a href="https://creativecommons.org/licenses/by/4.0/">CC BY
-          4.0</a> licenc alapján.'
-        contributors_za_html: |-
-          <strong>Dél-Afrika</strong>: tartalmaz olyan adatokat, amelyek a
-          <a href="http://www.ngi.gov.za/">nemzeti térinformatikai főigazgatóságtól</a> származnak, és az állam fenntartja a szerzői jogokat.
-        contributors_gb_html: "<strong>Egyesült Királyság</strong>: Térképészeti Szolgálat
-          adatai &copy; Királyi szerzői és adatbázisjog \n2010-2019."
-        contributors_footer_1_html: |-
-          További részletekért, és az OpenStreetMap javításához használt más forrásokról, kérjük, olvassa el <a href="https://wiki.openstreetmap.org/wiki/contributors">a szerkesztők oldalát
-          az OpenStreetMap wikin.</a>
+        contributors_at_cc_by_url: https://creativecommons.org/licenses/by/3.0/at/deed.hu
+        contributors_at_land_vorarlberg_url: https://vorarlberg.at/-/wms-dienste
         contributors_footer_2_html: Az adatok befoglalása az OpenStreetMapbe nem jelenti
           azt, hogy az eredeti adatszolgáltató támogatja az OpenStreetMapet, garanciát
           nyújt vagy felelősséget vállal rá.
@@ -2084,15 +2005,6 @@ hu:
           ne adjanak hozzá adatokat egyetlen szerzői jogvédett forrásból se (pl. Google
           Térkép vagy nyomtatott térképek) a szerzői jog tulajdonosának kifejezett
           engedélye nélkül.
-        infringement_2_html: |-
-          Ha úgy gondolod, hogy jogvédett anyag került jogszerűtlenül az OpenStreetMap adatbázisba vagy erre a weblapra, kérjük olvasd el az <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">eltávolítási
-          folyamat leírását</a> vagy jelentsd be közvetlenül az
-          <a href="https://dmca.openstreetmap.org/">online bejelentő oldalon</a>.
-        trademarks_title_html: <span id="trademarks"></span>Védjegyek
-        trademarks_1_html: Az OpenStreetMap, a nagyító ikon és a State of the Map
-          az OpenStreetMap Foundation bejegyzett védjegyei. Ha kérdésed van ezek felhasználásával
-          kapcsolatban, kérlek tekintsd meg a <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Védjegy
-          irányelv</a>einket.
     index:
       js_1: Vagy egy olyan böngészőt használsz, amely nem támogatja a JavaScriptet,
         vagy letiltottad a JavaScriptet.
@@ -2125,7 +2037,6 @@ hu:
       licence_details_html: Az OpenStreetMap adatokra az %{odbl_link} (ODbL) licenc
         vonatkozik.
       odbl: Open Data Commons Open Database License (open data commons nyílt adatbázis-licenc)
-      odbl_url: https://opendatacommons.org/licenses/odbl/1.0/
       too_large:
         advice: Ha a fenti exportálás sikertelen lenne, próbáld meg az alábbi listából
           valamelyik lehetőséget.
@@ -2224,7 +2135,6 @@ hu:
         Esetleg a szervezetednek is vannak tervei az OpenStreetMappel kapcsolatban? %{welcome_mat_link}.
       get_help_here: Itt kaphatsz segítséget
       welcome_mat: Nézd meg az előszobát
-      welcome_mat_url: https://welcome.openstreetmap.org/
     sidebar:
       search_results: Keresés eredményei
       close: Bezár
@@ -2347,9 +2257,7 @@ hu:
           kézi szerkesztésen kívül bármilyen más tevékenységet fontolgatsz, kérjük,
           olvasd el és kövesd az %{imports_link} és %{automated_edits_link} irányelveit.
         imports: Importálások
-        imports_url: https://wiki.openstreetmap.org/wiki/Import/Guidelines
         automated_edits: automatizált szerkesztések
-        automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct
       start_mapping: Térképezés indítása
       add_a_note:
         title: Nincs időd szerkeszteni? Küldj be jegyzetet!
@@ -2436,7 +2344,9 @@ hu:
       newer: Újabb nyomvonalak
     trace:
       pending: FÜGGŐBEN
-      count_points: '%{count} pont'
+      count_points:
+        one: '%{count} pont'
+        other: '%{count} pont'
       more: tovább
       trace_details: Nyomvonal részleteinek megtekintése
       view_map: Térkép megtekintése
@@ -2832,19 +2742,19 @@ hu:
       time_past_html: Véget ért %{time} időpontban.
       block_duration:
         hours:
-          one: 1 óra
+          one: '%{count} óra'
           other: '%{count} óra'
         days:
-          one: 1 nap
+          one: '%{count} nap'
           other: '%{count} nap'
         weeks:
-          one: 1 hét
+          one: '%{count} hét'
           other: '%{count} hét'
         months:
-          one: 1 hónap
+          one: '%{count} hónap'
           other: '%{count} hónap'
         years:
-          one: 1 év
+          one: '%{count} év'
           other: '%{count} év'
     blocks_on:
       title: '%{name} blokkolásai'
@@ -2968,10 +2878,10 @@ hu:
       locate:
         title: Helyzetem megjelenítése
         metersPopup:
-          one: Egy méternél közelebb vagy ehhez a ponthoz
+          one: '%{count} méternél is közelebb vagy ehhez a ponthoz'
           other: '%{count} méternél közelebb vagy ehhez a ponthoz'
         feetPopup:
-          one: Egy lábnál is közelebb vagy ehhez a ponthoz
+          one: '%{count} lábnál is közelebb vagy ehhez a ponthoz'
           other: '%{count} lábnál közelebb vagy ehhez a ponthoz'
       base:
         standard: Alapértelmezett
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index cd5cd9bf9..b8000ad6a 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -172,41 +172,41 @@ ia:
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: circa 1 hora retro
+        one: circa %{count} hora retro
         other: circa %{count} horas retro
       about_x_months:
-        one: circa 1 mense retro
+        one: circa %{count} mense retro
         other: circa %{count} menses retro
       about_x_years:
-        one: circa 1 anno retro
+        one: circa %{count} anno retro
         other: circa %{count} annos retro
       almost_x_years:
-        one: quasi 1 anno retro
+        one: quasi %{count} anno retro
         other: quasi %{count} annos retro
       half_a_minute: un medie minuta retro
       less_than_x_seconds:
-        one: minus de 1 seconda retro
+        one: minus de %{count} secunda retro
         other: minus de %{count} secundas retro
       less_than_x_minutes:
-        one: minus de un minuta retro
+        one: minus de %{count} minuta retro
         other: minus de %{count} minutas retro
       over_x_years:
-        one: plus de 1 anno retro
+        one: plus de %{count} anno retro
         other: plus de %{count} annos retro
       x_seconds:
-        one: 1 secunda retro
+        one: '%{count} secunda retro'
         other: '%{count} secundas retro'
       x_minutes:
-        one: 1 minuta retro
+        one: '%{count} minuta retro'
         other: '%{count} minutas retro'
       x_days:
-        one: 1 die retro
+        one: '%{count} die retro'
         other: '%{count} dies retro'
       x_months:
-        one: 1 mense retro
+        one: '%{count} mense retro'
         other: '%{count} menses retro'
       x_years:
-        one: 1 anno retro
+        one: '%{count} anno retro'
         other: '%{count} annos retro'
   editor:
     default: Predefinite (actualmente %{name})
@@ -310,9 +310,7 @@ ia:
         sur le button hic infra.
       only_public_can_edit: Post le cambiamento al API 0.6, solmente usatores public
         pote modificar datos cartographic.
-      find_out_why_html: (%{link}).
       find_out_why: apprende proque
-      find_out_why_url: https://wiki.openstreetmap.org/wiki/Anonymous_edits
       email_not_revealed: Render tu conto public non revelara tu adresse de e-mail.
       not_reversible: Iste action es irreversibile e tote le nove usatores es ora
         public per predefinition.
@@ -338,10 +336,10 @@ ia:
     no_comment: (sin commento)
     part_of: Parte de
     part_of_relations:
-      one: 1 relation
+      one: '%{count} relation'
       other: '%{count} relationes'
     part_of_ways:
-      one: 1 via
+      one: '%{count} via'
       other: '%{count} vias'
     download_xml: Discargar XML
     view_history: Vider historia
@@ -386,7 +384,7 @@ ia:
       history_title_html: 'Historia del relation: %{name}'
       members: Membros
       members_count:
-        one: 1 membro
+        one: '%{count} membro'
         other: '%{count} membros'
     relation_member:
       entry_role_html: '%{type} %{name} como %{role}'
@@ -1431,7 +1429,7 @@ ia:
       last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> per %{user}
       link_to_reports: Vider reportos
       reports_count:
-        one: 1 reporto
+        one: '%{count} reporto'
         other: '%{count} reportos'
       reported_item: Objecto reportate
       states:
@@ -1606,11 +1604,11 @@ ia:
       subject: '[OpenStreetMap] Importation GPX fallite'
     gpx_success:
       hi: Salute %{to_user},
-      loaded_successfully:
-        one: ha essite cargate con successo con %{trace_points} ex un maximo de 1
+      loaded:
+        one: ha essite cargate con successo con %{trace_points} ex un maximo de %{count}
           puncto.
         other: ha essite cargate con successo con %{trace_points} ex un maximo de
-          %{possible_points} punctos.
+          %{count} punctos.
       subject: '[OpenStreetMap] Importation GPX succedite'
     signup_confirm:
       subject: '[OpenStreetMap] Benvenite a OpenStreetMap'
@@ -1906,8 +1904,6 @@ ia:
   shared:
     markdown_help:
       heading_html: Interpretate con %{kramdown_link}
-      kramdown_url: https://kramdown.gettalong.org/quickref.html
-      kramdown: kramdown
       headings: Titulos
       heading: Titulo
       subheading: Subtitulo
@@ -1977,109 +1973,53 @@ ia:
         mapping_link: comenciar le cartographia
       legal_babble:
         title_html: Copyright e Licentia
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> es <i>datos aperte</i>, licentiate sub le <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) per le <a
-          href="https://osmfoundation.org/">Fundation OpenStreetMap</a> (OSMF).
-        intro_2_html: Vos es libere de copiar, distribuer, transmitter e adaptar nostre
-          datos, a condition que vos da recognoscentia a OpenStreetMap e su contributores.
-          Si vos altera o extende nostre datos, vos pote distribuer le resultato solmente
-          sub le mesme licentia. Le <a href="https://opendatacommons.org/licenses/odbl/1.0/">codice
-          juridic</a> complete explica vostre derectos e responsabilitates.
-        intro_3_1_html: Nostre documentation es publicate sub licentia <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA 2.0).
+        introduction_1_html: |-
+          OpenStreetMap%{registered_trademark_link} es %{open_data}, licentiate sub
+          %{odc_odbl_link} (ODbL) per le %{osm_foundation_link} (OSMF).
+        introduction_1_open_data: datos aperte
+        introduction_1_odc_odbl: Licentia de base de datos aperte de Open Data Commons
+        introduction_1_osm_foundation: Fundation OpenStreetMap
+        introduction_2_html: Vos es libere de copiar, distribuer, transmitter e adaptar
+          nostre datos, a condition que vos da recognoscentia a OpenStreetMap e su
+          contributores. Si vos altera o extende nostre datos, vos pote distribuer
+          le resultato solmente sub le mesme licentia. Le %{legal_code_link} complete
+          explica vostre derectos e responsabilitates.
+        introduction_2_legal_code: codice juridic
+        introduction_3_html: Nostre documentation es sub licentia %{creative_commons_link}
+          (CC BY-SA 2.0).
+        introduction_3_creative_commons: Creative Commons Attribution-CompartiSimile
+          2.0
+        introduction_3_creative_commons_url: https://creativecommons.org/licenses/by-sa/2.0/deed.ia
         credit_title_html: Como dar recognoscentia a OpenStreetMap
         credit_1_html: 'Ubi tu usa le datos de OpenStreetMap, tu es obligate a facer
           le sequente duo cosas:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Dar credito a OpenStreetMap monstrante nostre aviso de derecto de autor.</li>
-            <li>Render clar que le datos es disponibile sub Open Database License.</li>
-          </ul>
-        credit_3_1_html: Quanto al aviso de derecto de autor, nos ha differente exigentias
+        credit_2_1: Forni credito a OpenStreetMap monstrante nostre aviso de derecto
+          de autor.
+        credit_2_2: Rende clar que le datos es disponibile sub le Licentia Open Database.
+        credit_3_html: Quanto al aviso de derecto de autor, nos ha differente exigentias
           sur como illo debe esser monstrate, dependente de como tu usa nostre datos.
           Per exemplo, se applica regulas differente sur como monstrar le aviso de
           derecto de autor dependente de si tu ha create un carta navigabile, un carta
           imprimite o un imagine static. Le detalios complete sur le iste exigentias
-          se trova in le <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Directivas
-          de attribution</a>.
-        credit_4_html: Pro render clar que le datos es disponibile sub Open Database
-          License, tu pote ligar a <a href="https://www.openstreetmap.org/copyright">iste
-          pagina de derecto de autor</a>. Alternativemente, e obligatorimente si tu
-          distribue OSM in forma de datos, tu pote mentionar le licentia(s) e ligar
-          directemente a illo(s). Si tu usa un medio de communication in le qual le
-          ligamines non es possibile (p.ex. un obra imprimite), nos suggere que tu
-          dirige le lectores a openstreetmap.org (forsan inserente iste adresse complete
-          in loco del parola &lsquo;OpenStreetMap&rsquo;) e a opendatacommons.org.
+          se trova in le %{attribution_guidelines_link}.
+        credit_3_attribution_guidelines: Directivas de attribution
+        credit_4_1_html: Pro render clar que le datos es disponibile sub Open Database
+          License, tu pote ligar a %{this_copyright_page_link}. Alternativemente,
+          e obligatorimente si tu distribue OSM in forma de datos, tu pote mentionar
+          le licentia(s) e ligar directemente a illo(s). Si tu usa un medio de communication
+          in le qual le ligamines non es possibile (p.ex. un obra imprimite), nos
+          suggere que tu dirige le lectores a openstreetmap.org (forsan inserente
+          iste adresse complete in loco del parola ‘OpenStreetMap’) e a opendatacommons.org.
           In iste exemplo, le credito appare in le angulo del carta.
+        credit_4_1_this_copyright_page: iste pagina de derecto de autor
         attribution_example:
           alt: Exemplo de como recognoscer OpenStreetMap in un pagina web
           title: Exemplo de recognoscentia
         more_title_html: Pro saper plus
-        more_1_html: Lege plus sur le uso de nostre datos, e sur como citar correctemente
-          lor fonte, in le <a href="https://osmfoundation.org/Licence">pagina de licentia
-          OSMF</a>.
-        more_2_html: |-
-          Ben que OpenStreetMap es datos aperte, nos non pote fornir un API cartographic gratuite pro tertios. Vide nostre <a href="https://operations.osmfoundation.org/policies/api/">politica pro le uso del API</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles">politica pro le uso de tegulas</a>
-          e <a href="https://operations.osmfoundation.org/policies/nominatim">politica pro le uso de Nominatim</a>.
         contributors_title_html: Nostre contributores
         contributors_intro_html: 'Nostre contributores es milles de personas. Nos
           include anque le datos sub licentia aperte de agentias cartographic national
           e de altere fontes, inter le quales:'
-        contributors_at_html: '<strong>Austria</strong>: Contine datos ab le <a href="https://data.wien.gv.at/">Citate
-          de Vienna</a> licentiate sub <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC
-          BY</a>, <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
-          Vorarlberg</a> e Land Tirol (sub <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC
-          BY AT con emendamentos</a>).'
-        contributors_au_html: '<strong>Australia</strong>: Incorpora o disveloppate
-          usante Limites Administrative &copy; <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape
-          Australia</a> publicate per le Commonwealth de Australia sub licentia <a
-          href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution
-          4.0 International (CC BY 4.0)</a>.'
-        contributors_ca_html: |-
-          <strong>Canada</strong>: Contine datos ab
-             GeoBase&reg;, GeoGratis (&copy; Department of Natural
-             Resources Canada), CanVec (&copy; Department of Natural
-             Resources Canada), e StatCan (Geography Division,
-             Statistics Canada).
-        contributors_fi_html: '<strong>Finlandia</strong>: Contine datos ab le base
-          de datos topographic del Inspection National del Territorio de Finlandia
-          e de altere insimules de datos, sub le <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">licentia
-          NLSFI</a>.'
-        contributors_fr_html: |-
-          <strong>Francia</strong>: Contine datos fornite per le
-             Direction Générale des Impôts.
-        contributors_nl_html: '<strong>Nederlandia</strong>: Contine datos &copy;
-          AND, 2007 (<a href="https://www.and.com">www.and.com</a>)'
-        contributors_nz_html: '<strong>Nove Zelandia</strong>: Contine datos proveniente
-          de <a href="https://data.linz.govt.nz/">LINZ Data Service</a> e licentiate
-          pro re-uso sub <a href="https://creativecommons.org/licenses/by/4.0/">CC
-          BY 4.0</a>.'
-        contributors_si_html: |-
-          <strong>Slovenia</strong>: Contine datos ab le
-          <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> e del
-          <a href="http://www.mkgp.gov.si/en/">Ministerio del Agricultura, Silvicultura e Alimento</a>
-          (information public de Slovenia).
-        contributors_es_html: '<strong>Espania</strong>: Contine datos proveniente
-          del Instituto Geographic National (<a href="http://www.ign.es/">IGN</a>)
-          e del Systema Cartographic National (<a href="http://www.scne.es/">SCNE</a>),
-          licentiate pro su reutilisation sub <a href="https://creativecommons.org/licenses/by/4.0/">CC
-          BY 4.0</a>.'
-        contributors_za_html: |-
-          <strong>Africa del Sud</strong>: Contine datos proveniente del
-             <a href="http://www.ngi.gov.za/">Chief Directorate:
-             National Geo-Spatial Information</a>, copyright del Stato reservate.
-        contributors_gb_html: |-
-          <strong>Regno Unite</strong>: Contine datos de Ordnance
-          Survey &copy; copyright del Corona e derecto de base de datos
-          2010-23.
-        contributors_footer_1_html: |-
-          Pro ulterior detalios de iste e altere fontes que ha essite usate
-          pro adjutar a meliorar OpenStreetMap, vide le <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">pagina
-          de contributores</a> in le wiki de OpenStreetMap.
         contributors_footer_2_html: |2-
             Le inclusion de datos in OpenStreetMap non implica que le fornitor
             original del datos indorsa OpenStreetMap, forni alcun garantia, o
@@ -2089,16 +2029,6 @@ ia:
             Nos rememora al contributores de OSM de nunquam adder datos de alcun
             fonte sub derecto de autor (p.ex. Google Maps o cartas imprimite)
             sin explicite permission del titulares del derecto de autor.
-        infringement_2_html: Si vos crede que material sub copyright ha essite inserite
-          inappropriatemente in le base de datos de OpenStreetMap o in iste sito,
-          per favor consulta nostre <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">procedura
-          de remotion</a> o submitte un plancto immediate usante nostre <a href="https://dmca.openstreetmap.org/">formulario
-          in linea</a>.
-        trademarks_title_html: <span id="trademarks"></span>Marcas commercial
-        trademarks_1_html: OpenStreetMap, le logotypo con le lupa e "State of the
-          Map" es marcas registrate del Fundation OpenStreetMap. Si vos ha questiones
-          sur le uso de iste marcas, vide nostre <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">politica
-          sur le marcas registrate</a>.
     index:
       js_1: O tu usa un navigator que non supporta JavaScript, o tu ha disactivate
         JavaScript.
@@ -2131,7 +2061,6 @@ ia:
       licence_details_html: Le datos de OpenStreetMap data es sub licentia %{odbl_link}
         (ODbL).
       odbl: Licentia de base de datos aperte de Open Data Commons
-      odbl_url: https://opendatacommons.org/licenses/odbl/1.0/
       too_large:
         advice: 'Si iste exportation falle, considera usar un del fontes listate hic
           infra:'
@@ -2186,7 +2115,6 @@ ia:
           pro plus information juridic o contacta le %{working_group_link} appropriate.
         copyright: pagina de derecto de autor
         working_group: Gruppo de labor del Fundation OSM
-        working_group_url: https://wiki.osmfoundation.org/wiki/Working_Groups
     help:
       title: Obtener adjuta
       introduction: OpenStreetMap ha plure ressources pro apprender a cognoscer le
@@ -2232,7 +2160,6 @@ ia:
         in un navigator web.
       desktop_application_html: Tu pote sempre usar Potlatch per %{download_link}.
       download: discargar le application scriptorio pro Mac e Windows
-      download_url: https://www.systemed.net/potlatch/
       id_editor_html: Alternativemente, tu pote fixar le editor predefinite a iD,
         le qual functiona in tu navigator web como Potlatch lo faceva antea. %{change_preferences_link}
       change_preferences: Cambia tu preferentias hic
@@ -2244,7 +2171,6 @@ ia:
         planos pro OpenStreetMap? %{welcome_mat_link}.
       get_help_here: Obtene adjuta hic
       welcome_mat: Discoperi le Tapete de benvenita
-      welcome_mat_url: https://welcome.openstreetmap.org/
     sidebar:
       search_results: Resultatos del recerca
       close: Clauder
@@ -2367,9 +2293,7 @@ ia:
           activitates altere que modificar per mano, per favor lege e seque le directivas
           sur %{imports_link} e %{automated_edits_link}.
         imports: Importationes
-        imports_url: https://wiki.openstreetmap.org/wiki/Import/Guidelines
         automated_edits: Modificationes automatisate
-        automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct
       start_mapping: comenciar le cartographia
       add_a_note:
         title: Non ha tempore pro modificar? Adde un nota!
@@ -2403,7 +2327,6 @@ ia:
           Non es necessari stabilir formalmente un gruppo in le mesme mesura que le capitulos local.
           In effecto, multe gruppos existe con grande successo como reunion informal de personas o como un gruppo communitari. Omnes pote crear o adherer a tales. Lege plus sur le %{communities_wiki_link}.
         communities_wiki: pagina wiki sur communitates
-        communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group
   traces:
     visibility:
       private: Private (solmente condividite como anonymo, punctos non ordinate)
@@ -2469,7 +2392,7 @@ ia:
     trace:
       pending: PENDENTE
       count_points:
-        one: 1 puncto
+        one: '%{count} puncto'
         other: '%{count} punctos'
       more: plus
       trace_details: Vider detalios del tracia
@@ -2492,7 +2415,6 @@ ia:
         le %{wiki_link}.'
       upload_new: Incargar un nove tracia
       wiki_page: pagina wiki
-      wiki_page_url: https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2
       upload_trace: Incargar un tracia
       all_traces: Tote le tracias
       my_traces: Mi tracias
@@ -2880,19 +2802,19 @@ ia:
       time_past_html: Expirava %{time}.
       block_duration:
         hours:
-          one: 1 hora
+          one: '%{count} hora'
           other: '%{count} horas'
         days:
-          one: 1 die
+          one: '%{count} die'
           other: '%{count} dies'
         weeks:
-          one: 1 septimana
+          one: '%{count} septimana'
           other: '%{count} septimanas'
         months:
-          one: 1 mense
+          one: '%{count} mense'
           other: '%{count} menses'
         years:
-          one: 1 anno
+          one: '%{count} anno'
           other: '%{count} annos'
     blocks_on:
       title: Blocadas de %{name}
@@ -3015,10 +2937,10 @@ ia:
       locate:
         title: Monstrar mi position
         metersPopup:
-          one: Tu es minus de un metro distante de iste puncto
+          one: Tu es minus de %{count} metro distante de iste puncto
           other: Tu es minus de %{count} metros distante de iste puncto
         feetPopup:
-          one: Tu es minus de un pede distante de iste puncto
+          one: Tu es minus de %{count} pede distante de iste puncto
           other: Tu es minus de %{count} pedes distante de iste puncto
       base:
         standard: Standard
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 0602a11c0..153177a77 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1522,8 +1522,6 @@ id:
       subject: '[OpenStreetMap] gagal impor GPX'
     gpx_success:
       hi: Halo %{to_user},
-      loaded_successfully: telah berhasil dengan %{trace_points} dari %{possible_points}
-        titik yang mungkin.
       subject: '[OpenStreetMap] impor GPX sukses'
     signup_confirm:
       subject: '[OpenStreetMap] Selamat datang di OpenStreetMap'
@@ -1877,108 +1875,18 @@ id:
         mapping_link: memulai pemetaan
       legal_babble:
         title_html: Hak Cipta & Lisensi
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> adalah <i>data terbuka</i>, berlisensi di bawah <a
-          href="http://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) oleh  <a
-          href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
-        intro_2_html: |-
-          Anda dibebaskan untuk menyalin, menyalurkan, mentransfer dan mengadaptasi data kami,
-          selama Anda menyertakan OpenStreetMap dan kontributornya. Jika Anda mengubah atau membangun
-          data kami, Anda harus menyalurkan hasilnya dalam lisensi yang sama.
-          <a href="http://opendatacommons.org/licenses/odbl/1.0/">Kode legal</a> berisi penjelasan hak dan kewajiban Anda.
-        intro_3_1_html: |-
-          Dokumentasi kami dilisensikan di bawah <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> lisensi (CC BY-SA 2.0).
         credit_title_html: Cara memberikan kredit pada OpenStreetMap
         credit_1_html: 'Ketika Anda menggunakan data OpenStreetMap, Anda diwajibkan
           untuk melakukan dua hal berikut:'
-        credit_2_1_html: "<ul>\n  <li> Berikan kredit kepada OpenStreetMap dengan
-          menampilkan pemberitahuan hak cipta kami.</li> \n  <li> Jelaskan bahwa data
-          tersedia di bawah Lisensi Open Database.</li> \n</ul>"
-        credit_3_1_html: Untuk pemberitahuan hak cipta, kami memiliki persyaratan
-          yang berbeda tentang bagaimana ini harus ditampilkan, tergantung pada bagaimana
-          Anda menggunakan data kami. Misalnya, aturan yang berbeda berlaku tentang
-          cara menampilkan pemberitahuan hak cipta bergantung pada apakah Anda membuat
-          peta yang dapat dijelajahi, peta yang dicetak, atau gambar statis. Detail
-          lengkap tentang persyaratan dapat ditemukan di <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Pedoman
-          Atribusi</a> .
-        credit_4_html: 'Untuk memperjelas bahwa data tersedia di bawah Lisensi Open
-          Database, Anda dapat menautkan ke <a href="http://www.openstreetmap.org/copyright">halaman
-          hak cipta</a>. Cara lainnya, dan diwajibkan jika Anda mendistribusikan OSM
-          dalam bentul data, Anda bisa menyebut nama dan tautan ke lisensi. Dalam
-          media yang tidak memungkinkan tautan (contohnya: karya cetak), kami menyarankan
-          Anda mengarahkan pembaca Anda ke openstreetmap.org (mungkin dengan memperluas
-          tulisan ''OpenStreetMap'' menjadi alamat lengkap) dan opendatacommons.org.
-          Dalam contoh ini, kreditnya ditampilkan di pojok peta.'
         attribution_example:
           alt: Contoh tentang bagaimana memberikan atribusi untuk OpenStreetMap pada
             halaman web
           title: Contoh atribusi
         more_title_html: Mengetahui lebih lanjut
-        more_1_html: |-
-          Baca lebih lanjut tentang pemakaian data kami, dan cara memberi kami kredit, di <a
-          href="http://osmfoundation.org/License">halaman lisensi OSMF</a> dan <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Pertanyaan Legal yang sering diajukan (FAQ)</a> komunitas.
-        more_2_html: |-
-          Meskipun OpenStreetMap merupakan data yang terbuka, kami tidak dapat menyediakan API peta gratis bagi pihak ketiga.
-          Lihat <a href="ttps://operations.osmfoundation.org/policies/api">Kebijakan Penggunaan API</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">Kebijakan Penggunaan Tile</a>
-          dan <a href="https://operations.osmfoundation.org/policies/nominatim/">Kebijakan Penggunaan Nominatim</a>.
         contributors_title_html: Kontributor kami
         contributors_intro_html: 'Kontributor kami terdiri dari ribuan orang. Kami
           juga memasukkan data dengan lisensi terbuka yang didapat dari badan-badan
           pemetaan nasional dan sumber lainnya, diantaranya:'
-        contributors_at_html: |-
-          <strong>Austria</strong>: Berisi data dari
-          <a href="http://data.wien.gv.at/">Stadt Wien</a> (lisensi
-          <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> dan
-          Land Tirol (lisensi <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT dengan perubahan</a>).
-        contributors_au_html: |-
-          <strong>Australia</strong>: Memasukkan atau dikembangkan menggunakan Administrative Boundaries &copy;
-          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a>
-          dilisensikan oleh Commonwealth of Australia di bawah
-          <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International licence (CC BY 4.0)</a>.
-        contributors_ca_html: |-
-          <strong>Kanada</strong>: Berisi data dari
-          GeoBase&reg;, GeoGratis (&copy; Department of Natural
-          Resources Canada), CanVec (&copy; Department of Natural
-          Resources Canada), dan StatCan (Geography Division,
-          Statistics Canada).
-        contributors_fi_html: "<strong>Finlandia</strong>: Berisi data dari basis
-          data topografi\nSurvei Pertanahan Nasional Finlandia \n dan dataset lainnya,
-          di bawah\n<a href=\"http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501\">Lisensi
-          NLSFI</a>."
-        contributors_fr_html: |-
-          <strong>Perancis</strong>: Berisi data yang bersumber dari
-          Direction Générale des Impôts.
-        contributors_nl_html: |-
-          <strong>Belanda</strong>: Berisi &copy; data AND, 2007
-          (<a href="http://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>Selandia Baru</strong>: Berisi data yang bersumber dari
-          <a href="https://data.linz.govt.nz/">Layanan Data LINZ</a> dan atas lisensi untuk digunakan ulang berdasarkan <a href="https://creativecommons.org/licenses/by/4.0/"><a href="https://data.linz.govt.nz/">CC BY 4.0</a>
-        contributors_si_html: |-
-          <strong>Slovenia</strong>: Berisi data dari
-          <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> dan
-          <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
-          (informasi publik Slovenia).
-        contributors_es_html: |-
-          <strong>Spanyol</strong>: Mengandung data yang bersumber dari
-          Institut Geografi Nasional (<a href="http://www.ign.es/">IGN</a>) dan
-          Sistem Kartografi Nasional Spanyol (<a href="http://www.scne.es/">SCNE</a>)
-          dilisensikan untuk digunakan kembali di bawah <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: |-
-          <strong>Afrika Selatan</strong>: Berisi data yang bersumber dari
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, hak cipta milik negara.
-        contributors_gb_html: |-
-          <strong>Britania Raya</strong>: Berisi data Ordnance
-          Survey &copy; Hak cipta dan basis data milik Kerajaan
-          2010-19.
-        contributors_footer_1_html: |-
-          Untuk rincian lebih lanjut, dan sumber-sumber lainnya yang telah digunakan untuk meningkatkan OpenStreetMap, silakan lihat <a
-          href="http://wiki.openstreetmap.org/wiki/Contributors">halaman Kontributor</a> pada Wiki OpenStreetMap.
         contributors_footer_2_html: Dimasukkannya data dalam OpenStreetMap tidak berarti
           bahwa penyedia data yang asli mendukung OpenStreetMap, menyediakan jaminan,
           atau menerima tanggung jawab apapun.
@@ -1986,15 +1894,6 @@ id:
         infringement_1_html: Kontributor OSM diingatkan untuk tidak menambahkan data
           dari sumber yang memiliki hak cipta sendiri (misalnya, Google Maps atau
           peta cetak) tanpa izin eksplisit dari pemegang hak cipta.
-        infringement_2_html: |-
-          Jika Anda percaya bahwa materi berhak cipta telah tidak tepat
-           ditambahkan ke OpenStreetMap database atau situs ini, silakan lihat <a href="https://wiki.osmfoundation.org/wiki/License/Takedown_procedure">prosedur takedown</a> kami atau kirimkan file langsung pada
-          <a href="https://dmca.openstreetmap.org/">pengajuan halaman on-line</a>.
-        trademarks_title_html: <span id="trademarks"></span>Merek dagang
-        trademarks_1_html: OpenStreetMap, logo lup, dan State of the Map adalah merek
-          dagang terdaftar dari OpenStreetMap Foundation. Jika Anda memiliki pertanyaan
-          tentang penggunaan merek tersebut, silakan kirim pertanyaan Anda ke <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence
-          Working Group</a>.
     index:
       js_1: Anda menggunakan browser yang tidak mendukung JavaScript, atau Anda telah
         menonaktifkan JavaScript.
diff --git a/config/locales/is.yml b/config/locales/is.yml
index e4e283f31..4aa4c501c 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1600,9 +1600,6 @@ is:
       subject: '[OpenStreetMap] Villa við að flytja inn GPX skrá'
     gpx_success:
       hi: Hæ %{to_user},
-      loaded_successfully:
-        one: var hlaðið inn með %{trace_points} af 1 punkti mögulegum.
-        other: var hlaðið inn með %{trace_points} punktum af %{possible_points} mögulegum.
       subject: '[OpenStreetMap] GPX skrá flutt inn'
     signup_confirm:
       subject: '[OpenStreetMap] Velkomin í OpenStreetMap'
@@ -1973,111 +1970,17 @@ is:
         mapping_link: farið að kortleggja
       legal_babble:
         title_html: Höfundaréttur og notkunarleyfi
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> er <i>opinn og frjáls kortagrunnur</i>, gefinn út með <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) notkunarleyfi frá  <a
-          href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF) sjálfseignarstofnuninni.
-        intro_2_html: |-
-          Þér er frjálst að afrita, dreifa, senda og aðlaga kortagrunninn
-           og gögn hans, gegn því að þú vísar í og viðurkennir rétt OpenStreetMap
-          og sjálfboðaliða þess. Ef þú breytir eða byggir á kortagrunninum
-          eða gögnum hans, þá verður þú að gefa niðurstöðuna út með
-          sama leyfi.
-          <a href="https://opendatacommons.org/licenses/odbl/1.0/">Leyfistextinn</a>
-          útskýrir réttindi þín og skyldur.
-        intro_3_1_html: "Hjálparskjölin okkar eru gefin út með \n<a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons
-          Attribution-ShareAlike 2.0</a> notkunarleyfi (CC BY-SA 2.0)."
         credit_title_html: Hvernig á að vísa til OpenStreetMap
         credit_1_html: 'Þegar þú notar gögn úr OpenStreetMap, þarft þú að gera tvennt:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Birta tilvísun í OpenStreetMap með höfundarréttartilkynningu okkar.</li>
-            <li>Gera ljóst að gögnin séu tiltæk með Open Database License notkunarleyfinu.</li>
-          </ul>
-        credit_3_1_html: Varðandi höfundarréttartilkynninguna erum við með aðrar kröfur
-          um hvernig hún ætti að birtast, háð því hvernig þú sért að nota gögnin okkar.
-          Til dæmis, mismunandi reglur eiga við um birtingu höfundarréttartilkynningar
-          eftir því hvort þú hafir útbúið flettanlegt landakort, prentað kort eða
-          fasta mynd. Nánari upplýsingar um þessar kröfur má finna á síðunni um <a
-          href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Leiðbeiningar
-          varðandi tilvísanir höfundarréttar</a>.
-        credit_4_html: |-
-          Til að gera ljóst að gögnin séu tiltæk með Open Database License notkunarleyfinu, gætirðu tengt í <a href="https://www.openstreetmap.org/copyright">þessa höfundarréttarsíðu</a>.
-          Að öðrum kosti, sem er krafa ef þú ert að dreifa OSM á gagnaformi, geturðu nefnt og tengt beint í notkunarleyfið/notkunarleyfin. Í gagnamiðlum þar sem tenglar eru ekki mögulegir (t.d. prentuðu efni), leggjum við til að þú bendir lesendum þínum á openstreetmap.org (til dæmis með því að birta
-          'OpenStreetMap' sem fulla slóð) og á opendatacommons.org.
-          Í þessu dæmi ætti tilvísunin að birtast í horni kortsins.
         attribution_example:
           alt: Dæmi um hvernig eigi að vísa til OpenStreetMap á vefsíðu
           title: Dæmi um tilvísun höfundarréttar
         more_title_html: Finna út meira
-        more_1_html: |-
-          Lestu meira um notkun á gögnunum okkar og hvernig eigi að vísa til okkar á síðunni <a
-          href="https://osmfoundation.org/Licence">OSMF notkunarleyfi</a>.
-        more_2_html: |-
-          Þó OpenStreetMap snúist um opin gögn, getum við ekki
-          séð utanaðkomandi aðilum fyrir ókeypis API-kortaþjónustu.
-          Skoðaðu síðurnar um <a href="https://operations.osmfoundation.org/policies/api/">notkun á API-forritsviðmóti</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">notkun á kortaflísum</a>
-          and <a href="https://operations.osmfoundation.org/policies/nominatim/">notkun á OSM-Nominatim</a>.
         contributors_title_html: Þeir sem hafa komið með framlög
         contributors_intro_html: |-
           Framlög hafa komið frá mörgum þúsundum einstaklinga. Við erum líka
           með gögn með opnum notkunarleyfum frá þjóðlegum landupplýsingastofnunum
           auk annarra opinberra aðila, meðal annars:
-        contributors_at_html: |-
-          <strong>Austurríki</strong>: Inniheldur gögn frá
-          <a href="https://data.wien.gv.at/">Stadt Wien</a> (með
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> og
-          Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT með viðaukum</a>).
-        contributors_au_html: |-
-          <strong>Ástralía</strong>: Inniheldur gögn frá
-          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a>
-          sem gert er aðgengilegt af Commonwealth of Australia með
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a> notkunarleyfi.
-        contributors_ca_html: |-
-          <strong>Kanada</strong>: Inniheldur gögn frá
-          GeoBase&reg;, GeoGratis (&copy; Department of Natural
-          Resources Canada), CanVec (&copy; Department of Natural
-          Resources Canada), og StatCan (Geography Division,
-          Statistics Canada).
-        contributors_fi_html: |-
-          <strong>Finnland</strong>: Inniheldur gögn frá
-          landupplýsingagagnagrunni Landmælinga Finnlands
-          auk annarra gagnasafna, með
-          <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI notkunarleyfi</a>.
-        contributors_fr_html: |-
-          <strong>Frakkland</strong>: Inniheldur afleidd gögn frá
-          Direction Générale des Impôts (Skattstjóraembættið).
-        contributors_nl_html: |-
-          <strong>Holland</strong>: Inniheldur AND-gögn &copy;, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>Nýja-Sjáland</strong>: Inniheldur gögn með uppruna frá
-          <a href="https://data.linz.govt.nz/">LINZ Data Service</a> og er með notkunarleyfi til endurnýtingar fyrir <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: |-
-          <strong>Slóvenía</strong>: Inniheldur gögn frá
-          <a href="http://www.gu.gov.si/en/">landmælinga og kortagerðaryfirvöldum</a> og
-          <a href="http://www.mkgp.gov.si/en/">ráðuneyti landbúnaðar, skógnýtingar og matvæla</a>
-          (opinberar upplýsingar í Slóveníu).
-        contributors_es_html: |-
-          <strong>Spánn</strong>: Inniheldur landmælinga- og kortagerðargögn frá
-          Spænsku landfræðistofnuninni (<a href="http://www.ign.es/">IGN</a>) og
-          úr Spænska kortagerðarkerfinu (<a href="http://www.scne.es/">SCNE</a>)
-          sem leyfilegt er að endurnýta með <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a> notkunarleyfi.
-        contributors_za_html: |-
-          <strong>Suður-Afríka</strong>: Inniheldur gögn frá
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, höfundarréttur suðurafríska ríkisins (state copyright) áskilinn.
-        contributors_gb_html: |-
-          <strong>Bretland</strong>: Inniheldur landmælinga-
-          og kortagerðargögn með &copy; Crown Copyright höfundarrétti auk réttinda varðandi gagnasafn
-          2010-19.
-        contributors_footer_1_html: |-
-          Til að skoða nánari upplýsingar um þetta, auk annarra gagna sem notuð hafa verið
-          til að bæta OpenStreetMap, skoðaðu þá síðuna <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">Þátttakendur</a> á wiki/kvikusvæði OpenStreetMap.
         contributors_footer_2_html: |-
           Samþætting gagna inn í OpenStreetMap hefur ekki sjálfkrafa í för með sér að
           upprunaleg gagnaþjónusta taki þátt í OpenStreetMap, taki neina ábyrgð á gögnum, eða
@@ -2087,17 +1990,6 @@ is:
           Þátttakendur í OSM eru minntir á að þeir megi aldrei bæta inn gögnum frá neinum
           höfundarréttarvörðum upptökum (t.d. Google Maps eða prentuðum kortum) án
           sérstakrar heimildar frá handhöfum höfundarréttarins.
-        infringement_2_html: |-
-          Ef þú heldur að höfundarréttarvarið efni hafi ranglega verið bætt í
-          OpenStreetMap gagnagrunninn eða á þetta vefsvæði, skaltu skoða
-          <a href="https://wiki.osmfoundation.org/wiki/License/Takedown_procedure">fjarlægingarferlið</a> okkar eða skrá fyrirspurn beint á
-           veflægu <a href="https://dmca.openstreetmap.org/">kröfugerðarsíðuna</a> okkar.
-        trademarks_title_html: <span id="trademarks"></span>Vörumerki
-        trademarks_1_html: OpenStreetMap, merkið með stækkunarglerinu staða kortsins
-          eru skrásett vörumerki OpenStreetMap Foundation sjálfseignarstofnuninnar.
-          Ef þú ert með spurningar varðandi notkun þína á þessum vörumerkjum, sendu
-          þá fyrirspurnir á <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">vinnuhóp
-          notkunarleyfa</a>.
     index:
       js_1: Þú ert annaðhvort að nota vafra sem styður ekki JavaScript eða hefur slökkt
         á JavaScript stuðning.
diff --git a/config/locales/it.yml b/config/locales/it.yml
index a1b91b61f..8353ffc12 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -226,41 +226,41 @@ it:
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: circa 1 ora fa
+        one: circa %{count} ora fa
         other: circa %{count} ore fa
       about_x_months:
-        one: circa 1 mese fa
+        one: circa %{count} mese fa
         other: circa %{count} mesi fa
       about_x_years:
-        one: circa 1 anno fa
+        one: circa %{count} anno fa
         other: circa %{count} anni fa
       almost_x_years:
-        one: quasi 1 anno fa
+        one: quasi %{count} anno fa
         other: quasi %{count} anni fa
       half_a_minute: mezzo minuto fa
       less_than_x_seconds:
-        one: meno di 1 secondo fa
+        one: meno di %{count} secondo fa
         other: meno di %{count} secondi fa
       less_than_x_minutes:
-        one: meno di un minuto fa
+        one: meno di %{count} minuto fa
         other: meno di %{count} minuti fa
       over_x_years:
-        one: oltre 1 anno fa
+        one: oltre %{count} anno fa
         other: oltre %{count} anni fa
       x_seconds:
-        one: 1 secondo fa
+        one: '%{count} secondo fa'
         other: '%{count} secondi fa'
       x_minutes:
-        one: 1 minuto fa
+        one: '%{count} minuto fa'
         other: '%{count} minuti fa'
       x_days:
-        one: 1 giorno fa
+        one: '%{count} giorno fa'
         other: '%{count} giorni fa'
       x_months:
-        one: 1 mese fa
+        one: '%{count} mese fa'
         other: '%{count} mesi fa'
       x_years:
-        one: 1 anno fa
+        one: '%{count} anno fa'
         other: '%{count} anni fa'
   editor:
     default: Predefinito (al momento %{name})
@@ -391,10 +391,10 @@ it:
     no_comment: (nessun commento)
     part_of: Parte di
     part_of_relations:
-      one: 1 relazione
+      one: '%{count} relazione'
       other: '%{count} relazioni'
     part_of_ways:
-      one: 1 percorso
+      one: '%{count} percorso'
       other: '%{count} percorsi'
     download_xml: Scarica XML
     view_history: Visualizza cronologia
@@ -439,7 +439,7 @@ it:
       history_title_html: 'Cronologia relazione: %{name}'
       members: Membri
       members_count:
-        one: 1 membro
+        one: '%{count} membro'
         other: '%{count} membri'
     relation_member:
       entry_role_html: '%{type} %{name} come %{role}'
@@ -1484,7 +1484,7 @@ it:
       last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> da %{user}
       link_to_reports: Visualizza segnalazioni
       reports_count:
-        one: 1 segnalazione
+        one: '%{count} segnalazione'
         other: '%{count} segnalazioni'
       reported_item: Elemento segnalato
       states:
@@ -1657,10 +1657,6 @@ it:
       subject: '[OpenStreetMap] Importazione GPX fallita'
     gpx_success:
       hi: Ciao %{to_user},
-      loaded_successfully:
-        one: sia stato caricato con successo con %{trace_points} di 1 punto possibile.
-        other: sia stato caricato con successo con %{trace_points} dei possibili %{possible_points}
-          punti.
       subject: '[OpenStreetMap] Importazione GPX completata con successo'
     signup_confirm:
       subject: '[OpenStreetMap] Benvenuti su OpenStreetMap'
@@ -2030,107 +2026,29 @@ it:
         mapping_link: inizia a mappare
       legal_babble:
         title_html: Copyright e licenza
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> è <i>open data</i>, e i suoi dati sono distribuiti con licenza <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL) dalla <a href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
-        intro_2_html: "Sei libero di copiare, distribuire, trasmettere e adattare
-          i nostri dati, finché lo attribuisci a OpenStreetMap e ai suoi contributori.
-          Se alteri o ti basi sui nostri dati,\npuoi distribuire il risultato solo
-          sotto la stessa licenza. Il \n<a href=\"https://opendatacommons.org/licenses/odbl/1.0/\">codice\nlegale
-          completo</a> illustra i tuoi diritti e le tue responsabilità."
-        intro_3_1_html: "La nostra documentazione è rilasciata in base alla licenza
-          <a href=\"https://creativecommons.org/licenses/by-sa/2.0/deed.it\">Creative
-          \nCommons Attribuzione - Condividi allo stesso modo 2.0</a> (CC BY-SA 2.0)."
         credit_title_html: Come si attribuisce a OpenStreetMap
         credit_1_html: 'Quando utilizzi i dati di OpenStreetMap, devi eseguire le
           seguenti due operazioni:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Fornisci crediti a OpenStreetMap visualizzando il nostro avviso di copyright.</li>
-            <li>Rendere chiaro che i dati sono disponibili con la licenza Open Database.</li>
-          </ul>
-        credit_3_1_html: Per l'avviso di copyright, abbiamo requisiti diversi su come
-          dovrebbe essere visualizzato, a seconda di come stai utilizzando i nostri
-          dati. Ad esempio, si applicano regole diverse su come mostrare l'avviso
-          di copyright a seconda che tu abbia creato una mappa navigabile, una mappa
-          stampata o un'immagine statica. Tutti i dettagli sui requisiti possono essere
-          trovati nelle <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">linee
-          guide sull'attribuzione</a>.
-        credit_4_html: |-
-          Per rendere chiaro che i dati sono disponibili in base alla licenza Open Database, puoi inserire un collegamento a <a href="https://www.openstreetmap.org/copyright">questa pagina sul copyright</a>. In alternativa, e come requisito se stai distribuendo OSM in a
-          modulo dati, è possibile nominare e collegare direttamente le licenze. Nei media dove i collegamenti non sono possibili (ad es. opere cartacee), ti suggeriamo di indirizzare i tuoi lettori direttamente a openstreetmap.org (magari espandendo 'OpenStreetMap' al suo indirizzo completo) e a opendatacommons.org. In questo esempio, i crediti appaiono nell'angolo della mappa.
         attribution_example:
           alt: Esempio di come attribuire ad OpenStreetMap su una pagina web
           title: Esempio di attribuzione
         more_title_html: Per saperne di più
-        more_1_html: Per saperne di più su come utilizzare i nostri dati e come citarne
-          correttamente la fonte, consulta la pagina sulla <a href="https://osmfoundation.org/Licence">Licenza
-          OSMF</a>.
-        more_2_html: |-
-          Anche se i dati OpenStreetMap sono aperti, non possiamo fornire accesso alle API della mappa gratuitamente per terze parti.
-          Vedi la nostra <a href="https://operations.osmfoundation.org/policies/api/">Politica di utilizzo delle API</a>, la
-          <a href="https://operations.osmfoundation.org/policies/tiles/">Politica di utilizzo delle tavole della mappa</a>
-          e la <a href="https://operations.osmfoundation.org/policies/nominatim/">Politica di utilizzo di Nominatim</a>.
         contributors_title_html: Nostri collaboratori
         contributors_intro_html: 'I nostri contributori sono migliaia di individui.
           Includiamo anche dati distribuiti sotto licenze aperte provenienti da agenzie
           cartografiche nazionali o di altra fonte, tra cui:'
-        contributors_at_html: |-
-          <strong>Austria</strong>: contiene i dati della
-          <a href="https://data.wien.gv.at/">Stadt Wien</a> (sotto
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> e
-          Land Tirol (sotto <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT con emendamenti</a>).
-        contributors_au_html: '<strong>Australia</strong>: contiene o è sviluppato
-          sfruttando i confini amministrativi &copy; <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape
-          Australia</a> rilasciati dal Commonwealth dell''Australia con licenza <a
-          href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribuzione
-          4.0 Internazionale (CC BY 4.0)</a>.'
-        contributors_ca_html: |-
-          <strong>Canada</strong>: contiene i dati della
-          GeoBase&reg;, GeoGratis (&copy; Department of Natural
-          Resources Canada), CanVec (&copy; Department of Natural
-          Resources Canada), e della StatCan (Geography Division,
-          Statistics Canada).
-        contributors_fi_html: |-
-          <strong>Finlandia</strong>: contiene dati dal
-          National Land Survey of Finland's Topographic Database
-          e di altri set di dati, in base alla
-          <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">licensa NLSFI</a>.
-        contributors_fr_html: |-
-          <strong>Francia</strong>: contiene dati provenienti dalla
-          Direction Générale des Impôts.
-        contributors_nl_html: |-
-          <strong>Olanda</strong>: contiene dati &copy; AND, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>Nuova Zelanda</strong>: contiene i dati provenienti da
-          <a href="https://data.linz.govt.nz/">LINZ Data Service</a> in
-          base alla licenza per il riutilizzo
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: |-
-          <strong>Slovenia</strong>: Contiene dati dell'
-          <a href="http://www.gu.gov.si/en/">Autorità per il Rilievo e la Mappatura</a> e del
-          <a href="http://www.mkgp.gov.si/en/">Ministero dell' Agricoltura, delle foreste e dell'alimentazione</a>
-          (informazioni pubbliche della Slovenia).
-        contributors_es_html: '<strong>Spagna</strong>: contiene dati provenienti
-          dall''istituto geografico nazionale spagnolo (<a href="http://www.ign.es/">IGN</a>)
-          e dal sistema cartografico nazionale (<a href="http://www.scne.es/">SCNE</a>)
-          con autorizzazione al riutilizzo secondo la <a href="https://creativecommons.org/licenses/by/4.0/">CC
-          BY 4.0</a>.'
-        contributors_za_html: |-
-          <strong>Sud Africa</strong>: contiene i dati provenienti dalla
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, State copyright reserved.
-        contributors_gb_html: |-
-          <strong>Regno Unito</strong>: contiene i dati della
-          Ordnance Survey &copy; Crown copyright and database right
-          2010-2023.
-        contributors_footer_1_html: |-
-          Per ulteriori dettagli di queste e altre fonti che sono state utilizzate
-          per aiutare a migliorare OpenStreetMap, consulta la <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">pagina dei
-          collaboratori</a> sul wiki di OpenStreetMap.
+        contributors_at_austria: Austria
+        contributors_at_cc_by: CC BY
+        contributors_au_australia: Australia
+        contributors_ca_canada: Canada
+        contributors_fi_finland: Finlandia
+        contributors_fr_france: Francia
+        contributors_nz_new_zealand: Nuova Zelanda
+        contributors_nz_cc_by: CC BY 4.0
+        contributors_si_slovenia: Slovenia
+        contributors_es_spain: Spagna
+        contributors_es_cc_by: CC BY 4.0
+        contributors_gb_united_kingdom: Regno Unito
         contributors_footer_2_html: |-
           L'inserimento dei dati in OpenStreetMap non implica che il fornitore
           originale dei dati appoggi OpenStreetMap, fornisca alcuna garanzia o
@@ -2139,15 +2057,6 @@ it:
         infringement_1_html: Ai contributori OSM si ricorda di non aggiungere dati
           da qualsiasi fonte protetta da copyright (ad esempio Google Maps o mappe
           stampate) senza esplicita autorizzazione dei titolari del copyright.
-        infringement_2_html: |-
-          Se ritieni che materiale protetto da copyright sia stato impropriamente aggiunto al database di OpenStreetMap o a questo sito, consulta la nostra
-           <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">procedura di rimozione per violazione del copyright</a> o segnalacelo direttamente alla nostra
-          <a href="https://dmca.openstreetmap.org/">pagina di segnalazione on-line</a>.
-        trademarks_title_html: <span id="trademarks"></span>Marchi registrati
-        trademarks_1_html: '"OpenStreetMap", il logo con la lente d''ingrandimento
-          e "State of the Map" sono marchi registrati della <i>Fondazione OpenStreetMap</i>.
-          Se hai domande sull''uso dei marchi, vedi la nostra <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">politica
-          sui marchi</a>.'
     index:
       js_1: Si sta utilizzando un browser che non supporta JavaScript, oppure è stato
         disabilitato JavaScript.
@@ -2513,7 +2422,7 @@ it:
     trace:
       pending: IN ATTESA
       count_points:
-        one: 1 punto
+        one: '%{count} punto'
         other: '%{count} punti'
       more: altri
       trace_details: Visualizza i dettagli del tracciato
@@ -2926,19 +2835,19 @@ it:
       time_past_html: Terminato %{time}.
       block_duration:
         hours:
-          one: 1 ora
+          one: '%{count} ora'
           other: '%{count} ore'
         days:
-          one: 1 giorno
+          one: '%{count} giorno'
           other: '%{count} giorni'
         weeks:
-          one: 1 settimana
+          one: '%{count} settimana'
           other: '%{count} settimane'
         months:
-          one: 1 mese
+          one: '%{count} mese'
           other: '%{count} mesi'
         years:
-          one: 1 anno
+          one: '%{count} anno'
           other: '%{count} anni'
     blocks_on:
       title: Blocchi su %{name}
@@ -3060,10 +2969,10 @@ it:
       locate:
         title: Mostra la mia posizione
         metersPopup:
-          one: Ti trovi entro un metro da questo punto
+          one: Ti trovi entro %{count} metro da questo punto
           other: Ti trovi entro %{count} metri da questo punto
         feetPopup:
-          one: Ti trovi entro un piede da questo punto
+          one: Ti trovi entro %{count} piede da questo punto
           other: Ti trovi entro %{count} piedi da questo punto
       base:
         standard: Standard
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index d126c009f..1a85e3ef3 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1584,8 +1584,6 @@ ja:
       subject: '[OpenStreetMap] GPX のインポートが失敗'
     gpx_success:
       hi: こんにちは、%{to_user} さん。
-      loaded_successfully:
-        other: 利用可能な点 %{possible_points} 個のうち、%{trace_points} 個の読み込みに成功しました。
       subject: '[OpenStreetMap] GPX のインポートが成功'
     signup_confirm:
       subject: '[OpenStreetMap] OpenStreetMapへようこそ'
@@ -1880,86 +1878,34 @@ ja:
         mapping_link: マッピングを開始
       legal_babble:
         title_html: 著作権とライセンス
-        intro_1_html: |-
-          OpenStreetMap<a href="#trademarks">&reg;</a> は<a
-          href="https://osmfoundation.org/">OpenStreetMap財団</a> (OSMF)が<a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL) の下にライセンスする<i>オープンデータ</i>です。
-        intro_2_html: OpenStreetMapとその協力者をクレジットすれば、データを自由にコピー、配布、送信、利用することができます。変更したり翻案したりしたデータは同じライセンスに従う場合のみ、提供することができます。あなたの権利と責任は、<a
-          href="https://opendatacommons.org/licenses/odbl/1.0/">ライセンス契約</a>の全文で説明しています。
-        intro_3_1_html: |-
-          ドキュメントは、<a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> ライセンス (CC BY-SA 2.0) に基づいてライセンスされます。
         credit_title_html: OpenStreetMap のクレジット表記の仕方
         credit_1_html: OpenStreetMap を使う場所では、以下の2つの条件を必ず守ってください。
-        credit_2_1_html: |-
-          <ul>
-            <li>私たちの著作権表示ページを掲載し、OpenStreetMap にクレジットがあることを示してください。</li>
-            <li>データはライセンス要件である Open Database License に基づいて提供されていることを明示してください。</li>
-          </ul>
-        credit_3_1_html: |-
-          <!-- www.openstreetmap.org に載っている&ldquo;standard style&rdquo; の地図のタイルは、OpenStreetMap財団によるオープンデータベース・ライセンス（Open Database License）に準拠してOSMデータ（OpenStreetMap data ）を使用した作成物（Produced Work）です。もし皆さんがこれらのタイルを利用する場合は、以下の継承を表示してください。
-          &ldquo;Base map and data from OpenStreetMap and OpenStreetMap Foundation&rdquo;。 -->著作権表示に関しては、皆さんが私たちのデータをどう使われるかによって、その表示要件が異なります。たとえば皆さんが新しく作成した地図は利用者が動かせるかどうか（browsable）、地図を印刷した、静止画像の地図を作成したなど、それぞれに適用されるルールが異なります。表示要件の詳細は
-          <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">帰属のガイドライン</a>をご参照ください。
-        credit_4_html: |-
-          あなたはデータが Open Database License に基づいて提供されていることを明示するため
-          <a href="https://www.openstreetmap.org/copyright">この著作権ページ</a>にリンクしてください。もしくは OSM をデータ形式で配布する場合の必須条件として、直接、それぞれのライセンス条項の名前を提示しリンクしてください。リンク付与が不可能な媒体の場合は（例：印刷物ほか）、読者の皆さんに openstreetmap.orgを読むよう（「OpenStreetMap」という文言を連絡先URLに置換してもよい）、また opendatacommons.org
-          をお勧めしてください。左の丸カッコ内の処理例ですと、地図の隅に著作権表示が印刷されます。
         attribution_example:
           alt: ウェブページに OpenStreetMap を記述する方法の例
           title: 権利表示の例
         more_title_html: 詳細を見る
-        more_1_html: |-
-          データの利用やクレジット方法についての詳細は<a
-          href="https://osmfoundation.org/Licence">OSMF ライセンスページ</a>をお読みください。
-        more_2_html: OpenStreetMap はオープンデータですが、サードパーティーの開発者のための無料の地図 API は提供できません。<a
-          href="https://operations.osmfoundation.org/policies/api/">API 利用規約</a>、<a
-          href="https://operations.osmfoundation.org/policies/tiles/">タイル利用規約</a>ならびに<a
-          href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim利用ポリシー</a>をお読みください。
+        more_1_1_osmf_licence_page: OSMFライセンスページ
+        more_2_1_api_usage_policy: API利用ポリシー
         contributors_title_html: 協力者
         contributors_intro_html: 数千人もの個人が協力者となっています。それに加え、各国の地図作成機関や、以下のように、その他の情報源も含め、公開されたライセンスによるデータを含みます。
-        contributors_at_html: '<strong>オーストリア</strong>: <a href="https://data.wien.gv.at/">Stadt
-          Wien</a> (ライセンス <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC
-          BY</a>)、<a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
-          Vorarlberg</a>、Land Tirol (ライセンス <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC
-          BY AT with amendments</a>) によるデータを含みます。'
-        contributors_au_html: '<strong>オーストラリア</strong>: 行政管轄の境界（Administrative Boundaries）の組み入れもしくは採用した開発において&copy;<a
-          href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">PSMA
-          Australia Limited</a>を出典とするデータは<a href="https://creativecommons.org/licenses/by/4.0/">クリエイティブ・コモンズ表示
-          4.0 国際 (CC BY 4.0)</a>のもとオーストラリア連邦政府の許諾を得ています。'
-        contributors_ca_html: '<strong>カナダ</strong>: GeoBase&reg;、GeoGratis (&copy;
-          Department of Natural Resources Canada)、CanVec (&copy; Department of Natural
-          Resources Canada)、StatCan (Geography Division, Statistics Canada) によるデータを含みます。'
-        contributors_fi_html: '<strong>フィンランド</strong>: <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI
-          License</a>に基づき、National Land Survey of Finland''s Topographic Database及びその他のデータセットのデータを含んでいます。'
-        contributors_fr_html: '<strong>フランス</strong>: Direction Générale des Impôts
-          によるデータを含みます。'
-        contributors_nl_html: '<strong>オランダ</strong>: &copy; AND データ、2007 (<a href="https://www.and.com">www.and.com</a>)
-          を含みます。'
-        contributors_nz_html: '<strong>ニュージーランド</strong>: <a href="https://data.linz.govt.nz/">LINZ
-          Data Service</a>に提供されたデータを含み、再利用に関する著作権は<a href="https://creativecommons.org/licenses/by/4.0/">CC
-          BY 4.0</a>に基づきます。'
-        contributors_si_html: '<strong>スロベニア</strong>: <a href="http://www.gu.gov.si/en/">調査地図庁</a>ならびに<a
-          href="http://www.mkgp.gov.si/en/">農林食料省</a>(スロベニアの公開情報)による。'
-        contributors_es_html: '<strong>スペイン</strong>: データ典拠スペイン国立地理研究所 (<a href="http://www.ign.es/">IGN</a>)
-          ならびに国立地理情報センター(<a href="http://www.scne.es/">SCNE</a>)より<a href="https://creativecommons.org/licenses/by/4.0/">CC
-          BY 4.0</a>ライセンスの下で再利用。'
-        contributors_za_html: '<strong>南アフリカ</strong>: <a href="http://www.ngi.gov.za/">Chief
-          Directorate: National Geo-Spatial Information</a>,政府によるデータを含み、著作権を保持します。'
-        contributors_gb_html: "<strong>イギリス</strong>: 陸地測量\nデータ &copy; クラウン・コピーライト及びデータベース権限
-          database right \n2010-19 を含みます。"
-        contributors_footer_1_html: |-
-          これらの詳細について、またOpenStreetMapの向上に使用されたその他のソースについては、OpenStreetMap Wikiの<a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">協力者ページ</a>をご覧ください。
+        contributors_at_austria: オーストリア
+        contributors_au_australia: オーストラリア
+        contributors_ca_canada: カナダ
+        contributors_fi_finland: フィンランド
+        contributors_fi_nlsfi_license: NLSFIライセンス
+        contributors_fr_france: フランス
+        contributors_nl_netherlands: オランダ
+        contributors_nz_new_zealand: ニュージーランド
+        contributors_si_slovenia: スロベニア
+        contributors_es_spain: スペイン
+        contributors_za_south_africa: 南アフリカ
+        contributors_gb_united_kingdom: イギリス
         contributors_footer_2_html: OpenStreetMapのデータに含めることは、元データの提供者がOpenStreetMapを支持したり、何かしらの保証を行ったり、何かしらの責任を負ったりすることを意味するものではありません。
         infringement_title_html: 著作権侵害
         infringement_1_html: 'OpenStreetMapの協力者は、著作権者から明確な許諾を得ずに、著作権のある情報源 (例: Google
           マップや印刷された地図) から決してデータを持ち込まないよう注意するものとします。'
-        infringement_2_html: もし著作権のある素材がOpenStreetMapのデータベースや本サイトに不正に追加されたとお考えの場合は、<a
-          href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">却下手順</a>をお読みになるか、<a
-          href="https://dmca.openstreetmap.org/">オンライン却下のページ</a>から直接申し立てを行ってください。
-        trademarks_title_html: <span id="trademarks"></span>商標
-        trademarks_1_html: OpenStreetMapならびに拡大鏡のロゴおよびState of the MapはOpenStreetMap財団の登録商標です。商標の利用に関しては、<a
-          href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">商標利用ポリシー</a>を参照ください。
+        trademarks_title: 商標
+        trademarks_1_1_trademark_policy: 商標ポリシー
     index:
       js_1: JavaScript に対応していないブラウザーを使用しているか、JavaScript を無効にしているかのどちらかです。
       js_2: OpenStreetMap は地図の表示に JavaScript を使用します。
@@ -2028,7 +1974,6 @@ ja:
         title: 他の問題
         copyright: 著作権ページ
         working_group: OSMFワーキンググループ
-        working_group_url: https://wiki.osmfoundation.org/wiki/Working_Groups
     help:
       title: ヘルプの取得
       introduction: OpenStreetMapにはプロジェクトについて学んだり、質疑応答したり、協議したり、マッピングについての知識を文書化したりするさまざまなリソースがあります。
@@ -2063,7 +2008,6 @@ ja:
       removed: お使いの OpenStreetMap エディタは既定では Potlatch が選択されています。 Adobe Flash Player
         の撤退により、 Potlatch is はウェブブラウザ上で利用できなくなりました。
       download: macOS および Windows 用のデスクトップ アプリケーションのダウンロード
-      download_url: https://www.systemed.net/potlatch/
       id_editor_html: 代わりに、デフォルトのエディターを iD に設定することもできます。iD は、以前のPotlatchのように、Web ブラウザーで実行されます。
         %{change_preferences_link}。
     any_questions:
@@ -2185,7 +2129,6 @@ ja:
           地方支部と同じように公式にグループを設立する必要はありません.
           実際に多くのグループが非公式な人々の集まりとして、または
           コミュニティグループとして非常にうまく存在しています.誰でもこれらを設定または参加できます。 %{communities_wiki_link} で詳細をお読みください。
-        communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group
   traces:
     visibility:
       private: 非公開 (匿名、点は順不同)
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index ed2800599..3d6c3d5da 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -850,8 +850,6 @@ kab:
       failed_to_import: 'ur d-yettwakter ara. Hatta tuccḍa:'
       subject: '[OpenStreetMap] Akter GPX ur yeddi ara'
     gpx_success:
-      loaded_successfully: yuli-d akken iwata s %{trace_points} n %{possible_points}
-        n tneqqiḍin izemren ad ilint.
       subject: '[OpenStreetMap] Akter GPX yedda'
     signup_confirm:
       subject: '[OpenStreetMap] Aná¹£uf ar OpenStreetMap'
@@ -1040,26 +1038,12 @@ kab:
         mapping_link: Bdu attekki
       legal_babble:
         title_html: Izerfan n umeskar d turagt
-        intro_1_html: |-
-          OpenStreetMap d tagrumma n <i>isefka yeldin</i>, yellan ddaw n turagt <a
-          href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL).
         credit_title_html: Amek ara ternuḍ asmad i OpenStreetMap
         attribution_example:
           alt: Amedɣa ɣef wamek ara tettekkiḍ di OpenStreetMap s usebter web
           title: Amedya n uttekki
         more_title_html: Akken ad tafeḍ ugar n telɣut
         contributors_title_html: Iwiziwen-nneɣ
-        contributors_at_html: '<strong>Utric</strong> : tegber isefka ɣef <a href="http://data.wien.gv.at/">Tamdint
-          n Viyan</a> (ddaw n turagt <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC
-          BY</a>), <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">tamnaḍt
-          n Vorarlberg</a> akked temnadt n Tyrol (ddaw n turagt <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC
-          BY AT avec amendements</a>).'
-        contributors_ca_html: '<strong>Canada</strong> : yegber isefka n <em>GeoBase</em>®,
-          <em>GeoGratis</em> (© Agezdu n tiɣbula n ugama n Kanada), <em>CanVec</em>
-          (© Agezdu n tiqbula n ugama n Kanada) et <em>StatCan</em> (Agezdu n tirakalt,
-          Tidaddanin n Kanada).'
-        contributors_nl_html: '<strong>Huland</strong> : yegber isefka © <abbr title="Automotive
-          Navigation Data">AND</abbr>, 2007 (<a href="http://www.and.com">www.and.com</a>).'
     index:
       permalink: Aseɣwen yezgan
       shortlink: Aseɣwen awezlan
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 565677644..77925c621 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1486,7 +1486,6 @@ ko:
       subject: '[OpenStreetMap] GPX 가져오기 실패'
     gpx_success:
       hi: 안녕하세요 %{to_user}님,
-      loaded_successfully: 가능한 %{possible_points} 점 중 %{trace_points} 점을 성공적으로 불러왔습니다.
       subject: '[OpenStreetMap] GPX 가져오기 성공'
     signup_confirm:
       subject: '[OpenStreetMap] OpenStreetMap에 오신 것을 환영합니다'
@@ -1786,95 +1785,16 @@ ko:
         mapping_link: 매핑을 시작
       legal_babble:
         title_html: 저작권 및 라이선스
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup>은 <i>오픈 데이터</i>로 <a
-          href="https://osmfoundation.org/">OpenStreetMap 재단</a> (OSMF)의 <a
-          href="https://opendatacommons.org/licenses/odbl/">오픈 데이터
-          커먼즈 오픈 데이터베이스 라이선스</a>(ODbL)에 따라 사용할 수 있습니다.
-        intro_2_html: |-
-          OpenStreetMap 기여자를 명시하는 한, OpenStreetMap 데이터를 자유롭게 복사, 배포, 전송 및 적용할 수 있습니다.
-          데이터를 바꾸거나 데이터를 기초로 작업할 때는 오로지
-          같은 라이선스에 따라서만 결과를 배포할 수 있습니다.
-          <a href="https://opendatacommons.org/licenses/odbl/1.0/">전문</a>은
-          당신의 권리와 책임을 설명합니다.
-        intro_3_1_html: |-
-          설명문서는
-          <a href="https://creativecommons.org/licenses/by-sa/2.0/">크리에이티브
-          커먼즈 저작자표시-동일조건변경허락 2.0</a> 라이선스(CC BY-SA)에 따라 사용할 수 있습니다.
         credit_title_html: OpenStreetMap 제작진 넣는 방법
         credit_1_html: OpenStreetMap 데이터를 사용하는 경우 다음 두 가지를 수행해야 합니다.
-        credit_2_1_html: |-
-          또한 데이터는 오픈 데이터베이스 라이선스에 따라 사용할 수 있으며, 지도 제작은
-          지도 타일을 사용할 때에 CC-BY-SA로 허가한다는 내용을 명확하게 통지해야 합니다.
-          <a href="https://www.openstreetmap.org/copyright">이 저작권 문서</a>로
-          링크하여 이렇게 할 수 있습니다.
-          또한 데이터 형식으로 OSM을 배포할 때는 라이선스 이름과
-          라이선스에 직접 링크를 할 수 있습니다. 링크할 수 없는
-          매체(예를 들어 인쇄 작업)에서는 opendatacommons.org와
-          openstreetmap.org('OpenStreetMap'을 전체 주소로 확장)로
-          독자에 직접 알려주세요. 관련 있다면 creativecommons.org로 알려주세요.
-        credit_4_html: |-
-          찾아볼 수 있는 전자 지도에 대해서는 제작진은 지도의 모서리에 보여야만 합니다.
-          예를 들어:
         attribution_example:
           alt: 웹페이지에 OpenStreetMap에 표시하는 방법의 예
           title: 권리 표시 예
         more_title_html: 자세히 찾기
-        more_1_html: |-
-          데이터를 사용하는 방법과 제작진을 표시하는 방법에 대해서는 <a
-          href="https://osmfoundation.org/Licence">OSMF 라이선스 문서
-          </a>를 자세히 읽으세요.
-        more_2_html: |-
-          OpenStreetMap은 오픈 데이터이지만 타사 개발자를 위한
-          지도 API는 무료로 제공할 수 없습니다.
-          <a href="https://operations.osmfoundation.org/wiki/policies/api/">API 사용 정책</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">타일 사용 정책</a>과
-          <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim(이름) 사용 정책</a>를 참조하세요.
         contributors_title_html: 우리의 기여자
         contributors_intro_html: |-
           우리의 기여자는 수천 명입니다. 또한 국립지도 제작 기관과
           같은 다른 소스의 공개 라이선스의 데이터를 포함하고 있습니다:
-        contributors_at_html: |-
-          <strong>오스트리아</strong>: <a href="https://data.wien.gv.at/">Stadt Wien</a>
-          (<a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>에 따름),
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a>와
-          Land Tirol (<a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">개정된 CC-BY AT</a>에 따름)에서의
-          데이터를 포함합니다.
-        contributors_au_html: '<strong>오스트레일리아</strong>: <a href="https://creativecommons.org/licenses/by/4.0/">CC
-          BY 4.0</a> 하에 오스트레일리아 연방이 허가한 <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA
-          오스트레일리아 유한회사</a>가 제공한 자료를 담고 있습니다.'
-        contributors_ca_html: '<strong>캐나다</strong>: GeoBase&reg;, GeoGratis(&copy;
-          캐나다 자연자원부), CanVec(&copy; 캐나다 자연자원부), StatCan(캐나다 연방통계청 지리과)의 데이터를 포함합니다.'
-        contributors_fi_html: |-
-          <strong>핀란드</strong>: <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI 라이선스</a>에 따른,
-          National Land Survey of Finland's Topographic Database와
-          다른 데이터집합에서의 데이터를 포함합니다.
-        contributors_fr_html: |-
-          <strong>프랑스</strong>: Direction Générale des Impôts에서의
-          데이터를 포함합니다.
-        contributors_nl_html: |-
-          <strong>네덜란드</strong>: &copy; AND 데이터, 2007년
-          (<a href="https://www.and.com">www.and.com</a>)을 포함합니다.
-        contributors_nz_html: '<strong>뉴질랜드</strong>: <a href="https://data.linz.govt.nz/">LINZ
-          데이터 서비스</a>의 데이터를 포함하며, <a href="https://creativecommons.org/licenses/by/4.0/">CC
-          BY 4.0</a>에 따라 재사용될 수 있습니다.'
-        contributors_si_html: |-
-          <strong>슬로베니아</strong>: <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a>와
-          <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
-          (슬로베니아의 공개 정보)에서의 데이터를 포함합니다.
-        contributors_za_html: |-
-          <strong>남아프리카 공화국</strong>: <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>에서의 데이터를
-          포함합니다. 국가가 저작권을 소유합니다.
-        contributors_gb_html: |-
-          <strong>영국</strong>: 육지 측량 데이터
-          &copy; Crown 저작권 및 데이터베이스 권리
-          2010-19를 포함합니다.
-        contributors_footer_1_html: |-
-          자세한 내용과 OpenStreetMap을 개선하는 데 도움이 되는 데 사용한
-          기타 자료에 대해서는 OpenStreetMap 위키에 있는 <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">기여자 문서</a>
-          를 참조하세요.
         contributors_footer_2_html: |-
           OpenStreetMap에 포함된 데이터는 원래 데이터 제공자가
           OpenStreetMap을 보증하거나 어떠한 보증도 제공하거나
@@ -1884,15 +1804,6 @@ ko:
           OSM 기여자는 저작권 소유자로부터 명시적 허가 없이
           저작권이 있는 자료(예를 들어 Google 지도 또는 인쇄된 지도)에서
           데이터를 반입하지 않도록 주의하여야 합니다.
-        infringement_2_html: |-
-          저작권을 가진 자료가 부적절하게 OpenStreetMap 데이터베이스나 이 사이트에
-          추가되었다고 생각하면 <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">게시
-          중단 절차</a>를 참고하거나 <a href="https://dmca.openstreetmap.org/">온라인
-          신고 페이지</a>에서 직접 제출하세요.
-        trademarks_title_html: <span id="trademarks"></span>등록 상표
-        trademarks_1_html: OpenStreetMap, 돋보기 로고, 스테이트 오브 맵은 OpenStreetMap 재단의 등록상표입니다.
-          상표의 사용에 대해 의문이 있는 경우, 관련된 질문을 <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">라이선싱
-          작업 그룹</a>으로 보내 주세요.
     index:
       js_1: 자바스크립트를 지원하지 않는 브라우저를 사용 중이거나, 자바스크립트가 활성화되어 있지 않습니다.
       js_2: OpenStreetMap은 매끄러운 지도를 위해 자바스크립트를 사용합니다.
@@ -2127,7 +2038,6 @@ ko:
     new:
       upload_trace: GPS 궤적 올리기
       visibility_help: 이게 무슨 뜻입니까?
-      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: 도움말
       help_url: https://wiki.openstreetmap.org/wiki/Upload
     create:
@@ -2145,7 +2055,6 @@ ko:
       title: '%{name} 경로 편집'
       heading: '%{name} 경로 편집'
       visibility_help: 이게 무슨 뜻입니까?
-      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     update:
       updated: 추적 업데이트됨
     trace_optionals:
@@ -2315,7 +2224,6 @@ ko:
       title: 내 클라이언트 애플리케이션
       no_applications_html: '%{oauth2} 표준을 사용하여 등록하려는 애플리케이션이 있습니까? 이 서비스에 OAuth 요청을
         하려면 먼저 애플리케이션을 등록해야 합니다.'
-      oauth_2: OAuth 2
       new: 새 애플리케이션 등록
       name: 이름
       permissions: 권한
diff --git a/config/locales/ksh.yml b/config/locales/ksh.yml
index 0bb315d8c..bc4d305dd 100644
--- a/config/locales/ksh.yml
+++ b/config/locales/ksh.yml
@@ -260,10 +260,6 @@ ksh:
         english_link: em Änglesche Ojinaal
       native:
         title: Övver di Sigg heh
-      legal_babble:
-        trademarks_1_html: |2-
-
-          <i lang="en" xml:lang="en" dir="ltr" title="An openly licensed map of the world being created by volunteers using local knowledge, GPS tracks and donated sources">OpenStreetMap</i>, dat Loro met dä Luhp, un <i lang="en" xml:lang="en" dir="ltr" title="„Zohschtand vun de Kaate“">State of the Map</i> sin Wahrezeijsche vun de <i lang="en" xml:lang="en" dir="ltr" title="An openly licensed map of the world being created by volunteers using local knowledge, GPS tracks and donated sources">OpenStreetMap</i>-Schtefftong. Wä Frohre drövver hät, schrihv di aan de <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Ärbejdsjropp vun de Lezänze</a>.
     edit:
       anon_edits_link_text: Fengk eruß, woröm dadd esu es.
     export:
diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 6b7e259f1..e0471014f 100644
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -1608,11 +1608,6 @@ ku-Latn:
       subject: '[OpenStreetMap] Anîna GPXê bi ser neket'
     gpx_success:
       hi: Merheba %{to_user},
-      loaded_successfully:
-        one: ji nuqteyekê %{possible_points} yê muhtemel bi %{trace_points} bi awayekî
-          serkefî hate barkirin.
-        other: Ji nuqteyên %{possible_points} yê muhtemel bi %{trace_points} bi awayekî
-          serkefî hate barkirin.
       subject: '[OpenStreetMap] Împortkirina GPXê bi ser ket'
     signup_confirm:
       subject: '[OpenStreetMap] Bi xêr hatî OpenStreetMapê'
@@ -1981,101 +1976,17 @@ ku-Latn:
         mapping_link: dest bi çêkirina nexşeyan bike
       legal_babble:
         title_html: Mafê daneriyê û lîsans
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> <i>open data</i> ye, bi lîsansa <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbLê) ku ji aliyê <a
-          href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF) ve hatiye çêkirin ve hatiye lîsanskirin.
-        intro_2_html: Hûn serbest in ku daneyên me kopî bikin, belav bikin, bişînin
-          yekî an jî adapte bikin bi şerta ku hûn behsa me bikin, rûmeta me bigrin.
-          Eger hûn daneyên me biguherînin an jî baştir bikin hûn vê netîceyê tenê
-          di bin eynî lîsansê de dikarin belav bikin. Temamiya <a href="https://opendatacommons.org/licenses/odbl/1.0/">koda
-          qanûnî</a>, maf û berpirsiyariyên we îzah dike.
-        intro_3_1_html: |-
-          Belgekirinên di nexşeya me de, di bin lîsansa <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0) de hatiye lîsanskirin.
         credit_title_html: Em çawan wekî çavkaniyekê behsa OpenStreetMapê bikin
         credit_1_html: 'Li cihê ku daneya OpenStreetMapê bi kar bînî, divê van du
           tiştan bikî:'
-        credit_2_1_html: |-
-          <ul>
-          <li>Bi nîşandana danezana mafê telîfê heqê OpenStreetMapê nîşan bidin.</li>
-          <li>Herwiha divê hûn zelal bikin ku daneyên me di bin lîsansa Open Database License de hatiye lîsanskirin.</li>
-          </ul>
-        credit_3_1_html: Ji bo hişyariya mafê telîfê, li gor bikaranîna te ya daneyên
-          me, çend pêdiviyên şiklê nîşandana wê hene. Mîsalen li ser nîşandana hişyariya
-          mafê telîfê qaîdeyên cuda wê bên sepandin, li gor çêkirina te ya nexşeyeke
-          gerrînbar, nexşeyeke çapkirî an wêneyeke statîk. Temamiya detayên li ser
-          pêdiviyan dikarî ji ser <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Rêbernameyên
-          Atfkirinê</a> peyda bikî.
-        credit_4_html: "Ji bo bi eşkereyî zelal bikî ku dane li bin Lîsansa Dabatas
-          ya Vekirî de berdest in, tu dikarî lînk bidî ser <a href=\"https://www.openstreetmap.org/copyright\">vê
-          rûpela mafê telîfê</a>. \nAlternatîven, û wekî hewcehiyekê, ger OSMyê di
-          formeke daneyê de belav bikî, tu dikarî rasterast lînk bikî lîsansê(an)
-          û nav lê bikî. Di wan medyayan de ku lînkkirin nemimkin e (wekî nimûne,
-          xebatên çapkirî), em pêşniyar dikin ku xwînerên xwe ber bi openstreetmap.org-ê
-          ve (belkî jî bi berfirehkirina 'OpenStreetMap'ê li vê adresa temamî) û li
-          openstreetmap.org-ê alî bikî. \nDi vê nimûneyê de, referans li kinarê nexşeyê
-          tê xuyan."
         attribution_example:
           alt: Mînakekê atfkirinê ya OpenSteetMapê yê li ser malperekî înternetê
           title: Mînaka atfkirinê
         more_title_html: Zêdetir hîn bibe
-        more_1_html: |-
-          Ji bo ku derbarê emilandina daneyên me û referansdana me de zêdetir hîn bibî <a
-          href="https://osmfoundation.org/Licence">rûpela Lîsansê a OSMFê</a> bixwîne.
-        more_2_html: Digel ku OpenStreetMap bi daneyên vekirî be jî, em ji bo aliyên
-          sêyem APIyekê nexşeyê ya belaş peyda nakin. Binêre rûpelên me yên <a href="https://operations.osmfoundation.org/policies/api/">Polîtîkaya
-          Emilandina APIyê </a>, <a href="https://operations.osmfoundation.org/policies/tiles/">Polîtîkaya
-          Emilandina Karoyê</a> û <a href="https://operations.osmfoundation.org/policies/nominatim/">Polîtîkaya
-          Emilandina Nominatimê</a>.
         contributors_title_html: Beşdarên me
         contributors_intro_html: 'Bi hezaran beşdarên me hene. Herwiha em ji ajansên
           nexşekirinê yên netewî û çavkaniyên din jî daneyên bi lîsansa-vekirî îhtîwa
           dikin, hinek ji wan ev in:'
-        contributors_at_html: |-
-          <strong>Awistirya</strong>: Daneyên ji <a href="https://data.wien.gv.at/">Stadt Wien</a> (di bin
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a> de), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> û Land Tirol (tevî guhartinan di bin lîsansa <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT de</a>) dihundirrîne.
-        contributors_au_html: |-
-          <strong>Awistralya</strong>: Bi bikaranîna Sînorên Îdarî tê berfirehkirin an bipêşxistin &copy;
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a> yên ku ji aliyê Commonwealth of Australia ve li bin
-          <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International licence (CC BY 4.0)</a> hatine lîsanskirin dihewîne.
-        contributors_ca_html: |-
-          <strong>Keneda</strong>: Daneyên ji GeoBase&reg;, GeoGratis (&copy; Department of Natural
-          Resources Canada), CanVec (&copy; Department of Natural
-          Resources Canada), û StatCan (Geography Division,
-          Statistics Canada) dihundirrîne.
-        contributors_fi_html: '<strong>Fînlenda</strong>: Daneyên ji National Land
-          Survey of Finland''s Topographic Database û ji komên din ên daneyan, di
-          bin a <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">Lîsansa
-          NLSFI</a> de daneyan dihundirrîne.'
-        contributors_fr_html: '<strong>Frensa</strong>: Daneyên ji Direction Générale
-          des Impôts''ê hatine bidestxistin dihundirrîne.'
-        contributors_nl_html: |-
-          <strong>Holenda</strong>: Daneyên &copy; ANDê dihundirrîne, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: '<strong>Nû Zelenda</strong>: Daneyên ku ji <a href="https://data.linz.govt.nz/">LINZ
-          Data Service</a> hatine bidestxistin dihundirrîne û ji bo cardin-bikaranînê
-          di bin <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>
-          de lîsanskirî ye.'
-        contributors_si_html: |-
-          <strong>Slovenya</strong>: Daneyên ji <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> û
-          <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
-          (agahiyên ji xelkê re vekirî yên Slovenyayê) dihundirrîne.
-        contributors_es_html: |-
-          <strong>Spanya</strong>: Daneyên ji
-          Spanish National Geographic Institute (<a href="http://www.ign.es/">IGN</a>) û
-          National Cartographic System (<a href="http://www.scne.es/">SCNE</a>)
-          yên ji bo cardinbikaranînê di bin <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a> de hatine lîsanskirin dihewîne.
-        contributors_za_html: |-
-          <strong>Afrîkaya Başûr</strong>: Daneyên ku ji <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a> hatine bidestxistin dihundirrîne. Mafê daneriyê yê dewletê parastî ye.
-        contributors_gb_html: |-
-          <strong>Mîrnişîna Yekbûyî</strong>: Daneyên Ordnance
-          Survey data &copy dihundirrîne; mafê daneriyê yê Crownê û mafê databasê parastî ne 2010-19.
-        contributors_footer_1_html: |-
-          Ji bo dêtayên van û çavkaniyên din yên ku di pêşdebirina OpenStreeteMapê de hatine bikaranîn agahiyên zêdetir werbigrî, xêra xwe ji ser OpenStreetMap Wiki'yê binêre <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">rûpela Beşdaran</a>.
         contributors_footer_2_html: Daxilbûna daneyan a di OpenStreetMapê de nayê
           maneya ku peydakera daneyan yê eslî OpenStreetMapê teswîb dike, garantiyekî
           temîn dike an jî berpirsîyariyekê qebûl dike.
@@ -2084,16 +1995,6 @@ ku-Latn:
           daneyên ji çavkaniyên ku mafên wan ên daneriyê parastî be (wekî nimûne Google
           Maps an jî nexşeyên çapkirî) bêyî destûra eşkere yê xwediyê wan, ji van
           çavkaniyan ti daneyek wernegrin.
-        infringement_2_html: Eger tu bawer bî materyalekî ku mafê we yê daneriyê parastî
-          ye bi şaşîtî li vê sîteyê an jî li daneya OpenStreetMapê hatibe zêdekirin
-          xêra xwe miracaeta <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">prosedûra
-          me ya rakirinê</a> bike an jî rasterast di <a href="https://dmca.openstreetmap.org/">rûpela
-          me ya dosyekirinê a online</a> de qeyd bikin.
-        trademarks_title_html: <span id="trademarks"></span>Markên bazirganî
-        trademarks_1_html: OpenStreetMap, logoya mercekê û State of the Map; markên
-          ticarî yên OpenStreetMap Foundationê yên qeydkirî nin. Heke derbarê bikaranîna
-          markan de pirsên we hebin xêra xwe binêrin <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Polîtîkaya
-          Markên Ticarî</a>.
     index:
       js_1: Tu an gerokek ku piştgiriyê nade JavaScriptê bi kar tînî an jî JavaScript
         hatiye neçalakkirin.
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index b0e58362b..d55da91a4 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -174,41 +174,41 @@ lb:
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: virun ongeféier 1 Stonn
+        one: virun ongeféier %{count} Stonn
         other: virun ongeféier %{count} Stonnen
       about_x_months:
-        one: virun ongeféier 1 Mount
+        one: virun ongeféier %{count} Mount
         other: virun ongeféier %{count} Méint
       about_x_years:
-        one: virun ongeféier 1 Joer
+        one: virun ongeféier %{count} Joer
         other: virun ongeféier %{count} Joer
       almost_x_years:
-        one: viru bal 1 Joer
+        one: viru bal %{count} Joer
         other: viru bal %{count} Joer
       half_a_minute: virun enger hallwer Minutt
       less_than_x_seconds:
-        one: viru manner wéi 1 Sekonn
+        one: viru manner wéi %{count} Sekonn
         other: viru manner wéi %{count} Sekonnen
       less_than_x_minutes:
-        one: viru manner wéi 1 Minutt
+        one: viru manner wéi %{count} Minutt
         other: viru manner wéi %{count} Minutten
       over_x_years:
-        one: viru méi wéi 1 Joer
+        one: viru méi wéi %{count} Joer
         other: viru méi wéi %{count} Joer
       x_seconds:
-        one: virun 1 virun enger Sekonn
+        one: virun virun %{count} Sekonn
         other: virun viru(n) %{count} Sekonnen
       x_minutes:
-        one: virun 1 Minutt
+        one: virun %{count} Minutt
         other: viru(n) %{count} Minutten
       x_days:
-        one: virun 1 Dag
+        one: virun %{count} Dag
         other: viru(n) %{count} Deeg
       x_months:
-        one: virun 1 Mount
+        one: virun %{count} Mount
         other: viru(n) %{count} Méint
       x_years:
-        one: virun 1 Joer
+        one: virun %{count} Joer
         other: viru(n) %{count} Joer
   editor:
     default: Standard (elo %{name})
@@ -330,10 +330,10 @@ lb:
     no_comment: (keng Bemierkung)
     part_of: Deel vu(n)
     part_of_relations:
-      one: 1 Relatioun
+      one: '%{count} Relatioun'
       other: '%{count} Relatiounen'
     part_of_ways:
-      one: 1 Wee
+      one: '%{count} Wee'
       other: '%{count} Weeër'
     download_xml: XML eroflueden
     view_history: Versioune weisen
@@ -378,7 +378,7 @@ lb:
       history_title_html: 'Versioune vun der Relatioun: %{name}'
       members: Memberen
       members_count:
-        one: 1 Member
+        one: '%{count} Member'
         other: '%{count} Memberen'
     relation_member:
       entry_role_html: '%{type} %{name} als %{role}'
@@ -1412,7 +1412,7 @@ lb:
         %{user}
       link_to_reports: Rapporte weisen
       reports_count:
-        one: 1 Bericht
+        one: '%{count} Bericht'
         other: '%{count} Berichter'
       reported_item: Gemellten Objet
       states:
@@ -1586,10 +1586,6 @@ lb:
       subject: '[OpenStreetMap] GPX-Import Feeler'
     gpx_success:
       hi: Salut %{to_user},
-      loaded_successfully:
-        one: mat %{trace_points} von 1 méigleche Punkt erfollegräich gelueden.
-        other: mat %{trace_points} vun %{possible_points} méigleche Punkten erfollegräich
-          gelueden.
       subject: '[OpenStreetMap] GPX-Import erfollegräich'
     signup_confirm:
       subject: '[OpenStreetMap] Wëllkomm bei OpenStreetMap'
@@ -1952,34 +1948,23 @@ lb:
         credit_1_html: 'Wann Dir Donnéeë vun OpenStreetMap benotz muss Dir dës zwou
           Saache respektéieren:'
         more_title_html: Fir méi ze wëssen
-        more_2_html: |-
-          Obwuel OpenStreetMap „Open Data“ ass, kënne mir keng onentgeltlech Kaarten-API fir Drëttparteie bereetstellen.
-          Kuck eis <a href="https://operations.osmfoundation.org/policies/api/">API-Verwendungsrichtlinn</a>, d'<a href="https://operations.osmfoundation.org/policies/tiles/">Kachelverwendungsrichtlinn</a> an d'<a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim-Verwendungsrichtlinn</a>.
         contributors_title_html: Eis Matwierkend
         contributors_intro_html: 'Eis Matwierkend sinn dausende vun eenzele Mënschen.
           Mir bezéien och oppe lizenzéiert Donnéeë vu nationale Kaartenagenturen an
           anere Quellen an, dorënner:'
-        contributors_at_html: |-
-          <strong>Éisträich</strong>: Enthält Donnéeë vun der <a href="https://data.wien.gv.at/">Stad Wien</a> (ënner <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> a Land Tirol (ënner <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT mat Amendementer</a>).
-        contributors_ca_html: |-
-          <strong>Kanada</strong>: Enthält Donnéeë vu GeoBase&reg;, GeoGratis (&copy; Department of Natural
-          Resources Canada), CanVec (&copy; Department of Natural
-          Resources Canada), a StatCan (Geography Division,
-          Statistics Canada).
-        contributors_fr_html: '<strong>Frankräich</strong>: Enthält Donnéeë vun der
-          <i>Direction Générale des Impôts</i>.'
-        contributors_nz_html: '<strong>Neiséiland</strong>: Enthält Donnéeë vum <i>Land
-          Information New Zealand Data Service</i> an ass fir d''Rëmbenotzen ënner
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a> lizenzéiert.'
-        contributors_es_html: |-
-          <strong>Spuenien</strong>: Enthält Donnéeë vum spuenesche nationale geographeschen Institut (<a href="http://www.ign.es/">IGN</a>) an nationale kartographesche System (<a href="http://www.scne.es/">SCNE</a>)
-          fir d'Rëmbenotzen ënner <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a> lizenzéiert.
+        contributors_at_austria: Éisträich
+        contributors_at_stadt_wien: Stad Wien
+        contributors_au_australia: Australien
+        contributors_ca_canada: Kanada
+        contributors_fi_finland: Finnland
+        contributors_fr_france: Frankräich
+        contributors_nl_netherlands: Holland
+        contributors_nz_new_zealand: Neiséiland
+        contributors_si_slovenia: Slowenien
+        contributors_es_spain: Spuenien
+        contributors_za_south_africa: Südafrika
+        contributors_gb_united_kingdom: Vereenegt Kinnekräich
         infringement_title_html: Copyright-Verletzung
-        trademarks_title_html: <span id="trademarks"></span>Markenzeechen
-        trademarks_1_html: OpenStreetMap, de Luppelogo a „State of the Map“ sinn agedroe
-          Wouerzeeche vun der OpenStreetMap Foundation. Falls du Froen iwwer d'Verwendung
-          vu Marken hues, lies wannechgelift eis <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy"><Markerichtlinn</a>.
     index:
       js_1: Dir hutt entweder e Browser dee JavaScript net ënnerstëtzt oder Dir hutt
         JavaScript desaktivéiert.
@@ -2187,7 +2172,7 @@ lb:
       newer: Méi nei Spueren
     trace:
       count_points:
-        one: 1 Punkt
+        one: '%{count} Punkt'
         other: '%{count} Punkten'
       more: méi
       trace_details: Detailer vun de Spueren uweisen
@@ -2410,19 +2395,19 @@ lb:
     helper:
       block_duration:
         hours:
-          one: 1 Stonn
+          one: '%{count} Stonn'
           other: '%{count} Stonnen'
         days:
-          one: 1 Dag
+          one: '%{count} Dag'
           other: '%{count} Deeg'
         weeks:
-          one: 1 Woch
+          one: '%{count} Woch'
           other: '%{count} Wochen'
         months:
-          one: 1 Mount
+          one: '%{count} Mount'
           other: '%{count} Méint'
         years:
-          one: 1 Joer
+          one: '%{count} Joer'
           other: '%{count} Joren'
     blocks_on:
       title: Späre vum %{name}
@@ -2511,11 +2496,11 @@ lb:
       locate:
         title: Weise wou ech sinn
         metersPopup:
-          one: Dir sidd manner wéi ee Meter vun dësem Punkt ewech
-          other: Dir sidd %{count} Meter vun dësem Punkt ewech
+          one: Dir sidd manner wéi %{count} Meter vun dësem Punkt ewech
+          other: Dir sidd manner wéi %{count} Meter vun dësem Punkt ewech
         feetPopup:
-          one: Dir sidd manner wéi ee Fouss vun dësem Punkt ewech
-          other: Dir sidd %{count} Féiss vun dësem Punkt ewech
+          one: Dir sidd manner wéi %{count} Fouss vun dësem Punkt ewech
+          other: Dir sidd manner wéi %{count} Féiss vun dësem Punkt ewech
       base:
         standard: Standard
         cyclosm: CyclOSM
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 73afbfc81..86a3e82ca 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -188,42 +188,66 @@ lt:
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: prieš maždaug 1 valandą
-        other: prieš maždaug %{count} valandas
+        one: maždaug prieš %{count} valandą
+        few: maždaug prieš %{count} valandas
+        many: maždaug prieš %{count} valandą
+        other: maždaug prieš %{count} valandų
       about_x_months:
-        one: prieš maždaug 1 mėnesį
-        other: prieš maždaug %{count} mėnesius
+        one: maždaug prieš %{count} mėnesį
+        few: maždaug prieš %{count} mėnesius
+        many: maždaug prieš %{count} mėnesį
+        other: maždaug prieš %{count} mėnesių
       about_x_years:
-        one: prieš maždaug 1 metus
-        other: prieš maždaug %{count} metus
+        one: maždaug prieš %{count} metus
+        few: maždaug prieš %{count} metus
+        many: maždaug prieš %{count} metus
+        other: maždaug prieš %{count} metų
       almost_x_years:
-        one: prieš beveik 1 metus
-        other: prieš beveik %{count} metus
+        one: beveik prieš %{count} metus
+        few: beveik prieš %{count} metus
+        many: beveik prieš %{count} metus
+        other: beveik prieš %{count} metų
       half_a_minute: prieš pusę minutės
       less_than_x_seconds:
-        one: mažiau nei prieš 1 sekundę
-        other: prieš mažiau nei %{count} sekundes
+        one: prieš mažiau nei %{count} sekundę
+        few: prieš mažiau nei %{count} sekundes
+        many: prieš mažiau nei %{count} sekundę
+        other: prieš mažiau nei %{count} sekundžių
       less_than_x_minutes:
-        one: prieš mažiau nei minutę
+        one: prieš mažiau nei %{count} minutę
+        few: prieš mažiau nei %{count} minutes
+        many: prieš mažiau nei %{count} minutę
         other: prieš mažiau nei %{count} minučių
       over_x_years:
-        one: prieš daugiau nei 1 metus
-        other: prieš daugiau nei %{count} metus
+        one: prieš daugiau nei %{count} metus
+        few: prieš daugiau nei %{count} metus
+        many: prieš daugiau nei %{count} metus
+        other: prieš daugiau nei %{count} metų
       x_seconds:
-        one: prieš 1 sekundę
-        other: prieš %{count} sekundes
+        one: prieš %{count} sekundę
+        few: prieš %{count} sekundes
+        many: prieš %{count} sekundę
+        other: prieš %{count} sekundžių
       x_minutes:
-        one: prieš 1 minutę
-        other: prieš %{count} minutes
+        one: prieš %{count} minutę
+        few: prieš %{count} minutes
+        many: prieš %{count} minutę
+        other: prieš %{count} minučių
       x_days:
-        one: prieš 1 dieną
+        one: prieš %{count} dieną
+        few: prieš %{count} dienas
+        many: prieš %{count} dieną
         other: prieš %{count} dienų
       x_months:
-        one: prieš 1 mėnesį
-        other: prieš %{count} mėnesius
+        one: prieš %{count} mėnesį
+        few: prieš %{count} mėnesius
+        many: prieš %{count} mėnesį
+        other: prieš %{count} mėnesių
       x_years:
-        one: prieš 1 metus
-        other: prieš %{count} metus
+        one: prieš %{count} metus
+        few: prieš %{count} metus
+        many: prieš %{count} metus
+        other: prieš %{count} metų
   editor:
     default: Numatytasis (Å¡iuo metu %{name})
     id:
@@ -294,7 +318,7 @@ lt:
     edit:
       title: Keisti paskyrą
       my settings: Mano nustatymai
-      current email address: Dabartinis e-pašto adresas
+      current email address: Dabartinis el. pašto adresas
       external auth: Išorinė autentikacija
       openid:
         link text: kas tai?
@@ -710,6 +734,7 @@ lt:
           drinking_water: Geriamas vanduo
           driving_school: Vairavimo mokykla
           embassy: Ambasada
+          events_venue: Renginių vieta
           fast_food: Greitas maistas
           ferry_terminal: Keltų terminalas
           fire_station: Gaisrinė
@@ -737,6 +762,7 @@ lt:
           parking: Stovėjimo aikštelė
           parking_entrance: Įvažiavimas į stovėjimo aikštelę
           parking_space: Stovėjimo Vieta
+          payment_terminal: Mokėjimo terminalas
           pharmacy: Vaistinė
           place_of_worship: Maldos namai
           police: Policija
@@ -745,6 +771,7 @@ lt:
           prison: Kalėjimas
           pub: Aludė
           public_bath: Vieša Pirtis
+          public_bookcase: Knygų dalinimosi lentyna
           public_building: Visuomeninis pastatas
           recycling: Perdirbimo punktas
           restaurant: Restoranas
@@ -921,7 +948,7 @@ lt:
           brownfield: Apleista teritorija
           cemetery: Kapinės
           commercial: Komercinis plotas
-          conservation: Apsaugos zona
+          conservation: Saugoma teritorija
           construction: Statybų aikštelė
           farmland: Fermos žemės
           farmyard: Ferma
@@ -941,7 +968,7 @@ lt:
           reservoir: Rezervuaras
           reservoir_watershed: Vandens rezervuaras
           residential: Gyvenamasis rajonas
-          retail: Mažmeninė prekyba
+          retail: Mažmeninės prekybos zona
           village_green: Gyvenvietės žalioji zona
           vineyard: Vynuogynas
           "yes": Žemėnauda
@@ -957,7 +984,7 @@ lt:
           fitness_station: Fitneso treniruočių vieta
           garden: Sodas
           golf_course: Golfo laukas
-          horse_riding: Jodinėjimas žirgais
+          horse_riding: Jodinėjimo žirgais centras
           ice_rink: Slidinėjimo vieta (paklojant užšąlantį vandenį)
           marina: Valčių ir nedidelių laivų prieplauka
           miniature_golf: Mini golfas
@@ -976,13 +1003,20 @@ lt:
           water_park: Vandens parkas
           "yes": Laisvalaikis
         man_made:
+          advertising: Reklama
           antenna: Antena
+          avalanche_protection: Apsauga nuo lavinų
+          beacon: Radijo Å¡vyturys
           beehive: Bičių avilys
+          breakwater: Molas
           bridge: Tiltas
           bunker_silo: Bunkeris
+          cairn: Kernas
           chimney: Kaminas
+          communications_tower: Ryšių bokštas
           crane: Kranas
           cross: Kryžius
+          dyke: Pylimas
           flagpole: Vėliavos stiebas
           lighthouse: Å vyturys
           mast: Stiebas
@@ -991,6 +1025,11 @@ lt:
           monitoring_station: Stebėjimo Stotis
           petroleum_well: Naftos Å¡ulinys
           pipeline: Vamzdynas
+          pumping_station: Siurblinė
+          reservoir_covered: Uždengtas rezervuaras
+          silo: Siloso bokštas
+          snow_cannon: Sniego patranka
+          snow_fence: Sniego tvora
           surveillance: Stebėjimas
           telescope: Teleskopas
           tower: Bokštas
@@ -1009,6 +1048,7 @@ lt:
         mountain_pass:
           "yes": Kalnų perėja
         natural:
+          atoll: Atolas
           bay: Įlanka
           beach: Paplūdimys
           cape: Kyšulys
@@ -1025,7 +1065,9 @@ lt:
           grassland: Žolė
           heath: Dykynė
           hill: Kalva
+          hot_spring: Karštoji versmė
           island: Sala
+          isthmus: Sąsmauka
           land: Žemė
           marsh: Pelkė
           moor: Dažnai užliejama vieta
@@ -1058,21 +1100,27 @@ lt:
           architect: Architektas
           association: Asociacija
           company: Bendrovė
+          diplomatic: Diplomatinis biuras
           educational_institution: Švietimo Įstaiga
           employment_agency: Įdarbinimo agentūra
+          energy_supplier: Energijos tiekėjo biuras
           estate_agent: Nekilnojamojo turto agentas
+          financial: Finansų biuras
           government: Vyriausybinė tarnyba
           insurance: Draudimo įstaiga
           it: IT Ofisas
           lawyer: Advokatas
           logistics: Logistikos biuras
+          newspaper: Laikraščio biuras
           ngo: NGO įstaiga
           notary: Notaro biuras
+          research: Tyrimų biuras
           telecommunication: Telekomunikacijų tarnyba
           travel_agent: Kelionių agentūra
           "yes": Biuras
         place:
           allotments: Kolektyviniai sodai
+          archipelago: Salynas
           city: Miestas
           city_block: Miesto Blokas
           country: Å alis
@@ -1087,6 +1135,7 @@ lt:
           locality: Vietovė
           municipality: Savivaldybė
           neighbourhood: Rajonas
+          plot: Sklypas
           postcode: Pašto kodas
           region: Regionas
           sea: JÅ«ra
@@ -1126,7 +1175,10 @@ lt:
           alcohol: Licencijuotos parduotuvės
           antiques: Antikvariniai daiktai
           art: Meno parduotuvė
+          baby_goods: Kūdikių prekės
+          bag: Rankinių parduotuvė
           bakery: Kepykla
+          bathroom_furnishing: Vonios kambario baldai
           beauty: Grožio salonas
           beverages: Gėrimų parduotuvė
           bicycle: Dviračių parduotuvė
@@ -1141,6 +1193,7 @@ lt:
           charity: Labdaros parduotuvė
           cheese: Sūrio parduotuvė
           chemist: Chemikas
+          chocolate: Šokoladinė
           clothes: Drabužių parduotuvė
           coffee: Kavinė
           computer: Kompiuterių parduotuvė
@@ -1148,13 +1201,17 @@ lt:
           convenience: Parduotuvė
           copyshop: Kanceliarinių prekių parduotuvė
           cosmetics: Kosmetikos parduotuvė
+          craft: Rankdarbių reikmenų parduotuvė
           curtain: Užuolaidų parduotuvė
+          dairy: Pieno produktų parduotuvė
           deli: Gastronomas
           department_store: Universalinė parduotuvė
           discount: Nukainotų prekių parduotuvė
-          doityourself: Pasidaryk pats
+          doityourself: Parduotuvė „Pasidaryk pats“
           dry_cleaning: Sausasis valymas
+          e-cigarette: Elektroninių cigarečių parduotuvė
           electronics: Elektronikos parduotuvė
+          erotic: Erotikos prekių parduotuvė
           estate_agent: Nekilnojamojo turto agentas
           fabric: Audinių parduotuvė
           farm: Ūkio parduotuvė
@@ -1162,9 +1219,11 @@ lt:
           fishing: Žvejybos reikmenų parduotuvė
           florist: Gėlininkas
           food: Maisto parduotuvė
+          frame: Rėmelių parduotuvė
           funeral_directors: Laidotuvių direktoriai
           furniture: Baldai
           garden_centre: Sodo prekės
+          gas: Dujų parduotuvė
           general: Bendroji parduotuvė
           gift: Dovanų parduotuvė
           greengrocer: Daržovių ir vaisių pardavėjas
@@ -1174,20 +1233,25 @@ lt:
           health_food: Sveiko maisto parduotuvė
           hearing_aids: Klausos aparatai
           herbalist: Žolininkas
-          hifi: Hi-Fi
+          hifi: Hi-Fi parduotuvė
+          houseware: Namų apyvokos reikmenų parduotuvė
           ice_cream: Ledų parduotuvė
           interior_decoration: Interjero Dekoracija
           jewelry: Juvelyrikos parduotuvė
           kiosk: Kioskas
           laundry: Skalbykla
+          locksmith: Spynininkas
           lottery: Loterija
           mall: Prekybos centras
           massage: Masažas
+          medical_supply: Medicinos reikmenų parduotuvė
           mobile_phone: Mobiliųjų telefonų parduotuvė
           motorcycle: Motociklų parduotuvė
+          motorcycle_repair: Motociklų remonto dirbtuvės
           music: Muzikos prekių parduotuvė
           musical_instrument: Muzikos instrumentai
           newsagent: Spaudos pardavėjas
+          nutrition_supplements: Maisto papildai
           optician: Optikas
           organic: Ekologiškų maisto produktų parduotuvė
           outdoor: Lauko parduotuvė
@@ -1197,19 +1261,24 @@ lt:
           perfumery: Parfumerijos parduotuvė
           pet: Naminių gyvūnėlių parduotuvė
           photo: Foto prekių parduotuvė
+          seafood: Jūros gėrybės
           second_hand: Dėvėtų parduotuvė
+          sewing: Siuvimo reikmenų parduotuvė
           shoes: Batų parduotuvė
           sports: Sporto prekių parduotuvė
           stationery: Raštinės reikmenys
           supermarket: Prekybos centras
           tailor: Siuvėjas
+          tattoo: Tatuiruočių salonas
           tea: Arbatos parduotuvė
           ticket: Bilietų Parduotuvė
           tobacco: Tabako Parduotuvė
           toys: Žaislų parduotuvė
           travel_agency: Kelionių agentūra
           tyres: Padangų Parduotuvė
+          variety_store: Įvairių prekių parduotuvė
           video: Video parduotuvė
+          video_games: Vaizdo žaidimų parduotuvė
           wine: Vyno Parduotuvė
           "yes": Parduotuvė
         tourism:
@@ -1218,7 +1287,7 @@ lt:
           artwork: Meno dirbiniai
           attraction: Lankytina vieta
           bed_and_breakfast: Nakvynės namai (viešbutis)
-          cabin: Kabina
+          cabin: Turistų namelis
           camp_site: Stovyklavietė
           caravan_site: Kemperių aikštelė
           chalet: Trobelė
@@ -1277,6 +1346,7 @@ lt:
       select_status: Parinkite būseną
       select_type: Pasirinkite tipą
       search: Ieškoti
+      search_guidance: 'Problemų paieška:'
       user_not_found: Naudotojo nėra
       issues_not_found: Tokių problemų nerasta
       status: BÅ«sena
@@ -1286,8 +1356,10 @@ lt:
       last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> %{user}
       link_to_reports: Žiūrėti pranešimus
       reports_count:
-        one: 1 Report
-        other: '%{count} pranešimas'
+        one: '{%count} pranešimas'
+        few: '%{count} pranešimai'
+        many: '{%count} pranešimas'
+        other: '%{count} pranešimų'
       reported_item: Praneštas elementas
       states:
         ignored: Ignoruota
@@ -1296,8 +1368,9 @@ lt:
     show:
       title: '%{status} Problema #%{issue_id}'
       reports:
-        zero: No reports
-        one: 1 report
+        one: '{%count} pranešimas'
+        few: '%{count} pranešimai'
+        many: '{%count} pranešimas'
         other: '%{count} pranešimų'
       report_created_at: Pirmą kartą pranešta %{datetime}
       last_resolved_at: Paskutinį kartą išspręsta %{datetime}
@@ -1458,9 +1531,6 @@ lt:
       subject: '[OpenStreetMap] Nepavyko įkelti pėdsako (GPX)'
     gpx_success:
       hi: Sveiki, %{to_user},
-      loaded_successfully: '{{PLURAL|one=sėkmingai įkelta su %{trace_points} iš galimo
-        1 taško.|sėkmingai įkelta su %{trace_points} iš galimų %{possible_points}
-        taškų.'
       subject: '[OpenStreetMap] Sėkmingai įkeltas pėdsakas (GPX)'
     signup_confirm:
       subject: '[OpenStreetMap] Sveiki atvykę į OpenStreetMap'
@@ -1818,101 +1888,17 @@ lt:
         mapping_link: pradėti žymėjimą
       legal_babble:
         title_html: Autorinės teisės ir licencija
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> yra <i>laisvai prieinamas</i>, licencijuotas <a
-          href="http://osmfoundation.org/">OpenStreetMap fondo</a> (OSMF) pagal <a
-          href="http://opendatacommons.org/licenses/odbl/">„Open Data
-          Commons Open Database License“</a> (ODbL).
-        intro_2_html: |-
-          Jūs galite laisvai platinti ir pritaikyti mūsų duomenis tol, kol paminite OpenStreetMap ir jo kūrėjus. Jei naudodamiesi mūsų duomenimis sukursite savo duomenis, jūsų duomenys irgi turi būti licencijuoti pagal tą pačią licenziją.
-          <a href="http://opendatacommons.org/licenses/odbl/1.0/">Pilnas teisinis aprašymas</a> paaiškins jūsų teises ir atsakomybes.
-        intro_3_1_html: |-
-          Mūsų dokumentacija yra licencijuoti pagal <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> licenciją (CC-BY-SA).
         credit_title_html: Kaip paminėti OpenStreetMap
         credit_1_html: 'Naudodami OpenStreetMap duomenis, privalote atlikti Å¡iuos
           du dalykus:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Nurodyti OpenStreetMap kaip duomenų šaltinį, parodant autorinių teisių pranešimą.</li>
-            <li>Aiškiai parodyti, kad duomenys pasiekiami pagal Open Database License licenciją.</li>
-          </ul>
-        credit_3_1_html: Turime skirtingus reikalavimus kaip turėtų būti rodoma informaciją
-          apie autorių teises, ir tai priklauso nuo to, kaip naudojate mūsų duomenis.
-          Pavyzdžiui, skirtingos taisyklės taikomos tam, kaip rodyti informaciją apie
-          autorių teises, priklasomai, ar sukurėte naršomą žemėlapį, spausdinamą žemėlapį
-          ar statinį vaizdą.
-        credit_4_html: |-
-          Norėdami aiškiai parodyti, kad duomenys yra prieinami pagal Open
-          Database License licenciją, galite pridėti nuorodą į <a href="https://www.openstreetmap.org/copyright">autorinių teisių puslapį</a>.
-          Kitu atveju, jei platinate OSM duomenų formoje, galite pavadinti ir pridėti nuorodas tiesiai į licenciją ar licencijas. Formatuose, kur neįmanoma įdėti nuorodų (pvz. atspausdintuose dokumentuose), rekomenduojame nukreipti skaitytojus į openstreetmap.org (gal būt išplečiant "OpenStreetMap" į šį pilną adresą) ir į opendatacommons.org.
-          Pateiktame pavyzdyje nuorodos pridėtos žemėlapio kampe.
         attribution_example:
           alt: Pavyzdys kaip galima priskirti paskyrimus OpenStreetMap svetainėje
           title: Priskyrimo pavyzdys
         more_title_html: Papildoma informacija
-        more_1_html: |-
-          Daugiau informacijos apie mūsų duomenų naudojimą bei kaip paminėti prie jo prisidėjusius rasite <a
-          href="http://osmfoundation.org/Licence">OSMF licencijavimo puslapyje</a> ir bendruomenės <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">teisiniame DUK</a>.
-        more_2_html: |-
-          Nors OpenStreetMap duomenys yra atviri, mes negalime pateikti
-          nemokamos žemėlapių API trečiosioms šalims.
-          Peržiūrėkite mūsų <a href="https://operations.osmfoundation.org/policies/api/">API naudojimo politiką</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">Kaladėlių naudojimo politiką</a>,
-          bei <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim naudojimo politiką</a>.
         contributors_title_html: Mūsų autoriai
         contributors_intro_html: Mūsų autoriai yra tūkstančiai įvairių žmonių. Taip
           pat įtrauktas ir laisvai prieinamas turinys iš valstybinių kartografijos
           agentūrų bei įvairių kitų šaltinių.
-        contributors_at_html: |-
-          <strong>Austrija</strong>: yra duomenų iš:
-          <a href="http://data.wien.gv.at/">Stadt Wien</a> (pagal
-          <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> ir
-          Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT su pataisomis</a>).
-        contributors_au_html: "<strong>Australija</strong>: Įtraukta arba išvystyta
-          naudojant Administracines sienas &copy; \n<a href=\"https://geoscape.com.au/legal/data-copyright-and-disclaimer/\">Geoscape
-          Australia</a>\nAustralijos Sandraugos licenija:\n<a href=\"https://creativecommons.org/licenses/by/4.0/\">Creative
-          Commons Attribution 4.0 International licence (CC BY 4.0)</a>."
-        contributors_ca_html: |-
-          <strong>Kanada</strong>: yra duomenų iš:
-          GeoBase&reg;, GeoGratis (&copy; Department of Natural
-          Resources Canada), CanVec (&copy; Department of Natural
-          Resources Canada), bei StatCan (Geography Division,
-          Statistics Canada).
-        contributors_fi_html: '<strong>Suomija</strong>: yra duomenų iš Nacionalinio
-          žemės tyrimo Suomijos topografijos duomenų bazės ir kitų duomenų rinkinių,
-          pagal <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI
-          Licensiją</a>.'
-        contributors_fr_html: |-
-          <strong>Prancūzija</strong>: yra duomenų iš:
-          Direction Générale des Impôts.
-        contributors_nl_html: |-
-          <strong>Nyderlandai</strong>: yra &copy; AND duomenų, 2007
-          (<a href="http://www.and.com">www.and.com</a>)
-        contributors_nz_html: '<strong>Naujoji Zelandija</strong>: yra duomenų iš
-          <a href="https://data.linz.govt.nz/">LINZ Data Service</a>, licencijuota
-          perpanaudojimui pagal <a href="https://creativecommons.org/licenses/by/4.0/">CC
-          BY 4.0</a>.'
-        contributors_si_html: |-
-          <strong>Slovėnija</strong>: panaudoti duomenys iš <a href="http://www.gu.gov.si/en/">Matavimo ir kartografavimo valdžios</a> bei
-          <a href="http://www.mkgp.gov.si/en/">Žemės ūkio, miškų ir maisto ministerijos</a>
-          (vieša Slovėnijos informacija).
-        contributors_es_html: "<strong>Ispanija</strong>: yra duomenų iš \nSpanish
-          National Geographic Institute (<a href=\"http://www.ign.es/\">IGN</a>) ir\nNational
-          Cartographic System (<a href=\"http://www.scne.es/\">SCNE</a>)\nlicencijuota
-          pagal <a href=\"https://creativecommons.org/licenses/by/4.0/\">CC BY 4.0</a>."
-        contributors_za_html: |-
-          <strong>Pietų Afrika</strong>: yra duomenų iš:
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, autoriaus teisės saugomos.
-        contributors_gb_html: |-
-          <strong>Jungtinė Karalystė</strong>: yra duomenų iš Ordnance
-          Survey data &copy; Crown autorinės teisės ir duomenų bazės teisės 2010-2023.
-        contributors_footer_1_html: Norėdami daugiau sužinoti apie šiuos ir kitus
-          šaltinius, kurie buvo naudojami tobulinant OpenStreetMap, peržiūrėkite <a
-          href="http://wiki.openstreetmap.org/wiki/Contributors">vystytojų puslapį</a>
-          OpenStreetMap wiki.
         contributors_footer_2_html: Duomenų įtraukimas į OpenStreetMap nereiškia,
           kad originalių duomenų tiekėjas remia OpenStreetMap. Nenumatomos jokios
           garantijos ir neprisiimama jokia atsakomybė.
@@ -1920,16 +1906,6 @@ lt:
         infringement_1_html: OSM pildytojai primenami niekada nesinaudoti autorių
           teisėmis apsaugotų šaltinių (pvz. Google Maps ar spausdintų žemėlapių) be
           leidimo naudoti.
-        infringement_2_html: Jei manote, kad autorių teisių saugomi darbai buvo netinkamai
-          panaudoti pildant OpenStreetMap duomenų bazę, įskaitant ir šią svetainę,
-          susipažinkite su mūsų <a href="http://wiki.osmfoundation.org/wiki/License/Takedown_procedure">duomenų
-          pašalinimo procedūra</a> arba užpildykite <a href="https://dmca.openstreetmap.org/">užpildykite
-          internetinę formą</a>.
-        trademarks_title_html: <span id="trademarks"></span>Prekių ženklai
-        trademarks_1_html: OpenStreetMap, lupos logotipas ir „State of the Map“ yra
-          registruoti OpenStreetMap fondo prekių ženklai. Jei turite klausimų apie
-          šių ženklų naudojimą, siųskite savo klausimus <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licencijavimo
-          darbinei grupei</a>.
     index:
       js_1: Jūs arba naudojate naršyklę, nepalaikančią JavaScript, arba išjungėte
         JavaScript palaikymą.
@@ -2231,7 +2207,11 @@ lt:
       newer: Naujesni pėdsakai
     trace:
       pending: LAUKIAMA
-      count_points: '{{PLURAL|one=1 taškas|%{count} taškai(-ų)'
+      count_points:
+        one: '{%count} taškas'
+        few: '%{count} taškai'
+        many: '{%count} taškas'
+        other: '%{count} taškų'
       more: daugiau
       trace_details: Žiūrėti pėdsako detales
       view_map: Žemėlapis
@@ -2621,20 +2601,30 @@ lt:
       time_past_html: Pasibaigė %{time}
       block_duration:
         hours:
-          one: 1 valanda
-          other: '%{count} valandos'
+          one: '{%count} valanda'
+          few: '%{count} valandos'
+          many: '{%count} valanda'
+          other: '%{count} valandų'
         days:
-          one: 1 day
-          other: '%{count} diena'
+          one: '{%count} diena'
+          few: '%{count} dienos'
+          many: '{%count} diena'
+          other: '%{count} dienų'
         weeks:
-          one: 1 week
-          other: '%{count} savaitė'
+          one: '{%count} savaitė'
+          few: '%{count} savaitės'
+          many: '{%count} savaitė'
+          other: '%{count} savaičių'
         months:
-          one: 1 month
-          other: '%{count} mėnuo'
+          one: '{%count} mėnesis'
+          few: '%{count} mėnesiai'
+          many: '{%count} mėnesis'
+          other: '%{count} mėnesių'
         years:
-          one: 1 year
-          other: '%{count} metai'
+          one: '{%count} metai'
+          few: '%{count} metai'
+          many: '{%count} metai'
+          other: '%{count} metų'
     blocks_on:
       title: Naudotojo %{name} blokavimai
       heading_html: Naudotojo %{name} apribojimų sąrašas
@@ -2705,6 +2695,7 @@ lt:
       reactivate: IÅ¡ naujo suaktyvinti
       comment_and_resolve: Komentuoti & išspręsti
       comment: Komentuoti
+      disappear_date_html: Ši išspręsta pastaba dings iš žemėlapio po %{disappear_in}.
     new:
       title: Nauja pastaba
       intro: Pastebėjote klaidą ar kažko trūksta? Praneškite kitiems žymėtojams, kad
@@ -2728,6 +2719,8 @@ lt:
       custom_dimensions: Nustatyti savo apimtį
       format: 'Formatas:'
       scale: 'Mastelis:'
+      image_dimensions: Paveikslėlyje bus rodomas %{width} x %{height} dydžio standartinis
+        sluoksnis
       download: Atsisiųsti
       short_url: Trumpas URL
       include_marker: Įtraukti žymeklį
@@ -2748,11 +2741,23 @@ lt:
         out: Nutolinti
       locate:
         title: Rodyti mano vietą
+        metersPopup:
+          one: Jūs esate %{count} metro atstumu nuo šio taško
+          few: Jūs esate %{count} metrų atstumu nuo šio taško
+          many: Jūs esate %{count} metro atstumu nuo šio taško
+          other: Jūs esate %{count} metrų atstumu nuo šio taško
+        feetPopup:
+          one: Jūs esate %{count} pėdos atstumu nuo šio taško
+          few: Jūs esate %{count} pėdų atstumu nuo šio taško
+          many: Jūs esate %{count} pėdos atstumu nuo šio taško
+          other: Jūs esate %{count} pėdų atstumu nuo šio taško
       base:
         standard: Standartinis
+        cyclosm: CyclOSM
         cycle_map: Dviračių žemėlapis
         transport_map: Transporto žemėlapis
         hot: Humanitarinis
+        opnvkarte: ÖPNVKarte
       layers:
         header: Žemėlapio sluoksniai
         notes: Žemėlapio pastabos
@@ -2804,8 +2809,24 @@ lt:
       instructions:
         continue_without_exit: Tęskite kelionę %{name}
         slight_right_without_exit: Dešiniau į %{name}
+        offramp_right: Užvažiuokite ant rampos dešinėje
+        offramp_right_with_exit: Važiuokite į išvažiavimą %{exit} dešinėje
+        offramp_right_with_exit_name: Važiuokite į išvažiavimą %{exit} dešinėje į
+          %{name}
+        offramp_right_with_exit_directions: Važiuokite į išvažiavimą %{exit} dešinėje
+          link %{directions}
+        offramp_right_with_exit_name_directions: Važiuokite į išvažiavimą %{exit}
+          dešinėje į %{name}, link %{directions}
         offramp_right_with_name: Pasirinkite rampą dešinėje į %{name}
+        offramp_right_with_directions: Užvažiuokite rampa dešinėje link %{directions}
+        offramp_right_with_name_directions: Užvažiuokite rampa dešinėje į %{name},
+          link %{directions}
         onramp_right_without_exit: Sukite dešinėn ant rampos į %{name}
+        onramp_right_with_directions: Sukite dešinėn ant rampos link %{directions}
+        onramp_right_with_name_directions: Sukite dešinėn ant rampos į %{name}, link
+          %{directions}
+        onramp_right_without_directions: Sukite dešinėn ant rampos
+        onramp_right: Sukite dešinėn ant rampos
         endofroad_right_without_exit: Kelio pabaigoje sukite dešinėn į %{name}
         merge_right_without_exit: Įsilieti dešinėn į %{name}
         fork_right_without_exit: Išsišakojime sukite dešinėn į %{name}
@@ -2814,8 +2835,23 @@ lt:
         uturn_without_exit: Apsisukite ties %{name}
         sharp_left_without_exit: Staigus posūkis kairėn į %{name}
         turn_left_without_exit: Sukite kairėn į %{name}
+        offramp_left: Važiuokite rampa kairėje
+        offramp_left_with_exit: Važiuokite išvažiavimu %{exit} kairėje
+        offramp_left_with_exit_name: Važiuokite išvažiavimu %{exit} kairėje į %{name}
+        offramp_left_with_exit_directions: Važiuokite išvažiavimu %{exit} kairėje
+          link %{directions}
+        offramp_left_with_exit_name_directions: Važiuokite išvažiavimu %{exit} kairėje
+          į %{name}, link %{directions}
         offramp_left_with_name: Pasirinkite rampą kairėje į %{name}
+        offramp_left_with_directions: Važiuokite rampa kairėje link %{directions}
+        offramp_left_with_name_directions: Važiuokite rampa kairėje į %{name}, link
+          %{directions}
         onramp_left_without_exit: Sukite kairėn ant rampos į %{name}
+        onramp_left_with_directions: Sukite kairėn ant rampos link %{directions}
+        onramp_left_with_name_directions: Sukite kairėn ant rampos į %{name}, link
+          %{directions}
+        onramp_left_without_directions: Sukite kairėn ant rampos
+        onramp_left: Sukite kairėn ant rampos
         endofroad_left_without_exit: Kelio pabaigoje sukite kairėn į %{name}
         merge_left_without_exit: Įsilieti kairėn į %{name}
         fork_left_without_exit: Išsišakojime sukite kairėn į %{name}
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index ddf6f4873..b2278ad75 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1081,8 +1081,6 @@ lv:
       failed_to_import: 'imports neizdevās. Kļūda:'
       subject: '[OpenStreetMap] GPX importēšanas kļūme'
     gpx_success:
-      loaded_successfully: tika ielādēts veiksmīgi ar %{trace_points} no iespējamiem
-        %{possible_points} punktiem.
       subject: '[OpenStreetMap] GPX imports paveikts'
     signup_confirm:
       subject: '[OpenStreetMap] Laipni lūgti OpenStreetMap'
@@ -1364,93 +1362,19 @@ lv:
         mapping_link: sākt kartēt
       legal_babble:
         title_html: Autortiesības un Licence
-        intro_1_html: |-
-          OpenStreetMap ir <i>atvērto datu</i>, kad licencēti zem <a
-          href="http://opendatacommons.org/licenses/odbl/">Atvērtās Datu Kopas Atvērtās Datubāzes licences</a> (ODbL).
-        intro_2_html: |-
-          Tu vari kopēt, izplatīt, nosūtīt un adaptēt mūsu kartes
-            un datus, kamēr tu atsaucies uz OpenStreetMap un tās
-            veidotājiem. Ja tu maini vai veido uz mūsu kartēm, tu
-            vari izplatīt rezultātu tikai zem tās pašas licences. Pilns
-            <a href="http://opendatacommons.org/licenses/odbl/1.0/">juridiskais kods</a> izskaidro tavas tiesības un pienākumus.
-        intro_3_1_html: |-
-          Kartogrāfija mūsu karšu flīzēs un mūsu dokumentācija ir licencēti zem <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> licences (CC-BY-SA).
         credit_title_html: Kā atsaukties uz OpenStreetMap
         credit_1_html: |-
           Mēs pieprasām, ka tu izmanto atsauci &ldquo;&copy; OpenStreetMap
           veidotāji&rdquo;.
-        credit_2_1_html: "Kur iespējams, OpenStreetMap vajadzētu būt iesaitētam uz
-          <a\n  href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n
-          \ un CC BY-SA uz <a\n  href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>.
-          Ja\n  tu lieto mediju, kur saites nav iespējamas (piem. \n  printēts darbs),
-          mēs iesakām pārsūtīt savus lasītājus uz\n  www.openstreetmap.org (piemēram
-          paplašinot\n  &lsquo;OpenStreetMap.org&rsquo; uz pilno adresi) un uz\n  www.creativecommons.org."
-        credit_4_html: 'Priekš pārlūkojamas elektroniskās kartes, atsaucei ir jāparādās
-          kartes stūrī. Piemēram:'
         attribution_example:
           alt: Piemērs, kā OpenStreetMap apzīmēt web lapā
           title: Atsauces piemērs
         more_title_html: Uzzināt vairāk
-        more_1_html: |-
-          Lasi vairāk par mūsu datu izmantošanu, un kā uz mums atsaukties <a
-            href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">juridiskajā
-            FAQ</a>.
-        more_2_html: |-
-          Lai gan OpenStreetMap ir atvērti dati, mēs nevaram piedāvāt bezmaksas kartes API trešās puses izstrādātājiem.
-          Apskati mūsu <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API Lietošanas Politiku</a>,
-          <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Flīžu Lietošanas Politiku</a>
-          un <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Lietošanas Politiku</a>.
         contributors_title_html: Mūsu veidotāji
         contributors_intro_html: |-
           Mūsu veidotāji ir tūkstošiem cilvēku. Mēs arī ievietojam
           atvērti-licencētus datus no nacionālajām kartēšanas aģentūrām
           un citiem avotiem, to skaitā:
-        contributors_at_html: |-
-          <strong>Austrija</strong>: Ietver datus no
-              <a href="http://data.wien.gv.at/">Stadt Wien</a> (zem
-              <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>).
-        contributors_au_html: |-
-          <strong>Austrālija</strong>: Ietver pilsētu datus no
-              Australian Bureau of Statistics data.
-        contributors_ca_html: |-
-          <strong>Kanāda</strong>: Ietver datus no
-              GeoBase&reg;, GeoGratis (&copy; Department of Natural
-              Resources Canada), CanVec (&copy; Department of Natural
-              Resources Canada), un StatCan (Geography Division,
-              Statistics Canada).
-        contributors_fi_html: |-
-          <strong>Somija</strong>: Satur datus no
-          Somijas Topogrāfiskās Datubāzes Nacionālās Zemes Dienesta
-          un citām datu kopām zem
-          <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI Licence</a>.
-        contributors_fr_html: |-
-          <strong>Francija</strong>: Ietver datus no
-              Direction Générale des Impôts.
-        contributors_nl_html: |-
-          <strong>NÄ«derlande</strong>: Satur &copy; AND data, 2007
-          (<a href="http://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>Jaunzēlande</strong>: Ietver datus no
-              Land Information New Zealand. Crown Copyright reserved.
-        contributors_si_html: |-
-          <strong>Slovēnija</strong>: Satur datus no
-          <a href="http://www.gu.gov.si/en/">Aptauju un kartogrāfijas aģentūras</a> un
-          <a href="http://www.mkgp.gov.si/en/">Lauksaimniecības, mežsaimniecībass un pārtikas ministrijas</a>
-          (Slovēnijas publiskā informācija).
-        contributors_za_html: |-
-          <strong>Dienvidāfrika</strong>: Ietver datus no
-              <a href="http://www.ngi.gov.za/">Chief Directorate:
-              National Geo-Spatial Information</a>, State copyright reserved.
-        contributors_gb_html: |-
-          <strong>Apvienotā Karaliste</strong>: Satur Ordnance
-              Survey datus &copy; Kroņa tiesības un datubāze
-              2010-12.
-        contributors_footer_1_html: |-
-          Sīkāku informāciju par šiem, un citiem avotiem, kas izmantoti,
-          lai uzlabotu OpenStreetMap, lūdzu apskati <a
-          href="http://wiki.openstreetmap.org/wiki/Contributors">Veidotāju
-          lapu</a> iekš OpenStreetMap Wiki.
         contributors_footer_2_html: |2-
             Datu ievietošana OpenStreetMap nenozīmē ka oriģinālais
             datu avots sniedz atbalstu OpenStreetMap, dod garantiju, vai
@@ -1460,17 +1384,6 @@ lv:
           no jebkuriem \nar autortiesībām aizsargātiem avotiem (piem. Google Maps
           vai drukātām kartēm), bez \nprecīzi formulētas atļaujas no autortiesību
           īpašniekiem."
-        infringement_2_html: |-
-          Ja tu tici, ka ar autortiesībām aizsargāts materiāls ir ticis neatbilstoši
-          pievienots OpenStreetMap datubāzei vai vietnei, lūdzu atsaucies uz
-          mūsu <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">noņemšanas
-          procedūru</a> vai paziņo pa tiešo mums, izmantojot
-          <a href="https://dmca.openstreetmap.org/">on-line ziņošanas veidni</a>.
-        trademarks_title_html: <span id="trademarks"></span>Reģistrētas preču zīmes
-        trademarks_1_html: OpenStreetMap, lupa un štata karte ir reģistrētas OpenStreetMap
-          fonda preču zīmes. Ja jums ir jautājumi par mūsu logotipu lietošanu, lūdzu
-          sūtiet jūsu jautājumus uz <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence
-          Working Group</a>.
     index:
       js_1: Vai nu jūs lietojat pārlūkprogrammu, kas neatbalsta JavaScript, vai arī
         jūsu pārlūkprogrammā JavaScript ir atslēgts.
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 8de7defe7..41d1a8e67 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -172,41 +172,41 @@ mk:
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: пред околу 1 час
+        one: пред околу %{count} час
         other: пред околу %{count} часа
       about_x_months:
-        one: пред околу 1 месец
+        one: пред околу %{count} месец
         other: пред околу %{count} месеци
       about_x_years:
-        one: пред околу 1 година
+        one: пред околу %{count} година
         other: пред околу %{count} години
       almost_x_years:
-        one: речиси пред 1 година
+        one: речиси пред %{count} година
         other: речиси пред %{count} години
       half_a_minute: пред половина минута
       less_than_x_seconds:
-        one: пред помалку од 1 секунда
+        one: пред помалку од %{count} секунда
         other: пред помалку од %{count} секунди
       less_than_x_minutes:
-        one: пред помалку од 1 минута
+        one: пред помалку од %{count} минута
         other: пред помалку од %{count} минути
       over_x_years:
-        one: пред повеќе од 1 година
+        one: пред повеќе од %{count} година
         other: пред повеќе од %{count} години
       x_seconds:
-        one: пред повеќе од 1 секунда
+        one: пред повеќе од %{count} секунда
         other: пред повеќе од %{count} секунди
       x_minutes:
-        one: пред 1 минута
+        one: пред %{count} минута
         other: пред %{count} минути
       x_days:
-        one: пред 1 ден
+        one: пред %{count} ден
         other: пред %{count} дена
       x_months:
-        one: пред 1 месец
+        one: пред %{count} месец
         other: пред %{count} месеци
       x_years:
-        one: пред 1 година
+        one: пред %{count} година
         other: пред %{count} години
   printable_name:
     with_version: '%{id}, вер. %{version}'
@@ -309,9 +309,7 @@ mk:
         копчето подолу.
       only_public_can_edit: Почнувајќи од смената на приложникот 0.6, картографски
         податоци можат да уредуваат само јавни корисници.
-      find_out_why_html: (%{link}).
       find_out_why: дознајте зошто
-      find_out_why_url: https://wiki.openstreetmap.org/wiki/Anonymous_edits
       email_not_revealed: Вашата е-поштенска адреса нема да им се открива на другите.
       not_reversible: Ова дејство е неповратно и сите нови корисници сега се јавни
         по основно.
@@ -337,10 +335,10 @@ mk:
     no_comment: (нема коментари)
     part_of: Дел од
     part_of_relations:
-      one: 1 однос
+      one: '%{count} однос'
       other: '%{count} односи'
     part_of_ways:
-      one: 1 пат
+      one: '%{count} пат'
       other: '%{count} патишта'
     download_xml: Преземи XML
     view_history: Погл. историја
@@ -385,7 +383,7 @@ mk:
       history_title_html: 'Историја на односот: %{name}'
       members: Членови
       members_count:
-        one: 1 член
+        one: '%{count} член'
         other: '%{count} члена'
     relation_member:
       entry_role_html: '%{type} %{name} како %{role}'
@@ -1429,7 +1427,7 @@ mk:
       last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> од %{user}
       link_to_reports: Преглед на пријави
       reports_count:
-        one: 1 пријава
+        one: '%{count} пријава'
         other: '%{count} пријави'
       reported_item: Пријавена ставка
       states:
@@ -1601,9 +1599,9 @@ mk:
       subject: '[OpenStreetMap] Проблем при увозот на GPX податотека'
     gpx_success:
       hi: Здраво %{to_user},
-      loaded_successfully:
-        one: успешно вчитана %{trace_points} од можната една точка.
-        other: успешно вчитани %{trace_points} од можните %{possible_points} точки.
+      loaded:
+        one: успешно вчитано со %{trace_points} од %{count} можни точки.
+        other: успешно вчитано со %{trace_points} од %{count} можни точки.
       subject: '[OpenStreetMap] Успешен увоз на GPX-податотека'
     signup_confirm:
       subject: '[OpenStreetMap] Добре дојдовте на OpenStreetMap'
@@ -1894,8 +1892,6 @@ mk:
   shared:
     markdown_help:
       heading_html: Расчленето со %{kramdown_link}
-      kramdown_url: https://kramdown.gettalong.org/quickref.html
-      kramdown: kramdown
       headings: Наслови
       heading: Наслов
       subheading: Подзаглавие
@@ -1969,106 +1965,125 @@ mk:
         mapping_link: почнете да ги работите картите
       legal_babble:
         title_html: Авторски права и лиценца
-        intro_1_html: "OpenStreetMap<sup><a href=\"#trademarks\">&reg;</a></sup> има
-          <i>отворени податоци</i> под лиценцата <a\nhref=\"https://opendatacommons.org/licenses/odbl/\">Open
-          Data\nCommons Open Database License</a> (ODbL) од <a\n \t+\t\nhref=\"https://osmfoundation.org/\">фондацијата
-          OpenStreetMap</a> (OSMF)."
-        intro_2_html: "Нашите податоци слободно можете да ги умножувате, распространувате,
-          предавате и менувате, \nдоколку ја наведете OpenStreetMap и нејзините\nучесници.
-          Доколку ги измените или дополните податоците,\nдобиеното можете да го распространувате
-          само под истата лиценца. Вашите права и одговорност ќе ги најдете\nво целосниот
-          <a\nhref=\"https://opendatacommons.org/licenses/odbl/1.0/\">правен текст</a>."
-        intro_3_1_html: "Нашата документација се нуди под лиценцата \n<a href=\"https://creativecommons.org/licenses/by-sa/2.0/deed.mk\">Криејтив
-          комонс Наведи извор-Сподели под исти услови 2.0</a> (CC BY-SA 2.0)."
+        introduction_1_html: |-
+          OpenStreetMap%{registered_trademark_link} работи на %{open_data}, заштитен со лиценцата
+          %{odc_odbl_link} (ODbL) од %{osm_foundation_link} (OSMF).
+        introduction_1_open_data: отворени податоци
+        introduction_1_odc_odbl: Лиценцата за отворени бази на податоци
+        introduction_1_osm_foundation: Фондацијата OpenStreetMap
+        introduction_2_html: |-
+          Нашите податоци слободно можете да ги умножувате, предавате и менувате,
+          под услов да ја наведете OpenStreetMap и нејзините учесници. Доколку ги измените или дополните податоците, добиеното мора да го распространувате само под истата лиценца. Вашите права и одговорности ќе ги најдете во целосниот %{legal_code_link}.
+        introduction_2_legal_code: правен документ
+        introduction_3_html: Нашата документација е под лиценцата %{creative_commons_link}
+          (CC BY-SA 2.0).
+        introduction_3_creative_commons: Криејтив комонс Наведи извор-Сподели под
+          исти услови 2.0
+        introduction_3_creative_commons_url: https://creativecommons.org/licenses/by-sa/2.0/deed.mk
         credit_title_html: Како да ја наведете OpenStreetMap
         credit_1_html: 'Кога користите податоци од OpenStreetMap, задолжително треба
           да ги направите следниве две нешта:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Да му оддадете заслуга на OpenStreetMap прикажувајќи ја нашата авторскоправна напомена.</li>
-            <li>Да истакнете дека податоците се достапни под Лиценцата за отворени бази.</li>
-          </ul>
-        credit_3_1_html: "Условите за истакнување на авторскоправната напомена се
-          разликуваат зависно од тоа како ги користите нашите податоци. На пример,
-          правилата се различни за прелистлива карта, печатена карта и уцврстена слика.
-          Сите подробности на условите ќе ги најдете во \n<a href=\"https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines\">Упатството
-          за припишување</a>."
-        credit_4_html: "За да истакнете дека податоците се достапни под Лиценцата
-          за отврени бази,\nможете да ставите врска до <a href=\"https://www.openstreetmap.org/copyright\">оваа
-          авторскоправна страница</a>.\nАлтернативно, и како неопходно ако го распространувате
-          OSM во\nподаточен облик, можете право да го напишете името на лиценцата/ците
-          и да ставите непосредна врска до неа/нив. \nКај медиумските содржини каде
-          ова е невозможно (на пр. печатени дела), предлагаме\nда ги упатите читалтелите
-          на openstreetmap.org (можеби проширувајќи го\n„OpenStreetMap“ на целносната
-          адреса) и opendatacommons.org.\nВо овој пример, приписот се покажува во
-          аголот на картата."
+        credit_2_1: Дајте му заслуга на OpenStreetMap прикажувајќи ја нашата авторскоправна
+          напомена.
+        credit_2_2: Истакнете дека податоците се достапни под Лиценцата за отворени
+          бази на податоци.
+        credit_3_html: "Условите за истакнување на авторскоправната напомена се разликуваат
+          зависно од тоа како ги користите нашите податоци. На пример, правилата се
+          различни за прелистлива карта, печатена карта и уцврстена слика. Сите подробности
+          на условите ќе ги најдете на \n%{attribution_guidelines_link}."
+        credit_3_attribution_guidelines: Напатствијата за припис
+        credit_4_1_html: "За да истакнете дека податоците се достапни под Лиценцата
+          за отврени бази, можете да ставите врска до %{this_copyright_page_link}.\nАлтернативно,
+          и како неопходно ако го распространувате OSM во\nподаточен облик, можете
+          право да го напишете името на лиценцата/ците и да ставите непосредна врска
+          до неа/нив. \nКај медиумските содржини каде ова е невозможно (на пр. печатени
+          дела), предлагаме\nда ги упатите читалтелите на openstreetmap.org (можеби
+          проширувајќи го\n„OpenStreetMap“ на целносната адреса) и opendatacommons.org.\nВо
+          овој пример, приписот се покажува во аголот на картата."
+        credit_4_1_this_copyright_page: оваа авторскоправна страница
         attribution_example:
           alt: Пример за тоа како да ја наведете OpenStreetMap на некоја страница
           title: Пример за наведување
         more_title_html: Повеќе информации
-        more_1_html: |-
-          Повеќе за употребата на нашите податоци и како да нè наведете ќе најдете на <a
-          href="https://osmfoundation.org/Licence">лиценцната страница</a>.
-        more_2_html: |-
-          Иако OpenStreetMap работи со отворени податоци, ние не можеме да понудиме
-          бесплатни извршници (API) за карти на трети лица.
-          Погледајте ги <a href="https://operations.osmfoundation.org/policies/api/">правилата за употреба на извршникот</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">правилата за полињата</a>
-          и <a href="https://operations.osmfoundation.org/policies/nominatim/">за Nominatim</a>.
+        more_1_1_html: Прочитајте повеќе за употребата на нашите податоци и затоа
+          како да ни оддадавате заслуга (припис) на %{osmf_licence_page_link}.
+        more_1_1_osmf_licence_page: страницата за лиценцата OSMF
+        more_2_1_html: |-
+          Иако OpenStreetMap работи на отворени податоци, не можеме да понудиме бесплатен приложник на трети лица.
+          Погледајте ги нашите %{api_usage_policy_link}, %{tile_usage_policy_link} and %{nominatim_usage_policy_link}.
+        more_2_1_api_usage_policy: Правила за употреба на приложник
+        more_2_1_tile_usage_policy: Правила за употреба на полиња
+        more_2_1_nominatim_usage_policy: Правила за употреба на Nominatim
         contributors_title_html: Нашите учесници
         contributors_intro_html: |-
           Во нашиот проект учествуваат илјадници поединци. Користиме и
           податоци со отворена лиценца од државни картографски установи
           и други извори, меѓу кои се:
-        contributors_at_html: |-
-          <strong>Австрија</strong>: Содржи податоци од
-          <a href="https://data.wien.gv.at/">Град Виена</a> (под
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.mk">CC BY</a>),
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Покраина Предарлска</a> и
-          Покраина Тирол (под <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT со исправки</a>).
-        contributors_au_html: |-
-          <strong>Австралија</strong>: Содржи податоци преземени од или разработени врз основа на
-          &copy; <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Австралија</a>
-          ставени на располагање од австралиската држава под лиценцата <a href="https://creativecommons.org/licenses/by/4.0/deed.mk">Криејтив Комонс Наведи извор 4.0 Меѓународна (CC BY 4.0)</a>.
-        contributors_ca_html: |-
-          <strong>Canada</strong>: Содржи податоци од
-          GeoBase&reg;, GeoGratis (&copy; Министерство за природни ресурси на Канада), CanVec (&copy; Министерство за природни ресурси на Канада), and StatCan (Географско одделение,
-          Статистичка служба на Канада).
-        contributors_fi_html: |-
-          <strong>Финска</strong>: Содржи податоци од топографската база и други ресурси на Државната геодетска служба на Финска, под лиценцата
-          <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI</a>.
-        contributors_fr_html: |-
-          <strong>Франција</strong>: Содржи податоци од
-          Генералната даночна управа.
-        contributors_nl_html: |-
-          <strong>Холандија</strong>: Содржи &copy; податоци од AND, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>Нов Зеланд</strong>: Содржи податоци од
-          <a href="https://data.linz.govt.nz/">Катастарската служба на Нов Зеланд (LINZ)</a> и лиценцирана за примена под лиценцата
-          <a href="https://creativecommons.org/licenses/by/4.0/deed.mk">CC BY 4.0</a>.
-        contributors_si_html: |-
-          <strong>Словенија</strong>: Содржи податоци од
-          <a href="http://www.gu.gov.si/en/">Геодетската управа</a> и
-          <a href="http://www.mkgp.gov.si/en/">Министерството за земјоделство, шумарство и храна</a>
-          (јавни информации од Словенија).
-        contributors_es_html: |-
-          <strong>Шпанија</strong>: Содржи податоци преземени од
-          Националниот географски институт на Шпанија (<a href="http://www.ign.es/">IGN</a>) и
-          Националниот картографски систем (<a href="http://www.scne.es/">SCNE</a>)
-          достапни за употреба под лиценцата <a href="https://creativecommons.org/licenses/by/4.0/deed.mk">CC BY 4.0</a>.
-        contributors_za_html: |-
-          <strong>ЈАР</strong>: Содржи податоци од
-          <a href="http://www.ngi.gov.za/">Главната управа:
-          Национална катастарска служба</a>, државни авторски права задржани.
-        contributors_gb_html: |-
-          <strong>Велика Британија</strong>: Содржи податоци
-          од Картографскиот завод на Обединетото Кралство&copy; Крунски авторски права и
-          права на базата 2010-2023 г.
-        contributors_footer_1_html: |-
-          Повеќе информации за овие и други извори искористени
-          за подобрување на OpenStreetMap ќе најдете на страницата <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">Учесници</a> на викито на OpenStreetMap.
+        contributors_at_credit_html: |-
+          %{austria}: Содржи податоци од %{stadt_wien_link} (под %{cc_by_link}), %{land_vorarlberg_link}
+          и Земјиште Тирол (под %{cc_by_at_with_amendments_link}).
+        contributors_at_austria: Австрија
+        contributors_at_stadt_wien: Град Виена
+        contributors_at_cc_by: CC BY
+        contributors_at_land_vorarlberg: Покраина Предарлска
+        contributors_at_cc_by_at_with_amendments: CC BY AT со измени/дополнувања
+        contributors_au_credit_html: |-
+          %{australia}: Вклучува или разработено користејќи ги Административните граници &copy; %{geoscape_australia_link}
+          заштитени од Државната Заедница Австралија под %{cc_licence_link}.
+        contributors_au_australia: Австралија
+        contributors_au_geoscape_australia: Geoscape Австралија
+        contributors_au_cc_licence: Криејтив комонс Наведи извор 4.0 Меѓународна (CC
+          BY 4.0)
+        contributors_au_cc_licence_url: https://creativecommons.org/licenses/by/4.0/deed.mk
+        contributors_ca_credit_html: |-
+          %{canada}: Содржи податоци од
+          GeoBase&reg;, GeoGratis (&copy; Министерство за природни ресурси), CanVec (&copy; Министерство за природни ресурси) и StatCan (Географски оддел, Статистичка служба на Канада).
+        contributors_ca_canada: Канада
+        contributors_fi_credit_html: |-
+          %{finland}: Содржи податоци од
+          Националниот земјомер на Финската топографска база на податоци и други податочни збирови под лиценцата %{nlsfi_license_link}.
+        contributors_fi_finland: Финска
+        contributors_fi_nlsfi_license: NLSFI
+        contributors_fr_credit_html: |-
+          %{france}: Содржи податоци преземени од
+          Главната даночна управа.
+        contributors_fr_france: Франција
+        contributors_nl_credit_html: '%{netherlands}: Содржи &copy; и податоци, 2007
+          (%{and_link})'
+        contributors_nl_netherlands: Холандија
+        contributors_nz_credit_html: |-
+          %{new_zealand}: Содржи податоци од %{linz_data_service_link}
+          и лиценцирана за преупотреба според %{cc_by_link}.
+        contributors_nz_new_zealand: Нов Зеланд
+        contributors_nz_linz_data_service: Податочната служба LINZ
+        contributors_nz_cc_by: CC BY 4.0
+        contributors_nz_cc_by_url: https://creativecommons.org/licenses/by/4.0/deed.mk
+        contributors_si_credit_html: |-
+          %{slovenia}: Содржи податоци од %{gu_link} и %{mkgp_link}
+          (информации од јавен карактер во Словенија).
+        contributors_si_slovenia: Словенија
+        contributors_si_gu: Геоодетската управа на Словенија
+        contributors_si_mkgp: Министерството за земјоделство, шумарство и храна
+        contributors_es_credit_html: |-
+          %{spain}: Содржи податоци преземени од
+          Националиот географски иститут на Шпанија (%{ign_link}) и Националниот катографски систем (%{scne_link})
+          достапно за преупотреба согласно %{cc_by_link}.
+        contributors_es_spain: Шпанија
+        contributors_es_ign: IGN
+        contributors_es_cc_by: CC BY 4.0
+        contributors_es_cc_by_url: https://creativecommons.org/licenses/by/4.0/deed.mk
+        contributors_za_credit_html: '%{south_africa}: Содржи податоци добиени од
+          %{ngi_link}, Државните авторски права се задржани.'
+        contributors_za_south_africa: ЈАР
+        contributors_za_ngi: 'Главна управа: Национални геопросторни информации'
+        contributors_gb_credit_html: '%{united_kingdom}: Содржи податоци од Картографскиот
+          завод на Обединетото Кралство &copy; Крунски авторски права и права на базата
+          2010-2023 г.'
+        contributors_gb_united_kingdom: Обединето Кралство
+        contributors_2_html: Повеќе поединости за овие и други извори употребени за
+          подобрување на OpenStreetMap ќе најдете на %{contributors_page_link} на
+          Викито на OpenStreetMap.
+        contributors_2_contributors_page: Страна за учесници
         contributors_footer_2_html: |-
           Употребата на податоците на OpenStreetMap не подразбира дека добавувачот
           на изворните податоци го застапува или рекламира OpenStreetMap, дава каква било гаранција, или
@@ -2078,16 +2093,16 @@ mk:
           Би сакале да ги потсетиме учесниците на OSM дека никогаш не смеат да ставаат
           податоци од извори заштитени со авторски права (на пр. Google Карти или печатени карти) без
           изречна дозвола од нивните праводршци.
-        infringement_2_html: "Доколку сметате дека базата на OpenStreetMap или ова
-          мрежно место\nсодржи бесправно или неисправно поставени податоци, погледајте
-          ја\n<a href=\"https://wiki.osmfoundation.org/wiki/License/Takedown_procedure\">процедурата
-          \nза отстранување</a> или поднесете жалба на \n<a href=\"https://dmca.openstreetmap.org/\">оваа
-          наменска страница</a>."
-        trademarks_title_html: <span id="trademarks"></span>Заштитни знаци
-        trademarks_1_html: OpenStreetMap, логото со лупа и  „State of the Map“ („Состојба
-          на картата“) се заштитни знаци на задолжбината OpenStreetMap. Ако имате
-          прашања во врска со употребата на знаците, погл. <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Работната
-          група за лиценци</a>.
+        infringement_2_1_html: |-
+          Ако сметате дека некој бесправно додал авторскозаштитен материјал во базата на OpenStreetMap database или ова мрежно место, погледајте ја нашата %{takedown_procedure_link} или поднесете пријава непосредно на нашата
+          %{online_filing_page_link}.
+        infringement_2_1_takedown_procedure: постапка за симнување
+        infringement_2_1_online_filing_page: страница за семрежно поднесување
+        trademarks_title: Заштитни знаци
+        trademarks_1_1_html: |-
+          OpenStreetMap, логото со лупа и Состојба на картата се заштитни знаци/имиња на Фондацијата OpenStreetMap. Ако имате прашања за тоа како да ги користите знаците, погледајте го нашите
+          %{trademark_policy_link}.
+        trademarks_1_1_trademark_policy: Правила за заштитни знаци
     index:
       js_1: Или користите прелистувач кој не поддржува JavaScript, или пак сте го
         оневозможиле тој програм.
@@ -2121,7 +2136,6 @@ mk:
       licence_details_html: Податоците на OpenStreetMap се лиценцирани според  %{odbl_link}
         (ODbL).
       odbl: Лиценцата за отворени бази на податоци
-      odbl_url: https://opendatacommons.org/licenses/odbl/1.0/
       too_large:
         advice: 'Ако не успее увозот погоре, послужете се со некој од долунаведените
           извори:'
@@ -2173,7 +2187,6 @@ mk:
           %{copyright_link} за повеќе правни информации, или пак обратете се кај соодветната %{working_group_link}.
         copyright: страница за авторски права
         working_group: работна група на OSMF
-        working_group_url: https://wiki.osmfoundation.org/wiki/Working_Groups
     help:
       title: Помош
       introduction: |-
@@ -2218,7 +2231,6 @@ mk:
         употреба во прелистувач.
       desktop_application_html: Сè уште можете да го користите Potlatch со %{download_link}.
       download: преземање на оваа програма за Mac и Windows
-      download_url: https://www.systemed.net/potlatch/
       id_editor_html: Во спротивно, можете да го поставите уредникот iD како стандарден,
         кој работи во вашиот прелистувач како што порано беше случај со Potlatch.
         %{change_preferences_link}.
@@ -2230,7 +2242,6 @@ mk:
         %{help_link}. Дали сте дел од организација која прави планови за OpenStreetMap? %{welcome_mat_link}.
       get_help_here: Овде побарајте помош
       welcome_mat: Погледајте ја подлогата за добредојде
-      welcome_mat_url: https://welcome.openstreetmap.org/
     sidebar:
       search_results: Исход од пребарувањето
       close: Затвори
@@ -2352,9 +2363,7 @@ mk:
           OpenStreetMap има малку формални правила, но од сите учесници се очекува да соработуваат и општат со заедницата. Ако размислувате за други активности освен рачно уредување, прочитајте и следете ги напатствијата за
           %{imports_link} и %{automated_edits_link}.
         imports: Увози
-        imports_url: https://wiki.openstreetmap.org/wiki/Import/Guidelines
         automated_edits: Автоматски уредувања
-        automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct
       start_mapping: Почнете да ги работите картите
       add_a_note:
         title: Немате време да уредувате? Ставете белешка.
@@ -2386,7 +2395,6 @@ mk:
           Нема потреба од формално основање на група како што тоа важи за месните ограноци.
           Многу групи работат мошне успешно со неформални собири на учесници или како заедница. Секој може да отпочне ваква група или да се приклучи кон постоечка. Повеќе за нив ќе прочитате на %{communities_wiki_link}.
         communities_wiki: викистраницата за Заедници
-        communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group
   traces:
     visibility:
       private: Доверливо (споделено само како анонимни, неподредени точки)
@@ -2453,7 +2461,7 @@ mk:
     trace:
       pending: ВО ИСЧЕКУВАЊЕ
       count_points:
-        one: 1 точка
+        one: '%{count} точка'
         other: '%{count} точки'
       more: повеќе
       trace_details: Погледајте ги деталите за трагата
@@ -2476,7 +2484,6 @@ mk:
         на %{wiki_link}.'
       upload_new: Подигни нова трага
       wiki_page: викистраницата
-      wiki_page_url: https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2
       upload_trace: Подигни трага
       all_traces: Сите траги
       my_traces: Мои траги
@@ -2865,19 +2872,19 @@ mk:
       time_past_html: Истечено %{time}.
       block_duration:
         hours:
-          one: еден час
+          one: '%{count} час'
           other: '%{count} часа'
         days:
-          one: 1 ден
+          one: '%{count} ден'
           other: '%{count} дена'
         weeks:
-          one: 1 седмица
+          one: '%{count} седмица'
           other: '%{count} седмици'
         months:
-          one: 1 месец
+          one: '%{count} месец'
           other: '%{count} месеци'
         years:
-          one: 1 година
+          one: '%{count} година'
           other: '%{count} години'
     blocks_on:
       title: Блокови за %{name}
@@ -2999,10 +3006,10 @@ mk:
       locate:
         title: Прик. моја местоположба
         metersPopup:
-          one: Се наоѓате на еден метар од оваа точка
+          one: Се наоѓате на  %{count} метар од оваа точка
           other: Се наоѓате на %{count} метри од оваа точка
         feetPopup:
-          one: Се наоѓате на една стапка од оваа точка
+          one: Се наоѓате на  %{count} стапка од оваа точка
           other: Се наоѓате на %{count} стапки од оваа точка
       base:
         standard: Стандардна
diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index ef24da434..3f7c19243 100644
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -1005,16 +1005,6 @@ mr:
         mapping_link: नकाशा आरेखन
       legal_babble:
         title_html: प्रताधिकार व परवाना
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> हे <i>मुक्त डेटा</i> आहे, जे <a
-          href="https://osmfoundation.org/">OpenStreetMap फाउंडेशन</a> (OSMF) द्वारे <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) अंतर्गत परवानाकृत आहे.
-        intro_2_html: जोपर्यंत तुम्ही OpenStreetMap आणि त्याच्या योगदानकर्त्यांना
-          श्रेय देता तोपर्यंत तुम्ही आमचा डेटा प्रतीलीपित, वितरित, प्रसारित आणि रुपांतर
-          करण्यास मोकळे आहात. जर तुम्ही काही विशिष्ट मार्गांनी डेटा बदलला किंवा तयार
-          केला, तर तुम्ही फक्त त्याच परवान्यानुसार निकाल वितरित करू शकता. <a href="https://opendatacommons.org/licenses/odbl/1.0/">ह्या
-          कायदेशीर पत्रात</a> तुमचे अधिकार आणि जबाबदाऱ्या स्पष्ट केल्या आहेत.
         credit_title_html: ओपनस्ट्रीटमॅपला श्रेय कसे द्यावे
         credit_1_html: |-
           &ldquo;&copy; OpenStreetMap
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 8bf346c10..461807dc9 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1247,8 +1247,6 @@ ms:
       subject: '[OpenStreetMap] GPX gagal diimport'
     gpx_success:
       hi: Hai %{to_user},
-      loaded_successfully: berjaya dimuatkan dengan %{trace_points} daripada sejumlah
-        %{possible_points} titik.
       subject: '[OpenStreetMap] GPX berjaya diimport'
     signup_confirm:
       subject: '[OpenStreetMap] Selamat datang ke OpenStreetMap'
@@ -1492,7 +1490,6 @@ ms:
   shared:
     markdown_help:
       heading_html: Dihuraikan dengan %{kramdown_link}
-      kramdown: kramdown
       headings: Judul
       heading: Judul
       subheading: Tajuk kecil
@@ -1550,77 +1547,17 @@ ms:
         mapping_link: mula membuat peta
       legal_babble:
         title_html: Hak Cipta dan Lesen
-        intro_1_html: |-
-          OpenStreetMap ialah <i>data terbuka</i> yang dilesenkan di bawah <a
-          href="http://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL).
-        intro_2_html: Anda bebas menyalin, mengedarkan, menyebarkan dan mengubah suai
-          data kami, asalkan anda memperakui OpenStreetMap dan para penyumbangnya.
-          Jika anda mengubah suai atau menokok tambah data kami, anda boleh mengedarkannya
-          di bawah lesen yang sama sahaja. <a href="http://opendatacommons.org/licenses/odbl/1.0/">Kanun
-          undang-undang</a> yang lengkap ini menerangkan hak-hak dan tanggungjawab
-          anda.
-        intro_3_1_html: Kartografi jubin peta kami serta pendokumenan kami dilesenkan
-          di bawah lesen <a href="http://creativecommons.org/licenses/by-sa/2.0/">Pengiktirafan-PerkongsianSerupa
-          2.0</a> (CC-BY-SA).
         credit_title_html: Cara memberikan penghargaan kepada OpenStreetMap
         credit_1_html: Kami memerlukan anda menggunakan dikenali sebagai &ldquo;&copy;
           penyumbang OpenStreetMap&rdquo; dalam penghargaan.
-        credit_2_1_html: |-
-          Anda juga mesti memperjelas bahawa data ini tersedia di bawah Open Database License, dan juga kartografinya berada di bawah lesen CC-BY-SA jika jubin peta kami turut digunakan. Anda boleh berbuat demikian dengan membuat pautan ke <a href="http://www.openstreetmap.org/copyright">halaman hak cipta ini</a>.
-          Selain itu, dan sebagai kemestian untuk mengedarkan OSM dalam bentuk data, anda boleh menyatakan nama dan membuat pautan secara terus kepada lesen. Untuk media yang tidak membolehkan pautan (cth. bahan cetakan), kami mencadangkan supaya anda menghalakan pembaca-pembaca ke openstreetmap.org (misalnya, dengan meluaskan 'OpenStreetMap' ke alamat penuh ini), ke opendatacommons.org, dan juga creativecommons.org jika berkenaan.
-        credit_4_html: |-
-          Untuk peta elektronik yang boleh disemak imbas, kredit seharusnya disiarkan di sudut peta.
-          Contoh:
         attribution_example:
           alt: Contoh mengatribusikan OpenStreetMap pada halaman sesawang
           title: Contoh atribusi
         more_title_html: Mengetahui lebih lanjut
-        more_1_html: Baca lebih lanjut tentang penggunaan data kami serta memperakui
-          kami di <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Soalan Lazim
-          Undang-Undang</a>.
-        more_2_html: Sungguhpun OpenStreetMap merupakan data terbuka, namun kami tidak
-          boleh menyediakan API peta yang percuma kepada pembangun pihak ketiga. Sila
-          rujuk <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">Dasar
-          Penggunaan API</a>, <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Dasar
-          Penggunaan Jubin</a> dan <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Dasar
-          Penggunaan Nominatim</a>.
         contributors_title_html: Penyumbang kami
         contributors_intro_html: 'Penyumbang kami merupakan ribuan individu. Kami
           turut menyertakan data yang dilesenkan secara terbuka daripada lembaga-lembaga
           pemetaan kebangsaan dan sumber-sumber yang lain, antaranya:'
-        contributors_at_html: '<strong>Austria</strong>: Mengandungi data daripada
-          <a href="http://data.wien.gv.at/">Stadt Wien</a> (di bawah <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC
-          BY</a>) dan <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
-          Vorarlberg</a>, dan Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY
-          AT dengan pindaan</a>).'
-        contributors_au_html: '<strong>Australia</strong>: Mengandungi data subbandar
-          berasaskan data Australian Bureau of Statistics.'
-        contributors_ca_html: '<strong>Kanada</strong>: Mengandungi data daripada
-          GeoBase&reg;, GeoGratis (&copy; Department of Natural Resources Canada),
-          CanVec (&copy; Department of Natural Resources Canada), and StatCan (Geography
-          Division, Statistics Canada).'
-        contributors_fi_html: |-
-          <strong>Finland</strong>: Mengandungi data dari Pangkalan Data Topografi
-          Tinjauan Daratan Negara Finland dan lain-lain set data di bawah
-          <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">Lesen NLSFI</a>.
-        contributors_fr_html: '<strong>Perancis</strong>: Mengandungi data yang disumberkan
-          daripada Direction Générale des Impôts.'
-        contributors_nl_html: |-
-          <strong>Belanda</strong>: Mendandungi data &copy; AND, 2007
-             (<a href="http://www.and.com">www.and.com</a>)
-        contributors_nz_html: '<strong>New Zealand</strong>: Mengandungi data yang
-          disumberkan daripada Land Information New Zealand. Crown Copyright reserved.'
-        contributors_za_html: |-
-          <strong>Afrika Selatan</strong>: Mengandungi data yang disumberkan daripada
-             <a href="http://www.ngi.gov.za/">Pejabat Ketua Pengarah:
-             National Geo-Spatial Information</a>, Hak cipta kerajaan dipelihara.
-        contributors_gb_html: '<strong>United Kingdom</strong>: Mengandungi Data Tinjauan
-          Kelengkapan &copy; Hak cipta diraja dan hak kepemilikan pangkalan data 2010-2023.'
-        contributors_footer_1_html: '  Untuk keterangan lanjut tentang semua ini,
-          serta sumber-sumber lain yang telah digunakan untuk membantu menambah baik
-          OpenStreetMap, sila rujuk <a href="http://wiki.openstreetmap.org/wiki/Contributors">Halaman
-          penyumbang</a> di Wiki OpenStreetMap.'
         contributors_footer_2_html: '  Penyertaan data dalam OpenStreetMap tidak bermaksud
           bahawa pembekal data asal menyokong OpenStreetMap, menyediakan sebarang
           waranti, atau menerima sebarang tanggungan.'
@@ -1628,11 +1565,6 @@ ms:
         infringement_1_html: Penyumbang OSM diingatkan supaya tidak sesekali menambah
           data daripada mana-mana sumber berhak cipta (cth. Peta Google atau peta
           cetakan) tanpa izin bersurat daripada pemegang hak cipta.
-        infringement_2_html: "Sekiranya anda percaya bahawa bahan berhak cipta telah
-          dtambahkan secara tidak berpatutan ke dalam pangkalan OpenStreetMap atau
-          tapak ini, sila rujuk <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">prosedur
-          penarikan</a> atau laporkan secara terus ke dalam \n<a href=\"https://dmca.openstreetmap.org/\">halaman
-          laporan on-line</a>."
     index:
       js_1: Anda sedang menggunakan pelayar web yang tidak menyokong JavaScript, ataupun
         anda tidak menghidupkan JavaScript.
@@ -1718,7 +1650,6 @@ ms:
           yang sepatutnya
         copyright: laman berhak cipta
         working_group: Kumpulan bekerja OSMF
-        working_group_url: https://wiki.osmfoundation.org/wiki/Working_Groups
     help:
       title: Meminta Bantuan
       introduction: OpenStreetMap menyediakan kemudahan-kemudahan untuk mempelajari
@@ -1861,7 +1792,6 @@ ms:
     communities:
       other_groups:
         communities_wiki: Laman wiki komuniti
-        communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group
   traces:
     visibility:
       private: Peribadi (hanya dikongsikan sebagai titik yang tidak tersusun secara
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index b9bbc7ce9..182a3793e 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -1418,9 +1418,6 @@ nb:
       failed_to_import: 'klarte ikke importere. Her er feilen:'
       subject: '[OpenStreetMap] Feil under import av GPX'
     gpx_success:
-      loaded_successfully:
-        one: lastet med %{trace_points} av %{possible_points} mulig punkt.
-        other: lastet med %{trace_points} av %{possible_points} mulige punkter.
       subject: '[OpenStreetMap] Vellykket import av GPX'
     signup_confirm:
       subject: '[OpenStreetMap] Velkommen til OpenStreetMap'
@@ -1712,97 +1709,16 @@ nb:
         mapping_link: start kartlegging
       legal_babble:
         title_html: Opphavsrett og lisenser
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> er <i>Ã¥pne data</i>, lisensiert under <a
-          href="http://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) av <a href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
-        intro_2_html: |-
-          Du står fritt til å kopiere, distribuere, overføre og tilpasse våre kart og data,
-          så lenge du krediterer OpenStreetMap og dens
-          bidragsytere. Hvis du endrer eller bygger videre på våre kart eller data, må du
-          distribuere resultatet under samme lisens. Den
-          fullstendige <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">juridiske teksten</a> beskriver rettigheter og ansvar.
-        intro_3_1_html: |-
-          Dokumentasjonen vår er lisensiert under <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Hvordan kreditere OpenStreetMap
         credit_1_html: Vi krever at du bruker godskrivinga «© OpenStreetMap-bidragsyterene».
-        credit_2_1_html: "Du må også gjøre det klart at dataene er tilgjengelige under
-          Open \nDatabase License, og dersom du bruker våre kartfliser, at kartografien
-          er\n lisensert som CC BY-SA. Du kan gjøre dette ved å lenke til\n<a href=\"http://www.openstreetmap.org/copyright\">denne
-          siden om opphavsrett</a>. \nAlternativt, og som et krav, hvis du distribuerer
-          OSM i et\n dataskjema, kan du navngi og opprette en hyperlink direkte til
-          lisensene. I medier\n hvor hyperlenker ikke er mulig (f.eks. trykte verker)
-          foreslår vi at du\n henviser dine lesere til openstreetmap.org (kanskje
-          ved å utvide\n'OpenStreetMap' til denne fulle adressen), til opendatacommons.org,
-          og\n hvis relevant, til creativecommons.org."
-        credit_3_1_html: |-
-          Kartflisene i standardkartlaget på www.openstreetmap.org er et produsert verk («Produced Work») av OpenStreetMap Foundation som bruker data from OpenStreetMap lisensiert under Open Database License. Hvis du bruker disse kartflisene, vennligst bruk følgende kreditering:
-          «Grunnkart og data fra OpenStreetMap og OpenStreetMap Foundation».
-        credit_4_html: For et navigerbart elektronisk kart bør krediteringen vises
-          i hjørnet på kartet.
         attribution_example:
           alt: Eksempel på hvordan man angir OpenStreetMap som kartkilde på en nettside
           title: Eksempel på kildehenvisning
         more_title_html: Finner ut mer
-        more_1_html: Les mer om hvordan du kan bruke dataene våre og hvordan du oppgir
-          oss som kilde på <a href="http://osmfoundation.org/Licence">siden om OSMF-lisensen</a>.
-        more_2_html: |-
-          Selv om OpenStreetMap er åpent data, kan vi ikke bidra med gratis kart-API for tredjepartsutviklere.
-          Se vår <a href="https://operations.osmfoundation.org/policies/api/">API Usage Policy</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">Tile Usage Policy</a> og <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Usage Policy</a>.
         contributors_title_html: VÃ¥re bidragsytere
         contributors_intro_html: 'Vi har tusenvis av individuelle bidragsytere. Vi
           inkluderer også åpne datasett fra nasjonale karttjenester og andre kilder,
           blant annet fra:'
-        contributors_at_html: |-
-          <strong>Østerrike</strong>: Inneholder data fra
-             <a href="http://data.wien.gv.at/">Stadt Wien</a> under
-             <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>,
-          <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> og
-          Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT med tilføyelser</a>).
-        contributors_au_html: |-
-          <strong>Australia</strong>: Inneholder forstaddata basert
-             på Australian Bureau of Statistics data.
-        contributors_ca_html: |-
-          <strong>Canada</strong>: Inneholder data fra
-             GeoBase®, GeoGratis (© Department of Natural
-             Resources Canada), CanVec (© Department of Natural
-             Resources Canada), og StatCan (Geography Division,
-             Statistics Canada).
-        contributors_fi_html: '<strong>Finland</strong>: Inneholder data fra National
-          Land Survey fra Finlands topografiske database og andre datasett under <a
-          href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI-lisensen</a>.'
-        contributors_fr_html: |-
-          <strong>Frankrike</strong>: Inneholder data hentet fra
-             Direction Générale des Impôts.
-        contributors_nl_html: |-
-          <strong>Nederland</strong>: Inneholder &copy; AND data, 2007
-          (<a href="http://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>New Zealand</strong>: Inneholder data hentet fra
-          <a href="https://data.linz.govt.nz/">LINZ Data Service</a> og
-          lisensiert for gjenbruk under
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: |-
-          <strong>Slovenia</strong>: Inneholder data fra
-          <a href="http://www.gu.gov.si/en/">Geologisk undersøkelse og kartmyndighet</a> and
-          <a href="http://www.mkgp.gov.si/en/">Departemanget for jordbruk, skog og mat</a>
-          (offentlig informasjonsopphav fra Slovenia).
-        contributors_es_html: |-
-          <strong>Spania</strong>: Inneholder data fra
-          Spanish National Geographic Institute (<a href="http://www.ign.es/">IGN</a>) og
-          National Cartographic System (<a href="http://www.scne.es/">SCNE</a>)
-          lisensiert for gjenbruk under <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: '<strong>Sør-Afrika</strong>: Inneholder data fra <a
-          href="http://www.ngi.gov.za/">Chief Directorate: National Geo-Spatial Information</a>,
-          State copyright reservert.'
-        contributors_gb_html: |-
-          <strong>Storbritannia</strong>: Inneholder Ordnance
-           Survey data © Crown copyright and database right 2010-19.
-        contributors_footer_1_html: For detaljer om disse og andre kilder som har
-          blitt brukt for å forbedre OpenStreetMap, se <a href="http://wiki.openstreetmap.org/wiki/Contributors">siden
-          med bidragsytere</a> på OpenStreetMap-wikien.
         contributors_footer_2_html: |2-
             Inkludering av data i OpenStreetMap innebærer ikke at den opprinnelige
             dataleverandøren støtter OpenStreetMap, gir noen garanti eller
@@ -1811,17 +1727,6 @@ nb:
         infringement_1_html: OSM-bidragsytere blir minnet på aldri å legge til data
           fra opphavsrettsbeskyttede  kilder (f.eks. Google Maps eller utskrevne kart)
           uten uttrykkelig tillatelse fra rettighetshaverne.
-        infringement_2_html: |-
-          Hvis du mener at opphavsrettslig beskyttet materiale feilaktig er
-          lagt til OpenStreetMap-databasen eller dette nettstedet, ber vi deg se på
-          vår <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">prosedyre for fjerning av materiale</a> eller send inn klagen direkte på
-          <a href="https://dmca.openstreetmap.org/">nettsiden</a>.
-        trademarks_title_html: <span id="trademarks"></span>Varemerker
-        trademarks_1_html: OpenStreetMap, forstørrelsesglasslogoen og State of the
-          Map er registrerte varemerker beskyttet på vegne av OpenStreetMap Foundation.
-          Hvis du har spørsmål vedrørende bruken av varemerkene, rett spørsmål mot
-          <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">arbeidsgruppen
-          for lisenser</a>.
     index:
       js_1: Du har en nettleser som ikke støtter JavaScript eller så har du slått
         av JavaScript.
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index faf9aac7a..eab455bb9 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -225,41 +225,41 @@ nl:
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: ongeveer 1 uur geleden
+        one: ongeveer %{count} uur geleden
         other: ongeveer %{count} uur geleden
       about_x_months:
-        one: ongeveer 1 maand geleden
+        one: ongeveer %{count} maand geleden
         other: ongeveer %{count} maanden geleden
       about_x_years:
-        one: ongeveer 1 jaar geleden
+        one: ongeveer %{count} jaar geleden
         other: ongeveer %{count} jaar geleden
       almost_x_years:
-        one: bijna 1 jaar geleden
+        one: bijna %{count} jaar geleden
         other: bijna %{count} jaar geleden
       half_a_minute: een halve minuut geleden
       less_than_x_seconds:
-        one: minder dan 1 seconde geleden
+        one: minder dan %{count} seconde geleden
         other: minder dan %{count} seconden geleden
       less_than_x_minutes:
-        one: minder dan 1 minuut geleden
+        one: minder dan %{count} minuut geleden
         other: minder dan %{count} minuten geleden
       over_x_years:
-        one: meer dan 1 jaar geleden
+        one: meer dan %{count} jaar geleden
         other: meer dan %{count} jaar geleden
       x_seconds:
-        one: 1 seconde geleden
+        one: '%{count} seconde geleden'
         other: '%{count} seconden geleden'
       x_minutes:
-        one: 1 minuut geleden
+        one: '%{count} minuut geleden'
         other: '%{count} minuten geleden'
       x_days:
-        one: 1 dag geleden
+        one: '%{count} dag geleden'
         other: '%{count} dagen geleden'
       x_months:
-        one: 1 maand geleden
+        one: '%{count} maand geleden'
         other: '%{count} maanden geleden'
       x_years:
-        one: 1 jaar geleden
+        one: '%{count} jaar geleden'
         other: '%{count} jaar geleden'
   editor:
     default: Standaard (op dit moment %{name})
@@ -364,9 +364,7 @@ nl:
         contact met u op te nemen.
       only_public_can_edit: Sinds de omschakeling naar de API versie 0.6 kunnen alleen
         openbare gebruikers kaartgegevens bewerken.
-      find_out_why_html: (%{link}).
       find_out_why: lees waarom
-      find_out_why_url: https://wiki.openstreetmap.org/wiki/Anonymous_edits
       email_not_revealed: Door uw account openbaar te maken wordt uw e-mailadres niet
         onthuld.
       not_reversible: Deze actie kan niet ongedaan worden gemaakt en alle nieuwe gebruikers
@@ -393,10 +391,10 @@ nl:
     no_comment: (geen opmerking)
     part_of: Onderdeel van
     part_of_relations:
-      one: 1 relatie
+      one: '%{count} relatie'
       other: '%{count} relaties'
     part_of_ways:
-      one: 1 weg
+      one: '%{count} weg'
       other: '%{count} wegen'
     download_xml: XML downloaden
     view_history: Geschiedenis weergeven
@@ -441,7 +439,7 @@ nl:
       history_title_html: 'Relatiegeschiedenis: %{name}'
       members: Leden
       members_count:
-        one: 1 lid
+        one: '%{count} lid'
         other: '%{count} leden'
     relation_member:
       entry_role_html: '%{type} %{name} als %{role}'
@@ -1488,8 +1486,8 @@ nl:
       last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> door %{user}
       link_to_reports: Rapporten weergeven
       reports_count:
-        one: 1 Rapport
-        other: '%{count} Rapporten'
+        one: '%{count} rapport'
+        other: '%{count} rapporten'
       reported_item: Gerapporteerd Item
       states:
         ignored: Genegeerd
@@ -1498,7 +1496,7 @@ nl:
     show:
       title: '%{status} Probleem #%{issue_id}'
       reports:
-        one: 1 rapport
+        one: '%{count} rapport'
         other: '%{count} rapporten'
       report_created_at: Voor het eerst vermeld op %{datetime}
       last_resolved_at: Laatst opgelost op %{datetime}
@@ -1662,10 +1660,6 @@ nl:
       subject: '[OpenStreetMap] GPX-import mislukt'
     gpx_success:
       hi: Hallo %{to_user},
-      loaded_successfully:
-        one: succesvol geladen met %{trace_points} van 1 mogelijke punt.
-        other: succesvol geladen met %{trace_points} van %{possible_points} mogelijke
-          punten.
       subject: '[OpenStreetMap] GPX-import afgerond'
     signup_confirm:
       subject: '[OpenStreetMap] Welkom bij OpenStreetMap'
@@ -1963,8 +1957,6 @@ nl:
   shared:
     markdown_help:
       heading_html: Verwerkt met %{kramdown_link}
-      kramdown_url: https://kramdown.gettalong.org/quickref.html
-      kramdown: kramdown
       headings: Kopjes
       heading: Kopje
       subheading: Onderkop
@@ -2035,115 +2027,19 @@ nl:
         mapping_link: begin met mappen
       legal_babble:
         title_html: Auteursrechten en licentie
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">®</a></sup> is <i>open data</i>, vrijgegeven onder de <a
-          href="http://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) door de <a
-          href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
-        intro_2_html: |-
-          Het staat u vrij onze gegevens te kopiëren, te distribueren,
-          weer te geven en aan te passen, zo lang u OpenStreetMap en haar
-          bijdragers vermeldt. Als u onze kaarten of gegevens wijzigt of erop verder bouwt,
-          mag u het resultaat enkel onder dezelfde licentie distribueren. In de
-          volledige <a href="https://opendatacommons.org/licenses/odbl/1.0/">juridische
-          tekst</a> worden uw rechten en verantwoordelijkheden uitgelegd.
-        intro_3_1_html: |-
-          Onze documentatie is vrijgegeven onder de licentie
-          <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Naamsvermelding-Gelijk delen 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Hoe OpenStreetMap te vermelden
         credit_1_html: 'Wanneer u OpenStreetMap-gegevens gebruikt, bent u verplicht
           de volgende twee dingen te doen:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Geef OpenStreetMap erkenning door onze verklaring van auteursrecht weer te geven.</li>
-            <li>Maak duidelijk dat de gegevens beschikbaar zijn onder de Open Database License.</li>
-          </ul>
-        credit_3_1_html: Voor de auteursrechtelijke vermelding hanteren wij verschillende
-          voorschriften ten aanzien van de manier waarop deze moet worden weergegeven,
-          afhankelijk van de wijze waarop u onze gegevens gebruikt. Zo gelden er verschillende
-          regels voor het weergeven van de auteursrechtelijke vermelding, afhankelijk
-          van of u een doorbladerbare kaart, een afgedrukte kaart of een statische
-          afbeelding hebt gemaakt. Alle details over de vereisten zijn te vinden in
-          de <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Richtlijnen
-          voor naamsvermelding</a>.
-        credit_4_html: Om duidelijk te maken dat de gegevens beschikbaar zijn onder
-          de Open Database License, kunt u een koppeling maken naar <a href="https://www.openstreetmap.org/copyright">deze
-          auteursrechtpagina</a>. Een andere mogelijkheid, en een vereiste als u OSM
-          in de vorm van gegevens verspreidt, is dat u de licentie(s) noemt en er
-          een rechtstreekse koppeling naar maakt. Bij dragers waar koppelingen niet
-          mogelijk zijn (bijv. gedrukte werken), stellen we voor dat u uw lezers verwijst
-          naar openstreetmap.org (wellicht door 'OpenStreetMap' om te zetten in dit
-          volledige adres) en naar opendatacommons.org. In dit voorbeeld staat de
-          naamsvermelding op de hoek van de kaart.
         attribution_example:
           alt: Voorbeeld van hoe de naamsvermelding voor OpenStreetMap toe te passen
             op een webpagina
           title: Voorbeeld naamsvermelding
         more_title_html: Meer informatie
-        more_1_html: Lees meer over het gebruik van onze gegevens, en hoe u OpenStreetMap
-          moet vermelden, op de <a href="https://osmfoundation.org/Licence">licentiepagina
-          van de OSMF</a>
-        more_2_html: |-
-          Hoewel OpenStreetMap open data is, kunnen we geen gratis
-          kaart-API voor derde partijen aanbieden.
-          Zie ons <a href="https://operations.osmfoundation.org/policies/api/">API-gebruikbeleid</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">Tegelgebruikbeleid</a>
-          en <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatimgebruikbeleid</a>.
         contributors_title_html: Onze bijdragers
         contributors_intro_html: |-
           Onze bijdragers zijn duizenden individuen. OSM bevat ook
           open gelicenseerde gegevens van nationale kaartenbureaus
           en andere bronnen, waaronder:
-        contributors_at_html: |-
-          <strong>Oostenrijk</strong>: bevat gegevens van de
-          <a href="https://data.wien.gv.at/">Stad Wenen</a> (onder
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> en
-          Land Tirol (onder <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY-AT met aanvullingen</a>).
-        contributors_au_html: |-
-          <strong>Australië</strong>: Bevat of is ontwikkeld met behulp van administratieve grenzen &copy;
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australië</a>
-          vrijgegeven door het Gemenebest van Australië onder de licentie
-          <a href="https://creativecommons.org/licenses/by/4.0/deed.nl">Creative Commons Naamsvermelding 4.0 Internationaal (CC BY 4.0)</a>.
-        contributors_ca_html: |-
-          <strong>Canada</strong>: Bevat gegevens van
-          GeoBase&reg;, GeoGratis (&copy; Department of Natural
-          Resources Canada), CanVec (&copy; Department of Natural
-          Resources Canada), en StatCan (Geography Division,
-          Statistics Canada).
-        contributors_fi_html: '<strong>Finland</strong>: bevat gegevens van de topografische
-          database van het nationaal kadaster van Finland en andere gegevensverzamelingen,
-          onder de licentie <a href="https://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI</a>.'
-        contributors_fr_html: |-
-          <strong>Frankrijk</strong>: Bevat gegevens van
-          Direction Générale des Impôts.
-        contributors_nl_html: |-
-          <strong>Nederland</strong>: Bevat &copy; Gegevens van AND, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>Nieuw-Zeeland</strong>: Bevat gegevens verkregen van de <a href="https://data.linz.govt.nz/">LINZ Data Service</a> en
-          vrijgegeven voor hergebruik onder <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: |-
-          <strong>Slovenië</strong>: Bevat gegevens uit
-          <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> en
-          <a href="http://www.mkgp.gov.si/en/">Ministerie van Landbouw, Bosbouw en Voedsel</a>
-          (openbare informatie van Slovenië).
-        contributors_es_html: |-
-          <strong>Spanje</strong>: Bevat data afkomstig van het Spaans Nationaal Geografisch Instituut (<a href="http://www.ign.es/">IGN</a>) en het Nationaal Cartografisch Systeem (<a href="http://www.scne.es/">SCNE</a>)
-          vrijgegeven voor hergebruik onder <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: |-
-          <strong>Zuid-Afrika</strong>: Bevat gegevens afkomstig uit
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, auteursrechten voor de Staat voorbehouden.
-        contributors_gb_html: |-
-          <strong>Verenigd Koninkrijk</strong>: bevat gegevens van
-          Ordnance Survey &copy; Crown copyright en databaserechten
-          2010-2023.
-        contributors_footer_1_html: |-
-          Voor meer gegevens over deze en andere bronnen die gebruikt zijn
-          voor het verbeteren van OpenStreetMap, kunt u de <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">pagina met Bijdragers</a>
-          op de OpenStreetMap Wiki raadplegen.
         contributors_footer_2_html: |-
           Opname van gegevens in OpenStreetMap betekent niet dat de originele
           gegevensverstrekker OpenStreetMap ondersteunt, enige vorm van garantie geeft, of
@@ -2153,15 +2049,6 @@ nl:
           OSM-bijdragers horen nooit gegevens toe te voegen
           uit bronnen waarvan de licentie niet vrij is (bijvoorbeeld Google Maps of gedrukte kaarten)
           zonder expliciete toestemming van de auteursrechtenhouders.
-        infringement_2_html: |-
-          Als u van mening bent dat auteursrechtelijk beschermd en niet vrij gelicenseerd materiaal
-          ongeoorloofd aan de OpenStreetMap-database of aan deze website is toegevoegd, raadpleeg dan
-          onze <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">verwijderprocedure</a>
-          of meld het direct en formeel via onze <a href="https://dmca.openstreetmap.org/">online claimpagina</a>.
-        trademarks_title_html: <span id="trademarks"></span>Handelsmerken
-        trademarks_1_html: OpenStreetMap, het vergrootglaslogo en State of the Map
-          zijn geregistreerde handelsmerken van de OpenStreetMap Foundation. Als u
-          vragen hebt over uw gebruik van deze merken, bekijkt u ons <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Handelsmerkbeleid</a>.
     index:
       js_1: U gebruikt een browser die JavaScript niet ondersteunt, of u hebt JavaScript
         uitgeschakeld.
@@ -2194,7 +2081,6 @@ nl:
       licence_details_html: OpenStreetMap-gegevens zijn gelicentieerd onder de %{odbl_link}
         (ODbL).
       odbl: Open Data Commons Open Database-licentie
-      odbl_url: https://opendatacommons.org/licenses/odbl/1.0/
       too_large:
         advice: 'Als de bovenstaande export mislukt, overweeg dan één van de onderstaande
           bronnen te gebruiken:'
@@ -2248,7 +2134,6 @@ nl:
           %{copyright_link} voor meer juridische informatie, of neem contact op met de juiste %{working_group_link}.
         copyright: pagina auteursrechten
         working_group: OSMF-werkgroep
-        working_group_url: https://wiki.osmfoundation.org/wiki/Working_Groups
     help:
       title: Hulp krijgen
       introduction: Er zijn verschillende bronnen om meer te leren over OpenStreetMap,
@@ -2295,7 +2180,6 @@ nl:
         worden in de webbrowser.
       desktop_application_html: U kunt Potlatch nog altijd gebruiken door %{download_link}.
       download: het downloaden van de desktop-applicatie voor Mac en Windows
-      download_url: https://www.systemed.net/potlatch/
       id_editor_html: U kunt ook uw standaardeditor op iD zetten. Dat werkt in uw
         browser zoals Potlatch dat vroeger deed. %{change_preferences_link}.
       change_preferences: Wijzig hier uw voorkeuren
@@ -2307,7 +2191,6 @@ nl:
         die plannen maakt voor OpenStreetMap? %{welcome_mat_link}.
       get_help_here: Zoek hier hulp
       welcome_mat: Bekijk de welkomstmat
-      welcome_mat_url: https://welcome.openstreetmap.org/
     sidebar:
       search_results: Zoekresultaten
       close: Sluiten
@@ -2432,9 +2315,7 @@ nl:
           Als u andere activiteiten overweegt dan handmatig bewerken, lees en volg
           dan de richtlijnen op %{imports_link} en %{automated_edits_link}.
         imports: Importeringen
-        imports_url: https://wiki.openstreetmap.org/wiki/Import/Guidelines
         automated_edits: Geautomatiseerde bewerkingen
-        automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct
       start_mapping: Beginnen met kaarten maken
       add_a_note:
         title: Geen tijd om te bewerken? Voeg een opmerking toe!
@@ -2465,7 +2346,6 @@ nl:
           als informele bijeenkomst van mensen of als gemeenschapsgroep. Iedereen
           kan deze opzetten of er lid van worden. Lees meer op de %{communities_wiki_link}.
         communities_wiki: Wiki-pagina community's
-        communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group
   traces:
     visibility:
       private: Persoonlijk (alleen gedeeld als anoniem; ongeordende punten)
@@ -2531,7 +2411,7 @@ nl:
     trace:
       pending: BEZIG
       count_points:
-        one: 1 punt
+        one: '%{count} punt'
         other: '%{count} punten'
       more: meer
       trace_details: Trajectdetails weergeven
@@ -2553,7 +2433,6 @@ nl:
       empty_upload_html: '%{upload_link} of lees meer over GPS-tracering op de %{wiki_link}.'
       upload_new: Upload een nieuwe tracering
       wiki_page: wikipagina
-      wiki_page_url: https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2
       upload_trace: Traject uploaden
       all_traces: Alle trajecten
       my_traces: Mijn trajecten
@@ -2946,19 +2825,19 @@ nl:
       time_past_html: '%{time} vervallen.'
       block_duration:
         hours:
-          one: 1 uur
+          one: '%{count} uur'
           other: '%{count} uur'
         days:
-          one: 1 dag
+          one: '%{count} dag'
           other: '%{count} dagen'
         weeks:
-          one: 1 week
+          one: '%{count} week'
           other: '%{count} weken'
         months:
-          one: 1 maand
+          one: '%{count} maand'
           other: '%{count} maanden'
         years:
-          one: 1 jaar
+          one: '%{count} jaar'
           other: '%{count} jaar'
     blocks_on:
       title: Blokkades voor %{name}
@@ -3087,10 +2966,10 @@ nl:
       locate:
         title: Uw locatie weergeven
         metersPopup:
-          one: U bevindt zich binnen één meter van dit punt
+          one: U bevindt zich binnen %{count} meter van dit punt
           other: U bevindt zich binnen %{count} meter van dit punt
         feetPopup:
-          one: U bevindt zich binnen één voet van dit punt
+          one: U bevindt zich binnen %{count} voet van dit punt
           other: U bevindt zich binnen %{count} voet van dit punt
       base:
         standard: Standaard
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 5849de0f2..af4f79c2f 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1051,8 +1051,6 @@ nn:
       failed_to_import: 'klarte ikkje importere. Her er feilen:'
       subject: '[OpenStreetMap] Feil under import av GPX'
     gpx_success:
-      loaded_successfully: lasta med %{trace_points} av %{possible_points} moglege
-        punkt.
       subject: '[OpenStreetMap] Vellukka import av GPX'
     signup_confirm:
       subject: '[OpenStreetMap] Velkommen til OpenStreetMap'
@@ -1266,84 +1264,16 @@ nn:
         mapping_link: start kartlegging
       legal_babble:
         title_html: Opphavsrett og lisensar
-        intro_1_html: Data frå OpenStreetMap er <i>åpne data</i>, lisensiert under
-          <a href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open
-          Database License</a> (ODbL).
-        intro_2_html: "Du er fri til å kopiere, distribuere, overføre og tilpasse
-          dataa våre, så lenge du godskriv OpenStreetMap og bidragsytarane\n  deira.
-          Dersom du endrar eller byggjer på dataa våre, kan du berre distribuere resultatet
-          under same lisens. \n  Den fullstendige <a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">juridiske\n
-          \ teksten</a> forklarer rettane og ansvaret."
-        intro_3_1_html: |-
-          Kartografien i våre kartfliser, og dokumentasjonen vår, er lisensiert under <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
-             Commons Navngivelse-DelPåSammeVilkår 2.0</a> (CC BY-SA).
         credit_title_html: Korleis kreditere OpenStreetMap
         credit_1_html: Me krev at du brukar godskrivinga «© OpenStreetMap-bidragsytarane».
-        credit_2_1_html: Du må óg gjere det klart at dataa er tilgjengeleg under Open
-          Database License, og dersom du brukar kartflisene, at kartografien er lisensiert
-          under CC BY-SA. Du kan gjere dette ved å lenkje til <a href="http://www.openstreetmap.org/copyright">denne
-          sida</a>. Alternativt, og eit krav om du distribuerer OSM i dataform, kan
-          du nemne og lenkje til lisensen eller lisensane. I former der lenkjer er
-          umogleg (t.d. trykte verk), føreslår me at du viser lesarane dine til openstreetmap.org
-          (kanskje ved å utvide «OpenStreetMap» til denne fulle adressa), til opendatacommons.org,
-          og dersom relevant, til creativecommons.org.
-        credit_4_html: |-
-          For et navigerbart elektronisk kart, skal kjelda visast i hjørnet av kartet.
-          Til dømes:
         attribution_example:
           alt: Døme på korleis ein syner OpenStreetMap som kjelde på ei vevside
           title: Døme på kjeldehenvising
         more_title_html: Finn ut meir
-        more_1_html: |-
-          Les meir om korleis du brukar dataa våre, og korleis du krediterer oss, i den <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">juridiske
-            FAQ-en</a>.
-        more_2_html: |-
-          Sjølv om OpenStreetMap er åpne data kan me ikkje gje eit
-            gratis kart-API til tredjepartsutviklere.
-
-            Sjå våre retningslinjer for nytting av <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API-et</a>,
-            <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">kartbilder</a>
-            og <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_policy">Nominatim</a>.
         contributors_title_html: Bidragsytarane våre
         contributors_intro_html: 'Me har tusenvis av individuelle bidragsytarar. Me
           inkluderer óg åpne datasett frå nasjonale karttjenester og andre kjelder,
           bland anna frå:'
-        contributors_at_html: |-
-          <strong>Austerrike</strong>: Inneheld data henta frå
-             <a href="http://data.wien.gv.at/">Stadt Wien</a> under
-             <a href="http://creativecommons.org/licenses/by/3.0/at/deed.dei">CC BY</a>,
-             <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> og
-             Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT med tilleg</a>).
-        contributors_au_html: |-
-          <strong>Australia</strong>: Inneheld forstadsdata basert
-             på Australian Bureau of Statistics data.
-        contributors_ca_html: |-
-          <strong>Canada</strong>: Inneheld data frå
-             GeoBase®, GeoGratis (© Department of Natural
-             Resources Canada), CanVec (© Department of Natural
-             Resources Canada), og StatCan (Geography Division,
-             Statistics Canada).
-        contributors_fr_html: |-
-          <strong>Frankrike</strong>: Inneheld data henta frå
-             Direction Générale des Impôts.
-        contributors_nl_html: |-
-          <strong>Nederland</strong>: Inneheld &copy; AND-data, 2007
-             (<a href="http://www.and.com">www.and.com</a>)</li>
-             <li><strong>New Zealand</strong>: Inneheld data henta frå
-             Land Information New Zealand. Crown Copyright reservert.
-        contributors_nz_html: |-
-          <strong>New Zealand</strong>: Inneheld data henta frå
-             Land Information New Zealand. Crown Copyright reservert.
-        contributors_za_html: '<strong>Sør-Afrika</strong>: Inneheld data frå <a href="http://www.ngi.gov.za/">Chief
-          Directorate: National Geo-Spatial Information</a>, State copyright reserved.'
-        contributors_gb_html: |-
-          <strong>Storbritannia</strong>: Inneheld Ordnance
-             Survey data © Crown copyright og database-rettar
-             2010-12.
-        contributors_footer_1_html: |2-
-            For detaljar om desse og andre kjelder som har blitt brukt for å forbetra
-            OpenStreetMap, sjå <a href="http://wiki.openstreetmap.org/wiki/Contributors">Bidragsytarar
-            sida</a> på OpenStreetMap Wikien.
         contributors_footer_2_html: |2-
             Inkludering av data i OpenStreetMap inneber ikkje at den opphavlege
             dataleverandøren støttar OpenStreetMap, gjev nokon garanti eller
@@ -1352,11 +1282,6 @@ nn:
         infringement_1_html: |-
           OSM-bidragsytarar vert minna på å aldri leggje til data frå opphavsrettsbeskytta kjelder (t.d. Google Maps eller utskrivne kart) utan
             uttrykkeleg løyve frå rettighetshavere.
-        infringement_2_html: "Dersom du trur at kopibeskytta materiale har blitt lagt
-          inn i OpenStreetMap databasen eller denne sida, venligst henvend deg til
-          vår <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">takedown
-          \nprosedyre</a> eller direkte til vårt <a href=\"https://dmca.openstreetmap.org/\">online
-          skjema</a>."
     index:
       js_1: Du har ein nettleser som ikkje støttar JavaScript eller så har du slått
         av JavaScript.
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index ede6ad940..6ff057cee 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -335,8 +335,6 @@ oc:
     view_history: Mostrar l’istoric
     view_details: Mostrar lei detalhs
     location: 'Emplaçament :'
-    common_details:
-      coordinates_html: '%{latitude}, %{longitude}'
     changeset:
       title: 'Grop de modificacions : %{id}'
       belongs_to: Autor
@@ -380,7 +378,6 @@ oc:
         one: 1 membre
         other: '%{count} membres'
     relation_member:
-      entry_html: '%{type} %{name}'
       entry_role_html: '%{type} %{name} amb lo ròtle %{role}'
       type:
         node: Nos
@@ -1573,8 +1570,6 @@ oc:
       subject: '[OpenStreetMap] Error al moment de l''impòrt GPX'
     gpx_success:
       hi: Adieu %{to_user},
-      loaded_successfully: s'es cargat correctament amb %{trace_points} punch sus
-        %{possible_points}.
       subject: '[OpenStreetMap] Impòrt GPX capitat'
     signup_confirm:
       subject: '[OpenStreetMap] Benvenguda dins OpenStreetMap'
@@ -1915,79 +1910,18 @@ oc:
         mapping_link: començar a contribuir
       legal_babble:
         title_html: Copyright e Licéncia
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> es un ensemble de <i>donadas dobèrtas</i>, disponiblas jos licéncia liura <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL) alprèp de la <a
-          href="https://osmfoundation.org/">Fondacion OpenStreetMap</a> (OSMF).
-        intro_2_html: |2-
-           Sètz liure de copiar, distribuir, transmetre e adaptar nòstras donadas,
-            a condicion que creditetz OpenStreetMap e sos
-            contributors. Se modificatz o utilizatz nòstras donadas dins d’autras òbras derivadas,
-            las podètz distribuir sonque jos la meteissa licéncia. Lo
-            <a href="https://opendatacommons.org/licenses/odbl/1.0/">tèxte
-            legal</a> complet detalha vòstres dreits e responsabilitats.
-        intro_3_1_html: Nòstrei carrèus de rendut cartografics, e tanben la documentacion,
-          son disponibles sota la licéncia <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons paternitat – partiment a l’identic 2.0</a> (CC-BY-SA).
         credit_title_html: Cossí creditar OpenStreetMap
         credit_1_html: Demandam que vòstre crèdit compòrte la mencion « © lei contribueires
           d’OpenStreetMap ».
-        credit_2_1_html: Vos fau tanben botar en evidéncia que lei donadas son disponiblas
-          sota licéncia de basa de donadas dubèrtas e, s'utilizatz nòstrei mapas,
-          que la cartografia a licéncia CC-BY-SA. Podètz o far en ligant <a href="http://www.openstreetmap.org/copyright">aquela
-          pagina de copyright</a>. De maniera alternativa, mai coma requisit obligatòri
-          se distribuissètz OSM en forma de donadas en brut, podètz citar e ligar
-          directament a la licéncia. Dins lo cas d'utilizar de supòrts que lei ligams
-          de hipertext i son pas possibles (per exemple, òbras estampadas), vos suggerissèm
-          d'adreiçar lei lectors a openstreetmap.org (En indicant benlèu l'adreiça
-          completa de OpenStreetMap), a opendatacommons.org E, se s'escau, a creativecommons.org.
-        credit_4_html: |-
-          Per una mapa electronica navigabla, lo crèdit deuriá aparéisser dins lo canton de la mapa.
-          Per exemple :
         attribution_example:
           alt: Exemple d'atribucion OpenStreetMap sus una pagina internet
           title: Exemple d'atribucion
         more_title_html: Per trobar mai d’informacions
-        more_1_html: |-
-          Per obténer mai d’informacions sus cossí reütilizar nòstras donadas e nos creditar, legissètz la <a
-          href="https://osmfoundation.org/Licence">FAQ legala</a>.
         contributors_title_html: Nòstres contributors
         contributors_intro_html: 'Nòstres collaboradors son de miliers de personas.
           Comprenèm tanben de donadas amb licéncia dobèrta deis agéncias publicas
           de cartografia e d''autrei fònts, entre elei:'
-        contributors_at_html: '<strong>Áustria</strong> : conten de donadas sus la
-          <a href="https://data.wien.gv.at/">vila de Viena</a> (jos licéncia <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC
-          BY</a>), la <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">region
-          de Vorarlberg</a> e la region de Tiròl (jos licéncia <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC
-          BY AT amb amendaments</a>).'
-        contributors_ca_html: '<strong>Canadà</strong> : conten de donadas de <em>GeoBase</em>®,
-          <em>GeoGratis</em> (© Departament de las Ressorsas naturalas de Canadà),
-          <em>CanVec</em> (© Departament de las Ressorsas naturalas de Canadà) e <em>StatCan</em>
-          (Division Geografia, Estatisticas de Canadà).'
-        contributors_fi_html: '<strong>Finlàndia</strong> : conten de donadas de la
-          Basa de donadas topograficas de l’Inspeccion nacionala del territòri de
-          Finlàndia e d’autres ensembles de donadas, jos <a href="https://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">licéncia
-          NLSFI</a>.'
-        contributors_fr_html: |-
-          <strong>França</strong> : conten de donadas de la
-             <em>Direccion generala dels impòts</em>.
-        contributors_nl_html: '<strong>Païses Basses</strong> : conten de donadas
-          © <abbr title="Automotive Navigation Data">AND</abbr>, 2007 (<a href="https://www.and.com">www.and.com</a>).'
-        contributors_nz_html: '<strong>Nòva Zelanda</strong> : conten de donadas que
-          provenon del <em>Land Information New Zealand</em>. Copyright de la Corona
-          reservat.'
-        contributors_si_html: '<strong>Eslovènia</strong> : conten de donadas de l’<a
-          href="http://www.gu.gov.si/en/">Autoritat de Planificacion e de Cartografia</a>
-          e del <a href="http://www.mkgp.gov.si/en/">Ministèri de l’Agricultura, del
-          Bòsc e de l’Alimentacion</a> (informacion publica d''Eslovènia).'
-        contributors_za_html: |-
-          <strong>Africa del Sud</strong> : conten de donadas eissidas de la <a href="http://www.ngi.gov.za/">Direccion principala de las
-          Informacions Geoespacialas Nacionalas</a>, copyright de l’Estat reservat.
-        contributors_gb_html: '<strong>Reialme Unit</strong> : conten de donadas eissidas
-          de l’<em>Ordonància Survey</em> © 2010-2012 Dreits d’autors e de la basa
-          de donadas de la Corona.'
         infringement_title_html: Violacion dels dreits d'autor
-        trademarks_title_html: <span id="marcas"></span>Marcas
     index:
       js_1: JavaScript es pas pres en carga pel navigador qu'utilizatz, o alara l’avètz
         desactivat.
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 6e0e74741..a1c2b5a0f 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1688,11 +1688,6 @@ pl:
       subject: '[OpenStreetMap] Nieudane importowanie pliku GPX'
     gpx_success:
       hi: Cześć, %{to_user},
-      loaded_successfully:
-        one: wczytano wraz z %{trace_points} z 1 punktu łącznie.
-        few: wczytano wraz z %{trace_points} z %{possible_points} punktów łącznie.
-        many: wczytano wraz z %{trace_points} z %{possible_points} punktów łącznie.
-        other: wczytano wraz z %{trace_points} z %{possible_points} punktów łącznie.
       subject: '[OpenStreetMap] Zaimportowano plik GPX'
     signup_confirm:
       subject: '[OpenStreetMap] Witamy w OpenStreetMap'
@@ -2051,95 +2046,16 @@ pl:
         mapping_link: rozpocząć tworzenie mapy
       legal_babble:
         title_html: Prawa autorskie i&nbsp;licencja
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">®</a></sup> to projekt <i>open data</i>, rozpowszechniany na licencji <a href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL) przez <a
-          href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
-        intro_2_html: Możesz swobodnie kopiować, rozpowszechniać, przekazywać innym
-          i dostosowywać nasze dane, pod warunkiem podania OpenStreetMap i jego autorów
-          jako źródła. Jeśli zmienisz, przekształcisz lub wykorzystasz nasze dane,
-          wynik swojej pracy możesz rozpowszechniać tylko na podstawie tej samej licencji.
-          <a href="https://opendatacommons.org/licenses/odbl/1.0/">Pełny tekst licencji</a>
-          dokładnie opisuje twoje prawa i obowiązki.
-        intro_3_1_html: Nasza dokumentacja rozpowszechniana jest na warunkach licencji
-          <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.pl">Uznanie
-          autorstwa na tych samych warunkach 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Jak określić pochodzenie danych
         credit_1_html: 'W przypadku korzystania z danych OpenStreetMap należy:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Podać źródło poprzez wyświetlenie informacji o prawach autorskich (np. w postaci „&copy; autorzy OpenStreetMap”.).</li>
-            <li>Wyraźnie zaznaczyć, że dane dostępne są na licencji Open Database License.</li>
-          </ul>
-        credit_3_1_html: W przypadku informacji o prawach autorskich mamy różne wymagania
-          co do sposobu jej wyświetlania, w zależności od tego, jak korzysta się z
-          naszych danych. Na przykład, różne zasady dotyczące sposobu wyświetlania
-          informacji o prawach autorskich zależą od tego, czy utworzono interaktywną
-          mapę elektroniczną, mapę drukowaną czy obraz statyczny. Pełne informacje
-          na temat wymagań można znaleźć w <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">wytycznych
-          dotyczących atrybucji</a>.
-        credit_4_html: |-
-          Żeby jasno zaznaczyć, że dane dostępne są na licencji Open Database License, możesz to zrobić przez podlinkowanie <a href="https://www.openstreetmap.org/copyright">tej strony licencyjnej</a>. W przypadku rozpowszechniania OSM w formie danych możesz podać nazwy licencji i umieścić do nich bezpośredni link. Jeśli niemożliwe jest umieszczenie linków (np. na mapach papierowych), sugerujemy pokierowanie czytelników na stronę openstreetmap.org (lub OpenStreetMap.org) i opendatacommons.org.
-          W przykładzie poniżej podziękowania pojawiają się w rogu mapy.
         attribution_example:
           alt: Przykład, jak przypisywać OpenStreetMap na stronie internetowej
           title: Przykład uznania autorstwa
         more_title_html: Dowiedz się więcej
-        more_1_html: |-
-          Dowiedz się więcej o korzystaniu z naszych danych i o tym, jak określić nas jako źródło, z którego pochodzą dane na <a
-          href="https://osmfoundation.org/License">stronie OSMF License</a>.
-        more_2_html: Chociaż dane OpenStreetMap są otwarte, nie jesteśmy w stanie
-          zapewnić nieograniczonego dostępu do naszego API wszystkim chętnym. Zapoznaj
-          się z naszą <a href="https://operations.osmfoundation.org/policies/api/">Polityką
-          korzystania z API</a>, <a href="https://operations.osmfoundation.org/policies/tiles/">Polityką
-          korzystania z kafelków</a> oraz <a href="https://operations.osmfoundation.org/policies/nominatim/">Polityką
-          korzystania z Nominatima</a>.
         contributors_title_html: Współtwórcy
         contributors_intro_html: 'Autorami są tysiące osób. Uwzględniamy również licencjonowane
           dane na otwartej zasadzie z krajowych agencji kartograficznych i innych
           źródeł, wśród nich:'
-        contributors_at_html: |-
-          <strong>Austria</strong>: Zawiera dane <a href="https://data.wien.gv.at/">miasta Wiednia</a> (na licencji <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> oraz
-          Land Tyrol (na licencji <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT z późniejszymi zmianami</a>).
-        contributors_au_html: '<strong>Australia</strong>: Zawiera dane oparte na
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape
-          Australia</a>, licencjonowane przez Związek Australijski na podstawie licencji
-          <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons
-          Attribution 4.0 International licence (CC BY 4.0)</a>.'
-        contributors_ca_html: '<strong>Kanada</strong>: Zawiera dane z GeoBase&reg;,
-          GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy;
-          Department of Natural Resources Canada) i StatCan (Geography Division, Statistics
-          Canada).'
-        contributors_fi_html: '<strong>Finlandia</strong>: Zawiera dane z National
-          Land Survey of Finland''s Topographic Database i innych zbiorów danych,
-          na podstawie <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI
-          License</a>.'
-        contributors_fr_html: '<strong>Francja</strong>: Zawiera dane uzyskane z Direction
-          Générale des Impôts.</li>'
-        contributors_nl_html: |-
-          <strong>Holandia</strong>: Zawiera dane &copy; AND, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>Nowa Zelandia</strong>: Zawiera dane uzyskane z <a href="https://data.linz.govt.nz/">LINZ Data Service</a> i licencjonowane do ponownego użycia na podstawie licencji
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: |-
-          <strong>Słowenia</strong>: Zawiera dane
-          <a href="http://www.gu.gov.si/en/">Urzędu Geodezji i Kartografii</a> oraz
-          <a href="http://www.mkgp.gov.si/en/">Ministerstwa Rolnictwa, Leśnictwa i Żywności</a>
-          (informacja publiczna Słowenii).
-        contributors_es_html: |-
-          <strong>Hiszpania</strong>: Zawiera dane z Hiszpańskiego Narodowego Instytutu Geograficznego (<a href="http://www.ign.es/">IGN</a>) i
-          Krajowego Systemu Kartograficznego (<a href="http://www.scne.es/">SCNE</a>) licencjonowane do ponownego użycia na podstawie licencji <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: |-
-          <strong>RPA</strong>: Zawiera dane pochodzące
-          z <a href="http://www.ngi.gov.za/">zarządu głównego:
-          National Geo-Spatial Information</a>, prawa autorskie państwa zastrzeżone.
-        contributors_gb_html: '<strong>Wielka Brytania</strong>: Zawiera dane Ordnance
-          Survey. &copy; Crown copyright and database right 2010-12.'
-        contributors_footer_1_html: |-
-          Szczegóły tych i innych źródeł, które zostały wykorzystane,
-          aby udoskonalić OpenStreetMap, są dostępne na stronie
-          <a href="https://wiki.openstreetmap.org/wiki/Contributors">Contributors (en)</a>.
         contributors_footer_2_html: Włączenie danych do OpenStreetMap nie musi oznaczać,
           że udostępniający je podmiot popiera OpenStreetMap, udziela jakiejkolwiek
           gwarancji lub ponosi jakąkolwiek odpowiedzialność.
@@ -2148,16 +2064,6 @@ pl:
           dodawać danych z żadnych źródeł chronionych prawami autorskimi (jak np.
           Google Maps i&nbsp;większość map drukowanych) bez wyraźnego pozwolenia właściciela
           praw autorskich.
-        infringement_2_html: Jeśli uważasz, że materiał chroniony prawem autorskim
-          został niewłaściwie dodany do bazy OpenStreetMap, zajrzyj pod adres naszej
-          <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">procedury
-          usuwania danych</a> lub <a href="https://dmca.openstreetmap.org/">wypełnij
-          formularz on-line</a>.
-        trademarks_title_html: <span id="trademarks"></span>Znaki towarowe
-        trademarks_1_html: OpenStreetMap, logo z lupą oraz nazwa State of the Map
-          są zarejestrowanymi znakami towarowymi Fundacji OpenStreetMap. Jeśli masz
-          pytania dotyczące ich używania, prześlij swoje pytania do <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">grupy
-          roboczej ds. licencji</a>.
     index:
       js_1: Twoja przeglądarka internetowa nie obsługuje JavaScriptu bądź też masz
         wyłączoną jego obsługę.
diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index 2dbc97e39..0ea296a59 100644
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -1280,9 +1280,6 @@ pnb:
       subject: '[⁠اوایس‌ایم⁠] کھرا اِمپورٹ کر نہیں سکیا'
     gpx_success:
       hi: سالام %{to_user}،
-      loaded_successfully:
-        one: اِکّ پوئینٹ نال کھرا لوڈ کیتا گیا سی۔
-        other: '%{possible_points} وچ %{trace_points} نال کھرا لوڈ کیٹا گیا سی۔'
       subject: "[اپون سٹریٹ میپ] کھرا اِمپورٹ کیتا \U0001F44D\U0001F44D"
     signup_confirm:
       subject: '[⁠اوایس‌ایم⁠] نقشے تے سواگت اے'
@@ -1561,54 +1558,14 @@ pnb:
         title_html: نکل حق تے لائیسنس
         credit_title_html: ایہہ نقشے لئی حوالے
         credit_1_html: 'ڈیٹا ورتݨ دے قواعد:'
-        credit_2_1_html: |-
-          <ul>
-          <li>لائیسنس نوٹ نال حوالے وچ ”اوپن سٹریٹ‌ میپ“ پایو۔</li>
-          <li>اگلے، جو ڈیٹے دا لائیسنس ”اوپن ڈیٹابیس لائیسنس“ پایو۔</li>
-          </ul>
         attribution_example:
           alt: ویب سائیٹ تے حوالے لئی مثال
           title: حوالے لئی مثال
         more_title_html: ہور جاݨکاری لبھݨ واستے
-        more_1_html: |-
-          ڈیٹا ورتݨ تے حوالے کرن بارے وچ <a
-          href="https://osmfoundation.org/Licence">لائیسنس دا صفحہ</a> تے ہور پڑھایو۔
         contributors_title_html: ساڈی یوگدانی
-        contributors_at_html: 'آسٹریا: سٹاٹ وین (لائیسنس)، لینڈ وورالبرگ تے لینڈ ٹیرول
-          (لائیسنس)۔'
-        contributors_au_html: '<strong>آسٹریلیا</strong>: کجھ حد &copy; <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">جیوسکیپ
-          آسٹریلیا</a> (<a href="https://creativecommons.org/licenses/by/4.0/">لائیسںس</a>)'
-        contributors_ca_html: '<strong>کینیڈا</strong>: جیوبیس ( «Geobase&reg;»)،
-          جیوگریٹس («GeoGratis» &copy; ڈپارٹمینٹ اف نیٹرل ریسورس کینیڈا)، کینویک  («CanVec»
-          &copy; ڈپارٹمینٹ اف نیٹرل ریسورس کینیڈا)، سٹیٹکین  («StatCan» &copy; ڈپارٹمینٹ
-          اف نیٹرل ریسورس کینیڈا)'
-        contributors_fi_html: '<strong>فِنلینڈ</strong>: نیشنل لینڈ سروے اف فِنلینڈ
-          ٹوپوگریفک ڈیٹابیس تے ایہدا ہور ڈیٹا (<a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">لائیسنس</a>)'
-        contributors_fr_html: '<strong>فرینس</strong>: ڈریکشن جینرال ڈے اِمپوٹ («Direction
-          Générale des Impôts»)'
-        contributors_nl_html: '<strong>نیڈرلینڈ</strong>: ڈیٹا &copy; <a href="https://www.and.com">اے
-          این ڈی</a>، ۲۰۰۷ء'
-        contributors_nz_html: '<strong>نیوزیلینڈ</strong>: <a href="https://data.linz.govt.nz/">لینز
-          ڈیٹا سروس</a> (<a href="https://creativecommons.org/licenses/by/4.0/">لائیسنس</a>)'
-        contributors_si_html: '<strong>سلووینیا</strong>: <a href="http://www.gu.gov.si/en/">سروے
-          اینڈ میپ آتھاریٹی</a> تے <a href="http://www.mkgp.gov.si/en/">منسٹری اف
-          اگریکلچر، فرسٹری، اینڈ فوڈ</a>'
-        contributors_es_html: '<strong>سپین</strong>: <a href="http://www.ign.es/">سپینش
-          نیشنل جیوگرفک</a> اینسٹیٹوٹ تے <a href="http://www.scne.es/">نیشنل کارٹوگرفک
-          سیسٹم</a> (<a href="https://creativecommons.org/licenses/by/4.0/">لائیسنس</a>)'
-        contributors_za_html: '<strong>دکھݨ افریقہ</strong>: <a href="http://ngi.gov.za/">چیف
-          ڈائیریکٹورٹ: نیسنل جیو سپیشل اینفورمیشن</a>، سٹیٹ کاپی لائیسںس'
-        contributors_gb_html: 'یونائیٹڈ کنگڈم: آرڈننس سروے ڈیٹا &copy; کرون کاپی تے
-          ڈیٹا لائیسنس ۲۰۱۰ء … ۲۰۱۹ء'
         infringement_title_html: حوالے قواعد بارے وچ منع کرن
         infringement_1_html: نقشے والے نا آزاد سروت، مثلاً گوگل، ورت نہیں سکدے اے۔
           ایہہ لئی پہلے لیکھک کہݨ‌گیئے چاہیدے سی۔
-        trademarks_title_html: <span id="trademarks"></span>ٹریڈمرک
-        trademarks_1_html: 'اوپن سٹریٹ میپ فاؤنڈیشن دوارا، ”اوپن سٹریٹ میپ“ دے ناں
-          تے لوگو، تے ”سٹیٹ اف میپ“ کنفرینس دا ناں، ٹریڈمارک ہندے سی۔ (نوٹ: ایہی انگریزی
-          وچ ناں ٹریڈمارک ہندے سی، پنجابی وچ ایہہ ٹریڈمارک نہیں سکدے اے۔) جے تہاڈے
-          کجھ سوال بھیجݨے چاہیدے گیئے، <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">ٹریڈمارک
-          دی پالیسی</a> ویکھیو۔'
     index:
       js_1: تہاڈے براؤزر جاواسکرپٹ نہیں ورتیئے، یا تسیں جاواسکرپٹ بند کیتے سی۔
       js_2: ایس ویب‌سائیٹ دا نقشہ جاواسکرپٹ ورتدا۔
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 0b2f78184..791dfeaaa 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -219,20 +219,20 @@ pt-BR:
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: cerca de 1 hora atrás
+        one: cerca de %{count} hora atrás
         other: cerca de %{count} horas atrás
       about_x_months:
-        one: cerca de 1 mês atrás
+        one: cerca de %{count} mês atrás
         other: cerca de %{count} meses atrás
       about_x_years:
         one: cerca de 1 ano atrás
         other: cerca de %{count} anos atrás
       almost_x_years:
-        one: quase 1 ano atrás
+        one: quase %{count} ano atrás
         other: quase %{count} anos atrás
       half_a_minute: meio minuto atrás
       less_than_x_seconds:
-        one: menos de 1 segundo atrás
+        one: menos de %{count} segundo atrás
         other: menos de %{count} segundos atrás
       less_than_x_minutes:
         one: menos de um minuto atras
@@ -241,7 +241,7 @@ pt-BR:
         one: mais de 1 ano atrás
         other: mais de %{count} anos atrás
       x_seconds:
-        one: 1 segundo atrás
+        one: '%{count} segundo atrás'
         other: '%{count} segundos atrás'
       x_minutes:
         one: 1 minuto atrás
@@ -387,7 +387,7 @@ pt-BR:
       one: 1 relação
       other: '%{count} relações'
     part_of_ways:
-      one: 1 via
+      one: '%{count} via'
       other: '%{count} vias'
     download_xml: Baixar XML
     view_history: Ver histórico
@@ -1648,10 +1648,9 @@ pt-BR:
       subject: '[OpenStreetMap] Falha ao importar arquivo GPX'
     gpx_success:
       hi: Olá %{to_user},
-      loaded_successfully:
-        one: carregado com sucesso com %{trace_points} de um 1 ponto possível.
-        other: carregado com sucesso com %{trace_points} de %{possible_points} pontos
-          possíveis.
+      loaded:
+        one: carregado com sucesso com %{trace_points} de %{count} ponto.
+        other: carregado com sucesso com %{trace_points} de %{count} pontos possíveis
       subject: '[OpenStreetMap] GPX importado com sucesso'
     signup_confirm:
       subject: '[OpenStreetMap] Bem-vindo(a) ao OpenStreetMap'
@@ -1944,8 +1943,6 @@ pt-BR:
   shared:
     markdown_help:
       heading_html: Analisado com %{kramdown_link}
-      kramdown_url: https://kramdown.gettalong.org/quickref.html
-      kramdown: kramdown
       headings: Títulos
       heading: Cabeçalho
       subheading: Subtítulo
@@ -2018,105 +2015,35 @@ pt-BR:
         mapping_link: começar a mapear
       legal_babble:
         title_html: Direitos autorais e licença
-        intro_1_html: |-
-          O OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> é disponibilizado em <i>dados abertos</i>, sob a licença <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) pela  <a
-          href="https://osmfoundation.org/">Fundação OpenStreetMap</a> (OSMF).
-        intro_2_html: Tem o direito de copiar, distribuir, transmitir e adaptar os
-          nossos dados, desde que atribua a autoria do OpenStreetMap e os seus contribuidores.
-          Se alterar ou adicionar conteúdo dos nossos dados, pode distribuir o resultado
-          apenas com a mesma licença. O <a href="https://opendatacommons.org/licenses/odbl/1.0/">texto
-          legal completo</a> explica os seus direitos e responsabilidades.
-        intro_3_1_html: "Nossa documentação é licenciada sob a \nlicença <a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons
-          Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0)."
         credit_title_html: Como fazer atribuição ao OpenStreetMap
         credit_1_html: 'Onde você usa dados do OpenStreetMap, é necessário fazer as
           duas coisas a seguir:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Forneça crédito ao OpenStreetMap exibindo nosso aviso de direitos autorais.</li>
-            <li>Deixe claro que os dados estão disponíveis sob a Open Database License.</li>
-          </ul>
-        credit_3_1_html: "Para o aviso de direitos autorais, temos requisitos diferentes
-          sobre como isso deve ser\nexibido, dependendo de como você está usando nossos
-          dados. Por exemplo, diferentes\nregras se aplicam sobre como mostrar o aviso
-          de direitos autorais dependendo se você\ncriou um mapa navegável, um mapa
-          impresso ou uma imagem estática. Detalhes completos sobre os\nrequisitos
-          podem ser encontrados no\n<a href=\"https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines\">Attribution
-          \nGuidelines</a>."
-        credit_4_html: |-
-          Para deixar claro que os dados estão disponíveis no Open
-          Licença de banco de dados, você pode vincular a
-          <a href="https://www.openstreetmap.org/copyright">esta página de direitos autorais</a>.
-          Alternativamente, e como requisito se você estiver distribuindo OSM em um
-          formulário de dados, você pode nomear e vincular diretamente à(s) licença(s). Nas mídias
-          onde as ligações não são possíveis (por exemplo, trabalhos impressos), sugerimos que você
-          direcione seus leitores para openstreetmap.org (talvez expandindo
-          'OpenStreetMap' para este endereço completo) e para opendatacommons.org.
-          Neste exemplo, o crédito aparece no canto do mapa.
+        credit_2_1: Forneça crédito ao OpenStreetMap exibindo nossa nota de direitos
+          autorais.
         attribution_example:
           alt: Exemplo de como atribuir o OpenStreetMap numa página web
           title: Exemplo de atribuição
         more_title_html: Descobrir mais
-        more_1_html: |-
-          Leia mais informações sobre a utilização dos nossos dados e como atribuir a autoria na <a
-          href="https://osmfoundation.org/Licence">página da licença da OSMF</a> (em inglês).
-        more_2_html: |-
-          Embora o OpenStreetMap seja aberto, não podemos fornecer
-          API de mapa gratuito para terceiros.
-          Veja nossa<a href="https://operations.osmfoundation.org/policies/api/"></a> Política de uso da API<a href="https://operations.osmfoundation.org/policies/tiles/"></a>Política de Uso de Imagens</a>
-            e<a href="https://operations.osmfoundation.org/policies/nominatim/"></a>
         contributors_title_html: Nossos contribuidores
         contributors_intro_html: |-
           Nossos contribuidores são milhares de indivíduos. Também incluímos
           dados, cujas licenças são abertas, de organismos nacionais de cartografia
           e de outras fontes, dentre elas:
-        contributors_at_html: '<strong>Áustria</strong>: Contém dados de <a href="https://data.wien.gv.at/">Stadt
-          Wien</a> (sob a licença <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC
-          BY</a>), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
-          Vorarlberg</a> e Land Tirol (sob a licença <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY
-          AT com emendas</a>).'
-        contributors_au_html: "<strong>Austrália</strong>: contém ou foi desenvolvido
-          usando fronteiras administrativas &copy; \n<a href=\"https://geoscape.com.au/legal/data-copyright-and-disclaimer/\">PSMA
-          Australia Limited</a>\nlicenciada pela Commonwealth of Australia sob uma
-          licença\n<a href=\"https://creativecommons.org/licenses/by/4.0/\">Creative
-          Commons Attribuição 4.0 Licença Internacional (CC BY 4.0)</a>."
-        contributors_ca_html: "<strong>Canadá</strong>: Contém dados do\n   GeoBase&reg;,
-          GeoGratis (&copy; Departamento de Recursos\n   Naturais do Canadá), CanVec
-          (&copy; Departamento de Recursos\n   Naturais do Canadá), and StatCan (Divisão
-          de Geografia e \n   Estatística do Canada)."
-        contributors_fi_html: "<strong>Finlândia</strong>: Contem dados do \nNational
-          Land Survey da Finland´s Topographic Database \nassim como de outras bases
-          de dados, sob a licença <a href=\"https://www.maanmittauslaitos.fi/en/opendata-licence-version1\">NLSFI</a>."
-        contributors_fr_html: |-
-          <strong>França</strong>: Contém dados da
-             Direction Générale des Impôts.
-        contributors_nl_html: '<strong>Países Baixos</strong>: Contém dados &copy;
-          AND, 2007 (<a href="https://www.and.com">www.and.com</a>)'
-        contributors_nz_html: |-
-          <strong>New Zealand</strong>: Contém dados originados do
-          <a href="https://data.linz.govt.nz/">LINZ Data Service</a> e
-          licenciado para reutilização sob
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: '<strong>Eslovênia</strong>: Possui dados da <a href="http://www.gu.gov.si/en/">Autoridade
-          de Levantamento e Mapeamento</a> e do <a href="http://www.mkgp.gov.si/en/">Ministério
-          de Agricultura, Silvicultura e Alimentação</a> (informações públicas da
-          Eslovênia).'
-        contributors_es_html: |-
-          <strong>Espanha</strong>: Contém dados provenientes do
-          Instituto Geográfico Nacional da Espanha (<a href="http://www.ign.es/">IGN</a>) e
-          Sistema Cartográfico Nacional (<a href="http://www.scne.es/">SCNE</a>)
-          licenciado para reutilização sob <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: |-
-          <strong>Africa do Sul</strong>: contém dados originários de
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, com direitos autorais reservados àquele Estado.
-        contributors_gb_html: '<strong>Reino Unido</strong>: Contém dados do Ordnance
-          Survey &copy; Crown copyright and database right 2010-2023.'
-        contributors_footer_1_html: Para mais informações sobre estas e outras fontes
-          utilizadas para melhorar o OpenStreetMap, consulte a <a href="https://wiki.openstreetmap.org/wiki/Contributors">página
-          de contribuidores</a> (em inglês) na wiki do OpenStreetMap.
+        contributors_at_credit_html: |-
+          %{austria}: Contém dados de %{stadt_wien_link} (conforme %{cc_by_link}), %{land_vorarlberg_link}
+          e Land Tirol (conforme %{cc_by_at_with_amendments_link}).
+        contributors_at_cc_by_url: https://creativecommons.org/licenses/by/3.0/at/deed.pt_BR
+        contributors_nz_linz_data_service: Serviço de Dados LINZ
+        contributors_nz_cc_by: CC BY 4.0
+        contributors_si_slovenia: Eslovenia
+        contributors_si_mkgp: Ministério da Agricultura, Silvicultura e Alimentos
+        contributors_es_credit_html: '%{spain}: Contém dados do Instituto Geográfico
+          Nacional da Espanha (%{ign_link}) e do Sitema de Cartografia Nacional (%{scne_link})
+          licenciados para reutilização conforme %{cc_by_link}.'
+        contributors_es_ign: IGN
+        contributors_2_html: Para mais detalhes come esses, e outras fontes que foram
+          usadas para ajudar a melhor o OpenStreetMap, por favor veja a %{contributors_page_link}
+          na OpenStreetMap Wiki.
         contributors_footer_2_html: "A inclusão de dados no OpenStreetMap não implica
           que fornecedor \noriginal apoie o OpenStreetMap, ou dê qualquer garantia,
           ou \naceite qualquer responsabilidade."
@@ -2125,16 +2052,9 @@ pt-BR:
             Os contribuidores do OSM são lembrados de nunca adicionar dados de quaisquer
             fontes com direitos autorais protegidos (ex.: Google Maps ou mapas impressos) sem
             permissão expressa dos seus detentores.
-        infringement_2_html: Se acredita que material protegido por direitos autorais
-          foi adicionado indevidamente à base de dados do OpenStreetMap, por favor
-          consulte o <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">procedimento
-          para retirar dados protegidos</a> (em inglês) ou preencha os dados diretamente
-          no <a href="https://dmca.openstreetmap.org/">formulário</a> (em inglês).
-        trademarks_title_html: <span id="trademarks"></span>Marcas registradas
-        trademarks_1_html: OpenStreetMap, o respetivo logótipo e State of the Map
-          são marcas registadas da Fundação OpenStreetMap. Se tiver alguma questão
-          sobre a utilização das marcas, por favor consulte as nossas <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Normas
-          sobre Marcas Comerciais</a>.
+        trademarks_1_1_html: OpenStreetMap, a logo com a lupa e State of the Map são
+          marcas registradas da Fundação OpenStreetMap. Se você tiver perguntas sobre
+          o seu uso das marcas, por favor veja nossa %{trademark_policy_link}.
     index:
       js_1: Você está usando um navegador sem suporte a JavaScript, ou está com o
         JavaScript desativado.
@@ -2222,7 +2142,6 @@ pt-BR:
           para mais informações legais, ou contate o %{working_group_link} apropriado.
         copyright: págian de direitos autorais
         working_group: Grupo de trabalho OSMF
-        working_group_url: https://wiki.osmfoundation.org/wiki/Working_Groups
     help:
       title: Obtendo ajuda
       introduction: O OpenStreetMap oferece vários recursos para você saber mais sobre
@@ -2270,7 +2189,6 @@ pt-BR:
         uso em um navegador da web.
       desktop_application_html: Você ainda pode usar Potlatch por %{download_link}.
       download: baixando o aplicativo de desktop para Mac e Windows
-      download_url: https://www.systemed.net/potlatch/
       id_editor_html: Como alternativa, você pode definir seu editor padrão para iD,
         que é executado em seu navegador da web como o Potlatch fazia anteriormente.
         %{change_preferences_link}.
@@ -2440,7 +2358,6 @@ pt-BR:
           De fato, muitos grupos existem com muito sucesso como uma reunião informal de pessoas ou como um
           grupo comunitário. Qualquer um pode criar ou se juntar a eles. Leia mais em %{communities_wiki_link}.
         communities_wiki: Páginas wiki de comunidades
-        communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group
   traces:
     visibility:
       private: Privado (compartilhado apenas como pontos anônimos e não ordenados)
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index c9b086d7b..4293cb66f 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -337,6 +337,17 @@ pt-PT:
       delete_account: Apagar Conta...
     go_public:
       heading: Edição pública
+      currently_not_public: Atualmente, as tuas edições são anónimas e as pessoas
+        não te podem enviar mensagens ou ver a tua localização. Para mostrar o que
+        já editaste e permitir que as pessoas te contactem através do website, clica
+        no botão em baixo.
+      only_public_can_edit: Desde a alteração da API 0.6, só os utilizadores públicos
+        podem editar dados no mapa.
+      find_out_why: descobre porquê
+      email_not_revealed: O teu endereço de correio eletrónico não será revelado ao
+        tornar-se público.
+      not_reversible: Esta ação não pode ser revertida e todos os novos utilizadores
+        são agora públicos por padrão.
       make_edits_public_button: Tornar todas as minhas edições públicas
     update:
       success_confirm_needed: As informações de utilizador foram atualizadas com sucesso.
@@ -1630,10 +1641,6 @@ pt-PT:
       subject: '[OpenStreetMap] Erro ao importar GPX'
     gpx_success:
       hi: Olá, %{to_user}.
-      loaded_successfully:
-        one: carregado corretamente com %{trace_points} de entre 1 ponto possível.
-        other: carregado corretamente com %{trace_points} de entre  %{possible_points}
-          pontos possíveis.
       subject: '[OpenStreetMap] Importação de GPX bem-sucedida'
     signup_confirm:
       subject: '[OpenStreetMap] Bem-vind@ ao OpenStreetMap'
@@ -1734,6 +1741,8 @@ pt-PT:
       success: Conta confirmada. Obrigado por te registares!
       already active: Esta conta já foi confirmada.
       unknown token: Esse código de confirmação expirou ou não existe.
+      resend_html: Se precisares que reenviemos o e-mail de confirmação, %{reconfirm_link}.
+      click_here: clica caqui
     confirm_resend:
       failure: O utilizador %{name} não foi encontrado.
     confirm_email:
@@ -1924,6 +1933,7 @@ pt-PT:
       support: apoio
   shared:
     markdown_help:
+      heading_html: Analisado com %{kramdown_link}
       headings: Títulos
       heading: Cabeçalho
       subheading: Subtítulo
@@ -1991,93 +2001,17 @@ pt-PT:
         mapping_link: começar a mapear
       legal_babble:
         title_html: Licença e Direitos de Autor
-        intro_1_html: |-
-          O OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> é disponibilizado em <i>dados abertos</i>, sob a licença <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) pela  <a
-          href="https://osmfoundation.org/">Fundação OpenStreetMap</a> (OSMF).
-        intro_2_html: Tem o direito de copiar, distribuir, transmitir e adaptar os
-          nossos dados, desde que atribua os devidos créditos ao OpenStreetMap e aos
-          seus contribuidores. Se alterar ou adicionar conteúdo dos nossos dados,
-          pode distribuir o resultado apenas com a mesma licença. O <a href="https://opendatacommons.org/licenses/odbl/1.0/">texto
-          legal completo</a> explica os seus direitos e responsabilidades.
-        intro_3_1_html: A nossa documentação está disponibilizada sob a licença <a
-          href="https://creativecommons.org/licenses/by-sa/2.0/deed.pt">Creative Commons
-          Atribuição-CompartilhaIgual 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Como creditar o OpenStreetMap
         credit_1_html: 'Onde usar dados do OpenStreetMap, é necessário fazer as duas
           coisas seguintes:'
-        credit_2_1_html: "<ul>\n<li> Atribuir os créditos ao OpenStreetMap exibindo
-          o nosso aviso de direitos de autor.</li> \n<li> Deixar claro que os dados
-          estão disponíveis sob a Licença Open Database.</li> \n</ul>"
-        credit_3_1_html: Para o aviso de direitos de autor, temos vários requisitos
-          para a sua exibição, dependendo da forma como usa os nossos dados. Por exemplo,
-          aplicam-se regras diferentes para a exibição do aviso de direitos de autor
-          conforme usar um mapa navegável, um mapa impresso ou uma imagem estática.
-          Poderá encontrar toda a informação sobre os requisitos nas <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Diretrizes
-          de Atribuição</a>.
-        credit_4_html: |-
-          Para deixar claro que os dados estão disponíveis sob a Licença Open
-          Database, é possível criar uma ligação para <a href="https://www.openstreetmap.org/copyright">esta página de direitos de autor</a>.
-          Em alternativa, e como requisito, se estiver a distribuir o OSM num formato de dados, pode nomear e ligar diretamente à(s) licença(s). Em plataformas multimédia onde as ligações não são possíveis (por exemplo, trabalhos impressos), sugerimos que direcione os seus utilizadores para openstreetmap.org (talvez expandindo 'OpenStreetMap' para este endereço completo) e para opendatacommons.org. Neste exemplo, os créditos aparecem no canto do mapa.
         attribution_example:
           alt: Exemplo de como indicar os créditos do OpenStreetMap numa página eletrónica
           title: Exemplo de atribuição
         more_title_html: Mais informação
-        more_1_html: |-
-          Leia mais informações sobre a utilização dos nossos dados e como atribuir os devidos créditos na <a
-          href="https://osmfoundation.org/Licence">página da licença da OSMF</a> (em inglês).
-        more_2_html: Apesar de o OpenStreetMap ser uma plataforma de dados abertos,
-          não podemos fornecer uma API de mapas a terceiros, livre de encargos. Veja
-          a <a href="https://operations.osmfoundation.org/policies/api/">Política
-          de Utilização da API</a>, <a href="https://operations.osmfoundation.org/policies/tiles/">Política
-          de Utilização de Telas</a> e <a href="https://operations.osmfoundation.org/policies/nominatim/">Política
-          de Utilização do Nominatim</a>.
         contributors_title_html: Os nossos contribuidores
         contributors_intro_html: 'O OpenStreetMap tem milhares de contribuidores.
           Também são utilizados dados de agências cartográficas nacionais e outras
           fontes, entre elas:'
-        contributors_at_html: '<strong>Áustria</strong>: Contém dados de <a href="https://data.wien.gv.at/">Stadt
-          Wien</a> (sob a licença <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC
-          BY</a>), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
-          Vorarlberg</a> e Land Tirol (sob a licença <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY
-          AT com emendas</a>).'
-        contributors_au_html: "<strong>Austrália</strong>: contém ou foi desenvolvido
-          usando fronteiras administrativas &copy; \n<a href=\"https://geoscape.com.au/legal/data-copyright-and-disclaimer/\">PSMA
-          Australia Limited</a>\nlicenciada pela Commonwealth of Australia sob uma
-          licença\n<a href=\"https://creativecommons.org/licenses/by/4.0/\">Creative
-          Commons Attribuição 4.0 Licença Internacional (CC BY 4.0)</a>."
-        contributors_ca_html: '<strong>Canadá</strong>: contém dados de GeoBase&reg;,
-          GeoGratis (&copy; Departmento de Recursos Naturais do Canadá), CanVec (&copy;
-          Departmento de Recursos Naturais do Canadá) e StatCan (Divisão de Geografia,
-          Estatísticas do Canadá).'
-        contributors_fi_html: '<strong>Finlândia</strong>: contém dados da Base de
-          Dados Topográficos do Instituto Nacional de Topografia da Finlândia e de
-          outras bases de dados, sob a licença <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI</a>.'
-        contributors_fr_html: '<strong>França</strong>: contém dados provenientes
-          da Direção Geral dos Impostos.'
-        contributors_nl_html: '<strong>Países Baixos</strong>: contém dados &copy;
-          AND, 2007 (<a href="https://www.and.com">www.and.com</a>)'
-        contributors_nz_html: |-
-          <strong>Nova Zelândia</strong>: contém dados provenientes do <a href="https://data.linz.govt.nz/">Serviço de Dados LINZ</a> e licenciados para reutilização com a licença
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: |-
-          <strong>Eslovénia</strong>: contém dados da
-          <a href="http://www.gu.gov.si/en/">Autoridade de Cartografia e Topografia (Geodetska uprava Republike Slovenije)</a> e do
-          <a href="http://www.mkgp.gov.si/en/">Ministério da Agricultura, Floresta e Alimentação (Ministrstvo za kmetijstvo, gozdarstvo in prehrano)</a>
-          (informação pública da Eslovénia).
-        contributors_es_html: |-
-          <strong>Espanha</strong>: contém dados provenientes do Instituto Geográfico Nacional (<a href="http://www.ign.es/">IGN</a>) e do Sistema Cartográfico Nacional (<a href="http://www.scne.es/">SCNE</a>) de Espanha
-          licenciado para reutilização com a <a href="https://creativecommons.org/licenses/by/4.0/deed.pt">CC BY 4.0</a>.
-        contributors_za_html: '<strong>África do Sul</strong>: contém dados provenientes
-          da <a href="http://www.ngi.gov.za/">Direção Geral da Informação Geoespacial
-          Nacional</a>, com direitos de autor do Estado reservados.'
-        contributors_gb_html: '<strong>Reino Unido</strong>: contém dados dos Serviços
-          Topográficos Britânicos &copy; direitos de autor e da base de dados da Coroa
-          2010-2019.'
-        contributors_footer_1_html: Para mais informações sobre estas e outras fontes
-          que foram utilizadas para melhorar o OpenStreetMap, consulte a <a href="https://wiki.openstreetmap.org/wiki/Contributors">página
-          de contribuidores</a> (em inglês) na wiki do OpenStreetMap.
         contributors_footer_2_html: A inclusão de dados no OpenStreetMap não implica
           que o fornecedor de dados originais apoie o OpenStreetMap, forneça qualquer
           garantia ou aceite algum tipo de responsabilidade.
@@ -2086,16 +2020,6 @@ pt-PT:
           para nunca adicionarem dados de fontes protegidas por direitos de autor
           (por exemplo o Google Maps ou mapas comerciais impressos) sem permissão
           explícita dos detentores dos direitos de autor.
-        infringement_2_html: Se entender que foi adicionado material protegido por
-          direitos de autor indevidamente à base de dados do OpenStreetMap, por favor,
-          consulte o <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">procedimento
-          para retirar dados protegidos</a> (em inglês) ou preencha os dados diretamente
-          no <a href="https://dmca.openstreetmap.org/">formulário online</a> (em inglês).
-        trademarks_title_html: <span id="trademarks"></span>Marcas registadas
-        trademarks_1_html: O nome OpenStreetMap, o respetivo logótipo e State of the
-          Map são marcas registadas da Fundação OpenStreetMap. Se tiver alguma questão
-          sobre a utilização das marcas, por favor, consulte as nossas <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Normas
-          Sobre Marcas Comerciais</a>.
     index:
       js_1: Está a usar um navegador de Internet que não suporta JavaScript ou tem
         o JavaScript desativado.
@@ -2126,6 +2050,9 @@ pt-PT:
       map_image: Imagem do mapa (mostra a camada padrão)
       embeddable_html: HTML integrável
       licence: Licença
+      licence_details_html: Os dados do OpenStreetMap são licenciados sob %{odbl_link}
+        (ODbL).
+      odbl: Licença de Base de Dados Aberta de Open Data Commons
       too_large:
         advice: 'Se a exportação acima falhar, por favor, considera o uso de uma das
           fontes seguintes:'
@@ -2174,6 +2101,11 @@ pt-PT:
             Isto irá adicionar um marcador ao mapa, que poderá mover arrastando-o. Adicione a sua mensagem e clique em gravar, para que outros mapeadores possam investigar.
       other_concerns:
         title: Outras preocupações
+        concerns_html: Se tiveres dúvidas sobre a forma como os nossos dados estão
+          a ser usados ou sobre o conteúdo, consulta a nossa %{copyright_link} para
+          mais informações legais, ou contacta o %{working_group_link} apropriado.
+        copyright: página de direitos de autor
+        working_group: grupo de trabalho OSMF
     help:
       title: Como Obter Ajuda
       introduction: O OpenStreetMap tem vários recursos para aprender mais sobre o
@@ -2217,8 +2149,18 @@ pt-PT:
       removed: O teu editor padrão do OpenStreetMap está definido como sendo o Potlatch.
         Como o Adobe Flash Player foi retirado, o Potlatch já não se encontra disponível
         para uso num navegador de Internet.
+      desktop_application_html: Ainda podes usar o Potlatch %{download_link}
+      download: transferindo a aplicação desktop para Mac e Windows
+      id_editor_html: Como alternativa, podes definir o teu editor padrão para o iD,
+        que é executado no teu navegador de internet, como o Potlatch fazia. %{change_preferences_link}.
+      change_preferences: Altera as tuas preferências aqui
     any_questions:
       title: Dúvidas?
+      paragraph_1_html: |-
+        O OpenStreetMap tem vários recursos que ajudam a aprender sobre o projeto, a fazer e responder a perguntas e discutir e documentar tópicos de mapeamento de forma colaborativa.
+        %{help_link}. Tem uma organização que pretende usar o OpenStreetMap? %{welcome_mat_link}.
+      get_help_here: Obtenha ajuda aqui
+      welcome_mat: Visite o Welcome Mat
     sidebar:
       search_results: Resultados da Pesquisa
       close: Fechar
@@ -2310,17 +2252,46 @@ pt-PT:
         um guia rápido com as coisas mais importantes que precisas de saber.
       whats_on_the_map:
         title: O que está no mapa
+        on_the_map_html: O OpenStreetMap é um lugar para mapear coisas que são %{real_and_current}
+          - isso inclui milhões de edifícios, estradas, e outros detalhes sobre lugares.
+          Podes mapear qualquer elemento do mundo real que achares interessante.
+        real_and_current: reais e atuais
+        off_the_map_html: |-
+          O que %{doesnt} inclui são dados com base em opiniões, como classificações, recursos históricos ou
+          hipotéticos e dados de fontes protegidas por direitos de autor. A menos que tenhas permissão especial, não copies de mapas on-line ou impressos.
+        doesnt: não
       basic_terms:
         title: Termos básicos para mapear
         paragraph_1: O OpenStreetMap tem os seus próprios conceitos. Aqui tens a explicação
           de algumas palavras úteis.
+        an_editor_html: Um %{editor} é um programa ou website que podes usar para
+          editar o mapa.
+        a_node_html: Um %{node} é um ponto no mapa, como um restaurante ou uma árvore.
+        a_way_html: Uma %{way} é uma linha ou área, como uma estrada, um ribeiro,
+          um lago ou um edifício.
+        a_tag_html: Uma %{tag} é uma informação sobre um ponto ou linha, como o nome
+          de um restaurante ou o limite de velocidade de uma estrada.
+        editor: editor
+        node: ponto
+        way: linha
+        tag: etiqueta
       rules:
         title: Regras!
+        para_1_html: O OpenStreetMap tem poucas regras formais, mas esperamos que
+          todos os participantes colaborem e se comuniquem com a comunidade. Se estiveres
+          a considerar alguma atividade além de editar manualmente, lê e segue as
+          diretrizes em %{imports_link} e %{automated_edits_link}.
+        imports: Importações
+        automated_edits: Edições automáticas
       start_mapping: Começar a mapear
       add_a_note:
         title: Sem tempo para editar? Adiciona uma nota!
         para_1: Se pretendes que seja feita uma pequena correção, mas não tens disponibilidade
           para criar uma conta e aprender a editar, é muito simples deixar uma nota.
+        para_2_html: 'Basta ir ao %{map_link} e clicar no ícone da nota: %{note_icon}.
+          Isso incluirá um marcador no mapa, que poderás mover, arrastando-o. Adiciona
+          a tua mensagem e clica em guardar para que outros mapeadores possam averiguar.'
+        the_map: mapa
     communities:
       title: Comunidades
       lede_text: "O OpenStreetMap tem o contributo de pessoas de todo o mundo e é
@@ -2340,6 +2311,10 @@ pt-PT:
           Locais:'
       other_groups:
         title: Outros Grupos
+        other_groups_html: |-
+          Não há necessidade de estabelecer formalmente um grupo como os Capítulos Locais.
+          Na verdade, há muitos grupos de sucesso que funcionam como encontros informais de pessoas ou como grupos comunitários. Qualquer pessoa pode criar um ou juntar-se a um que já exista. Lê mais na %{communities_wiki_link}.
+        communities_wiki: página wiki das comunidades
   traces:
     visibility:
       private: Privado (apenas partilhado como anónimo, pontos não ordenados)
@@ -2424,6 +2399,11 @@ pt-PT:
       public_traces_from: Rotas GPS públicas do utilizador %{user}
       description: Explorar as rotas GPS enviadas recentemente
       tagged_with: etiquetada com %{tags}
+      empty_title: Ainda não há aqui nada
+      empty_upload_html: '%{upload_link} ou aprende mais sobre as rotas de GPS na
+        %{wiki_link}.'
+      upload_new: Enviar nova rota
+      wiki_page: página wiki
       upload_trace: Enviar rota GPS
       all_traces: Todas as Rotas
       my_traces: As Minhas Rotas
@@ -2603,6 +2583,11 @@ pt-PT:
       support: apoio
       about:
         header: Livre e editável
+        paragraph_1: Ao contrário de outros mapas, o OpenStreetMap é completamente
+          criado por pessoas como tu, e qualquer pessoa o pode corrigir, transferir
+          e usar de forma gratuita.
+        paragraph_2: Regista-te para começares a contribuir. Iremos enviar um e-mail
+          para confirmar a tua conta.
       display name description: O nome de utilizador ficará visível publicamente.
         Poderás alterar o nome posteriormente nas configurações do teu perfil.
       external auth: 'Autenticação por terceiros:'
@@ -2630,6 +2615,10 @@ pt-PT:
       consider_pd: Além do referido anteriormente, considero que as minhas contribuições
         fazem parte âmbito do Domínio Público.
       consider_pd_why: O que é isto?
+      guidance_info_html: 'Informações para ajudar a entender estes termos: um %{readable_summary_link}
+        e algumas %{informal_translations_link}'
+      readable_summary: sumário legível por humanos
+      informal_translations: traduções informais
       continue: Continuar
       declined: https://wiki.openstreetmap.org/wiki/Pt:Contributor_Terms_Declined
       decline: Rejeitar
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 06a1ae0a6..91cb5e16a 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -1527,8 +1527,6 @@ ro:
       subject: '[OpenStreetMap] eșec import fișier GPX'
     gpx_success:
       hi: Salut %{to_user},
-      loaded_successfully:
-        other: încărcat cu succes cu %{trace_points} din 1 punct posibil.
       subject: '[OpenStreetMap] succes import fișier GPX'
     signup_confirm:
       subject: '[OpenStreetMap] Bun venit la OpenStreetMap'
@@ -1854,101 +1852,18 @@ ro:
         mapping_link: Începeți să cartografiați
       legal_babble:
         title_html: Drepturi de autor și licență
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> este <i>open data</i>, licențiat sub licență <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) by the  <a
-          href="https://osmfoundation.org/">Fundația OpenStreetMap</a> (OSMF).
-        intro_2_html: Sunteți liber să copiați, să distribuiți, să transmiteți și
-          să vă adaptați datele, atâta timp cât creditați OpenStreetMap și contribuitorii
-          ei. Dacă modificați sau folosiți datele noastre, puteți distribui rezultatul
-          doar sub aceeași licență. Aici  <a href="https://opendatacommons.org/licenses/odbl/1.0/">codul
-          legal</a> sunt explicate drepturile și responsabilitățile.
-        intro_3_1_html: |-
-          Documentația noastră este licențiată sub <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA).
         credit_title_html: Cum se creditează OpenStreetMap
         credit_1_html: Noi cerem să utilizați creditul&copy; contribuitori OpenStreetMap&
           rdquo;.
-        credit_2_1_html: |-
-          De asemenea, trebuie să clarificați faptul că datele sunt disponibile în cadrul licenței libere a bazei de date și, dacă folosim bucăți de hartă, atunci cartografierea este licențiată de CC BY-SA. Puteți face acest lucru prin conectarea la
-          <a href="https://www.openstreetmap.org/copyright"> această pagină de copyright</a>.
-          Alternativ, și ca o cerință dacă distribuim OSM într-un
-          formularul de date, puteți numi și să vă conectați direct la licența (licențele). Acolo unde legăturile nu sunt posibile (de exemplu lucrări tipărite), vă sugerăm să direcționați cititorii dvs. la openstreetmap.org (probabil prin extinderea "OpenStreetMap" la această adresă completă), la opendatacommons.org, și dacă este cazul, la creativecommons.org.
-        credit_4_html: |-
-          Pentru o hartă electronică care poate fi răsfoită, creditul ar trebui să apară în colțul hărții.
-          De exemplu:
         attribution_example:
           alt: Exemplu de atribuire a OpenStreetMap pe o pagină Web
           title: Exemplul de atribuire
         more_title_html: Aflați mai multe.
-        more_1_html: |-
-          Citiți mai multe despre utilizarea datelor noastre și despre cum să ne creditați la <a
-          href="https://osmfoundation.org/Licence">Pagina de licență OSMF</a>.
-        more_2_html: |-
-          Cu toate că OpenStreetMap este bază de date deschisă, nu putem oferi un
-          API pentru hărțile gratuite pentru terțe părți.
-          Consultați <a href="https://operations.osmfoundation.org/policies/api/"> Politica de utilizare a API</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">Politica de utilizare a plăcilor</a>
-          și <a href="https://operations.osmfoundation.org/policies/nominatim/">Politica de utilizare Nominatim</a>.
         contributors_title_html: Contribuitorii noștri
         contributors_intro_html: |-
           Contribuitorii noștri sunt mii de indivizi. De asemenea, includem
           date cu licență de la agențiile naționale de cartografiere
           și alte surse, printre care:
-        contributors_at_html: |-
-          <strong>Austria</strong>: Conține date de la
-          <a href="https://data.wien.gv.at/">Stadt Wien</a> (under
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
-          Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
-        contributors_au_html: '<strong>Australia</strong>: Incorporează sau dezvoltate
-          pe baza limitelor administrative &copy; <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape
-          Australia</a> licențiat de Commonwealth of Australia sub licența<a href="https://creativecommons.org/licenses/by/4.0/">Creative
-          Commons Attribution 4.0 Internațional (CC BY 4.0)</a>'
-        contributors_ca_html: |-
-          <strong>Canada</strong>: Conține date de la
-          GeoBase&reg;, GeoGratis (&copy; Department of Natural
-          Resources Canada), CanVec (&copy; Department of Natural
-          Resources Canada), and StatCan (Geography Division,
-          Statistics Canada).
-        contributors_fi_html: |-
-          <strong>Finland</strong>: Conține date de la
-          National Land Survey of Finland's Topographic Database
-          and other datasets, under the
-          <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI License</a>.
-        contributors_fr_html: |-
-          <strong>Franța</strong>: Conține date provenite de la
-          Direction Générale des Impôts
-        contributors_nl_html: |-
-          <strong>Olanda</strong>: Contains &copy; AND data, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>Noua Zeelandă</strong>: Conține date provenite din
-          <a href="https://data.linz.govt.nz/">LINZ Data Service</a> and
-          licensed for reuse under
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: |-
-          <strong>Slovenia</strong>: Conține date din
-          <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and
-          <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
-          (public information of Slovenia).
-        contributors_es_html: |-
-          <strong>Spain</strong>: Conține date de la Institutul Național Geografic Spaniol (<a href="http://www.ign.es/">IGN</a>) și
-          Sistemul Cartografice Național (<a href="http://www.scne.es/">SCNE</a>)
-          licențiată pentru refolosirea sub <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: |-
-          <strong>Africa de Sud</strong>: Contains data sourced from
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, State copyright reserved.
-        contributors_gb_html: |-
-          <strong>Regatul Unit</strong>: Conține Ordnance
-          Survey data &copy; Crown copyright and database right
-          2010-19.
-        contributors_footer_1_html: |-
-          Pentru detalii suplimentare despre acestea și despre alte surse care au fost utilizate
-          pentru a vă ajuta să îmbunătățiți OpenStreetMap, consultați <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">Pagina contribuitorilor</a> pe Wiki-ul OpenStreetMap.
         contributors_footer_2_html: |-
           Includerea datelor în OpenStreetMap nu implică faptul că originalul
           furnizor de date acceptă OpenStreetMap, oferă orice garanție sau
@@ -1958,15 +1873,6 @@ ro:
           date de la nici una dintre sursele protejate de drepturi de autor (de ex.,
           Hărți Google sau hărți tipărite) fără permisiunea explicită din partea deținătorilor
           drepturilor de autor.
-        infringement_2_html: |-
-          Dacă credeți că materialul protejat prin drepturi de autor a fost necorespunzător adăugați la baza de date OpenStreetMap sau la acest site, vă rugăm să consultați la <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
-          procedure</a> procedura noastră de retragere</a> sau fișier direct la adresa noastră
-          <a href="https://dmca.openstreetmap.org/">on-line filing page</a>.
-        trademarks_title_html: <span id="trademarks"></span>Mărci înregistrate
-        trademarks_1_html: OpenStreetMap, sigla cu lupă și starea hărții sunt mărci
-          comerciale înregistrate ale Fundației OpenStreetMap. Dacă aveți întrebări
-          cu privire la utilizarea mărcilor, consultați <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark
-          Policy</a>.
     index:
       js_1: Utilizați fie un browser care nu acceptă JavaScript, fie aveți JavaScript
         dezactivat.
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 92d42f020..06a11fa95 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1651,11 +1651,6 @@ ru:
       subject: '[OpenStreetMap] Сбой импорта GPX'
     gpx_success:
       hi: Здравствуйте, %{to_user},
-      loaded_successfully:
-        one: успешно загружена %{trace_points} точка из %{possible_points} возможной.
-        few: успешно загружены %{trace_points} точки из %{possible_points} возможных.
-        many: успешно загружено %{trace_points} точек из %{possible_points} возможных.
-        other: ""
       subject: '[OpenStreetMap] Импорт GPX прошёл успешно'
     signup_confirm:
       subject: '[OpenStreetMap] Добро пожаловать в OpenStreetMap'
@@ -2028,94 +2023,26 @@ ru:
         mapping_link: начать картографирование
       legal_babble:
         title_html: Авторские права и лицензирование
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> содержит <i>свободные данные</i>, распространяемые по лицензии <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) организацией  <a
-          href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
-        intro_2_html: Вы можете свободно копировать, распространять, передавать и
-          дорабатывать наши данные до тех пор, пока вы ссылаетесь на OpenStreetMap
-          и его сообщество. Если вы изменяете или берёте наши данные за основу, то
-          вы должны распространять результат только по такой же лицензии. Полный <a
-          href="https://opendatacommons.org/licenses/odbl/1.0/">юридический текст
-          лицензии</a> разъясняет ваши права и обязанности.
-        intro_3_1_html: Наша документация распространяются по лицензии <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Как сослаться на OpenStreetMap
         credit_1_html: 'Если вы используете данные OpenStreetMap, вы должны выполнить
           следующие два условия:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Обеспечьте упоминание «OpenStreetMap», отобразив также наше уведомление об авторском праве.</li>
-            <li>Явно укажите, что данные доступны по лицензии Open Database License.</li>
-          </ul>
-        credit_3_1_html: 'У нас есть различные требования к тому, как должно отображаться
-          наше уведомление об авторских правах: всё зависит от того, как вы используете
-          наши данные. Например, действуют разные правила при отображении уведомления
-          об авторских правах в разных случаях: создали ли вы просматриваемую карту,
-          печатную карту или статичное изображение. Полную информацию о требованиях
-          можно найти в <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Руководстве
-          по указанию авторства</a>.'
-        credit_4_html: |-
-          Чтобы явно указать, что данные доступны по лицензии Open Database License, вы можете сослаться на <a href="https://www.openstreetmap.org/copyright"> эту страницу об авторском праве</a>.
-          В качестве альтернативы, а также в качестве требования, если вы распространяете OSM в виде набора данных, вы можете назвать лицензию(и) и дать на неё(них) прямую ссылку.
-          В СМИ, где ссылки физически невозможны (например, в печатных изданиях), мы предлагаем вам направлять читателей на сайт openstreetmap.org (возможно, расширив написание «OpenStreetMap» до полного веб-адреса) и на opendatacommons.org.
-          В этом примере, упоминание находится в углу карты.
         attribution_example:
           alt: Пример того, как сослаться на OpenStreetMap с веб-страницы
           title: Пример указания авторства
         more_title_html: Узнайте больше
-        more_1_html: Прочитайте больше об использовании наших данных и о том, как
-          указывать нас, на <a href="https://osmfoundation.org/Licence?uselang=ru">странице
-          Лицензии OSMF</a>.
-        more_2_html: Хотя данные OpenStreetMap открыты для использования, мы не в
-          состоянии предоставить бесплатный API к нашим картам для сторонних разработчиков.
-          См. <a href="https://operations.osmfoundation.org/policies/api/">Правила
-          использования API</a>, <a href="https://operations.osmfoundation.org/policies/tiles/">Правила
-          использования частей карты</a> и <a href="https://operations.osmfoundation.org/policies/nominatim/">Правила
-          использования службы Nominatim</a> .
         contributors_title_html: Кто вносит вклад в наш проект
         contributors_intro_html: 'Участниками проекта являются тысячи отдельных людей.
           Проект также включает данные под свободными лицензиями от национальных картографических
           агентств и от других источников, среди которых:'
-        contributors_at_html: |-
-          <strong>Австрия.</strong> Данные <a href="https://data.wien.gv.at/">города Вена</a> (на условиях <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>), а также земель <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Форарльберга</a> и
-             Тироля (на условиях <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT с дополнениями</a>).
-        contributors_au_html: |-
-          <strong>Австралия</strong>: Включено или разработано с использованием административных границ и копии;
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a>
-          под лицензией Содружества Австралии по
-          <a href="https://creativecommons.org/licenses/by/4.0/">международной лицензии Creative Commons Attribution 4.0 (CC BY 4.0)</a>.
-        contributors_ca_html: <strong>Канада.</strong> Данные от GeoBase ®, GeoGratis
-          (© Департамент природных ресурсов Канады), CanVec (© Департамент природных
-          ресурсов Канады) и StatCan (Отдел Географии, Статистическое ведомство Канады).
-        contributors_fi_html: |-
-          <strong>Финляндия</strong>: Содержит данные из топографической базы национальной земельной службы Финляндии
-           и других наборов данных, под
-          <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">лицензией NLSFI</a>.
-        contributors_fr_html: '<strong>Франция</strong>: Данные от Главного налогового
-          управления.'
-        contributors_nl_html: '<strong>Нидерланды</strong>: Contains &copy; AND data,
-          2007 (<a href="https://www.and.com">www.and.com</a>)'
-        contributors_nz_html: <strong>Новая Зеландия:</strong> содержит данные из
-          сервиса <a href="https://data.linz.govt.nz/">LINZ</a>согласно лицензии <a
-          href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>
-        contributors_si_html: '<strong>Словения</strong>: содержит данные от <a href="http://www.gu.gov.si/en/">Геодезического
-          и картографического управления</a> и <a href="http://www.mkgp.gov.si/en/">Министерства
-          сельского, лесного хозяйства и продовольствия</a> (открытая информация Словении).'
-        contributors_es_html: |-
-          <strong>Испания</strong>: Содержит данные, полученные от
-          Испанского национального географического института (<a href="http://www.ign.es/">IGN</a>) и
-          Национальной картографической системы (<a href="http://www.scne.es/">SCNE</a>) и лицензированные для повторного использования в соответствии с <a href="https://creativecommons.org/licenses/by/4.0/deed.ru">CC BY 4.0</a>.
-        contributors_za_html: |-
-          <strong>ЮАР</strong>: Имеются данные из
-          <a href="http://www.ngi.gov.za/">Главное управление:
-          Национальная геоинформационная система</a>, права принадлежат государству.
-        contributors_gb_html: <strong>Великобритания.</strong> Данные Ordnance Survey
-          © Crown copyright и права на базы данных 2010-23.
-        contributors_footer_1_html: Более подробную информацию об этих и других источниках,
-          использованных для наполнения OpenStreetMap, смотрите на <a href="https://wiki.openstreetmap.org/wiki/Contributors">странице
-          Contributors</a> вики-сервера OpenStreetMap.
+        contributors_at_austria: Австрия
+        contributors_at_land_vorarlberg: Земля Форарльберг
+        contributors_ca_canada: Канада
+        contributors_fi_finland: Финляндия
+        contributors_fr_france: Франция
+        contributors_nz_new_zealand: Новая Зеландия
+        contributors_si_slovenia: Словения
+        contributors_es_spain: Испания
+        contributors_gb_united_kingdom: Великобритания
         contributors_footer_2_html: Включение данных в OpenStreetMap не означает,
           что поставщик первичных данных каким-либо образом поддерживает OpenStreetMap,
           предоставляет гарантии или принимает на себя какую-любую ответственность.
@@ -2124,18 +2051,7 @@ ru:
           данных из любых защищённых авторским правом источников (например, с Google
           Maps или печатных карт) не должно проводиться без явного предварительного
           согласия правообладателей.
-        infringement_2_html: |-
-          Если вы считаете, что защищённый авторским правом материал был неправомерно
-           добавлен к базе OpenStreetMap или к этому сайту, пожалуйста, обратитесь
-           к нашей <a href="https://wiki.osmfoundation.org/wiki/License/Takedown_procedure">процедуре
-           изымания</a> или непосредственно на нашу
-          <a href="https://dmca.openstreetmap.org/">вебстраницу регистрации</a>.
-        trademarks_title_html: <span id="trademarks"></span>Товарные знаки
-        trademarks_1_html: OpenStreetMap, логотип с увеличительным стеклом и State
-          of the Map являются зарегистрированными товарными знаками Фонда OpenStreetMap.
-          Если у вас есть вопросы об использовании этих знаков, пожалуйста, ознакомьтесь
-          с <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Политикой
-          в области товарных знаков</a>.
+        trademarks_1_1_trademark_policy: Политика в отношении товарных знаков
     index:
       js_1: Вы используете браузер, в котором не поддерживается или отключён JavaScript.
       js_2: OpenStreetMap использует JavaScript для отображения карт.
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index dbbe63aa7..23adfb55e 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -173,41 +173,41 @@ sc:
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: pagu prus o mancu 1 ora a como
+        one: pagu prus o mancu %{count} ora a como
         other: pagu prus o mancu %{count} oras a como
       about_x_months:
-        one: pagu prus o mancu 1 mese a como
+        one: pagu prus o mancu %{count} mese a como
         other: pagu prus o mancu %{count} meses a como
       about_x_years:
-        one: pagu prus o mancu 1 annu a como
+        one: pagu prus o mancu %{count} annu a como
         other: pagu prus o mancu %{count} annos a como
       almost_x_years:
-        one: belle 1 annu a como
+        one: belle %{count} annu a como
         other: belle %{count} annos a como
       half_a_minute: mesu minutu a como
       less_than_x_seconds:
-        one: prus pagu de 1 segundu a como
+        one: prus pagu de %{count} segundu a como
         other: prus pagu de %{count} segundos a como
       less_than_x_minutes:
-        one: prus pagu de 1 minutu a como
+        one: prus pagu de %{count} minutu a como
         other: prus pagu de %{count} minutos a como
       over_x_years:
-        one: prus de 1 annu a como
+        one: prus de %{count} annu a como
         other: prus de %{count} annos a como
       x_seconds:
-        one: 1 segundu a como
+        one: '%{count} segundu a como'
         other: '%{count} segundos a como'
       x_minutes:
-        one: 1 minutu a como
+        one: '%{count} minutu a como'
         other: '%{count} minutos a como'
       x_days:
-        one: 1 die a como
+        one: '%{count} die a como'
         other: '%{count} dies a como'
       x_months:
-        one: 1 mese a como
+        one: '%{count} mese a como'
         other: '%{count} meses a como'
       x_years:
-        one: 1 annu a como
+        one: '%{count} annu a como'
         other: '%{count} annos a como'
   editor:
     default: Predefinidu (in custu momentu %{name})
@@ -309,6 +309,17 @@ sc:
       delete_account: Iscantzella su contu...
     go_public:
       heading: Modificatzione pùblica
+      currently_not_public: In custu momentu sas modìficas tuas sunt anònimas e sas
+        persones non ti podent imbiare messàgios o bìdere sa positzione tua. Incarca
+        su butone inoghe in suta pro ammustrare sas modìficas tuas e permìtere a sas
+        persones de ti chircare tràmite su situ web.
+      only_public_can_edit: A pustis de su coladòrgiu a s'API 0.6, petzi sos utentes
+        pùblicos podent modificare sos datos de sa mapa.
+      find_out_why: iscoberi pro ite
+      email_not_revealed: S'indiritzu de posta eletrònica tuo no at a bènnere riveladu
+        si as a devènnere unu contu pùblicu.
+      not_reversible: Custa atzione non si podet annullare e pro impostadura predefinida
+        como totu sos utentes noos sunt pùblicos.
       make_edits_public_button: Faghe totu sas modìficas meas pùblicas
     update:
       success_confirm_needed: Informatziones de s'utente atualizadas. Controlla s'indiritzu
@@ -331,10 +342,10 @@ sc:
     no_comment: (perunu cummentu)
     part_of: Parte de
     part_of_relations:
-      one: 1 relatzione
+      one: '%{count} relatzione'
       other: '%{count} relatziones'
     part_of_ways:
-      one: 1 lìnia
+      one: '%{count} lìnia'
       other: '%{count} lìnias'
     download_xml: Iscàrriga XML
     view_history: Càstia sa cronologia
@@ -379,7 +390,7 @@ sc:
       history_title_html: 'Istòria de sa relatzione: %{name}'
       members: Membros
       members_count:
-        one: 1 membru
+        one: '%{count} membru'
         other: '%{count} membros'
     relation_member:
       entry_role_html: '%{type} %{name} comente %{role}'
@@ -1008,7 +1019,7 @@ sc:
           fitness_station: Palestra a s'abertu
           garden: Giardinu
           golf_course: Campu de golf
-          horse_riding: Ecuitatzione
+          horse_riding: Tzentru de ecuitatzione
           ice_rink: Pista de astra
           marina: Marina (portu minore)
           miniature_golf: Minigolf
@@ -1427,7 +1438,7 @@ sc:
       last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> dae %{user}
       link_to_reports: Abbàida sos informes
       reports_count:
-        one: 1 sinnalatzione
+        one: '%{count} sinnalatzione'
         other: '%{count} sinnalatziones'
       reported_item: Elementu sinnaladu
       states:
@@ -1437,7 +1448,7 @@ sc:
     show:
       title: '%{status} Problema #%{issue_id}'
       reports:
-        one: 1 sinnalatzione
+        one: '%{count} sinnalatzione'
         other: '%{count} sinnalatziones'
       report_created_at: Sinnaladu pro sa prima borta su %{datetime}
       last_resolved_at: Risoltu pro s'ùrtima borta su %{datetime}
@@ -1600,10 +1611,6 @@ sc:
       subject: '[OpenStreetMap] Faddina de importatzione de GPX'
     gpx_success:
       hi: Salude %{to_user},
-      loaded_successfully:
-        one: carrigadu in manera curreta cun %{trace_points} de 1 puntu possìbile.
-        other: larrigadu in manera curreta cun %{trace_points} de %{possible_points}
-          puntos possìbiles.
       subject: '[OpenStreetMap] GPX importadu chene problemas'
     signup_confirm:
       subject: '[OpenStreetMap] Bene bènnidu in OpenStreetMap'
@@ -1708,6 +1715,7 @@ sc:
       success: As cunfirmadu su contu tuo, gràtzias pro t'èssere registradu!
       already active: Custu contu est istadu giai cunfirmadu.
       unknown token: Custu còdighe de cunfirma est iscadidu o no esistet.
+      click_here: incarca inoghe
     confirm_resend:
       failure: Utente %{name} no agatadu.
     confirm_email:
@@ -1976,110 +1984,22 @@ sc:
         mapping_link: incumintzare a mapare
       legal_babble:
         title_html: Deretu de autore e litzèntzia
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> est <i>a datos abertos</i>, suta de sa lissèntzia <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) frunida dae sa  <a
-          href="https://osmfoundation.org/">Fundatzione OpenStreetMap</a> (OSMF).
-        intro_2_html: |-
-          Ses lìberu de copiare, distribuire, trasmìtere a manera pùblica e adatare sos datos nostros,
-          semper chi ispetzìfiches chi sunt òpera de OpenStreetMap e de sos
-          contribuidores suos. Si modìficas o creas cosas basende·ti subra de sos datos nostros, as a pòdere distribuire sos resurtados cun sa matessi litzèntzia. Su
-          <a href="https://opendatacommons.org/licenses/odbl/1.0/">còdighe
-          legale</a> intreu acrarit sos deretos tuos e sas responsabilidades tuas.
-        intro_3_1_html: |-
-          Sa documentatzione nostra est a disponimentu suta de sa litzèntzia
-          <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Comente dare s'atributzione de sos contributos a OpenStreetMap
         credit_1_html: 'Cando impreas sos datos de OpenStreetMap, depes fàghere custas
           duas cosas:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Atribuire sos crèditos a OpenStreetMap ammustrende s'avisu de deretu de autore nostru.</li>
-            <li>Acrarire su fatu chi sos datos sunt a disponimentu suta de sa litzèntzia Open Database.</li>
-          </ul>
-        credit_3_1_html: Pro s'avisu de deretu de autore amus recuisitos diferentes
-          subra de comente diat dèpere èssere ammustradu, a segunda de comente ses
-          impreende sos datos nostros. A esèmpiu, s'àplicant règulas diferentes subra
-          de comente ammustrare s'avisu de deretu de autore a segunda chi tue apas
-          creadu una mapa navigàbile, una mapa imprentada o un'immàgine istàtica.
-          Totu sas informatziones a sa minuda subra de sos recuisitos si podent agatare
-          in sas <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">lìnias
-          de ghia subra de s'atributzione</a>.
-        credit_4_html: |-
-          Pro pònnere in craru chi sos datos sunt a disponimentu in base a sa litzèntzia Open Database, podes insertare unu ligàmene a <a href="https://www.openstreetmap.org/copyright">custa pàgina subra de su deretu de autore</a>.
-          In alternativa, e comente recuisitu si ses distribuende OSM in forma de datos, podes numenare e ligare a manera direta sas litzèntzias. In sos mèdios de comunicatzione in ue sos ligàmenes non sunt possìbiles (a es. òperas de paperi), ti cussigiamus de indiritzare sos letores tuos in manera direta cara a openstreetmap.org (mancari ismanniende 'OpenStreetMap' a s'indiritzu intreu suo) e a opendatacommons.org. In custu esèmpiu, sos crèditos aparint in s'àngulu de sa mapa.
         attribution_example:
           alt: Esempru de comente atribuire sos crèditos a OpenStreetMap in una pàgina
             web
           title: Esempru de atributzione
         more_title_html: Pro nd'ischire de prus
-        more_1_html: |-
-          Leghe àteras informatziones subra de s'impreu de sos datos nostros, e de comente nos atribuire sos crèditos, in sa <a
-          href="https://osmfoundation.org/Licence">pàgina de sa litzèntzia OSMF</a>.
-        more_2_html: Mancari sos datos de OpenStreetMap siant datos abertos, non podimus
-          ofèrrere un'API de badas a tertzos. Pòmpia·ti sa <a href="https://operations.osmfoundation.org/policies/api/">polìtica
-          de impreu de s'API</a>, sa <a href="https://operations.osmfoundation.org/policies/tiles/">polìtica
-          de impreu de sos tasseddos</a> e sa <a href="https://operations.osmfoundation.org/policies/nominatim/">polìtica
-          de impreu de Nominatim</a>.
         contributors_title_html: Sos collaboradores nostros
         contributors_intro_html: |-
           Sos contribuidores nostros sunt mìgias de persones. Includimus fintzas
           datos cun litzèntzias abertas de sas agèntzias pùblicas de cartografia e de àteras fontes, che a:
-        contributors_at_html: |-
-          <strong>Àustria</strong>: cuntenet datos dae
-          <a href="https://data.wien.gv.at/">Stadt Wien</a> (suta de sa
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> e
-          Land Tirol (suta de sa <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT cun emendamentos</a>).
-        contributors_au_html: |-
-          <strong>Austràlia</strong>: cuntenet o est isvilupada impreende sas làcanas amministrativas &copy;
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a>
-          publicadas dae su Commonwealth de s'Austràlia suta de sa
-          <a href="https://creativecommons.org/licenses/by/4.0/">litzèntzia Creative Commons Attribution 4.0 Internatzionale (CC BY 4.0)</a>.
-        contributors_ca_html: |-
-          <strong>Cànada</strong>: cuntenet datos dae
-          GeoBase&reg;, GeoGratis (&copy; Dipartimentu de sas Resursas Naturales de su Cànada), CanVec (&copy; Dipartimentu de sas Resursas
-          Naturales de su Cànada), e StatCan (Divisione de Geografia,
-          Istatìsticas de su Cànada).
-        contributors_fi_html: |-
-          <strong>Finlàndia</strong>: cuntenet datos dae sa
-          Base de datos topogràficos de s'ispetzione natzionale de su territòriu de sa Finlàndia
-          e àteros annantos de datos, suta de sa
-          <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">litzèntzia NLSFI</a>.
-        contributors_fr_html: |-
-          <strong>Frantza</strong>: cunenet datos chi benint dae sa
-          Direction Générale des Impôts.
-        contributors_nl_html: |-
-          <strong>Paisos Bassos</strong>: cuntenet datos &copy; AND, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>Zelanda Noa</strong>: cunenet datos chi benint dae su
-          <a href="https://data.linz.govt.nz/">servìtziu de datos LINZ</a>
-          publicados pro los torrare a impreare suta de sa
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: |-
-          <strong>Islovènia</strong>: cuntenet datos dae
-          <a href="http://www.gu.gov.si/en/">s'Autoridade pro su Rilievu e sa Mapadura</a> e su
-          <a href="http://www.mkgp.gov.si/en/">Ministru de s'Agricultura, sos padentes e su màndigu</a>
-          (informatziones pùblicas de s'Islovènia).
-        contributors_es_html: |-
-          <strong>Ispagna</strong>: cuntenet datos chi benint dae
-          s'Istitutu geogràficu natzionale ispagnolu (<a href="http://www.ign.es/">IGN</a>) e sae su
-          Sistema cartogràficu natzionale (<a href="http://www.scne.es/">SCNE</a>)
-          publicados pro los torrare a impreare suta de sa <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: |-
-          <strong>Sud Àfrica</strong>: cuntenet datos chi benint dae su
-          <a href="http://www.ngi.gov.za/">Diretoradu printzipale:
-          informatziones geo-ispatziales natzionales Geo-Spatial Information</a>, deretos de autore riservados dae s'Istadu.
-        contributors_gb_html: |-
-          <strong>Regnu Unidu</strong>: cuntenet sos datos de sa Ordnance
-          Survey &copy; deretu de autore e base de datos de sa Corona
-          2010-19.
-        contributors_footer_1_html: |-
-          Pro àteros detàllios subra de custas e de àteras fontes impreadas pro megiorare OpenStreetMap pòmpia·ti sa <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">pàgina de sos contribuidores</a> in sa wiki de OpenStreetMap.
+        contributors_si_slovenia: Islovènia
+        contributors_es_spain: Ispagna
+        contributors_es_ign: IGN
+        contributors_gb_united_kingdom: Regnu Unidu
         contributors_footer_2_html: |-
           S'inclusione de datos in OpenStreetMap no ìmplicat chi su frunidore originale
           de sos datos diat suportu a OpenStreetMap, frunat cale si siat garantzia o
@@ -2088,16 +2008,6 @@ sc:
         infringement_1_html: |-
           Ammentamus a sos collaboradores de OSM chi non depent annànghere mai datos dae cale si siat fonte cun deretos de autore registrados (a es. Google Maps o mapas imprentadas) chene
           tènnere un'autorizatzione esplìtzita de sos titulares de sos deretos de autore.
-        infringement_2_html: |-
-          Si pensas chi b'at materiale amparadu dae deretu de autore chi est istadu annantu in manera impròpria
-          a sa base de datos de OpenStreetMap o a custu situ bae a
-          su <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">protzedimentu nostru pro eliminare datos amparados dae sos deretos de autore</a> o compila custu
-          <a href="https://dmca.openstreetmap.org/">formulàriu in lìnia</a>.
-        trademarks_title_html: <span id="trademarks"></span>Màrchios registrados
-        trademarks_1_html: OpenStreetMap, su logotipu de sa lente de ismanniamentu
-          e «State of the Map» sunt màrchios registrados de sa Fundatzione OpenStreetMap.
-          Si tenes pregontas subra s'impreu de sas marcas, consultades sa <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">polìtica
-          pro sos màrchios registrados</a>.
     index:
       js_1: Ses impreende unu navigadore chi non tenet su suportu pro JavaScript o
         as inabilitadu JavaScript.
@@ -2321,14 +2231,20 @@ sc:
         title: Terminologia de base pro sa mapadura
         paragraph_1: OpenStreetMap tenet unu limbàgiu suo. Inoghe tenes unas cantas
           paràulas crae chi t'ant a pòdere èssere de giudu.
+        editor: editore
+        node: nodu
+        tag: eticheta
       rules:
         title: Règulas!
+        imports: Importatziones
+        automated_edits: Modìficas automatizadas
       start_mapping: Incumintza a mapare
       add_a_note:
         title: Non tenes tempus pro fàghere modìficas? Annanghe una nota!
         para_1: Si boles petzi una curretzione minore, e non tenes su tempus pro ti
           registrare e imparare comente fàghere modìficas, est fàtzile a annànghere
           una nota.
+        the_map: sa mapa
     communities:
       title: Comunidades
       lede_text: |-
@@ -2413,7 +2329,7 @@ sc:
     trace:
       pending: ISETENDE
       count_points:
-        one: 1 puntu
+        one: '%{count} puntu'
         other: '%{count} puntos'
       more: àteru
       trace_details: Pòmpia sos detàllios de sa rasta
@@ -2431,6 +2347,7 @@ sc:
       public_traces_from: Rastas GPS pùblicas de %{user}
       description: Esplora sos carrigamentos reghentes de rastas GPS
       tagged_with: ' etichetadas cun %{tags}'
+      wiki_page: pàgina wiki
       upload_trace: Càrriga una rasta
       all_traces: Totu sas rastas
       my_traces: Sas rastas meas
@@ -2642,6 +2559,8 @@ sc:
       consider_pd: Paris a totu su chi b'at inoghe in subra, atzeto chi sos contributos
         meos siant de domìniu pùblicu
       consider_pd_why: ite est custu?
+      readable_summary: resumu chi un'èssere umanu podet lèghere
+      informal_translations: tradutziones informales
       continue: Sighi
       decline: Refuda
       you need to accept or decline: Pro pòdere sighire leghe e a pustis atzeta o
@@ -2822,19 +2741,19 @@ sc:
       time_past_html: Agabbadu %{time}.
       block_duration:
         hours:
-          one: 1 ora
+          one: '%{count} ora'
           other: '%{count} oras'
         days:
-          one: 1 die
+          one: '%{count} die'
           other: '%{count} dies'
         weeks:
-          one: 1 chida
+          one: '%{count} chida'
           other: '%{count} chidas'
         months:
-          one: 1 mese
+          one: '%{count} mese'
           other: '%{count} meses'
         years:
-          one: 1 annu
+          one: '%{count} annu'
           other: '%{count} annos'
     blocks_on:
       title: Blocos pro %{name}
@@ -2959,10 +2878,10 @@ sc:
       locate:
         title: Ammustra sa positzione mea
         metersPopup:
-          one: Ses a unu metru dae custu puntu
+          one: Ses a %{count} metru dae custu puntu
           other: Ses a %{count} metros dae custu puntu
         feetPopup:
-          one: Ses a unu pee dae custu puntu
+          one: Ses a %{count} pee dae custu puntu
           other: Ses a %{count} pees dae custu puntu
       base:
         standard: Istandard
diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 5507dc20c..d720c68bb 100644
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -1091,8 +1091,6 @@ scn:
       subject: '[OpenStreetMap] Mpurtazzioni GPX nun arrinisciuta'
     gpx_success:
       hi: Salutamu %{to_user},
-      loaded_successfully: fu carricatu bonu cu %{trace_points} dî %{possible_points}
-        punti pussìbbili.
       subject: '[OpenStreetMap] Mpurtazzioni GPX arrinisciuta'
     signup_confirm:
       subject: '[OpenStreetMap] Bimminutu nta OpenStreetMap'
@@ -1398,86 +1396,17 @@ scn:
         mapping_link: accuminzari a mappari
       legal_babble:
         title_html: Dritti d'auturi e Licenza
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> è fattu di <i>dati graputi</i>, cunciduti sutta â licenza <a
-          href="http://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) dâ <a
-          href="http://osmfoundation.org/">Funnazzioni OpenStreetMap</a> (OSMF).
-        intro_2_html: |-
-          Sî lìbbiru di cupiari, diffùnniri, trasmèttiri e adattari li nostri dati, fintantu chi l'attribbuisci a OpenStreetMap e ê sò cuntribbutura. Si canci li dati o l'adòpiri comu puntu di partenza, poi distribbuiri lu travagghiu risurtanti sulamenti sutta â stissa licenza. Lu <a href="http://opendatacommons.org/licenses/odbl/1.0/">còdici ligali
-          code</a> cumpletu spiega quali sunnu li tò dritti e li tò rispunzabbilità.
-        intro_3_1_html: |-
-          La cartugrafìa ntê mattunelli dâ nostra cartina, e la nostra ducumintazzioni, sunnu sutta â licenza <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA).
         credit_title_html: Comu s'attribbuisci a OpenStreetMap
         credit_1_html: Addumannamu chi s'usa l'attribbuzzioni &laquo;&copy; li cuntribbutura
           d'OpenStreetMap&raquo;.
-        credit_2_1_html: "S'havi a rènniri chiaru ca li dati sunnu misi a dispusizzioni
-          sutta dâ Open\nDatabase License, e si s’adòpiranu li mattunelli dâ nostra
-          cartina, chi la cartugrafìa è sutta dâ licenza CC BY-SA. Sta cosa si pò
-          fari mittennu nu culligamentu a \n<a href=\"http://www.openstreetmap.org/copyright\">sta
-          pàggina dû drittu d'auturi</a>.\nComu altirnativa, e obbligatoriamenti quannu
-          si diffunni OSM sutta forma di dati, si ponnu mintuari li licenzi pi nomu
-          e cûn culligamentu direttu chi porta unni iddi. Nta ddi menzi unni li culligamenti
-          nun sunnu pussìbbili (p'esempiu ntâ carta stampata), suggiremu di mannari
-          li littura direttamenti unni openstreetmap.org (macari espannennu \n‘OpenStreetMap’
-          a stu nnirizzu cumpletu), unni opendatacommons.org, e, quann'è oppurtunu,
-          unni\n creativecommons.org."
-        credit_4_html: |-
-          Nta na cartina elittrònica navigàbbili, l’attribbuzzioni avissi a spuntari nta l'àngulu dâ cartina.
-          P'esempiu:
         attribution_example:
           alt: Esempiu di comu s'attribbuisci a OpenStreetMap nta na pàggina web
           title: Esempiu d'attribbuzzioni
         more_title_html: Pi sapìrinni cchiossai
-        more_1_html: |-
-          Attrova àutri nfurmazzioni a prupòsitu di comu s'adòpiranu li nostri dati, e comu ni si duna attribbuzzioni, ntâ <a
-          href="http://osmfoundation.org/Licence">pàggina dâ licenza di l'OSMF</a> e ntê <a
-          href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">addumannati friquenti ligali</a> gistuti dâ cumunità.
-        more_2_html: "Macari si OpenStreetMap è fattu di dati graputi, nun putemu
-          furniri n'API cartugràfica gratùita ê sviluppatura di terza parti.\nTalìa
-          la nostra <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Pulìtica
-          pi l'utilizzu di l'API</a>, \nla <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Pulìtica
-          pi l'utilizzu dî mattunelli</a>\n e la <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Pulìtica
-          pi l'utilizzu di Nominatim</a>."
         contributors_title_html: Li nostri cuntribbutura
         contributors_intro_html: 'Li nostri cuntribbutura sunnu migghiara di genti.
           Pigghiamu macari dati cu licenza graputa furnuti di l''agginzìi cartugràfichi
           nazziunali e d''àutri fonti, tra dî quali:'
-        contributors_at_html: "<strong>Austria</strong>: Cunteni dati dâ\n<a href=\"http://data.wien.gv.at/\">Stadt
-          Wien</a> (sutta a \n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC
-          BY</a>),\n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land
-          Vorarlberg</a> e\nLand Tirol (sutta a <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC
-          BY AT cu canciamenti</a>)."
-        contributors_ca_html: "<strong>Canadà</strong>: Cunteni dati di \nGeoBase&reg;,
-          GeoGratis (&copy; Department of Natural\nResources Canada), CanVec (&copy;
-          Department of Natural\nResources Canada), e StatCan (Geography Division,\nStatistics
-          Canada)."
-        contributors_fi_html: "<strong>Finlannia</strong>: Cunteni dati dâ Basi di
-          Dati Topugràfica dû National Land Survey dâ Finlannia e d'àutri nzemi di
-          dati, sutta â \n<a href=\"http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501\">Licenza
-          NLSFI</a>."
-        contributors_fr_html: "<strong>Francia</strong>: Cunteni dati furnuti dâ \nDirection
-          Générale des Impôts."
-        contributors_nl_html: |-
-          <strong>Paisi Vasci</strong>: Cunteni dati &copy; AND, 2007
-          (<a href="http://www.and.com">www.and.com</a>)
-        contributors_nz_html: "<strong>Nova Zilanna</strong>: Cunteni dati furnuti
-          dâ \nLand Information New Zealand. Crown Copyright reserved."
-        contributors_si_html: "<strong>Sluvenia</strong>: Counteni dati dâ \n<a href=\"http://www.gu.gov.si/en/\">Surveying
-          and Mapping Authority</a> e dû\n<a href=\"http://www.mkgp.gov.si/en/\">Ministeru
-          di l’Agricultura, dî Furesti e di l’Alimintazzioni</a>\n(nfurmazzioni pùbblichi
-          dâ Sluvenia)."
-        contributors_za_html: "<strong>Àfrica dû Sud</strong>: Cunteni dati dû \n<a
-          href=\"http://www.ngi.gov.za/\">Chief Directorate:\nNational Geo-Spatial
-          Information</a>, State copyright reserved."
-        contributors_gb_html: |-
-          <strong>Regnu Unitu</strong>: Cunteni dati di l’Ordnance
-          Survey &copy; Crown copyright and database right
-          2010-12.
-        contributors_footer_1_html: |-
-          Pi canùsciri àutri dittagghî supra a chisti e àutri fonti chi foru adupirati pi migghiurari OpenStreetMap, poi taliari <a
-          href="http://wiki.openstreetmap.org/wiki/Contributors">la pàggina dî cuntribbutura</a> supra â wiki di OpenStreetMap.
         contributors_footer_2_html: La nclusioni dî dati nta OpenStreetMap nun ìmplica
           ca lu sò furnituri origginali susteni OpenStreetMap, furnisci na quarchi
           garanzìa, o accetta na quarchi rispunzabbilità.
@@ -1486,17 +1415,6 @@ scn:
           mai dati chi vèninu di fonti prutetti dû drittu d'auturi (ad esempiu Google
           Maps o puru li carti stampati) senza aviri n'auturizzazzioni splìcita dû
           titulari dû drittu d'auturi.
-        infringement_2_html: "Si penzi chi fu junciutu di manera nun dèbbita matiriali
-          prutettu dû drittu d'auturi o ntâ basi di dati di OpenStreetMap o puru nta
-          stu situ, pi favuri fai rifirimentu â nostra\n <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">prucidura
-          di cancillazzioni</a> o puru signalinilu direttamenti pi menzu dû nostru
-          \n<a href=\"https://dmca.openstreetmap.org/\">mòdulu di signalazzioni n
-          lìnia</a>."
-        trademarks_title_html: <span id="trademarks"></span>Marchi riggistrati
-        trademarks_1_html: OpenStreetMap e lu logu dâ lenti di ngrannimentu sunnu
-          marchi riggistrati dâ Funnazzioni OpenStreetMap. Si hai quarchi addumannata
-          supra a l'utilizzu chi poi fari di sti marchi, la poi mannari ô <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Gruppu
-          di travagghiu dî licenzi</a>.
     index:
       js_1: O stai adupirannu nu browser chi nun supporta lu JavaScript, o puru hai
         lu JavaScript disattivatu.
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 14b21663d..46c8b8bcc 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -860,86 +860,19 @@ sco:
         mapping_link: stairt cairttin
       legal_babble:
         title_html: Copyricht an License
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> is <i>open data</i>, licensed unner the <a
-          href="http://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) bi the  <a
-          href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
-        intro_2_html: |-
-          Ye are free tae copy, distribute, transmit an adapt oor data,
-          as lang as ye credit OpenStreetMap an its
-          contreibutors. If ye alter or big upon oor data, ye
-          mey distribute the result anly unner the same licence. The
-          full <a href="http://opendatacommons.org/licenses/odbl/1.0/">legal
-          code</a> explains yer richts an responsibilities.
-        intro_3_1_html: |-
-          The cairtografie in oor cairt tiles, an oor documentation, are
-          licensed unner the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).
         credit_title_html: Hou tae credit OpenStreetMap
         credit_1_html: |-
           We require that ye uise the credit &ldquo;&copy; OpenStreetMap
           contributors&rdquo;.
-        credit_2_1_html: |-
-          Ye must an aa mak it clear that the data is available unner the Open
-          Database License, an if uisin oor cairt tiles, that the cairtografie is
-          licensed as CC BY-SA. Ye mey dae this bi airtin tae
-          <a href="http://www.openstreetmap.org/copyright">this copyricht page</a>.
-          Alternatively, an as a requirement if ye are distributin OSM in a
-          data form, ye can name an link directly tae the license(s). In media
-          whaur airtins are nae possible (e.g. printed wirks), we suggest ye
-          direct yer readers tae openstreetmap.org (perhaps bi expandin
-          'OpenStreetMap' tae this full address), tae opendatacommons.org, an
-          if relevant, to creativecommons.org.
-        credit_4_html: |-
-          For a brousable electronic cairt, the credit should appear in the corner o the cairt.
-          For example:
         attribution_example:
           alt: Example o hou tae attribute OpenStreetMap on a wabpage
           title: Attreibution example
         more_title_html: Findin oot mair
-        more_1_html: |-
-          Read mair aboot uisin oor data, an hou tae credit us, at the <a
-          href="http://osmfoundation.org/Licence">OSMF Licence page</a> an the commonty <a
-          href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
-          FAQ</a>.
-        more_2_html: |-
-          Altho OpenStreetMap is open data, we cannae provide a
-          free-o-charge cairt API for third-party developers.
-          See oor <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API Uisage Policy</a>,
-          <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile Uisage Policy</a>
-          and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Uisage Policy</a>.
         contributors_title_html: Oor contreibutors
         contributors_intro_html: |-
           Oor contreibutors are thoosands o individuals. We an aa include
           openly-licensed data frae naitional mappin agencies
           an ither soorces, amang them:
-        contributors_at_html: |-
-          <strong>Austrick</strong>: Contains data frae
-          <a href="http://data.wien.gv.at/">Stadt Wien</a> (unner
-          <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> an
-          Land Tirol (unner <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT wi amendments</a>).
-        contributors_ca_html: |-
-          <strong>Canadae</strong>: Contains data frae
-          GeoBase&reg;, GeoGratis (&copy; Department o Naitural
-          Resoorces Canadae), CanVec (&copy; Department o Naitural
-          Resoorces Canadae), an StatCan (Geografie Diveesion,
-          Stateestics Canadae).
-        contributors_fi_html: |-
-          <strong>Finland</strong>: Contains data frae the
-          Naitional Laund Survey o Finland's Topographic Database
-          an ither datasets, unner the
-          <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI License</a>.
-        contributors_fr_html: |-
-          <strong>Fraunce</strong>: Contains data soorced frae
-          Direction Générale des Impôts.
-        contributors_nl_html: |-
-          <strong>Netherlands</strong>: Contains &copy; AND data, 2007
-          (<a href="http://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>New Zealand</strong>: Contains data soorced frae
-          Land Information New Zealand. Crown Copyricht reserved.
         infringement_title_html: Copyricht infringement
     export:
       title: Export
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 597740fef..0e76eed27 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1501,8 +1501,6 @@ sk:
       subject: '[OpenStreetMap] Neúspešný import GPX'
     gpx_success:
       hi: Ahoj %{to_user},
-      loaded_successfully: sa úspešne načítal s %{trace_points} z možných %{possible_points}
-        bodov.
       subject: '[OpenStreetMap] GPX import úspešný'
     signup_confirm:
       subject: '[OpenStreetMap] Vitajte v OpenStreetMap'
@@ -1843,78 +1841,17 @@ sk:
         mapping_link: začať mapovať
       legal_babble:
         title_html: Autorské práva a licencia
-        intro_1_html: OpenStreetMap sú <em>slobodné dáta</em>, ponúkané za podmienok
-          licencie <a href="http://opendatacommons.org/licenses/odbl/">Open Data Commons
-          Open Database License</a> (ODbL).
-        intro_2_html: '  Môžete kopírovať, distribuovať, oznamovať verejnosti a upravovať
-          naše dáta, pokiaľ ako zdroj uvediete „<em>OpenStreetMap a jeho prispievatelia</em>“.
-          Ak naše mapy alebo dáta budete upravovať alebo ich použijete vo svojom diele,
-          musíte výsledné dielo šíriť pod rovnakou licenciou. Vaše práva a povinnosti
-          sú vysvetlené v <a href="http://opendatacommons.org/licenses/odbl/">plnom
-          znení licenčnej zmluvy</a>.'
-        intro_3_1_html: Naša dokumentácia je zverejnená pod licenciou <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Uveďte autora – Zachovajte licenciu 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Ako uvádzať OpenStreetMap
         credit_1_html: 'Kde používate údaje OpenStreetMap, musíte urobiť nasledujúce
           dve veci:'
-        credit_2_1_html: "<ul>\n  <li>Uveďte zásluhy OpenStreetMap zobrazením nášho
-          oznámenia o autorských právach.\n</li> \n  <li>Jasne uveďte, že údaje sú
-          dostupné pod licenciou Open Database License.</li> \n</ul>"
-        credit_4_html: "Aby bolo jasné, že údaje sú dostupné na základe licencie Open\nDatabase
-          License, môžete odkazovať na\n <a href=\"https://www.openstreetmap.org/copyright\">túto
-          stránku o autorských právach</a> .\nAlternatívne a ako požiadavka, ak distribuujete
-          OSM vo forme\núdajov, môžete pomenovať a prepojiť priamo na licenciu(e).
-          V médiách,\nkde nie sú možné odkazy (napr. tlačené diela), odporúčame\nnasmerovať
-          svojich čitateľov na openstreetmap.org (možno rozšírením\n'OpenStreetMap'
-          na túto úplnú adresu) a na opendatacommons.org. \nV tomto príklade sa kredit
-          zobrazí v rohu mapy."
         attribution_example:
           alt: Príklad, ako uvádzať autorstvo OpenStreetMap na webovej stránke
           title: Príklad uvedenia autorstva
         more_title_html: Ďalšie informácie
-        more_1_html: O používaní našich dát a spôsobe citovania, sa môžete dočítať
-          viac v našich <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Často
-          kladených právnych otázkach</a>.
-        more_2_html: |-
-          Hoci OpenStreetMap tvorí slobodné dáta, nemôžeme zadarmo poskytovať tretím stranám mapové API.
-          Pozrite naše <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">Pravidlá použitia API</a>, <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Pravidlá použitia mapových dlaždíc</a> a <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Pravidlá použitia nástroja Nominatim</a>.
         contributors_title_html: Naši prispievatelia
         contributors_intro_html: 'Naši prispievatelia sú tisícky jednotlivcov. Máme
           aj dáta so slobodnou licenciou od národných geografických inštitúcií či
           iných zdrojov, medzi nimi:'
-        contributors_at_html: |-
-          <strong>Rakúsko</strong>: Obsahuje dáta od
-          <a href="http://data.wien.gv.at/">mesta Viedeň</a> (pod licenciou
-          <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">krajiny Vorarlberg</a> a
-          krajiny Tirol (pod licenciou <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT s úpravami</a>).
-        contributors_au_html: '<strong>Austrália</strong>: Zahŕňa alebo využíva Administrative
-          Boundaries © <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape
-          Australia</a>, ktoré Commonwealth of Australia poskytuje za podmienok <a
-          href="https://creativecommons.org/licenses/by/4.0/deed.cs">licencie Creative
-          Commons Uveďte pôvod 4.0 Medzinárodná (CC BY 4.0)</a>.'
-        contributors_ca_html: '<strong>Kanada</strong>: Obsahuje dáta z GeoBase ®,
-          GeoGratis (© Department of Natural Resources Canada), CanVec (© Department
-          of Natural Resources Canada) a StatCan (Geography Division, Statistics Canada).'
-        contributors_fr_html: '<strong>Francúzsko</strong>: Obsahuje dáta pochádzajúce
-          z Direction Générale des impôts.'
-        contributors_nl_html: |-
-          <strong>Holandsko</strong>: obsahuje © AND dát, 2007
-          (<a href="http://www.and.com">www.and.com</a>)
-        contributors_nz_html: '<strong>Nový Zéland</strong>: Obsahuje údaje zo zdroja
-          <a href="https://data.linz.govt.nz/">LINZ Data Service</a> v licencii <a
-          href="https://creativecommons.org/licenses/by/4.0/">CC 4.0</a>.'
-        contributors_si_html: '<strong>Slovinsko</strong>: Obsahuje údaje <a href="http://www.gu.gov.si/">Zememeračského
-          a mapovacieho úradu</a> a <a href="http://www.mkgp.gov.si/">Ministerstva
-          poľnohospodárstva, lesníctva a potravín</a> (verejné informácie o Slovinsku).'
-        contributors_za_html: '<strong>Juhoafrická republika</strong>: Obsahuje dáta
-          pochádzajúce z <a href="http://www.ngi.gov.za/">Chief Directorate: National
-          Geo-Spatial Information</a>, State copyright reserved.'
-        contributors_gb_html: '<strong>Spojené kráľovstvo</strong>: Obsahuje dáta
-          Ordnance Survey © Crown copyright a právo k databáze 2010-19.'
-        contributors_footer_1_html: |-
-          Podrobnosti o týchto a ďalších zdrojoch, ktoré boli použité pre vylepšenie OpenStreetMap, nájdete na <a
-          href="http://wiki.openstreetmap.org/wiki/Contributors">stránke Contributors</a> na OpenStreetMap wiki.
         contributors_footer_2_html: '  Zahrnutie dát do OpenStreetMap neznamená, že
           pôvodný poskytovateľ dát podporuje OpenStreetMap, ponúka akúkoľvek záruku,
           alebo prijíma akúkoľvek zodpovednosť.'
@@ -1922,15 +1859,6 @@ sk:
         infringement_1_html: Prispievateľom OSM pripomíname, že by nikdy nemali pridávať
           dáta zo zdrojov chránených autorským právom (napr. Google Maps či tlačené
           mapy) bez výslovného súhlasu držiteľov práv.
-        infringement_2_html: Ak sa domnievate, že materiál podliehajúci autorským
-          právam bol neoprávnene pridaný do databázy OpenStreetMap alebo na tieto
-          stránky, prosíme vás, aby ste si pozreli náš <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">postup
-          odstraňovania</a> alebo podajte žiadosť priamo na <a href="https://dmca.openstreetmap.org/">stránke
-          pre podávanie sťažností</a>.
-        trademarks_1_html: OpenStreetMap, logo s lupou a State of the Map sú registrované
-          ochranné známky OpenStreetMap Foundation. Ak máte otázky týkajúce sa používania
-          týchto známok, zašlite ich <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">pracovnej
-          skupine pre licencovanie</a>.
     index:
       js_1: Používate prehliadač bez podpory JavaScriptu, alebo máte JavaScript vypnutý.
       js_2: OpenStreetMap používa pre interaktívnu mapu JavaScript.
diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml
index 4f7cbcba1..e00870a28 100644
--- a/config/locales/skr-arab.yml
+++ b/config/locales/skr-arab.yml
@@ -176,8 +176,6 @@ skr-arab:
         link text: ایہ کیا ہے؟
       save changes button: تبدیلیاں محفوظ کرو
       delete_account: کھاتہ مٹاؤ۔۔۔
-    go_public:
-      find_out_why_html: (%{link}).
   browse:
     created: بݨ ڳیا
     closed: بند تھیا
@@ -818,9 +816,18 @@ skr-arab:
       native:
         title: ایں ورقے بارے
       legal_babble:
-        trademarks_1_html: |-
-          OpenStreetMap، میگنفائنگ گلاس علامت (لوگو) تے نقشہ دی ریاست OpenStreetMap فاؤنڈیشن دے رجسٹرڈ ٹریڈ مارک ہن.
-          ڄے تہاݙے کول نقشہ ورتݨ بارے سوال ہن تاں، براہ کرم ساݙی <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy"> ٹریڈ مارک پالیسی </a> ملاحظہ کرو.
+        introduction_1_open_data: کھلا ڈیٹا
+        contributors_at_austria: آسٹریا
+        contributors_at_cc_by: سی سی۔بی وائی
+        contributors_au_australia: آسٹریلیا
+        contributors_ca_canada: کنیڈا
+        contributors_fi_finland: فِن لینڈ
+        contributors_fr_france: فرانس
+        contributors_nz_cc_by: سی سی بی وائی ٤.٠
+        contributors_es_spain: سپین
+        contributors_es_cc_by: سی سی بی وائی ٤.٠
+        contributors_za_south_africa: جنوبی افریقہ
+        trademarks_1_1_trademark_policy: ٹریڈمارک پالیسی
     index:
       permalink: پکا لنک
       shortlink: مختصر لنک
@@ -846,7 +853,6 @@ skr-arab:
         title: آئی آر سی
     any_questions:
       title: کوئی سوال؟
-      welcome_mat_url: https://welcome.openstreetmap.org/
     sidebar:
       close: بند کرو
     search:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 6bda37260..1daeda273 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -182,63 +182,63 @@ sl:
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: pred približno 1 uro
+        one: pred približno %{count} uro
         two: pred približno %{count} urama
         few: pred približno %{count} urami
         other: pred približno %{count} urami
       about_x_months:
-        one: pred približno 1 mesecem
+        one: pred približno %{count} mesecem
         two: pred približno %{count} mesecema
         few: pred približno %{count} meseci
         other: pred približno %{count} meseci
       about_x_years:
-        one: pred približno 1 letom
+        one: pred približno %{count} letom
         two: pred približno %{count} letoma
         few: pred približno %{count} leti
         other: pred približno %{count} leti
       almost_x_years:
-        one: pred skoraj 1 letom
+        one: pred skoraj %{count} letom
         two: pred skoraj %{count} letoma
         few: pred skoraj %{count} leti
         other: pred skoraj %{count} leti
       half_a_minute: pred pol minute
       less_than_x_seconds:
-        one: pred manj kot 1 sekundo
+        one: pred manj kot %{count} sekundo
         two: pred manj kot %{count} sekundama
         few: pred manj kot %{count} sekundami
         other: pred manj kot %{count} sekundami
       less_than_x_minutes:
-        one: pred manj kot minuto
+        one: pred manj kot %{count} minuto
         two: pred manj kot %{count} minutama
         few: pred manj kot %{count} minutami
         other: pred manj kot %{count} minutami
       over_x_years:
-        one: pred več kot 1 letom
+        one: pred več kot %{count} letom
         two: pred več kot %{count} letoma
         few: pred več kot %{count} leti
         other: pred več kot %{count} leti
       x_seconds:
-        one: pred 1 sekundo
+        one: pred %{count} sekundo
         two: pred %{count} sekundama
         few: pred %{count} sekundami
         other: pred %{count} sekundami
       x_minutes:
-        one: pred 1 minuto
+        one: pred %{count} minuto
         two: pred %{count} minutama
         few: pred %{count} minutami
         other: pred %{count} minutami
       x_days:
-        one: pred 1 dnem
+        one: pred %{count} dnem
         two: pred %{count} dnevoma
         few: pred %{count} dnevi
         other: pred %{count} dnevi
       x_months:
-        one: pred 1 mesecem
+        one: pred %{count} mesecem
         two: pred %{count} mesecema
         few: pred %{count} meseci
         other: pred %{count} meseci
       x_years:
-        one: pred 1 letom
+        one: pred %{count} letom
         two: pred %{count} letoma
         few: pred %{count} leti
         other: pred %{count} leti
@@ -345,9 +345,7 @@ sl:
         spodnji gumb.
       only_public_can_edit: Od prehoda na API 0.6 lahko urejajo podatke zemljevida
         samo javni uporabniki.
-      find_out_why_html: (%{link}).
       find_out_why: ugotovite, zakaj
-      find_out_why_url: https://wiki.openstreetmap.org/wiki/Anonymous_edits
       email_not_revealed: Vaš e-poštni naslov ne bo razkrit, ko bo vaš račun postal
         javen.
       not_reversible: Tega dejanja ni mogoče razveljaviti, vsi novi uporabniki pa
@@ -374,12 +372,12 @@ sl:
     no_comment: (brez komentarja)
     part_of: Del
     part_of_relations:
-      one: 1 relacija
+      one: '%{count} relacija'
       two: '%{count} relaciji'
       few: '%{count} relacije'
       other: '%{count} relacij'
     part_of_ways:
-      one: 1 pot
+      one: '%{count} pot'
       two: 2 poti
       few: '%{count} poti'
       other: '%{count} poti'
@@ -387,8 +385,6 @@ sl:
     view_history: Ogled zgodovine
     view_details: Prikaz podrobnosti
     location: 'Lokacija:'
-    common_details:
-      coordinates_html: '%{latitude}, %{longitude}'
     changeset:
       title: 'Sklop sprememb: %{id}'
       belongs_to: Avtor
@@ -431,12 +427,11 @@ sl:
       history_title_html: 'Zgodovina povezave: %{name}'
       members: Člani
       members_count:
-        one: 1 član
+        one: '%{count} član'
         two: '%{count} člana'
         few: '%{count} člani'
         other: '%{count} članov'
     relation_member:
-      entry_html: '%{type} %{name}'
       entry_role_html: '%{type} %{name} kot %{role}'
       type:
         node: Vozlišče
@@ -614,7 +609,6 @@ sl:
       location: 'Lokacija:'
       view: Prikaži
       edit: Uredi
-      coordinates: '%{latitude}; %{longitude}'
     feed:
       user:
         title: Dnevniški zapisi OpenStreetMap za uporabnika %{user}
@@ -681,7 +675,6 @@ sl:
         osm_nominatim_reverse_html: Zadetki iz <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>-a
     search_osm_nominatim:
-      prefix_format: '%{name}'
       prefix:
         aerialway:
           cable_car: Nihalka
@@ -1478,7 +1471,7 @@ sl:
         %{user}
       link_to_reports: Ogled prijav
       reports_count:
-        one: 1 poročilo
+        one: '%{count} poročilo'
         two: '%{count} poročili'
         few: '%{count} poročila'
         other: '%{count} poročil'
@@ -1490,7 +1483,7 @@ sl:
     show:
       title: '%{status} Težava #%{issue_id}'
       reports:
-        one: 1 prijava
+        one: '%{count} prijava'
         two: '%{count} prijavi'
         few: '%{count} prijave'
         other: '%{count} prijav'
@@ -1562,9 +1555,6 @@ sl:
       successful_report: Vaše sporočilo je uspešno zabeleženo.
       provide_details: Navedite zahtevane podrobnosti
   layouts:
-    project_name:
-      title: OpenStreetMap
-      h1: OpenStreetMap
     logo:
       alt_text: OpenStreetMap logotip
     home: Domov
@@ -1653,13 +1643,22 @@ sl:
         Napaka:'
       more_info_html: Več informacij o napakah pri uvozu GPX in o tem, kako se jim
         izogniti, lahko najdete na %{url}.
-      import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures
       subject: '[OpenStreetMap] Neuspeh uvoza datoteke GPX'
     gpx_success:
       hi: Pozdravljeni, %{to_user},
-      loaded_successfully: |-
-        bila uspešno uvožena z %{trace_points} od vseh možnih
-        %{possible_points} točk.
+      loaded:
+        one: |-
+          bila uspešno naložena z %{trace_points} od možne
+          %{count} točke.
+        two: |-
+          bila uspešno naložena z %{trace_points} od možnih
+          %{count} točk
+        few: |-
+          bila uspešno naložena s %{trace_points} od možnih
+          %{count} točk
+        other: |-
+          bila uspešno naložena z %{trace_points} od možnih
+          %{count} točk
       subject: '[OpenStreetMap] Uspeh uvoza datoteke GPX'
     signup_confirm:
       subject: '[OpenStreetMap] Pozdravljeni v OpenStreetMap'
@@ -1959,8 +1958,6 @@ sl:
   shared:
     markdown_help:
       heading_html: Razčlenjeno s %{kramdown_link}
-      kramdown_url: https://kramdown.gettalong.org/quickref.html
-      kramdown: kramdown
       headings: Naslovi
       heading: Naslov
       subheading: Podnaslov
@@ -2032,104 +2029,129 @@ sl:
         mapping_link: začnete kartirati
       legal_babble:
         title_html: Avtorske pravice in licenca
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> so <i>prosti podatki</i>, objavljeni
-          pod licenco <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL) <a href="https://osmfoundation.org/">Fundacije OpenStreetMap</a> (OSMF).
-        intro_2_html: "Naše podatke lahko prosto kopirate, razširjate, prenašate\nin
+        introduction_1_html: |-
+          OpenStreetMap%{registered_trademark_link} so %{open_data}, ki jih je pod licenco
+          %{odc_odbl_link} (ODbL) objavila %{osm_foundation_link} (OSMF).
+        introduction_1_open_data: odprti podatki
+        introduction_1_odc_odbl: Licenca za odprte podatkovne zbirke Open Data Commons
+        introduction_1_osm_foundation: Fundacija OpenStreetMap
+        introduction_2_html: "Naše podatke lahko prosto kopirate, razširjate, prenašate\nin
           prilagajate, pod pogojem, da kot vir navedete OpenStreetMap in \nsodelavce.
           Če podatke spremenite ali nadgradite, jih lahko\nrazširjate le pod enakimi
-          licenčnimi pogoji. Vaše pravice in obveznosti opisuje polno\n<a href=\"https://opendatacommons.org/licenses/odbl/1.0/\">besedilo\nlicence</a>."
-        intro_3_1_html: Naša dokumentacija je na voljo pod pogoji licence <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.sl">Creative
-          Commons Priznanje avtorstva-Deljenje pod enakimi pogoji 2.0</a> (CC BY-SA
-          2.0).
+          licenčnimi pogoji. Vaše pravice in obveznosti opisuje %{legal_code_link}."
+        introduction_2_legal_code: pravno besedilo
+        introduction_3_html: Naša dokumentacija je objavljena pod licenco %{creative_commons_link}
+          (CC BY-SA 2.0).
+        introduction_3_creative_commons: Creative Commons Priznanje avtorstva-Deljenje
+          pod enakimi pogoji 2.0
+        introduction_3_creative_commons_url: https://creativecommons.org/licenses/by-sa/2.0/deed.sl
         credit_title_html: Kako pripisati zasluge projektu OpenStreetMap
         credit_1_html: 'Pri uporabi podatkov OpenStreetMap morate narediti naslednje:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Pripišite zasluge OpenStreetMap z navedbo našega obvestila o avtorskih pravicah.</li>
-            <li>Pojasnite, da so podatki na voljo pod licenco Open Database License.</li>
-          </ul>
-        credit_3_1_html: Za obvestilo o avtorskih pravicah imamo različne zahteve,
-          kako naj bo prikazano, odvisno od tega, kako uporabljate naše podatke. Veljajo
+        credit_2_1: Navedite avtorstvo OpenStreetMap s prikazom našega obvestila o
+          avtorskih pravicah.
+        credit_2_2: Pojasnite, da so podatki na voljo pod licenco Open Database.
+        credit_3_html: Za obvestilo o avtorskih pravicah imamo različne zahteve, kako
+          naj bo prikazano, odvisno od tega, kako uporabljate naše podatke. Veljajo
           na primer različna pravila o tem, kako prikazati obvestilo o avtorskih pravicah
           glede na to, ali ste ustvarili zemljevid za brskanje, natisnjeni zemljevid
-          ali statično sliko. Vse podrobnosti o zahtevah najdete v <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Smernicah
-          o pripisu avtorstva</a>.
-        credit_4_html: "Za pojasnitev, da so podatki na voljo pod licenco Open Database,
-          se lahko povežete na\n<a href=\"https://www.openstreetmap.org/copyright\">to
-          avtorskopravno stran</a>.\nDruga možnost in zahteva, če OSM distribuirate
-          v\npodatkovni obliki, je navedba licence (licenc) z neposredno povezavo
-          (neposrednimi povezavami) nanjo (nanje). V medijih,\nkjer povezave niso
-          mogoče (npr. tiskana dela), predlagamo, da svoje bralce usmerite na\nopenstreetmap.org
-          (morda z razširitvijo\n»OpenStreetMap« na ta polni naslov) in na opendatacommons.org.
-          \nV tem primeru je pripis zaslug naveden v kotu zemljevida."
+          ali statično sliko. Vse podrobnosti o zahtevah najdete v %{attribution_guidelines_link}.
+        credit_3_attribution_guidelines: Smernice za navedbo avtorstva
+        credit_4_1_html: "Za pojasnitev, da so podatki na voljo pod licenco Open Database,
+          se lahko povežete na\n%{this_copyright_page_link}.\nDruga možnost in zahteva,
+          če OSM distribuirate v\npodatkovni obliki, je navedba licence (licenc) z
+          neposredno povezavo (neposrednimi povezavami) nanjo (nanje). V medijih,\nkjer
+          povezave niso mogoče (npr. tiskana dela), predlagamo, da svoje bralce usmerite
+          na\nopenstreetmap.org (morda z razširitvijo\n»OpenStreetMap« na ta polni
+          naslov) in na opendatacommons.org. \nV tem primeru je pripis zaslug naveden
+          v kotu zemljevida."
+        credit_4_1_this_copyright_page: ta stran o avtorskih pravicah
         attribution_example:
           alt: Zgled pripisa avtorstva OpenStreetMap na spletni strani
           title: Zgled pripisa
         more_title_html: Več o tem
-        more_1_html: "Preberite več o uporabi naših podatkov in o tem, kako nam pripisati
-          zasluge, na \n<a href=\"https://osmfoundation.org/Licence\">strani licence
-          OSMF</a>."
-        more_2_html: |-
-          Čeprav so OpenStreetMap odprti podatki, za tretje
-          osebe ne moremo zagotavljati brezplačnega API-ja.
-          Glejte <a href="https://operations.osmfoundation.org/policies/api/">Pravilnik o uporabi API-ja</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">Pravilnik o uporabi ploščic</a>
-          in <a href="https://operations.osmfoundation.org/policies/nominatim/">Pravilnik o uporabi Nominatim</a>.
+        more_1_1_html: O uporabi naših podatkov in o tem, kako lahko navedete naše
+          avtorstvo, si preberite več na %{osmf_licence_page_link}.
+        more_1_1_osmf_licence_page: Licenčna stran Fundacije OSM
+        more_2_1_html: |-
+          Čeprav so OpenStreetMap odprti podatki, ne moremo zagotoviti
+          brezplačnega API-ja zemljevidov za tretje osebe.
+          Glejte %{api_usage_policy_link}, %{tile_usage_policy_link} in %{nominatim_usage_policy_link}.
+        more_2_1_api_usage_policy: Politika uporabe API-ja
+        more_2_1_tile_usage_policy: Politika uporabe ploščic
+        more_2_1_nominatim_usage_policy: Politika uporabe Nominatim
         contributors_title_html: Naši sodelavci
         contributors_intro_html: "Naših sodelavcev je na tisoče. Vključujemo tudi
           odprtolicenčne \npodatke nacionalnih kartografskih agencij\nin drugih virov,
           med njimi:"
-        contributors_at_html: "<strong>Avstrija</strong>: Vsebuje podatke \n<a href=\"https://data.wien.gv.at/\">Stadt
-          Wien</a> (pod licenco\n<a href=\"https://creativecommons.org/licenses/by/3.0/at/deed.de\">CC
-          BY</a>),\n<a href=\"https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land
-          Vorarlberg</a> in\nLand Tirol (under <a href=\"https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC
-          BY AT s popravki</a>)."
-        contributors_au_html: "<strong>Avstralija</strong>: vključuje ali se razvija
-          z uporabo upravnih meja &copy;\n<a href=\"https://geoscape.com.au/legal/data-copyright-and-disclaimer/\">Geoscape
-          Australia</a>, \nz dovoljenjem Commonwealtha Avstralije pod\n<a href=\"https://creativecommons.org/licenses/by/4.0/\">Mednarodno
-          licenco Creative Commons Attribution 4.0 (CC BY 4.0)</a>."
-        contributors_ca_html: |-
-          <strong>Kanada</strong>: Vsebuje podatke iz
+        contributors_at_credit_html: |-
+          %{austria}: Vsebuje podatke iz %{stadt_wien_link} (pod %{cc_by_link}), %{land_vorarlberg_link}
+          in dežele Tirolske (pod %{cc_by_at_with_amendments_link}).
+        contributors_at_austria: Avstrija
+        contributors_at_stadt_wien: Mesto Dunaj
+        contributors_at_cc_by: CC BY
+        contributors_at_cc_by_url: https://creativecommons.org/licenses/by-sa/3.0/deed.sl
+        contributors_at_land_vorarlberg: Dežela Vorarlberg
+        contributors_at_cc_by_at_with_amendments: CC BY AT s spremembami
+        contributors_au_credit_html: |-
+          %{australia}: Vključuje ali razvito z uporabo Administrative Boundaries &copy; %{geoscape_australia_link}
+          objavil Commonwealth of Australia pod licenco %{cc_licence_link}.
+        contributors_au_australia: Avstralija
+        contributors_au_geoscape_australia: Geoscape Avstralija
+        contributors_au_cc_licence: Lcenca Creative Commons Attribution 4.0 International
+          (CC BY 4.0)
+        contributors_ca_credit_html: |-
+          %{canada}: Vsebuje podatke iz
           GeoBase®, GeoGratis (&copy; Department of Natural
           Resources Canada), CanVec (&copy; Department of Natural
           Resources Canada) in StatCan (Geography Division,
           Statistics Canada).
-        contributors_fi_html: |-
-          <strong>Finska</strong>: Vsebuje podatke
-          National Land Survey Finske Topografske podatkovne zbirke
-          in druge nabore podatkov, pod
-          <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">licenco NLSFI</a>.
-        contributors_fr_html: |-
-          <strong>Francija</strong>: Vsebuje podatke iz
+        contributors_ca_canada: Kanada
+        contributors_fi_credit_html: |-
+          %{finland}: Vsebuje podatke iz
+          National Land Survey of Finland's Topographic Database
+          in druge nize podatkov pod %{nlsfi_license_link}.
+        contributors_fi_finland: Finska
+        contributors_fi_nlsfi_license: Licenca NLSFI
+        contributors_fr_credit_html: |-
+          %{france}: Vsebuje podatke iz
           Direction Générale des Impôts.
-        contributors_nl_html: |-
-          <strong>Nizozemska</strong>: Vsebuje podatke &copy; <abbr title="Automotive Navigation Data">AND"</abbr>, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>Nova Zelandija</strong>: Vsebuje podatke iz
-          <a href="https://data.linz.govt.nz/">LINZ Data Service</a> in
-          licencirane za nadaljnjo uporabo pod licenco
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: |-
-          <strong>Slovenija</strong>: Vsebuje javne podatke
-          <a href="http://www.gu.gov.si">Geodetske uprave Republike Slovenije</a> in
-          <a href="http://www.mkgp.gov.si">Ministrstva za kmetijstvo, gozdarstvo in prehrano</a>.
-        contributors_es_html: |-
-          <strong>Å panija</strong>: Vsebuje podatke, pridobljene od
-          Španskega nacionalnega geografskega inštituta (<a href="http://www.ign.es/">IGN</a>) in iz Nacionalnega kartografskega sistema (<a href="http://www.scne.es/">SCNE</a>),
-          licencirane za nadaljnjo uporabo pod licenco <a href="https://creativecommons.org/licenses/by/4.0/deed.sl">CC BY 4.0</a>.
-        contributors_za_html: |-
-          <strong>Južna Afrika</strong>: Vsebuje podatke
-          <a href="http://www.ngi.gov.za/">Glavnega direktorata:
-          Nacionalni geoprostorski podatki</a>, avtorske pravice države pridržane.
-        contributors_gb_html: |-
-          <strong>Združeno kraljestvo</strong>: Vsebuje podatke Ordnance
+        contributors_fr_france: Francija
+        contributors_nl_credit_html: '%{netherlands}: Vsebuje podatke © IN, 2007 (%{and_link})'
+        contributors_nl_netherlands: Nizozemska
+        contributors_nz_credit_html: |-
+          %{new_zealand}: Vsebuje podatke, pridobljene iz %{linz_data_service_link}
+          in objavljene za nadaljnjo uporabo pod licenco %{cc_by_link}.
+        contributors_nz_new_zealand: Nova Zelandija
+        contributors_nz_linz_data_service: Podatkovna storitev LINZ
+        contributors_nz_cc_by: CC BY 4.0
+        contributors_si_credit_html: |-
+          %{slovenia}: Vsebuje podatke iz %{gu_link} in %{mkgp_link}
+          (javne informacije v Sloveniji).
+        contributors_si_slovenia: Slovenija
+        contributors_si_gu: Geodetska uprava
+        contributors_si_gu_url: https://www.gov.si/drzavni-organi/organi-v-sestavi/geodetska-uprava/
+        contributors_si_mkgp: Ministrstvo za kmetijstvo, gozdarstvo in prehrano
+        contributors_es_credit_html: |-
+          %{spain}: Vsebuje podatke, pridobljene iz
+          Španskega nacionalnega geografskega inštituta (%{ign_link}) in
+          Nacionalnega kartografskega sistema (%{scne_link})
+          licenciranih za ponovno uporabo pod %{cc_by_link}.
+        contributors_es_spain: Å panija
+        contributors_es_ign: IGN
+        contributors_es_cc_by: CC BY 4.0
+        contributors_za_credit_html: '%{south_africa}: Vsebuje podatke iz %{ngi_link},
+          avtorske pravice države pridržane.'
+        contributors_za_south_africa: Južna Afrika
+        contributors_za_ngi: 'Glavni direktorat: Nacionalne geoprostorske informacije'
+        contributors_gb_credit_html: |-
+          %{united_kingdom}: Vsebuje podatke Ordnance
           Survey &copy; Avtorske pravice in pravice podatkovne zbirke,
           2010–2023.
-        contributors_footer_1_html: |-
-          Za več podrobnosti o teh in drugih virih, ki so bili uporabljeni kot pripomočki pri izboljševanju OpenStreetMap, si oglejte <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">stran sodelujočih</a> v vikiju OpenStreetMap.
+        contributors_gb_united_kingdom: Združeno kraljestvo
+        contributors_2_html: |-
+          Za dodatne podrobnosti o teh in drugih virih, ki so bili uporabljeni
+          za pomoč pri izboljšanju OpenStreetMap, glejte %{contributors_page_link} v vikiju OpenStreetMap.
+        contributors_2_contributors_page: Stran sodelujočih
         contributors_footer_2_html: |-
           Vključitev podatkov v OpenStreetMap ne pomeni, da izvorni
           ponudnik podatkov podpira OpenStreetMap, daje kakršno koli jamstvo ali
@@ -2139,16 +2161,18 @@ sl:
           Sodelavce OSM opozarjamo, da nikoli ne dodajajo podatkov iz nobenega
           avtorsko zavarovanega vira (npr. Zemljevidov Google ali tiskanih zemljevidov) brez
           izrecnega dovoljenja imetnikov avtorskih pravic.
-        infringement_2_html: |-
-          Če menite, da je bilo avtorsko zavarovano gradivo neprimerno
-          dodano v podatkovno zbirko OpenStreetMap ali na to spletno mesto, glejte
-          naš <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">postopek odstranitve</a> ali neposredno izpolnite našo
-          <a href="https://dmca.openstreetmap.org/">stran za spletno prijavo</a>.
-        trademarks_title_html: <span id="trademarks"></span>Tržne znamke
-        trademarks_1_html: OpenStreetMap, logotip povečevalnega stekla in State of
-          the Map so registrirane tržne znamke Fundacije OpenStreetMap. Če imate vprašanja
-          o uporabi znamk, glejte naš <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Pravilnik
-          o tržnih znamkah</a>.
+        infringement_2_1_html: |-
+          Če menite, da je bilo v zbirko podatkov OpenStreetMap ali na to spletno mesto neustrezno dodano avtorskopravno varovano gradivo, glejte
+          našo %{takedown_procedure_link} ali datoteko neposredno na naši
+          %{online_filing_page_link}.
+        infringement_2_1_takedown_procedure: postopek odstranitve
+        infringement_2_1_online_filing_page: spletna stran za prijavo
+        trademarks_title: Tržne znamke
+        trademarks_1_1_html: |-
+          OpenStreetMap, logotip povečevalnega stekla in State of the Map so registrirane blagovne znamke
+          OpenStreetMap Foundation. Če imate vprašanja o vaši uporabi znamk, glejte našo
+          %{trademark_policy_link}.
+        trademarks_1_1_trademark_policy: Politika tržnih znamk
     index:
       js_1: Bodisi uporabljate brskalnik, ki ne podpira Javascripta, ali pa je izvajanje
         Javascripta onemogočeno.
@@ -2165,7 +2189,6 @@ sl:
       not_public_description_html: Urejanje zemljevida ni mogoče dokler vaši prispevki
         niso javni. Označite jih lahko kot javne na %{user_page}.
       user_page_link: strani vašega uporabniškega računa
-      anon_edits_html: (%{link})
       anon_edits_link_text: Pojasnilo zakaj je temu tako.
       id_not_configured: iD Å¡e ni konfiguriran
       no_iframe_support: Vaš brskalnik ne podpira HTML iframes, kar je potrebno za
@@ -2182,7 +2205,6 @@ sl:
       licence_details_html: Podatki OpenStreetMap so licencirani pod %{odbl_link}
         (ODbL).
       odbl: Licenca odprte podatkovne zbirke Open Data Commons1
-      odbl_url: https://opendatacommons.org/licenses/odbl/1.0/
       too_large:
         advice: 'Če zgornji izvoz spodleti, uporabite enega od naslednjih virov:'
         body: To območje je preveliko za izvoz podatkov OpenStreetMap v formatu XML.
@@ -2235,7 +2257,6 @@ sl:
           %{copyright_link} za več pravnih informacij ali se obrnite na ustrezno %{working_group_link}.
         copyright: stran o avtorskih pravicah
         working_group: delovno skupino OSMF
-        working_group_url: https://wiki.osmfoundation.org/wiki/Working_Groups
     help:
       title: Iskanje pomoči
       introduction: OpenStreetMap ima več virov za učenje o projektu, postavljanje
@@ -2250,7 +2271,6 @@ sl:
         title: Vodnik za začetnike
         description: Vodnik za začetnike, ki ga vzdržuje skupnost.
       help:
-        url: https://help.openstreetmap.org/
         title: Forum za pomoč
         description: Postavite vprašanje ali poiščite odgovore v zbirki vprašanj in
           odgovorov OpenStreetMap.
@@ -2259,7 +2279,6 @@ sl:
         description: Postavite vprašanje ali razpravljajte o različnih krajevnih ali
           regionalnih temah v Å¡tevilnih dopisnih seznamih.
       community:
-        url: https://community.openstreetmap.org/
         title: Forum skupnosti
         description: Skupno mesto za pogovore o OpenStreetMap.
       irc:
@@ -2271,12 +2290,10 @@ sl:
         description: Pomoč za podjetja in organizacije, ki prehajajo na zemljevide
           in druge storitve OpenStreetMap.
       welcomemat:
-        url: https://welcome.openstreetmap.org/
         title: Za organizacije
         description: Ste iz organizacije z načrti za OpenStreetMap? Kar morati vedeti,
           lahko najdete v Paketu dobrodošlice.
       wiki:
-        url: https://wiki.openstreetmap.org/
         title: Viki OpenStreetMap
         description: Prebrskajte viki za poglobljeno dokumentacijo OpenStreetMap.
     potlatch:
@@ -2284,7 +2301,6 @@ sl:
         Player ni več na voljo, Potlatch ni več na voljo za uporabo v spletnem brskalniku.
       desktop_application_html: Å e vedno lahko uporabljate Potlatch %{download_link}.
       download: prenos namizne aplikacije za Mac in Windows
-      download_url: https://www.systemed.net/potlatch/
       id_editor_html: Lahko pa privzeti urejevalnik nastavite na iD, ki se izvaja
         v vašem spletnem brskalniku, tako kot se je Potlatch. %{change_preferences_link}
       change_preferences: Spremenite svoje prilagoditve tukaj
@@ -2296,7 +2312,6 @@ sl:
         %{help_link}. Ste pri organizacijo, ki ima načrte za uporabo OpenStreetMap? %{welcome_mat_link}.
       get_help_here: Poiščite pomoč tukaj
       welcome_mat: Oglejte si podlogo za dobrodošlico
-      welcome_mat_url: https://welcome.openstreetmap.org/
     sidebar:
       search_results: Iskalni zadetki
       close: Zapri
@@ -2422,7 +2437,6 @@ sl:
         imports: Uvozi
         imports_url: https://wiki.openstreetmap.org/wiki/SL:Import/Guidelines
         automated_edits: Avtomatizirana urejanja
-        automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct
       start_mapping: Začnite kartirati
       add_a_note:
         title: Nimate časa za urejanje? Dodajte opombo!
@@ -2451,7 +2465,6 @@ sl:
           obstajajo kot neformalno srečevanje ali kot skupina v skupnosti. Vsakdo
           jih lahko ustanovi ali se jim pridruži. Preberite več na %{communities_wiki_link}.
         communities_wiki: Vikistran skupnosti
-        communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group
   traces:
     visibility:
       private: Zasebna (v skupni rabi kot anonimna, neurejene točke)
@@ -2462,7 +2475,6 @@ sl:
     new:
       upload_trace: Naloži sled GPS
       visibility_help: kaj to pomeni?
-      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: Pomoč
       help_url: https://wiki.openstreetmap.org/wiki/Upload
     create:
@@ -2484,7 +2496,6 @@ sl:
       title: Urejanje sledi %{name}
       heading: Urejanje sledi %{name}
       visibility_help: kaj to pomeni?
-      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     update:
       updated: Sled posodobljena
     trace_optionals:
@@ -2517,7 +2528,7 @@ sl:
     trace:
       pending: V ČAKALNI VRSTI
       count_points:
-        one: 1 točka
+        one: '%{count} točka'
         two: '%{count} točki'
         few: '%{count} točke'
         other: '%{count} točk'
@@ -2670,7 +2681,6 @@ sl:
       no_applications_html: Imate aplikacijo, ki jo želite registrirati za uporabo
         z nami po standardu %{oauth2}? Da bo lahko za to storitev izvajala zahtevke
         OAuth, jo morate najprej registrirati.
-      oauth_2: OAuth 2
       new: Registriraj novo aplikacijo
       name: Ime
       permissions: Dovoljenja
@@ -2929,27 +2939,27 @@ sl:
       time_past_html: Je končala %{time} nazaj.
       block_duration:
         hours:
-          few: '%{count} ure'
-          one: 1 ura
+          one: '%{count} ura'
           two: '%{count} uri'
+          few: '%{count} ure'
           other: '%{count} ur'
         days:
-          one: 1 dan
+          one: '%{count} dan'
           two: '%{count} dneva'
           few: '%{count} dni'
           other: '%{count} dni'
         weeks:
-          one: 1 teden
+          one: '%{count} teden'
           two: '%{count} tedna'
           few: '%{count} tedni'
           other: '%{count} tednov'
         months:
-          one: 1 mesec
+          one: '%{count} mesec'
           two: '%{count} meseca'
           few: '%{count} meseci'
           other: '%{count} mesecev'
         years:
-          one: 1 leto
+          one: '%{count} leto'
           two: '%{count} leti'
           few: '%{count} leta'
           other: '%{count} let'
@@ -3075,12 +3085,12 @@ sl:
       locate:
         title: Pokaži mojo lokacijo
         metersPopup:
-          one: Ste znotraj enega metra od te točke
+          one: Ste znotraj %{count} metra od te točke
           two: Ste znotraj %{count} metrov od te točke
           few: Ste znotraj %{count} metrov od te točke
           other: Ste znotraj %{count} metrov od te točke
         feetPopup:
-          one: Ste znotraj enega čevlja od te točke
+          one: Ste znotraj %{count} čevlja od te točke
           two: Ste znotraj %{count} čevljev od te točke
           few: Ste znotraj %{count} čevljev od te točke
           other: Ste znotraj %{count} čevljev od te točke
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index aaee757b4..bc808a32a 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1095,38 +1095,10 @@ sq:
         mapping_link: fillo hatrografimin
       legal_babble:
         title_html: Të drejtat autoriale dhe licensa
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> përmban <i>të dhëna të hapura</i>, të licencuara nën <a
-          href="http://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) by the  <a
-          href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
-        intro_2_html: "Ju jeni të lirë të kopjoni, shpërndani, transmetoni dhe adoptoni
-          dhe të dhënat tona, \nduke pasur parasysh citimin e OpenStreetMap dhe kontribuuesve
-          të saj. Nëse ndryshoni apo ndërtoni mbi hartat apo të dhënat tona, ju\nmund
-          të shpërndani rezultatet nën licencën e njëjtë. Licenca e plotë <a\n  href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">legal\n
-          \ code</a> shpjegon të drejtat dhe përgjegjësitë tuaja."
-        intro_3_1_html: "Dokumentacioni ynë është i licencuar nën\n<a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">
-          \nLicenca Kreative e Atribuimit të përbashkët-ShareAlike 2.0 </a> (CC BY-SA
-          2.0)."
         credit_title_html: Si të citoni OpenStreetMap
         credit_1_html: Ne kërkojmë që ju të përdorni kreditet e &ldquo;&copy; OpenStreetMap
           contributors&rdquo;.
-        credit_2_1_html: "  Ku është e mundur, OpenStreetMap duhet të hyperlinked
-          to <a\n  href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n
-          \ dhe  CC BY-SA to <a\n  href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>.
-          Nëse jeni duke përdorur një medium ku nuk mund të bëhen linka (p.sh. a\n
-          \ letër e shtypur), ne sugjerojmë që ju të drejtoni lexuesit tek\n  www.openstreetmap.org
-          (ndoshta duke shpjeguar \n  &lsquo;OpenStreetMap&rsquo; këtë adresë të plotë)
-          dhe tek \n  www.creativecommons.org."
         more_title_html: Zbulo më shumë
-        more_1_html: |2-
-            Lexoni më shumë rreth përdorimit të të dhënave <a
-            href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
-            FAQ</a>.
-        more_2_html: |2-
-            OSM kontribuuesit duhet të mos përdorin asnjë të dhënë prej burimeve të çfarëdoshme
-            të mbrojtura me të drejta të kopjimit (p.sh. Google Maps apo harta të printuara) pa
-            leje speciale prej pronarëve të të drejtave të kopjimit.
         contributors_title_html: Kontribuuesit tanë
         contributors_intro_html: "  Licenca jonë CC BY-SA kërkon nga ju që &ldquo;të
           vlerësoni Autorin\n  Origjinal përkatës të mediumit apo masave që jeni duke
@@ -1135,23 +1107,6 @@ sq:
           por kur përfshihen në OSM, hartat nga një agjencion nacional i hartave \n
           \ apo faktor tjerë madhor burimor, është e arsyeshme të citohen drejtpërsëdrejti
           \n   duke paraqitur emrin apo duke lidhur faqen e tyre me link."
-        contributors_au_html: '<strong>Australia</strong>: Përmban të dhëna periferike
-          të bazuara në të dhënat e Zyrës Australiane të Statistikave.'
-        contributors_ca_html: |-
-          <strong>Canada</strong>: Përmban të dhëna nga
-          GeoBase&reg;, GeoGratis (&copy; Department of Natural
-          Resources Canada), CanVec (&copy; Department of Natural
-          Resources Canada), and StatCan (Geography Division,
-          Statistics Canada).
-        contributors_nz_html: |-
-          <strong> Zelanda e Re </strong>: Përmban të dhëna me burim nga
-          <a href="https://data.linz.govt.nz/"> Shërbimi i të Dhënave LINZ </a> dhe
-          licencuar për ripërdorim nën
-          <a href="https://creativecommons.org/licenses/by/4.0/"> CC BY 4.0 </a>.
-        contributors_gb_html: |-
-          <strong> Mbretëria e Bashkuar </strong>: Përmban Ordinancë
-          Të dhënat e sondazhit & kopje; E drejta e autorit e kurorës dhe e drejta e bazës së të dhënave
-          2010-19.
         contributors_footer_2_html: "  Përfshirja e të dhënave në OpenStreetMap nuk
           thekson se të ofruesi origjinal i të \n  dhënave përdor OpenStreetMap, ofron
           garancion, apo\n  pranon çfarëdo anekse."
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index c7eb340fd..9ffc66b17 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -801,8 +801,6 @@ sr-Latn:
       import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures?uselang=sr-ec
       subject: '[OpenStreetMap] GPX uvoz nije uspeo'
     gpx_success:
-      loaded_successfully: uspešno učitano sa %{trace_points} od mogućih %{possible_points}
-        tačaka.
       subject: '[OpenStreetMap] GPX uvoz je uspeo'
     signup_confirm:
       subject: '[OpenStreetMap] Potvrdite vašu e-adresu'
@@ -954,17 +952,6 @@ sr-Latn:
         mapping_link: počnite s mapiranjem
       legal_babble:
         title_html: Autorska prava i licenca
-        intro_1_html: |-
-          OpenStreetMap is <i>open data</i>, licensed under the <a
-          href="http://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL).
-        intro_2_html: |2-
-            Možete da umnožavate, delite, prenosite i prilagođavate
-            naše mape i podatke, sve dok imenujete Openstritmap i njene
-            urednike. Ako želite da menjate i dograđujete naše podatke,
-            možete ih deliti samo pod istom licencom.
-            Ceo <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">
-            tekst ugovora</a> objašnjava vam vaša prava i odgovornosti.
         credit_title_html: Kako da imenujete Openstritmap
         credit_1_html: |2-
             Ako koristite naše slike mapa, tražimo da zasluge sadrže
@@ -973,14 +960,6 @@ sr-Latn:
             navedite &ldquo;Kartografski podaci &copy; Doprinosioci Openstritmapa,
             CC BY-SA&rdquo;.
         more_title_html: Saznajte više
-        more_1_html: |2-
-            Pročitajte više o korišćenju naših podataka na <a
-            href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">ČPP</a>.
-        more_2_html: |2-
-            Podsećamo urednike Openstritmapa da nikada ne dodaju podatke
-            od bilo kog izvora zaštićenog autorskim pravima (npr.
-            Gugl mape ili štampane mape) bez izričite dozvole
-            nosioca autorskog prava.
         contributors_title_html: Naši saradnici
         contributors_intro_html: |2-
             Naša licenca CC BY-SA zahteva od vas da &ldquo;morate
@@ -990,41 +969,6 @@ sr-Latn:
             pripadaju nacionalnoj geografskoj agenciji ili drugom
             većem izvoru koji je uključen u Openstritmap, razumno je
             navesti izvor ili ostaviti hipervezu do njega.
-        contributors_at_html: |-
-          <strong>Austrija</strong>: sadrži podatke iz
-             <a href="http://data.wien.gv.at/">Å tata Viena</a> pod licencom
-             <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-             <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Forarlberg</a> i
-          Land Tirol (pod licencom <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT sa izmenama i dopunama</a>).
-        contributors_au_html: |-
-          <strong>Australija</strong>: sadrži podatke o opštinama
-              na osnovu podataka Australijskog biroa za statistiku.
-        contributors_ca_html: |-
-          <strong>Kanada</strong>: sadrži podatke iz
-              Beobaze&reg;, Geogratisa (&copy; Odeljenje za prirodne
-              resurse Kanade), Kanvek (&copy; Odeljenje za prirodne
-              resurse Kanade) i Statkan (Geografski odsek,
-              Zavod za statistiku Kanade).
-        contributors_fr_html: |-
-          <strong>Francuska</strong>: sadrži podatke koji potiču od
-              Generalne direkcije za oporezivanje.
-        contributors_nl_html: |-
-          <strong>Holandija</strong>: sadrži &copy; AND podaci, 2007
-          (<a href="http://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>Novi Zeland</strong>: sadrži podatke koji potiču od
-              Land Information New Zealand. Krunska autorska prava zadržana.
-        contributors_za_html: |-
-          <strong>Južnoafrička Republika</strong>: sadrži podatke iz
-          <a href="http://www.ngi.gov.za/">Glavne uprave:
-          Nacionalna katastarska služba</a>, državna autorska prava zadržana.
-        contributors_gb_html: |-
-          <strong>Ujedinjeno Kraljevstvo</strong>: sadrži Zvanične
-              podatke geodetskog premeravanja &copy; Autorska prava 2010.
-        contributors_footer_1_html: |-
-          Više informacija o ovim i drugim izvorima korišćenim
-          za poboljšavanje Openstritmapa možete naći na stranici <a
-          href="http://wiki.openstreetmap.org/wiki/Contributors">Doprinosioci</a> na našem vikiju.
         contributors_footer_2_html: |2-
             Uključivanje podataka u Openstritmap ne podrazumeva da izvorni
             vlasnik podataka prihvata Openstritmap, obezbeđuje bilo kakvu
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 00b863422..2673403e5 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1263,8 +1263,6 @@ sr:
       import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures?uselang=sr-ec
       subject: '[OpenStreetMap] GPX увоз није успео'
     gpx_success:
-      loaded_successfully: успешно учитано са %{trace_points} од могућих %{possible_points}
-        тачака.
       subject: '[OpenStreetMap] GPX увоз је успео'
     signup_confirm:
       subject: '[OpenStreetMap] Добро дошли на ОпенСтритМап'
@@ -1548,20 +1546,6 @@ sr:
         mapping_link: почни с уређивањем карте
       legal_babble:
         title_html: Ауторска права и лиценца
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> садржи <i>слободне податке</i> који су доступни под лиценцом <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) организације <a
-          href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
-        intro_2_html: |2-
-            Можете да умножавате, делите, преносите и прилагођавате
-            наше податке, све док именујете Опенстритмап и њене
-            уреднике. Ако желите да мењате и дограђујете наше податке,
-            можете их делити само под истом лиценцом.
-            Цео <a href="https://opendatacommons.org/licenses/odbl/1.0/">
-            текст уговора</a> објашњава вам ваша права и одговорности.
-        intro_3_1_html: Наша документација је лиценцирана под <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.mk">Кријејтив
-          комонс Ауторство-Делити под истим условима 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Како да именујете OpenStreetMap
         credit_1_html: 'Када користите податке са OpenStreetMap-а, захтевамо да урадите
           две ствари:'
@@ -1569,70 +1553,11 @@ sr:
           alt: Пример како да наведете Опенстритмап на некој страници
           title: Пример за навођење
         more_title_html: Више о
-        more_1_html: |-
-          Више о употреби података и како да нас наводите можете наћи на <a
-          href="http://osmfoundation.org/Licence">страници лиценце OSMF</a> и у <a
-          href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">честим правним питањима</a>.
-        more_2_html: |-
-          Иако OpenStreetMap ради с отвореним подацима, не можемо
-          трећим странама понудити бесплатан API за мапе.
-          Погледајте <a href="https://operations.osmfoundation.org/policies/api/">правила о употреби API-ја</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">правила о употреби поља</a>
-          и <a href="https://operations.osmfoundation.org/policies/nominatim/">Номинатим</a>.
         contributors_title_html: Наши сарадници
         contributors_intro_html: |-
           У нашем пројекту учествује на хиљаде појединаца. Користимо и
           податке с отвореном лиценцом од државних картографских установа
           и других извора, међу којима су:
-        contributors_at_html: |-
-          <strong>Аустрија</strong>: садржи податке из
-             <a href="https://data.wien.gv.at/">Штата Виена</a> под лиценцом
-             <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-             <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Ланд Форарлберг</a> и
-          Ланд Тирол (под лиценцом <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT са изменама и допунама</a>).
-        contributors_au_html: |-
-          <strong>Аустралија</strong>: садржи податке о општинама &copy;
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Аустралија</a>
-          лиценцирано од стране Комонвелта Аустралије под
-          <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International licence (CC BY 4.0)</a>.
-        contributors_ca_html: |-
-          <strong>Канада</strong>: садржи податке из
-              Беобазе&reg;, Геогратиса (&copy; Одељење за природне
-              ресурсе Канаде), Канвек (&copy; Одељење за природне
-              ресурсе Канаде) и Статкан (Географски одсек,
-              Завод за статистику Канаде).
-        contributors_fi_html: |-
-          <strong>Финска</strong>: Садржи податке са
-          Топографске базе података Националног геодетског завода Финске
-          те друге сетове података, под
-          <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI лиценцом</a>.
-        contributors_fr_html: |-
-          <strong>Француска</strong>: садржи податке који потичу од
-              Генералне дирекције за опорезивање.
-        contributors_nl_html: |-
-          <strong>Холандија</strong>: садржи &copy; AND подаци, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: "<strong>Нови Зеланд</strong>: Садржи податке које потичу
-          из \n<a href=\"https://data.linz.govt.nz/\">Услуге са подацима LINZ</a>,
-          а\nлиценциране за поновну употребу под лиценцом\n<a href=\"https://creativecommons.org/licenses/by/4.0/\">CC
-          BY 4.0</a>."
-        contributors_si_html: |-
-          <strong>Словенија</strong>: Садржи податке са
-          <a href="http://www.gu.gov.si/en/">Ауторитета за истраживање и мапирање</a> те од
-          <a href="http://www.mkgp.gov.si/en/">Министарства за пољопривреду, шумарство и прехрамбену индустрију</a>
-          (јавне информације Словеније).
-        contributors_za_html: |-
-          <strong>Јужноафричка Република</strong>: садржи податке из
-          <a href="http://www.ngi.gov.za/">Главне управе:
-          Национална катастарска служба</a>, државна ауторска права задржана.
-        contributors_gb_html: |-
-          <strong>Уједињено Краљевство</strong>: Садржи податке
-          Картографског завода Уједињеног Краљевства&copy; Крунска ауторска права и права базе података
-          2010-2023.
-        contributors_footer_1_html: |-
-          Више информација о овим и другим изворима коришћеним
-          за побољшавање Опенстритмапа можете наћи на страници <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">Доприносиоци</a> на нашем викију.
         contributors_footer_2_html: |2-
             Укључивање података у Опенстритмап не подразумева да изворни
             власник података прихвата Опенстритмап, обезбеђује било какву
@@ -1641,17 +1566,6 @@ sr:
         infringement_1_html: ОСМ сарадници се подсећају да никад не додају податке
           из извора заштићених ауторским правима (нпр. Гугл карте или штампане карте)
           без изричите дозволе власника ауторских права.
-        infringement_2_html: |-
-          Ако верујете да је материјал заштићен ауторским правима био неприкладно
-          додат у базу података OpenStreetMap или овај сајт, молимо да пратите
-          нашу <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">процедуру за
-          скидање</a> или да се директно обратите на
-          нашој <a href="https://dmca.openstreetmap.org/">онлајн страници за пријаве</a>.
-        trademarks_title_html: <span id="trademarks"></span>Робне марке
-        trademarks_1_html: OpenStreetMap, лого лупе и State of the Map регистроване
-          су робне марке Фондације OpenStreetMap. Ако имате питања о томе како да
-          користите марке, пошаљите своја питања <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Радној
-          групи за лиценце</a>.
     index:
       js_1: Користите прегледач који не подржава јаваскрипт или сте га онемогућили.
       js_2: OpenStreetMap користи јаваскрипт за приказивање мапа.
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index b76c9b0dc..b021485ca 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1604,15 +1604,6 @@ sv:
       subject: '[OpenStreetMap] Misslyckades importera GPX'
     gpx_success:
       hi: Hej %{to_user},
-      loaded_successfully:
-        one: |-
-          inläst med %{trace_points} av 1 möjlig punkt.
-
-          inläst med %{trace_points} av %{possible_points} möjliga punkter.
-        other: |-
-          inläst med %{trace_points} av %{possible_points} möjliga punkter.
-
-          inläst med %{trace_points} av %{possible_points} möjliga punkter.
       subject: '[OpenStreetMap] Lyckades importera GPX'
     signup_confirm:
       subject: '[OpenStreetMap] Välkommen till OpenStreetMap'
@@ -1964,104 +1955,18 @@ sv:
         mapping_link: börja kartlägga
       legal_babble:
         title_html: Upphovsrätt och licens
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> är <i>öppna data</i>, gjord tillgänglig under licensen <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL) av <a
-          href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
-        intro_2_html: |-
-          Du är fri att kopiera, distribuera, överföra och anpassa vår data,
-          så länge du anger OpenStreetMap och dess bidragsgivare som källa.
-          Om du ändrar eller bygger vidare på vår data kan du
-          endast distribuera resultatet under samma licens. Den
-          fullständiga <a href="https://opendatacommons.org/licenses/odbl/1.0/">juridiska
-          texten</a> förklarar dina rättigheter och skyldigheter.
-        intro_3_1_html: "Vår dokumentation är tillgänglig under licensen \n<a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons
-          Erkännande-DelaLika 2.0</a> (CC BY-SA 2.0)."
         credit_title_html: Hur du anger OpenStreetMap som källa
         credit_1_html: 'När du använder OpenStreetMap-data, måste du göra dessa två
           saker:'
-        credit_2_1_html: |-
-          Du måste också göra klart att datan är tillgänglig under licensen Open Database License, och om du använder våra kartrutor, att kartografin är
-          tillgänglig under licensen CC BY-SA. Du kan göra detta genom att länka till
-          <a href="https://www.openstreetmap.org/copyright">denna sida om upphovsrätt</a>.
-          Alternativt, och som krav om du distribuerar OSM i dataform, kan du namnge
-          och länka direkt till licenserna. I media där länkar ej är möjliga
-          (t.ex. tryckt material), föreslår vi att du hänvisar dina läsare till openstreetmap.org
-          (förslagsvis genom att expandera 'OpenStreetMap' till hela denna adress), till opendatacommons.org, och om relevant till creativecommons.org.
-        credit_3_1_html: Kartrutorna i &ldquo;standardstilen&rdquo; på www.openstreetmap.org
-          är ett producerat verk av OpenStreetMap Foundation med hjälp av OpenStreetMap-data
-          under licensen Open Database. När du använder denna kartstil krävs samma
-          erkännande som för kartdata.
-        credit_4_html: |-
-          För en navigerbar elektronisk karta, ska källhänvisningen synas i ena hörnet av kartan.
-          Till exempel:
         attribution_example:
           alt: Exempel på hur en webbsida kan ange OpenStreetMap som källa
           title: Exempel på attribuering.
         more_title_html: Mer information
-        more_1_html: |-
-          Läs mer om användning av vår data och hur du anger oss som källa på <a
-          href="https://osmfoundation.org/Licence">OSMF:s licenssida</a>.
-        more_2_html: |-
-          Även om OpenStreetMap är öppna data, kan vi inte tillhandahålla något gratis kart-API för tredjeparter.
-          Se vår <a href="https://operations.osmfoundation.org/policies/api/">användningspolicy för API</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">användningspolicy för kartrutor</a>
-          och <a href="https://operations.osmfoundation.org/policies/nominatim/">användningspolicy för Nominatim</a>.
         contributors_title_html: VÃ¥ra bidragsgivare
         contributors_intro_html: |-
           Våra bidragsgivare är tusentals individer. Vi inkluderar också
           öppna data från nationella karttjänster,
           bland annat från:
-        contributors_at_html: |-
-          <strong>Österrike</strong>: Innehåller data från
-          <a href="https://data.wien.gv.at/">Stadt Wien</a> (under licensen
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> och
-          Land Tirol (under licensen <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT med tillägg</a>).
-        contributors_au_html: |-
-          <strong>Australia</strong>: Innehåller förortsdata baserad
-             på data från Australian Bureau of Statistics.
-        contributors_ca_html: |-
-          <strong>Kanada</strong>: Innehåller data från
-             GeoBase&reg;, GeoGratis (&copy; Department of Natural
-             Resources Canada), CanVec (&copy; Department of Natural
-             Resources Canada), och StatCan (Geography Division,
-             Statistics Canada).
-        contributors_fi_html: '<strong>Finland</strong>: Innehåller data från Lantmäteriverket
-          i Finlands topografiska databas och andra dataset, under licensen <a href="https://www.maanmittauslaitos.fi/sv/Licens_till_avgiftsfria_datamaterial_version1_20120501">NLSFI</a>.'
-        contributors_fr_html: |-
-          <strong>Frankrike</strong>: Innehåller data
-             från Direction Générale des Impôts.
-        contributors_nl_html: |-
-          <strong>Nederländerna</strong>: Innehåller © AND data, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>Nya Zeeland</strong>: Innehåller data från
-          <a href="https://data.linz.govt.nz/">LINZ Data Service</a>
-          som är licensierad för återanvändning under
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: |-
-          <strong>Slovenien</strong>: Innehåller data från
-          <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> och
-          <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
-          (offentlig information i Slovenien).
-        contributors_es_html: |-
-          Spanien: Innehåller data från <strong>Spanish</strong> #Nationell Geographic Institute (<a href="http://www.ign.es/">IGN</a>) och
-          #Nationell Cartographic System (SCNE)
-          licenseret för videre bruk under CC STAD #4.0.
-        contributors_za_html: |-
-          <strong>Sydafrika</strong>: Innehåller data från
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, State copyright reserved.
-        contributors_gb_html: |-
-          <strong>Storbritannien</strong>: Innehåller Ordnance
-          Survey data &copy; Crown copyright and database right
-          2010-12.
-        contributors_footer_1_html: |-
-          För ytterligare detaljer om dessa och andra källor som använts
-          för att förbättra OpenStreetMap, se <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">sidan om bidragsgivare</a>
-          på OpenStreetMaps wiki.
         contributors_footer_2_html: "Införandet av uppgifter i OpenStreetMap innebär
           inte att den ursprungliga \ndatagivaren stödjer OpenStreetMap, \nger någon
           som helst garanti eller \ntar på sig något ansvar."
@@ -2070,15 +1975,6 @@ sv:
           Bidragsgivare till OSM påminns om att aldrig lägga till data från
           upphovsrättsskyddade källor (t.ex. Google Maps och tryckta kartor) utan
           uttryckligt tillstånd från upphovsrättsinnehavarna.
-        infringement_2_html: |-
-          Om du tror att upphovsrättsskyddat material felaktigt har
-          lagts in i OpenStreetMaps databas eller till den här webbplatsen, se
-          vårt <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">borttagningsförfarande</a>
-          eller fyll i vårt <a href="https://dmca.openstreetmap.org/">online-formulär</a> direkt.
-        trademarks_title_html: <span id="trademarks"></span>Varumärken
-        trademarks_1_html: OpenStreetMap, förstoringsglas-logotypen och State of the
-          Map är registrerade varumärken hos OpenStreetMap Foundation. Om du har frågor
-          gällande din användning av varumärkena, vänligen se vår <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">varumärkespolicy</a>.
     index:
       js_1: Du använder antingen en webbläsare som inte stöder JavaScript, eller så
         har du inaktiverat JavaScript.
diff --git a/config/locales/te.yml b/config/locales/te.yml
index efb548393..69557a434 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -1553,10 +1553,6 @@ te:
       subject: '[OpenStreetMap] GPX దిగుమతి వైఫల్యం'
     gpx_success:
       hi: నమస్కారం %{to_user} గారూ,
-      loaded_successfully:
-        one: సంభావ్యమైన 1 పాయింటులో %{trace_points} తో జయప్రదంగా లోడు చేసాం.
-        other: సంభావ్యమైన %{possible_points} పాయింట్లలో %{trace_points} తో జయప్రదంగా
-          లోడు చేసాం.
       subject: '[OpenStreetMap] GPX దిగుమతి జయప్రదం'
     signup_confirm:
       subject: '[ఓపెన్‌స్ట్రీట్‌మ్యాప్] ఓపెన్‌స్ట్రీట్‌మ్యాప్‌కి స్వాగతం'
@@ -1648,6 +1644,7 @@ te:
       success: మీ ఖాతాను ధ్రువీరించారు. నమోదైనందుకు ధన్యవాదాలు!
       already active: ఈ ఖాతాని ఇప్పటికే నిర్ధారించారు.
       unknown token: ఆ ధ్రువీకరణ కోడ్ మురిగిపోయింది. లేదా అసలు ఉనికిలోనే లేదు.
+      click_here: ఇక్కడ నొక్కండి
     confirm_resend:
       failure: వాడుకరి %{name} కనబడలేదు.
     confirm_email:
@@ -1875,38 +1872,35 @@ te:
         mapping_link: మ్యాపింగు మొదలుపెట్టండి
       legal_babble:
         title_html: కాపీహక్కు, లైసెన్సు
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> అనేది <i>ఓపెన్ డేట్</i>. దీన్ని <a
-          href="https://opendatacommons.org/licenses/odbl/">ఓపెన్ డేటా కామన్స్ ఓపెన్ డేటాబేస్ లైసెన్సు </a> (ODbL) కు లోబడి <a
-          href="https://osmfoundation.org/">OpenStreetMap ఫౌండేషను</a> (OSMF) అందిస్తోంది.
-        intro_2_html: |-
-          You are free to copy, distribute, transmit and adapt our data,
-          as long as you credit OpenStreetMap కు శ్రేయస్సును ఆపాదించినంతవరకు మా డేటాను కాపీ చేసుకోవచ్చు, పంపిణీ చేసుకోవచ్చు, ప్రసారం చేసుకోనూ వచ్చు. మా డేటాను మార్చినా, దానిపైన మరింగ్త అభిఉవృద్ధి చేసినా దాని ఫలితాన్ని కూడా అదే లైసెన్సు కింద మాత్రమే పంపిణీ చెయ్యాలి. ఈ పూర్తి <a href="https://opendatacommons.org/licenses/odbl/1.0/">లీగల్ కోడ్</a> మీ హక్కులు, బాధ్యతలను వివరిస్తుంది.
-        intro_3_1_html: మా డాక్యుమెంటేషను <a href="https://creativecommons.org/licenses/by-sa/2.0/">క్రియేటివ్
-          కామన్స్ యాట్రిబ్యూషను షేర్‌అలైక్ 2.0</a> లైసెన్సు (CC BY-SA 2.0) కింద లభ్యమౌతుంది.
+        introduction_1_open_data: ఓపెన్ డేటా
         credit_title_html: OpenStreetMap కు శ్రేయస్సు నివ్వడం ఎలా
         credit_1_html: |-
           మీరు &ldquo;&copy; OpenStreetMap
           contributors&rdquo; అనే క్రిడిట్ వాడాలి.
+        credit_3_attribution_guidelines: అట్రిబ్యూషన్ మార్గదర్శకాలు
         attribution_example:
           alt: వెబ్‌పేజీలో OpenStreetMap కు శ్రేయస్సును ఎలా ఆపాదించాలో చెప్పే ఉదాహరణ
           title: ఆపాదింపు ఉదాహరణ
         more_title_html: మరింత తెలుసుకోవడం
-        more_1_html: |-
-          మా డేటాను ఎలా వాడుకోవచ్చో, మాకు శ్రేయస్సును ఎలా ఆపాదించాలో <a
-          href="https://osmfoundation.org/Licence">OSMF Licence page</a> లో మరింత చదవొచ్చు.
-        more_2_html: "OpenStreetMap అందరికీ లభించే డేటా అయినప్పటికీ, థర్డు పార్టీలకు
-          మ్యాపు API లను ఉచితంగా ఇవ్వం.\nమా <a href=\"https://operations.osmfoundation.org/policies/api/\">API
-          Usage Policy</a>,\n<a href=\"https://operations.osmfoundation.org/policies/tiles/\">Tile
-          Usage Policy</a>, \n<a href=\"https://operations.osmfoundation.org/policies/nominatim/\">Nominatim
-          Usage Policy</a> లను చూడండి."
+        more_2_1_api_usage_policy: API వినియోగ విధానం
         contributors_title_html: మా కాంట్రిబ్యూటర్లు
+        contributors_at_austria: ఆస్ట్రియా
+        contributors_at_stadt_wien: స్టాడ్ట్ వీన్
+        contributors_at_land_vorarlberg: ల్యాండ్ వోరార్ల్‌బర్గ్
+        contributors_au_australia: ఆస్ట్రేలియా
+        contributors_au_geoscape_australia: జియోస్కేప్ ఆస్ట్రేలియా
+        contributors_ca_canada: కెనడా
+        contributors_fi_finland: ఫిన్లాండ్
+        contributors_fr_france: ఫ్రాన్స్
+        contributors_nl_netherlands: నెదర్లాండ్స్
+        contributors_nz_new_zealand: న్యూజిలాండ్
+        contributors_es_spain: స్పెయిన్
+        contributors_za_south_africa: దక్షిణ అమెరికా
+        contributors_gb_united_kingdom: యునైటెడ్ కింగ్‌డమ్
         infringement_title_html: కాపీహక్కుల ఉల్లంఘన
-        infringement_2_html: "OpenStreetMap డేటాబేసులో గానీ, ఈ సైటులో గానీ కాపీహక్కులున్న
-          సమాచారాన్ని అనుచితంగా వాడారని మీరు భావిస్తే, మా <a href=\"https://wiki.osmfoundation.org/wiki/Takedown_procedure\">తొలగించే
-          పద్ధతిని</a> చూడండి. లేదా నేరుగా మా \n<a href=\"https://dmca.openstreetmap.org/\">ఆన్‌లైను
-          ఫిర్యాదు పేజీలో</a> రాయండి."
-        trademarks_title_html: <span id="trademarks"></span>ట్రేడుమార్కులు
+        infringement_2_1_takedown_procedure: తొలగింపు విధానం
+        trademarks_title: ట్రేడ్‌మార్క్‌లు
+        trademarks_1_1_trademark_policy: ట్రేడ్మార్క్ విధానం
     index:
       permalink: స్థిరలంకె
       shortlink: చిన్నలింకు
@@ -1964,6 +1958,7 @@ te:
             పద్ధతి.
       other_concerns:
         title: ఇతర ఆందోళనలు
+        copyright: కాపీరైట్ పేజీ
     help:
       title: సహాయం పొందడం
       welcome:
@@ -2248,6 +2243,7 @@ te:
       heading: నియమాలు
       read_tou: నేను వాడుక నియమాలను చదివాను, వాటికి అంగీకరిస్తున్నాను
       consider_pd_why: ఇది ఏమిటి?
+      informal_translations: అనధికారిక అనువాదాలు
       continue: కొనసాగించు
       decline: తిరస్కరించు
       legale_select: 'నివసించే దేశం:'
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 9c334335e..11fd57f76 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1268,8 +1268,6 @@ th:
       failed_to_import: 'การนำเข้าล้มเหลว เนื่องจาก:'
       subject: '[OpenStreetMap] การนำเข้า GPX ล้มเหลว'
     gpx_success:
-      loaded_successfully: การนำเข้าสำเร็จ มีจำนวนจุด %{trace_points} จุด จากที่เป็นไปได้ทั้งหมด
-        %{possible_points} จุด
       subject: '[OpenStreetMap] การนำเข้า GPX เรียบร้อย'
     signup_confirm:
       subject: '[OpenStreetMap] ยินดีต้อนรับสู่ OpenStreetMap'
@@ -1539,103 +1537,18 @@ th:
         mapping_link: เริ่มการทำแผนที่
       legal_babble:
         title_html: ลิขสิทธิ์และสัญญาอนุญาต
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> เป็น<i>ข้อมูลเปิดให้ใช้งาน</i> และอนุญาตให้ใช้งานภายใต้สัญญาอนุญาต <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) โดย<a
-          href="https://osmfoundation.org/">มูลนิธิ OpenStreetMap</a> (OSMF).
-        intro_2_html: "ท่านสามารถทำสำเนา แจกจ่าย แพร่ภาพ และปรับใช้ข้อมูลของเรา\nตราบเท่าที่ได้ระบุชื่อ
-          OpenStreetMap ตลอดจนผู้ร่วมจัดทำไว้ในคำขอบคุณหรือที่มา\nถ้าท่านปรับแก้ไขหรือสร้างสรรค์งานใหม่โดยใช้ข้อมูลของเราเป็นพื้น
-          ท่านสามารถ\nแจกจ่ายผลลัพธ์ที่ได้ภายใต้สัญญาอนุญาตเดียวกันเท่านั้น โปรดดู
-          <a href=\"https://opendatacommons.org/licenses/odbl/1.0/\">ข้อกำหนดทางกฎหมาย</a>
-          \nซึ่งจะอธิบายสิทธิและหน้าที่ที่ท่านพึงมี"
-        intro_3_1_html: เอกสารประกอบนี้อยู่ภายใต้สัญญาอนุญาต <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0)
         credit_title_html: วิธีการแสดงที่มาหรือคำขอบคุณ OpenStreetMap
         credit_1_html: |-
           เราจำเป็นต้องให้ท่านแสดงที่มาหรือคำขอบคุณแก่ &ldquo;&copy; ผู้ร่วมสร้างสรรค์ OpenStreetMap
           &rdquo;.
-        credit_2_1_html: |-
-          ท่านจะต้องระบุให้ชัดเจนเจาะจงว่าข้อมูลอนุญาตให้ใช้ตามสัญญาอนุญาต Open
-          Database License และถ้ามีการนำรูปแผนที่ไปใช้ รูปนั้นอนุญาตให้ใช้ตามสัญญาอนุญาต
-           CC BY-SA ในการนี้อาจจะลิงก์ไปยังหน้า
-          <a href="https://www.openstreetmap.org/copyright">ข้อมูลลิขสิทธิ์</a>
-          นอกจากนี้ (จำเป็นหากท่านจ่ายแจกข้อมูล OSM) ท่านสามารถลิงก์ไปยังสัญญาอนุญาตโดยตรง
-          ในสื่ออย่างอื่น อาทิ สิ่งพิมพ์ ซึ่งไม่สามารถลิงก์ข้อมูลได้แนะนำให้ระบุเพียง openstreetmap.org
-          และ/หรือ opendatacommons.org และ/หรือ creativecommons.org
-        credit_4_html: สำหรับแผนที่อิเล็กทรอนิกส์ที่ค้นได้ รายชื่อผู้มีส่วนร่วมควรปรากฏที่มุมของแผนที่
         attribution_example:
           alt: ตัวอย่างการอ้างอิง OpenStreetMap บนหน้าเว็บ
           title: ตัวอย่างการอ้างอิง
         more_title_html: ค้นหาเพิ่มเติม
-        more_1_html: |-
-          อ่านเพิ่มเติมเกี่ยวกับการใช้ข้อมูลของเรา ตลอดจนการอ้างอิงเราได้ที่ <a
-          href="https://osmfoundation.org/Licence">หน้าสัญญาอนุญาต OSMF</a>
-        more_2_html: |-
-          ถึงแม้ว่า OpenStreetMap จะเป็นข้อมูลแบบเปิด เราก็ไม่สามารถมอบ API แผนที่แบบไม่คิดค่าใช้จ่ายให้แก่บุคคลที่สามได้
-          ดูที่<a href="https://operations.osmfoundation.org/policies/api/">นโยบายการใช้ API</a>
-          <a href="https://operations.osmfoundation.org/policies/tiles/">นโยบายการใช้ไทล์</a>
-          และ<a href="https://operations.osmfoundation.org/policies/nominatim/">นโยบายการใช้ Nominatim</a> ของเรา
         contributors_title_html: ผู้ร่วมสร้างสรรค์ของเรา
         contributors_intro_html: |-
           ผู้มีส่วนร่วมของเราคือบุคคลนับพัน เรายังมีข้อมูลที่ใช้สัญญาอนุญาตแบบเปิดเผย
           จากตัวแทนการทำแผนที่ของชาติต่าง ๆ และแหล่งข้อมูลอื่น ๆ ต่อไปนี้:
-        contributors_at_html: |-
-          <strong>ออสเตรีย</strong>: มีข้อมูลจาก
-          <a href="https://data.wien.gv.at/">Stadt Wien</a> (under
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> และ
-          Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
-        contributors_au_html: |-
-          <strong>ออสเตรเลีย</strong>: มีข้อมูลที่มาจาก
-          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a>
-          ซึ่งได้รับอนุญาตโดย Commonwealth of Australia ภายใต้
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>
-        contributors_ca_html: |-
-          <strong>แคนาดา</strong>: มีข้อมูลจาก
-          GeoBase&reg;, GeoGratis (&copy; Department of Natural
-          Resources Canada), CanVec (&copy; Department of Natural
-          Resources Canada) และ StatCan (Geography Division,
-          Statistics Canada)
-        contributors_fi_html: |-
-          <strong>ฟินแลนด์</strong>: มีข้อมูลจาก
-          ฐานข้อมูลการสำรวจภูมิศาสตร์แห่งชาติฟินแลนด์และฐานข้อมูลอื่น
-          อนุญาตให้ใช้ตาม
-          <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">สัญญาอนุญาต NLSFI</a>.
-        contributors_fr_html: |-
-          <strong>ฝรั่งเศส</strong>: มีข้อมูลจากอธิบดีกรมภาษี (
-          Direction Générale des Impôts)
-        contributors_nl_html: |-
-          <strong>เนเธอร์แลนด์</strong>: Contains &copy; AND data, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>นิวซีแลนด์</strong>: มีข้อมูลที่มาจาก
-          <a href="https://data.linz.govt.nz/">LINZ Data Service</a> และ
-          ได้รับอนุญาตให้ใช้ซ้ำได้ภายใต้
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>
-        contributors_si_html: |-
-          <strong>สโลวีเนีย</strong>: มีข้อมูลที่มาจาก
-          <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> และ
-          <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
-          (ข้อมูลสาธารณะของสโลวีเนีย)
-        contributors_es_html: |-
-          <strong>สเปน</strong>: มีข้อมูลที่มาจาก
-          Spanish National Geographic Institute (<a href="http://www.ign.es/">IGN</a>) และ
-          National Cartographic System (<a href="http://www.scne.es/">SCNE</a>)
-          ซึ่งได้รับอนุญาตให้ใช้ซ้ำภายใต้ <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>
-        contributors_za_html: |-
-          <strong>แอฟริกาใต้</strong>: มีข้อมูลที่มาจาก
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, State copyright reserved.
-        contributors_gb_html: |-
-          <strong>สหราชอาณาจักร</strong>: มีข้อมูลจากกองแผนที่ Ordnance
-          Survey data &copy; ลิขสิทธิ์ราชการและสิทธิ์แห่งฐานข้อมูล
-          2010-19
-        contributors_footer_1_html: |-
-          สำหรับรายละเอียดเพิ่มเติมเกี่ยวกับแหล่งข้อมูลเหล่านี้ และแหล่งข้อมูลอื่น ๆ
-          ที่ใช้เพื่อช่วยปรับปรุง OpenStreetMap โปรดดูที่<a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">หน้า
-          ผู้มีส่วนร่วม</a>บน OpenStreetMap Wiki
         contributors_footer_2_html: |-
           การรวมข้อมูลใน OpenStreetMap ไม่ได้หมายความว่าผู้ให้บริการข้อมูลดั้งเดิม
           จะรับรอง OpenStreetMap รับประกัน หรือรับผิดชอบใด ๆ
@@ -1644,13 +1557,6 @@ th:
           ผู้มีส่วนร่วม OSM จะถูกเตือนไม่ให้เพิ่มข้อมูลจากแหล่งข้อมูลที่มีลิขสิทธิ์
           (เช่น Google Maps หรือแผนที่แบบพิมพ์) โดยไม่ได้รับอนุญาตอย่าง
           ชัดเจนจากเจ้าของลิขสิทธิ์
-        infringement_2_html: |-
-          หากท่านเชื่อว่าข้อมูลละเมิดลิขสิทธิ์ปรากฏในเว็บไซต์นี้หรือในฐานข้อมูล OpenStreetMap โปรดดู <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">ขั้นตอนการลบข้อมูลละเมิดลิขสิทธิ์</a> หรือแจ้งได้ที่
-          <a href="https://dmca.openstreetmap.org/">หน้ารับแจ้งการละเมิดข้อมูลลิขสิทธิ์</a>
-        trademarks_title_html: <span id="trademarks"></span>เครื่องหมายการค้า
-        trademarks_1_html: OpenStreetMap, State of the Map, และตราสัญลักษณ์แว่นขยาย
-          เป็นเครื่องหมายการค้าจดทะเบียนของมูลนิธิ OpenStreetMap, หากคุณมีข้อสงสัยเกี่ยวกับการใช้ชื่อและตราสัญลักษณ์ของเรา
-          สามารถตรวจสอบรายละเอียดได้ที่หน้า<a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">นโยบายเครื่องหมายการค้า</a>
     index:
       js_1: ท่านกำลังใช้เบราว์เซอร์ที่ไม่รองรับจาวาสคริปต์ หรือท่านปิดใช้งานจาวาสคริปต์
       js_2: OpenStreetMap ใช้จาวาสคริปต์ในการแสดงแผนที่
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index d8c4b3c56..d2568577e 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -1279,8 +1279,6 @@ tl:
       subject: Nabigo ang Pag-angkat ng GPX ng [OpenStreetMap]
     gpx_success:
       hi: Kumusta %{to_user},
-      loaded_successfully: matagumpay na naikarga na may %{trace_points} mula sa isang
-        maaaring %{possible_points} mga tuldok.
       subject: Tagumpay ng Pag-angkat ng GPX ng [OpenStreetMap]
     signup_confirm:
       subject: '[OpenStreetMap] Maligayang pagdating sa OpenStreetMap'
@@ -1599,89 +1597,16 @@ tl:
         mapping_link: simulan ang pagmamapa
       legal_babble:
         title_html: Karapatan sa Paglalathala at Lisensiya
-        intro_1_html: |-
-          Ang OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> ay <i>bukas na datos</i>, nakalisensiya sa ilalim ng lisensiyang <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) ng <a href="https://osmfoundation.org/">OpenStreetMap Foundation</a> o OSMF.
-        intro_2_html: Malaya mong makokopya, maipapamahagi, maipahahatid at mahahalaw
-          ang aming mga dato, basta't babanggitin mo ang OpenStreetMap at ang mga
-          tagapag-ambag nito. Kapag binago mo o nagbuo sa pamamagitan ng aming mga
-          dato, maaari mong ipamahagi ang resulta sa ilalim lamang ng katulad na lisensiya.
-          Ipinapaliwanag ng buong <a href="https://opendatacommons.org/licenses/odbl/1.0/">kodigong
-          pambatas</a> ang mga karapatan at mga pananagutan mo.
-        intro_3_1_html: |-
-          Ang aming dokumentasyon ay lisensyado sa ilalim ng <a
-          href="https://creativecommons.org/licenses/by-sa/2.0/">lisensiyang Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Paano babanggitin ang OpenStreetMap
         credit_1_html: 'Kung saan mo ginagamit ang datos ng OpenStreetMap, kailangan
           mong gawin ang sumusunod na dalawang bagay:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Magbigay ng kredito sa OpenStreetMap sa pamamagitan ng pagpapakita ng aming abiso sa karapatang-sipi.</li>
-            <li>Gawing malinaw na ang datos ay maaring gamitin sa ilalim ng lisensiyang Open Database License.</li>
-          </ul>
         attribution_example:
           title: Halimbawa ng Atribusyon
         more_title_html: Ang pagtuklas ng mas marami pang iba
-        more_1_html: |-
-          Magbasa ng mas marami pa hinggil sa paggamit ng dato namin at kung paano kaming banggitin sa <a
-          href="https://osmfoundation.org/Licence">pahina ng Lisensya ng OSMF</a>.
-        more_2_html: |-
-          Kahit ang OpenStreetMap ay bukas na datos, hindi kami naglalaan ng isang walang bayad na API ng mapa para sa mga ikatlong partido.
-          Tignan ang ating <a href="https://operations.osmfoundation.org/policies/api/">Patakaran sa Paggamit ng API</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">Patakaran sa Paggamit ng mga Tile</a>
-          at <a href="https://operations.osmfoundation.org/policies/nominatim/">Patakaran sa Paggamit ng Nominatim</a>.
         contributors_title_html: Mga tagapag-ambag namin
         contributors_intro_html: 'Ang aming mga tagapag-ambag ay libu-libong mga tao.
           Isinasama rin namin ang mga datos na may bukas na lisensya mula sa mga pambansang
           ahensya ng pagmamapa at iba pang mga mapagkukunan, kabilang sa mga ito ay:'
-        contributors_at_html: "<strong>Austria</strong>: Naglalaman ng dato magmula
-          sa \n<a href=\"https://data.wien.gv.at/\">Stadt Wien</a> (na nasa ilalim
-          ng \n<a href=\"https://creativecommons.org/licenses/by/3.0/at/deed.de\">CC
-          BY</a>),\n<a href=\"https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land
-          Vorarlberg</a> at ng\nLand Tirol (na nasa ilalim ng <a href=\"https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC
-          BY AT na mayroong mga susog</a>)."
-        contributors_au_html: '<strong>Australiya</strong>: Isinasama o binuo gamit
-          ang mga Hangganang Pampangangasiwa &copy; <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape
-          Australia</a> na lisensyado ng Sampamahalaan ng Australia sa ilalim ng <a
-          href="https://creativecommons.org/licenses/by/4.0/">lisensiyang Creative
-          Commons Atribusyon 4.0 Pandaigdig (CC BY 4.0)</a>.'
-        contributors_ca_html: "<strong>Canada</strong>: Naglalaman ng dato mula sa\nGeoBase&reg;,
-          GeoGratis (&copy; Kagawaran ng Likas na Yaman ng \nCanada), CanVec (&copy;
-          Kagawaran ng Likas na Yaman ng Canada), at StatCan \n(Dibisyon ng Heograpiya,
-          Estadistika ng Canada)."
-        contributors_fi_html: |-
-          <strong>Pinlandiya</strong>: Naglalaman ng datos na nagmula sa Topograpikong Kalipunan ng mga Dato ng Pambansang Panukat ng Lupa ng Pinlandiya at iba pang mga hanay ng datos, sa ilaim ng
-          <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">Lisensyang NLSFI</a>.
-        contributors_fr_html: "<strong>Pransiya</strong>: Naglalaman ng dato na nanggaling
-          magmula sa \nDirection Générale des Impôts."
-        contributors_nl_html: |-
-          <strong>Nederlandiya</strong>: Naglalaman ng &copy; dato ng AND, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: '<strong>Bagong Selanda</strong>: Naglalaman ng dato
-          na nagmula sa <a href="https://data.linz.govt.nz/">Serbisyo ng Datos ng
-          LINZ</a> at lisensyado para sa muling paggamit sa ilalim ng <a href="https://creativecommons.org/licenses/by/4.0/">CC
-          BY 4.0</a>'
-        contributors_si_html: |-
-          <strong>Slovenia</strong>: Naglalaman ng dato na nagmula sa
-          <a href="http://www.gu.gov.si/en/">Awtoridad ng Agrimensura at Pagmamapa</a> at
-          <a href="http://www.mkgp.gov.si/en/">Ministeryo ng Agrikultura, Panggugubat at Pagkain </a>
-          (pampublikong impormasyon ng Slovenia).
-        contributors_es_html: |-
-          <strong>Espanya</strong>: Naglalaman ng dato na nagmula sa Pambansang Suriang Heograpiko ng Espanya (<a href="http://www.ign.es/">IGN</a>) at
-          Pambansang Sistemang Kartograpiko (<a href="http://www.scne.es/">SCNE</a>) na lisensyado para sa muling paggamit sa ilalim ng <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: "<strong>Timog Aprika</strong>: Naglalaman ng datong
-          nanggaling magmula sa \n<a href=\"http://www.ngi.gov.za/\">Punong Pangasiwaan:
-          \nPambansang Kabatiran na Pangheograpiya at Pangkalawakan</a>, nakareserba
-          ang karapatan ng paglalathala ng Estado."
-        contributors_gb_html: '<strong>Nagkakasiang mga Kaharian</strong>: Naglalaman
-          ng dato ng Ordnance Survey &copy; Karapatan sa Paglalathala ng Korona at
-          karapatan sa kalipunan ng dato 2010-19.'
-        contributors_footer_1_html: "Para sa karagdagang mga detalye ng mga ito, at
-          iba pang pinanggalingan na ginamit upang mapainam ang OpenStreetMap, paki
-          tingnan ang <a\nhref=\"https://wiki.openstreetmap.org/wiki/Contributors\">Pahina
-          ng \ntagapag-ambag</a> na nasa OpenStreetMap Wiki ."
         contributors_footer_2_html: Ang pagsasama ng dato sa loob ng OpenStreetMap
           ay hindi nagpapahiwatig na ang orihinal na tagapagbigay ng dato ay tumatangkilik
           sa OpenStreetMap, nagbibigay ng anumang garantiya, o tumatanggap ng anumang
@@ -1691,15 +1616,6 @@ tl:
           magdagdag ng datos mula sa anumang mapagkukunan na may karapatang-sipi na
           nakalaan (halimbawa, Google Maps o naka-print na mga mapa) nang walang pahintulot
           mula sa mga may hawak ng karapatang-sipi.
-        infringement_2_html: |-
-          Kung naniniwala ka na may mga bagay na may karapatang-sipi ay idinagdag sa hindi angkop na pamamaraan sa kalipunan ng dato ng OpenStreetMap o sa site na ito, tignan ang <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">pamamaraan sa takedown</a> o direktang magpadala sa aming
-          <a href="https://dmca.openstreetmap.org/">on-line filing page</a>.
-        trademarks_title_html: Mga Markang Pagkakakilanlan
-        trademarks_1_html: Ang OpenStreetMap, ang logo na may salaming pampalaki at
-          State of the Map ay mga rehistradong markang pagkakakilanlan ng OpenStreetMap
-          Foundation. Kung may tanong tungkol sa paggamit ng mga marka, tignan ang
-          ating <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Patakaran
-          sa Markang Pagkakakilanlan</a>.
     index:
       js_1: Maaaring gumagamit ka ng isang pantingin-tingin na hindi tumatangkilik
         ng JavaScript, o hindi mo pinagagana ang JavaScript.
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 4ef8361fe..697f0e95a 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1643,9 +1643,6 @@ tr:
       subject: '[OpenStreetMap] GPX dosyası maalesef alınamadı'
     gpx_success:
       hi: Merhaba %{to_user},
-      loaded_successfully:
-        one: '%{trace_points} olası 1 puan üzerinden başarıyla yüklendi.'
-        other: '%{trace_points} olası %{possible_points} puanından başarıyla yüklendi.'
       subject: '[OpenStreetMap] GPX dosyası başarıyla alındı'
     signup_confirm:
       subject: '[OpenStreetMap]''e hoş geldin'
@@ -1943,8 +1940,6 @@ tr:
   shared:
     markdown_help:
       heading_html: '%{kramdown_link} ile ayrıştırılmaktadır'
-      kramdown_url: https://kramdown.gettalong.org/quickref.html
-      kramdown: kramdown
       headings: Başlıklar
       heading: Başlık
       subheading: Alt başlık
@@ -2017,108 +2012,18 @@ tr:
         mapping_link: harita çizmeye başla
       legal_babble:
         title_html: Telif Hakkı ve Lisans
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup>,  <a
-          href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF) tarafından oluşturulan <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) ile lisanslandırılmıştır.
-        intro_2_html: |-
-          OpenStreetMap'e ve katkıda bulunanlarına değindiğiniz
-          sürece verilerimizi kopyalamak, dağıtmak, iletmek
-          ve uyarlamakta serbestsiniz.
-          Verilerimizi değiştirir veya geliştirirseniz
-          sonucu sadece aynı lisans altında dağıtabilirsiniz.
-          Tüm <a href="https://opendatacommons.org/licenses/odbl/1.0/">yasal kod</a>, haklarınızı ve sorumluluklarınızı açıklamaktadır.
-        intro_3_1_html: |-
-          Belgelerimiz
-          <a href="https://creativecommons.org/licenses/by-sa/2.0/deed.tr">Creative Commons Atıf-BenzerPaylaşım 2.0</a>
-          lisansı (CC BY-SA 2.0) ile lisanslanmıştır.
         credit_title_html: OpenStreetMap'e nasıl atıfta bulunulur
         credit_1_html: 'OpenStreetMap verilerini kullandığınız yerde aşağıdaki iki
           şeyi yapmanız gerekiyor:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Telif hakkı bildirimimizi görüntüleyerek OpenStreetMap'e atıfta bulunun.</li>
-            <li>Verilerin Açık Veritabanı Lisansı kapsamında mevcut olduğunu açıkça belirtin.</li>
-          </ul>
-        credit_3_1_html: Telif hakkı bildirimi için, verilerimizi nasıl kullandığınıza
-          bağlı olarak, bunun nasıl görüntülenmesi gerektiğine dair farklı gereksinimlerimiz
-          var. Örneğin göz atılabilir bir harita, basılı bir harita veya statik bir
-          resim oluşturmuş olmanıza bağlı olarak telif hakkı bildiriminin nasıl gösterileceğine
-          ilişkin farklı kurallar geçerlidir. Gereksinimlerle ilgili tüm ayrıntılar
-          <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">İlişkilendirme
-          Yönergeleri</a>'nde bulunabilir.
-        credit_4_html: Verilerin Açık Veritabanı Lisansı kapsamında mevcut olduğunu
-          açıkça belirtmek için <a href="https://www.openstreetmap.org/copyright">bu
-          telif hakkı sayfasına</a> bağlantı verebilirsiniz. Alternatif ve bir gereklilik
-          olarak, OSM'yi bir veri formunda dağıtıyorsanız lisansları adlandırabilir
-          ve doğrudan lisanslara bağlayabilirsiniz. Bağlantıların mümkün olmadığı
-          ortamlarda (örneğin basılı eserler), okuyucularınızı openstreetmap.org'a
-          (belki de 'OpenStreetMap'i bu tam adrese genişleterek) ve opendatacommons.org'a
-          yönlendirmenizi öneririz. Bu örnekte, atıf haritanın köşesinde görünür.
         attribution_example:
           alt: Web sayfasıında OpenStreetMap atıf etmek için bir örnek
           title: Atıf örneği
         more_title_html: Daha fazlasını öğrenin
-        more_1_html: |-
-          Verilerimizi kullanma ve bizi nasıl referans verebileceğiniz hakkında daha fazla bilgi için <a
-          href="https://osmfoundation.org/Licence">OSMF Lisans sayfasına</a> bakınız.
-        more_2_html: |-
-          OpenStreetMap açık veri olsa da, üçüncü taraflar
-          için ücretsiz bir harita API'ı sağlayamıyoruz. <a href="https://operations.osmfoundation.org/policies/api/">API Kullanım Politikası</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">Karo Kullanım Politikası</a>
-          ve <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Kullanım Politikası</a> sayfalarımıza bakınız.
         contributors_title_html: Katkıda Bulunanlar
         contributors_intro_html: |-
           Binlerce kişi projemize katkıda bulunmaktadır. Ulusal
           haritalama ajanslarından ve diğer kaynaklardan
           açık-lisanslı veriler de içeriyoruz:
-        contributors_at_html: |-
-          <strong>Avusturya</strong>: <a href="https://data.wien.gv.at/">Stadt Wien</a> (<a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a> lisansı altında),
-          <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> ve
-          Land Tirol'dan (<a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">değişiklikleriyle CC BY AT lisansı altında</a>) veriler içermektedir.
-        contributors_au_html: |-
-          <strong>Avustralya</strong>: İdari Sınırlar kullanılarak birleştirilir veya geliştirilir &copy;
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Avustralya</a>,
-          Avustralya Topluluğu tarafından
-          <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Atıf 4.0 Uluslararası lisansı (CC BY 4.0)</a> ile lisanslanmıştır.
-        contributors_ca_html: "<strong>Kanada</strong>: GeoBase&reg;, GeoGratis \n(&copy;
-          Department of Natural\nResources Canada), CanVec (&copy; Department of Natural\nResources
-          Canada) ve StatCan'den (Geography Division,\nStatistics Canada) veriler
-          içermektedir."
-        contributors_fi_html: |-
-          <strong>Finlandiya</strong>: National Land
-          Survey of Finland's Topographic Database
-          ve diğer veri setlerinden, <a href="https://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI License</a> altında, veriler içermektedir..
-        contributors_fr_html: |-
-          <strong>Fransa</strong>: Direction Générale des Impôts'dan
-          veri içermektedir.
-        contributors_nl_html: |-
-          <strong>Hollanda</strong>: Contains &copy; AND veri, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: '<strong>Yeni Zelanda</strong>: <a href="https://data.linz.govt.nz/">LINZ
-          Data Service</a>''den alınan verileri içerir ve <a href="https://creativecommons.org/licenses/by/4.0/">CC
-          BY 4.0</a> altında kullanım için lisanslanmıştır.'
-        contributors_si_html: |-
-          <strong>Slovenya</strong>: <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> ve
-          <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
-          (Slovenya'nın halka açık bilgileri) sayfalarından
-          edinilen verileri içermektedir.
-        contributors_es_html: |-
-          <strong>İspanya</strong>: İspanya Ulusal Coğrafya Enstitüsü (<a href="http://www.ign.es/">IGN</a>) ile
-          Ulusal Kartografik Sistem'den (<a href="http://www.scne.es/">SCNE</a>) elde edilen verileri içerir ve tekrar kullanım amacıyla <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a> ile lisanslanmıştır.
-        contributors_za_html: |-
-          <strong>Güney Afrika</strong>: <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a> kaynaklı verileri içermektedir, Devlet telif hakkı saklıdır.
-        contributors_gb_html: |-
-          <strong>Birleşik Krallık</strong>: Contains Ordnance
-          Anket verileri & kopya; Crown telif hakkı ve veritabanı hakkı
-          2010-2023.
-        contributors_footer_1_html: |-
-          OpenStreetMap'in geliştirilmesine yardımcı olmak için
-          bu ve diğer kaynaklar hakkında daha ayrıntılı bilgi almak için,
-          OpenStreetMap Wiki üzerinden <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">Katkıda bulunan kullanıcılar sayfasına</a> lütfen bakınız.
         contributors_footer_2_html: |-
           Verilerin OpenStreetMap'e dahil edilmesi, orijinal
           veri sağlayıcının OpenStreetMap'i onayladığını,
@@ -2130,16 +2035,6 @@ tr:
           açık izni olmadan telif hakkıyla korunan kaynaklardan
           (ör. Google Haritalar veya basılı haritalar) hiçbir zaman
           veri eklememeleri hatırlatılır.
-        infringement_2_html: |-
-          Telif hakkıyla korunan materyalin
-          OpenStreetMap veritabanına veya bu siteye
-          yanlışlıkla eklendiğine inanıyorsanız <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">kaldırma prosedürü</a> sayfasına başvurun veya
-          doğrudan <a href="https://dmca.openstreetmap.org/">çevrimiçi dosyalama sayfamızda</a> kayda geçirin.
-        trademarks_title_html: <span id="trademarks"></span>Ticari Markalar
-        trademarks_1_html: OpenStreetMap, büyüteç logosu ve State of the Map; OpenStreetMap
-          Foundation'ın tescilli ticari markalarıdır. Markaların kullanımı ile ilgili
-          sorularınız varsa lütfen sorularınızı <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Lisans
-          Çalışma Grubu</a>'na gönderiniz
     index:
       js_1: JavaScript desteklemeyen bir tarayıcı kullanıyorsunuz ya da JavaScript
         devre dışı bırakılmış.
@@ -2220,7 +2115,6 @@ tr:
         title: Diğer sorunlar
         copyright: telif hakkı sayfası
         working_group: OSMF çalışma grubu
-        working_group_url: https://wiki.osmfoundation.org/wiki/Working_Groups
     help:
       title: Yardım
       introduction: |-
@@ -2267,7 +2161,6 @@ tr:
         kullanılamaz.
       desktop_application_html: Potlatch'ı %{download_link} ile kullanmaya devam edebilirsiniz.
       download: Mac ve Windows için masaüstü uygulamasını indirme
-      download_url: https://www.systemed.net/potlatch/
       change_preferences: Tercihlerinizi buradan değiştirin
     any_questions:
       title: Sorularınız var mı?
@@ -2418,7 +2311,6 @@ tr:
           oluşturabilir veya bunlara katılabilir. %{communities_wiki_link} kısmında
           daha fazlasını okuyun.
         communities_wiki: Topluluklar için viki sayfası
-        communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group
   traces:
     visibility:
       private: Kişiye özel (sadece anonim ve sıralanmamış noktalar olarak paylaşılır)
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index e998711a7..5f93bf760 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -90,14 +90,22 @@ tt:
         allow_write_diary: көндәлектә язма калдырырга, шәрехләргә һәм яңа дуслар табарга
         allow_write_api: хаританы үзгәртергә
         allow_read_gpx: шәхси GPS трекларын укырга
+        allow_write_gpx: GPS трекларны йөкләргә
+        allow_write_notes: искәрмәләрне төзәтергә
       diary_comment:
         body: Текст
       diary_entry:
         user: Кулланучы
         title: Тема
+        body: Текст
         latitude: Киңлек
         longitude: Озынлык
         language_code: Тел
+      doorkeeper/application:
+        name: Исем
+        redirect_uri: Юнәлтүләр
+        confidential: Конфиденциаль кушымтамы?
+        scopes: Рөхсәтләр
       friend:
         user: Кулланучы
         friend: Дус
@@ -108,25 +116,52 @@ tt:
         size: Зурлык
         latitude: Киңлек
         longitude: Озынлык
+        public: Ачык
         description: Тасвир
         gpx_file: GPX файлын төяү
+        visibility: Күренүчәнлек
         tagstring: Тамгалар
       message:
         sender: Җибәрүче
         title: Тема
         body: Текст
         recipient: Хатны кабул итүче
+      redaction:
+        title: Башлык
+        description: Тасвирлама
+      report:
+        category: 'Хәбәрнамә ясавыгызның сәбәбен сайлагыз:'
+        details: Проблема турында тулырак мәгълүмат бирегез (бу мәҗбүри).
       user:
+        auth_provider: Аутентификация провайдеры
+        auth_uid: Аутентификациянең UID коды
         email: Электрон почтасы
+        email_confirmation: E-mail раслау
+        new_email: Яңа электрон почта адресы
         active: Актив
-        description: Тасвир
-        home_lat: 'Киңлек:'
-        home_lon: 'Озынлык:'
-        languages: Телләр
+        display_name: Күрсәтелүче исем
+        description: Профильның тасвирламасы
+        home_lat: Киңлек
+        home_lon: Озынлык
+        languages: Өстенлек бирелгән телләр
+        preferred_editor: Өстенлек бирелгән мөхәррирләү коралы
         pass_crypt: Серсүз
+        pass_crypt_confirmation: Серсүзне раслагыз
     help:
+      doorkeeper/application:
+        confidential: Кушымта клиентның сере сер булып кала алган урында кулланылачак
+          (аерым мобиль кушымталар һәм бер битле кушымталар турында алар конфиденциаль
+          дип әйтеп булмый)
+        redirect_uri: Бер URIга бер юл кулланыгыз
       trace:
         tagstring: өтер аша
+      user_block:
+        reason: Кулланучыны тыю сәбәбе. Зинһар, моңа мөмкинчә тыныч карагыз. Кулланучыга
+          тыю турында мөмкин кадәр тулырак мәгълүмат бирегез. Исегездә тотыгыз, бу
+          хәбәрнамәне һәркем дә укый алачак. Һәм шуны онытмагыз, җәмгыятьтә күнегелгән
+          жаргон сүзләрен бар кулланучылар да аңламый. Шуңа күрә дилетант төшенчәләр
+          кулланып карагыз.
+        needs_view: Тыю төшкәнче кулланучыга хисапъязмасы аша керергә рөхсәт бирергәме?
   datetime:
     distance_in_words_ago:
       about_x_hours:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 4b629f445..620eee31c 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -408,8 +408,8 @@ uk:
       many: '%{count} зв’язків'
       other: ""
     part_of_ways:
-      one: '%{count} лінії'
-      few: '%{count} ліній'
+      one: '%{count} ліня'
+      few: '%{count} лінії'
       many: '%{count} ліній'
       other: ""
     download_xml: Завантажити XML
@@ -1680,11 +1680,6 @@ uk:
       subject: '[OpenStreetMap] Збій імпорту GPX'
     gpx_success:
       hi: Привіт, %{to_user},
-      loaded_successfully:
-        one: успішно завантажено %{trace_points} точку з %{possible_points}.
-        few: успішно завантажено %{trace_points} точки з %{possible_points}.
-        many: успішно завантажено %{trace_points} точок з %{possible_points}.
-        other: успішно завантажено %{trace_points} точок з %{possible_points} можливих.
       subject: '[OpenStreetMap] Імпорт GPX пройшов успішно'
     signup_confirm:
       subject: '[OpenStreetMap] Ласкаво просимо до OpenStreetMap'
@@ -1982,8 +1977,6 @@ uk:
   shared:
     markdown_help:
       heading_html: Оброблено за допомогою %{kramdown_link}
-      kramdown_url: https://kramdown.gettalong.org/quickref.html
-      kramdown: kramdown
       headings: Заголовки
       heading: Заголовок
       subheading: Підзаголовок
@@ -2049,98 +2042,40 @@ uk:
         mapping_link: почати мапити
       legal_babble:
         title_html: Авторські права та ліцензування
-        intro_1_html: |-
-          Дані OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> є <i>відкритими даними</i>, що ліцензуються <a
-          href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF) на
-          умовах Ліцензії <a href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL).
-        intro_2_html: Ви можете вільно копіювати, поширювати, передавати й змінювати
-          наші дані, посилаючись при цьому на OpenStreetMap та спільноту. Якщо ви
-          змінюєте наші дані чи створюєте на їх основі свої, ви повинні розповсюджувати
-          результати під такою ж Ліцензією. Повний <a href="http://opendatacommons.org/licenses/odbl/1.0/">чинний
-          текст</a> Ліцензії пояснює ваші права та обов’язки.
-        intro_3_1_html: "Наша документація поширюється на умовах <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Ліцензії
-          Creative \nCommons Attribution-ShareAlike 2.0</a> (CC-BY-SA)."
+        introduction_1_html: OpenStreetMap%{registered_trademark_link} — це %{open_data},
+          ліцензовані %{osm_foundation_link} (OSMF) на умовах ліцензії %{odc_odbl_link}
+          (ODbL).
+        introduction_1_open_data: відкриті дані
+        introduction_1_odc_odbl: Open Data Commons Open Database License
+        introduction_1_osm_foundation: Фундацією OpenStreetMap
+        introduction_2_html: |-
+          Ви можете вільно копіювати, поширювати, передавати та адаптувати наші дані, за умови, що ви посилаєтесь на OpenStreetMap та його
+          учасників. Якщо ви змінюєте або використовуєте наші дані, ви
+          можете поширювати результат лише за тією самою ліцензією. Повний текст %{legal_code_link} пояснює ваші права та обов’язки.
+        introduction_2_legal_code: Ліцензійної угоди
+        introduction_3_html: Наша документація надається на умовах ліцензії %{creative_commons_link}
+          (CC BY-SA 2.0).
+        introduction_3_creative_commons: Creative Commons Attribution-ShareAlike 2.0
         credit_title_html: Як посилатись на OpenStreetMap
         credit_1_html: 'У разі використання даних OpenStreetMap, вам потрібно зробити
           дві речі:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Додайте посилання на OpenStreetMap, додавши наше повідомлення про авторські права.</li>
-            <li>Чітко зазначте, що дані доступні під ліцензією Open Database License.</li>
-          </ul>
-        credit_3_1_html: "Щодо повідомлення про авторські права, ми маємо різні вимоги
-          щодо того, як воно має показуватись, залежно від того, як ви використовуєте
-          наші дані. Наприклад, застосовуються різні правила щодо того, як показувати
-          повідомлення про авторські права, залежно від того, чи ви\nстворили мапу
-          для перегляду в мережі, друковану мапу чи зображення з мапою. Повну інформацію
-          про вимоги можна знайти в \n<a href=\"https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines\">Настановах
-          з атрибуції</a>."
-        credit_4_html: Ви повинні чітко вказувати, що дані доступні на умовах ліцензії
-          Open Database License. Ви можете зробити це, пославшись на <a href="http://www.openstreetmap.org/copyright">сторінку
-          з роз’ясненням ліцензійних вимог</a>. Або ж, під час розповсюдження даних
-          OSM, ви можете безпосередньо вказувати назву ліцензії(й) та посилання на
-          її(їх) текст. Якщо ви користуєтесь носіями, де використання гіпертекстових
-          посилань неможливе (наприклад друковані матеріали), ми пропонуємо посилатися
-          безпосередньо на www.openstreetmap.org (або розширено "www.openstreetmap.org,
-          OpenStreetMap") та на opendatacommons.org. В цьому прикладі посилання знаходиться
-          в куті мапи.
+        credit_2_1: Зазначити авторські права OpenStreetMap показуючи наше повідомлення
+          про авторське право.
+        credit_2_2: Явним чином зазначити, що дані доступні на умовах Open Database
+          License.
+        credit_3_html: |-
+          Що стосується сповіщення про авторські права, ми маємо різні вимоги щодо того, як це має бути зазначено, залежно від того, як ви використовуєте наші дані. Наприклад, застосовуються різні
+          правила щодо того, як показувати повідомлення про авторські права, залежно від того, чи ви створили мапу для онлайн перегляду, друковану мапу чи статичне зображення. Повну інформацію про
+          вимоги можна знайти в %{attribution_guidelines_link}.
+        credit_3_attribution_guidelines: Настановах з атрибуції
         attribution_example:
           alt: Приклад того, як треба посилатись на OpenStreetMap на веб-сторінці
           title: Приклад зазначення авторства
         more_title_html: Дізнатися більше
-        more_1_html: Дізнайтеся більше про використання наших даних та про те, як
-          посилатися на нас як на джерело, на <a href="http://osmfoundation.org/Licence">сторінці
-          ліцензії OSMF</a> та у <a href="http://wiki.openstreetmap.org/wiki/Uk:Legal_FAQ">відповідях
-          спільноти щодо правових питань</a>.
-        more_2_html: Хоча дані OpenStreetMap  є відкритими, ми не в змозі надавати
-          безкоштовний API для сторонніх користувачів. Ознайомтесь із нашими <a href="https://operations.osmfoundation.org/policies/api/">Правилами
-          використання API</a>, <a href="https://operations.osmfoundation.org/policies/tiles/">Правилами
-          використання тайлів мап</a> та <a href="https://operations.osmfoundation.org/policies/nominatim/">Правилами
-          використання сервісу Nominatim</a>.
         contributors_title_html: Наші учасники
         contributors_intro_html: 'Нашими учасниками є тисячі людей. Наші дані також
           містять дані від національних картографічних агенцій, які розповсюджуються
           на умовах відкритих ліцензій, серед них:'
-        contributors_at_html: |-
-          <strong>Австрія</strong>: дані від
-             <a href="https://data.wien.gv.at/">Stadt Wien</a> (на умовах ліцензії
-             <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Земля Форарльберґ</a> та Земля Тіроль (на умовах <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT зі змінами</a>).
-        contributors_au_html: |-
-          <strong>Австралія</strong>: Містить або розроблено за допомогою Administrative Boundaries &copy;
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a>, ліцензованих Австралійською Співдружністю за міжнародною
-          <a href="https://creativecommons.org/licenses/by/4.0/">ліцензією Creative Commons Attribution 4.0 (CC BY 4.0)</a>.
-        contributors_ca_html: '<strong>Канада</strong>: дані від GeoBase&reg;, GeoGratis
-          (&copy; Департамент природних ресурсів Канади), CanVec (&copy; Департамент
-          природних ресурсів Канади), та StatCan (Відділ Географії, Статистичне відомство
-          Канади).'
-        contributors_fi_html: |-
-          <strong>Фінляндія</strong>: містить дані з топографічної бази даних Національної земельної служби Фінляндії та інші набори даних на умовах ліцензії
-          <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI</a>.
-        contributors_fr_html: '<strong>Франція</strong>: Дані отримані від Direction
-          Générale des Impôts (Генеральне управління з оподаткування).'
-        contributors_nl_html: "<strong>Нідерланди</strong>: Дані від &copy; AND, 2007
-          \n  (<a href=\"http://www.and.com\">www.and.com</a>)"
-        contributors_nz_html: '<strong>Нова Зеландія</strong>: Містить дані з <a href="https://data.linz.govt.nz/">LINZ
-          Data Service</a>, які ліцензовано на умовах Ліцензії <a href="https://creativecommons.org/licenses/by/4.0/">CC
-          BY 4.0</a>'
-        contributors_si_html: '<strong>Словенія</strong>: містить дані <a href="http://www.gu.gov.si/en/">Управління
-          Геодезії і картографії</a> та <a href="http://www.mkgp.gov.si/en/">Міністерства
-          сільського і лісового господарства та продовольства</a> (публічна інформація
-          Словенії).'
-        contributors_es_html: |-
-          <strong>Іспанія</strong>: Містить дані отримані від
-          Spanish National Geographic Institute (<a href="http://www.ign.es/">IGN</a>) та
-          National Cartographic System (<a href="http://www.scne.es/">SCNE</a>)
-          ліцензованих для повторного використання на умовах Ліцензії  <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: "<strong>Південна Африка</strong>: Містить дані з \n
-          \ <a href=\"http://www.ngi.gov.za/\">Chief Directorate:\n  National Geo-Spatial
-          Information</a>, State copyright reserved."
-        contributors_gb_html: '<strong>Сполучене Королівство Великобританії</strong>:
-          дані Ordnance Survey &copy; Crown copyright and database right 2010-2023.'
-        contributors_footer_1_html: Щоб отримати більш докладну інформацію про ці
-          та інші джерела, що були використані для покращення мапи OpenStreetMap,
-          будь ласка, перегляньте сторінку <a href="http://wiki.openstreetmap.org/wiki/Contributors">Учасники</a>
-          OpenStreetMap Вікі.
         contributors_footer_2_html: Включення даних до OpenStreetMap не означає, що
           постачальник цих даних якимось чином підтримує OpenStreetMap, надає які-небудь
           гарантії чи бере на себе якусь  відповідальність.
@@ -2149,16 +2084,6 @@ uk:
           що забороняється додавати дані з будь-яких захищених авторським правом джерел
           (наприклад, з Google Maps чи з друкованих мап) без отримання попереднього
           дозволу правовласників.
-        infringement_2_html: Якщо ви вважаєте, що захищений авторським правом матеріал
-          був недоречно доданий до бази даних OpenStreetMap або до цього сайту, ознайомтесь
-          з нашим <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">порядком
-          з вилучення таких даних</a> або скористайтесь безпосередньо <a href="https://dmca.openstreetmap.org/">сторінкою
-          для онлайн звернень</a>.
-        trademarks_title_html: <span id="trademarks"></span>Торгові марки
-        trademarks_1_html: OpenStreetMap і логотип з лупою є зареєстрованими торговими
-          марками OpenStreetMap Foundation. Якщо у Вас є запитання щодо використання
-          Вами цих марок. будь ласка, надсилайте свої запитання до <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence
-          Working Group</a>.
     index:
       js_1: Ви користуєтесь оглядачем, в якому не підтримується або відключений JavaScript.
       js_2: OpenStreetMap використовує JavaScript для мапи.
@@ -2242,7 +2167,6 @@ uk:
           %{copyright_link} для отримання додаткової юридичної інформації або зверніться до відповідної %{working_group_link}.
         copyright: сторінки "авторські права"
         working_group: робочої групи OSMF
-        working_group_url: https://wiki.osmfoundation.org/wiki/Working_Groups
     help:
       title: Отримання довідки
       introduction: OpenStreetMap має різні ресурси для отримання інформації про проєкт,
@@ -2286,7 +2210,6 @@ uk:
         Adobe Flash Player він більше не доступний для використання у вебоглядачі.
       desktop_application_html: Ви можете продовжувати використовувати Potlatch %{download_link}.
       download: завантаживши застосунок для Mac чи Windows
-      download_url: https://www.systemed.net/potlatch/
       id_editor_html: Або ж ви можете вказати використовувати iD як стандартний редактор,
         що відкриватиметься у вебоглядачі, так само як це було для Potlatch. %{change_preferences_link}.
       change_preferences: Змініть ваші налаштування тут
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index c23892746..da474dcf1 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1496,10 +1496,6 @@ vi:
       subject: '[OpenStreetMap] Nhập GPX thất bại'
     gpx_success:
       hi: Chào %{to_user},
-      loaded_successfully:
-        one: '%{trace_points} điểm được tải thành công trên tổng số 1 điểm.'
-        other: '%{trace_points} điểm được tải thành công trên tổng số %{possible_points}
-          điểm.'
       subject: '[OpenStreetMap] Nhập GPX thành công'
     signup_confirm:
       subject: '[OpenStreetMap] Chào mừng bạn đã tham gia OpenStreetMap'
@@ -1850,98 +1846,17 @@ vi:
         mapping_link: bắt đầu vẽ bản đồ
       legal_babble:
         title_html: Bản quyền và Giấy phép
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> là <i>dữ liệu mở</i> được phát hành theo <a
-          href="https://opendatacommons.org/licenses/odbl/">Giấy phép Cơ sở dữ liệu Mở của Open Data
-          Commons</a> (ODbL) bởi <a href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
-        intro_2_html: Bạn được tự do sao chép, phân phối, truyền, và tạo ra các tác
-          phẩm phái sinh từ các dữ liệu của chúng ta, miễn là bạn ghi công OpenStreetMap
-          và những người đóng góp vào nó. Nếu bạn sửa đổi hoặc tạo sản phẩm dựa trên
-          các dữ liệu của chúng tôi, bạn chỉ được phép phân phối kết quả theo cùng
-          giấy phép. <a href="https://opendatacommons.org/licenses/odbl/1.0/">Mã pháp
-          lý</a> đầy đủ giải thích các quyền và trách nhiệm của bạn.
-        intro_3_1_html: "Tài liệu của chúng tôi được phát hành theo giấy phép <a href=\"https://creativecommons.org/licenses/by-sa/2.0/deed.vi\">Creative
-          \nCommons Ghi công–Chia sẻ tương tự 2.0</a> (CC BY-SA)."
         credit_title_html: Cách ghi công OpenStreetMap
         credit_1_html: 'Khi nào bạn sử dụng dữ liệu OpenStreetMap, bạn cần phải tuân
           tho hai quy tắc sau:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Ghi công OpenStreetMap bằng cách hiển thị lời thông báo bản quyền của chúng tôi.</li>
-            <li>Ghi rõ ràng rằng dữ liệu được phát hành theo Giấy phép Cơ sở dữ liệu Mở.</li>
-          </ul>
-        credit_3_1_html: "Việc hiển thị lời thông báo bản quyền có yêu cầu tùy theo
-          cách sử dụng dữ liệu của chúng tôi, ví dụ tùy bạn tạo ra bản đồ tương tác
-          trên mạng, bản đồ in ấn, hoặc hình ảnh tĩnh. Có chi tiết đầy đủ về các quy
-          tắc trong \n<a href=\"https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines?uselang=vi\">Hướng
-          dẫn ghi công</a>."
-        credit_4_html: "Để ghi rõ ràng rằng dữ liệu được phát hành theo Giấy phép
-          Cơ sở dữ liệu Mở, bạn có thể đặt liên kết đến \n<a href=\"https://www.openstreetmap.org/copyright\">trang
-          bản quyền này</a>.\nThay thế, bạn có thể ghi tên giấy phép và đặt liên kết
-          trực tiếp đến văn bản giấy phép; bạn cần phải ghi công theo kiểu này nếu
-          phân phối OSM dưới dạng dữ liệu. Đối với các phương tiện không có khả năng
-          liên kết (chẳng hạn tác phẩm in ấn), gợi ý bạn chỉ dẫn đọc giả tới openstreetmap.org
-          (thí dụ bằng cách thay thế “OpenStreetMap” bằng địa chỉ đầy đủ) và tới opendatacommons.org.\nTrong
-          ví dụ này, lời ghi công xuất hiện ở góc bản đồ."
         attribution_example:
           alt: Ví dụ ghi công OpenStreetMap trên một trang Web
           title: Ví dụ ghi công
         more_title_html: Tìm hiểu thêm
-        more_1_html: Hãy đọc thêm chi tiết về việc sử dụng dữ liệu của chúng tôi và
-          cách ghi công chúng tôi tại <a href="https://osmfoundation.org/Licence">trang
-          giấy phép Quỹ OSM</a>.
-        more_2_html: Tuy OpenStreetMap là một nguồn dữ liệu mở, nhưng chúng tôi không
-          thể cung cấp API miễn phí cho bên thứ ba truy cập bản đồ. Hãy xem <a href="https://operations.osmfoundation.org/policies/api/">Quy
-          định Sử dụng API</a>, <a href="https://operations.osmfoundation.org/policies/tiles/">Quy
-          định Sử dụng Mảnh Bản đồ</a>, và <a href="https://operations.osmfoundation.org/policies/nominatim/">Quy
-          định Sử dụng Nominatim</a>.
         contributors_title_html: Những người đóng góp vào đây
         contributors_intro_html: 'Dự án này nhờ công sức đóng góp của hàng ngàn cá
           nhân và cũng bao gồm các dữ liệu có giấy phép mở từ các cơ quan khảo sát
           quốc gia và những nguồn gốc khác, chẳng hạn:'
-        contributors_at_html: '<strong>Áo</strong>: Bao gồm dữ liệu từ <a href="https://data.wien.gv.at/">Bang
-          Viên</a> (theo <a href="https://creativecommons.org/licenses/by/3.0/at/deed.vi">CC
-          BY</a>), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Bang
-          Vorarlberg</a>, và Bang Tyrol (theo <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">bản
-          sửa đổi CC BY Áo</a>).'
-        contributors_au_html: |-
-          <strong>Úc</strong>: Bao gồm dữ liệu về ngoại ô dựa trên dữ liệu của Cục Thống kê Úc.
-          <strong>Úc</strong>: Bao gồm dữ liệu hoặc được phát triển theo các biên giới hành chính ©
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a>
-          được Thịnh vượng chung Úc phát hành dưới
-          giấy phép <a href="https://creativecommons.org/licenses/by/4.0/deed.vi">Creative Commons Ghi công 4.0 Quốc tế (CC BY 4.0)</a>.
-        contributors_ca_html: '<strong>Canada</strong>: Bao gồm dữ liệu từ GeoBase®,
-          GeoGratis (© Bộ Tài nguyên Canada), CanVec (© Bộ Tài nguyên Canada), và
-          StatCan (Sở Địa lý, Statistics Canada).'
-        contributors_fi_html: "<strong>Phần Lan</strong>: Chứa dữ liệu từ\nCơ sở dữ
-          liệu Địa hình của Cục Khảo sát Địa lý Quốc gia Phần Lan (NLS) và các tập
-          hợp dữ liệu khác theo \n<a href=\"https://www.maanmittauslaitos.fi/en/opendata-licence-version1\">Giấy
-          phép dữ liệu mở NLS</a>."
-        contributors_fr_html: '<strong>Pháp</strong>: Bao gồm dữ liệu từ Sở thuế Pháp
-          (<i lang="fr" xml:lang="fr">Direction générale des Impôts</i>).'
-        contributors_nl_html: '<strong>Hà Lan</strong>: Bao gồm dữ liệu © 2007 AND
-          (<a href="https://www.and.com">www.and.com</a>)'
-        contributors_nz_html: '<strong>New Zealand</strong>: Bao gồm dữ liệu bắt nguồn
-          từ <a href="https://data.linz.govt.nz/">Dịch vụ Dữ liệu LINZ</a> và được
-          phát hành theo giấy phép <a href="https://creativecommons.org/licenses/by/4.0/deed.vi">CC
-          BY 4.0</a>.'
-        contributors_si_html: "<strong>Slovenia</strong>: Bao gồm dữ liệu từ \n<a
-          href=\"http://www.gu.gov.si/en/\">Cơ quan Khảo sát và Bản đồ</a> và\n<a
-          href=\"http://www.mkgp.gov.si/en/\">Cục Nông nghiệp, Lâm nghiệp, và Thức
-          ăn</a>\n(thông tin công cộng của Slovenia)."
-        contributors_es_html: "<strong>Tây Ban Nha</strong>: Bao gồm dữ liệu bắt nguồn
-          từ \nViện Địa lý Quốc gia Tây Ban Nha (<a href=\"http://www.ign.es/\">IGN</a>)
-          và\nHệ thống Bản đồ Quốc gia (<a href=\"http://www.scne.es/\">SCNE</a>)\nđược
-          cấp phép tái sử dụng theo <a href=\"https://creativecommons.org/licenses/by/4.0/deed.vi\">CC
-          BY 4.0</a>."
-        contributors_za_html: '<strong>Nam Phi</strong>: Bao gồm dữ liệu từ <a href="http://www.ngi.gov.za/">Tổng
-          cục: Thông tin Không gian địa lý Quốc gia</a>, bản quyền nhà nước được bảo
-          lÆ°u.'
-        contributors_gb_html: '<strong>Vương quốc Anh</strong>: Bao gồm dữ liệu Ordnance
-          Survey © bản quyền Crown Copyright và quyền cơ sở dữ liệu 2010–19.'
-        contributors_footer_1_html: |-
-          Xem thêm chi tiết và các nguồn gốc khác dùng để cải tiến OpenStreetMap tại <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors?uselang=vi">trang Người đóng góp</a> trên OpenStreetMap Wiki.
         contributors_footer_2_html: '  Việc bao gồm dữ liệu trong OpenStreetMap không
           ngụ ý rằng nhà cung cấp dữ liệu đầu tiên ủng hộ OpenStreetMap, biện hộ sự
           chính xác của nó, hoặc nhận trách nhiệm pháp lý nào.'
@@ -1949,16 +1864,6 @@ vi:
         infringement_1_html: Những người đóng góp vào OSM được khuyên không bao giờ
           bổ sung dữ liệu từ những nguồn có bản quyền (chẳng hạn Bản đồ Google hoặc
           các bản đồ trên giấy) trước khi các nhà giữ bản quyền cho phép rõ ràng.
-        infringement_2_html: Nếu bạn tin rằng tài liệu có bản quyền đã được bổ sung
-          vào cơ sở dữ liệu OpenStreetMap hoặc trang này một cách không thích đáng,
-          xin vui lòng tham khảo <a href="https://wiki.osmfoundation.org/wiki/Licence/Takedown_procedure?uselang=vi">quá
-          trình <i>takedown</i></a> hoặc nộp đơn trực tiếp tại <a href="https://dmca.openstreetmap.org/">trang
-          khiếu nại trực tuyến</a> của chúng tôi.
-        trademarks_title_html: <span id="trademarks"></span>Nhãn hiệu
-        trademarks_1_html: OpenStreetMap, biểu trưng kính lúp, và State of the Map
-          đều là nhãn hiệu đăng ký của Quỹ OpenStreetMap. Nếu bạn có thắc mắc về cách
-          sử dụng các nhãn hiệu này, xin vui lòng tham khảo <a href="http://wiki.osmfoundation.org/wiki/Trademark_Policy?uselang=vi">Quy
-          định về nhãn hiệu</a> của chúng tôi.
     index:
       js_1: Hoặc trình duyệt của bạn không hỗ trợ JavaScript, hoặc bạn đã tắt JavaScript.
       js_2: OpenStreetMap sử dụng JavaScript cho chức năng bản đồ trơn.
diff --git a/config/locales/yo.yml b/config/locales/yo.yml
index 2a8fed605..99bb6c490 100644
--- a/config/locales/yo.yml
+++ b/config/locales/yo.yml
@@ -40,10 +40,6 @@ yo:
     log_in: Ìjáwọlé
     make_a_donation:
       text: Da wo si openstreetmap.org
-  user_mailer:
-    gpx_success:
-      loaded_successfully:
-        other: ókan=ó jẹ́ gbígbéjáde láṣeyorí pẹ̀lú %{trace_points} nínú iye 1
   messages:
     show:
       title: Ka message
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 67fcb2bfa..63f81ed6a 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -237,41 +237,41 @@ zh-CN:
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: 约1小时前
+        one: 约%{count}小时前
         other: 约%{count}小时前
       about_x_months:
-        one: 约1个月前
+        one: 约%{count}个月前
         other: 约%{count}个月前
       about_x_years:
-        one: 约1年
+        one: 约%{count}年
         other: 约%{count}年前
       almost_x_years:
-        one: 近1年前
+        one: 近%{count}年前
         other: 近%{count}年前
       half_a_minute: 30秒前
       less_than_x_seconds:
-        one: 小于1秒前
-        other: 小于%{count}秒前
+        one: 不到%{count}秒前
+        other: 不到%{count}秒前
       less_than_x_minutes:
-        one: 小于1分钟前
+        one: 小于%{count}分钟前
         other: 小于%{count}分钟前
       over_x_years:
-        one: 超过1年前
+        one: 超过%{count}年前
         other: 超过%{count}年前
       x_seconds:
-        one: 1秒
+        one: '%{count}秒前'
         other: '%{count}秒前'
       x_minutes:
-        one: 1分钟前
+        one: '%{count}分钟前'
         other: '%{count}分钟前'
       x_days:
-        one: 1日前
+        one: '%{count}日前'
         other: '%{count}日前'
       x_months:
-        one: 1个月前
+        one: '%{count}个月前'
         other: '%{count}个月前'
       x_years:
-        one: 1年前
+        one: '%{count}年前'
         other: '%{count}年前'
   printable_name:
     with_version: '%{id}，版本 %{version}'
@@ -364,6 +364,7 @@ zh-CN:
       only_public_can_edit: 自0.6 API上线以来，只有公共用户可以编辑地图数据。
       find_out_why: 找出为什么
       email_not_revealed: 您的电子邮件地址不会公开泄露。
+      not_reversible: 此操作无法撤消，所有新用户现在默认都是公开的。
       make_edits_public_button: 公开我所有的编辑
     update:
       success_confirm_needed: 成功更新用户信息。 查看您的邮箱以确认您的新邮箱地址。
@@ -385,10 +386,10 @@ zh-CN:
     no_comment: (无注释)
     part_of: 属于
     part_of_relations:
-      one: 1 relation
+      one: '%{count} 个关系'
       other: '%{count} 个关系'
     part_of_ways:
-      one: 1 way
+      one: '%{count} 条路径'
       other: '%{count} 条路径'
     download_xml: 下载 XML
     view_history: 查看历史
@@ -431,7 +432,7 @@ zh-CN:
       history_title_html: 关系历史：%{name}
       members: 成员
       members_count:
-        one: 1 member
+        one: '%{count} 位成员'
         other: '%{count} 位成员'
     relation_member:
       entry_role_html: '%{type} %{name} 作为%{role}'
@@ -632,13 +633,19 @@ zh-CN:
   errors:
     contact:
       contact_url: http://wiki.openstreetmap.org/wiki/Contact
+      contact_url_title: 各种联系渠道说明
       contact: 联系
+      contact_the_community_html: 如果您发现有损坏的链接/错误，请随时%{contact_link} OpenStreetMap
+        社区。并记下您请求的确切 URL。
     forbidden:
       title: 禁止
+      description: 您在 OpenStreetMap 服务器上请求的操作仅限管理员使用（HTTP 403）
     internal_server_error:
       title: 应用程序错误
+      description: OpenStreetMap 服务器遇到意外情况，无法满足请求（HTTP 500）
     not_found:
       title: 文件未找到
+      description: 在 OpenStreetMap 服务器上找不到该名称的文件/目录/API 操作（HTTP 404）
   friendships:
     make_friend:
       heading: 添加 %{user} 为朋友？
@@ -1456,7 +1463,7 @@ zh-CN:
       last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr>由%{user}
       link_to_reports: 查看举报
       reports_count:
-        one: 1个举报
+        one: '%{count}个举报'
         other: '%{count}个举报'
       reported_item: 举报项
       states:
@@ -1467,7 +1474,7 @@ zh-CN:
       title: '%{status}问题#%{issue_id}'
       reports:
         zero: 无举报
-        one: 1个举报
+        one: '%{count}个举报'
         other: '%{count}个举报'
       report_created_at: 首次报告于%{datetime}
       last_resolved_at: 上次解决于%{datetime}
@@ -1612,7 +1619,6 @@ zh-CN:
       subject: '[OpenStreetMap] GPX 导入失败'
     gpx_success:
       hi: 您好，%{to_user}：
-      loaded_successfully: 成功载入 %{possible_points} 可能节点中的 %{trace_points} 个。
       subject: '[OpenStreetMap] GPX 导入成功'
     signup_confirm:
       subject: '[OpenStreetMap] 欢迎加入 OpenStreetMap'
@@ -1683,6 +1689,8 @@ zh-CN:
       success: 已确认您的账户，感谢您的注册！
       already active: 该账户已经确认。
       unknown token: 确认码已经过期或不存在。
+      resend_html: 如果您需要我们重新发送确认邮件，%{reconfirm_link}。
+      click_here: 点击此处
     confirm_resend:
       failure: 用户 %{name} 未找到。
     confirm_email:
@@ -1854,6 +1862,7 @@ zh-CN:
       support: 支持
   shared:
     markdown_help:
+      heading_html: 以%{kramdown_link}解析
       headings: 标题
       heading: 标题
       subheading: 副标题
@@ -1907,78 +1916,35 @@ zh-CN:
         mapping_link: 开始绘制地图
       legal_babble:
         title_html: 著作权与许可
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup>是<i>开放数据</i>，由<a
-          href="https://osmfoundation.org/">OpenStreetMap基金会</a>（OSMF）采用<a
-          href="https://opendatacommons.org/licenses/odbl/">开放数据共享开放数据库许可协议</a>（ODbL）授权。
-        intro_2_html: 只要你表明来源为OpenStreetMap及其贡献者，你就可以自由地复制、分发、传送和改编我们的数据。如果你想转换或者以我们的数据为基础进行创作，你只能采用相同的许可协议发表你的作品。完整的<a
-          href="https://opendatacommons.org/licenses/odbl/1.0/">法律文本</a>阐明了你的权利和义务。
-        intro_3_1_html: 我们的文档采用<a href="https://creativecommons.org/licenses/by-sa/2.0/deed.zh">知识共享
-          署名-相同方式共享 2.0 （CC BY-SA 2.0）</a>许可协议授权。
+        introduction_1_open_data: 开放数据
+        introduction_1_odc_odbl: 开放数据共享开放数据库许可协议
+        introduction_1_osm_foundation: OpenStreetMap 基金会
         credit_title_html: 如何表明作者是 OpenStreetMap
         credit_1_html: 当您使用 OpenStreetMap 的数据，您会被要求遵循两件事：
-        credit_2_1_html: |-
-          <ul>
-            <li>显示出我们的版权声明来表达归属于 OpenStreetMap 的内容。</li>
-            <li>清楚表明数据在开放数据库许可协议下可用。</li>
-          </ul>
-        credit_3_1_html: 对于版权声明的显示，我们会依据您如何使用我们的数据，而有不同的要求。例如，不同的规则要如何显示版权声明，具体取决于您是否建立了可浏览的地图、列印的地图或是静态图像。完整的详细信息要求可以在<a
-          href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">署名方针</a>上查看。
-        credit_4_html: |-
-          请明确表示数据在开放数据库许可协议下可用，您可以链接到<a href="https://www.openstreetmap.org/copyright">这个版权页面</a>。
-          相对地，如果您以数据表来分发 OSM，您可以命名并直接链接到许可协议。在一些无法作出链接的媒介（例如印刷品），我们建议您引导您的读者到 openstreetmap.org（像是注明“OpenStreetMap”的完整网址）以及 opendatacommons.org。
-          在此示例中，版权相关的归属会出现在地图的角落。
         attribution_example:
           alt: 如何在网页上署名 OpenStreetMap 的示例
           title: 署名示例
         more_title_html: 了解更多
-        more_1_html: |-
-          请在<a
-          href="https://osmfoundation.org/Licence">OSMF许可协议页面</a>阅读更多关于使用我们的数据，以及如何表明我们是作者的信息。
-        more_2_html: 尽管 OpenStreetMap 开放数据，但是我们无法为第三方提供免费的地图 API。详见我们的 <a href="https://operations.osmfoundation.org/policies/api/">API使用政策</a>、<a
-          href="https://operations.osmfoundation.org/policies/tiles/">地图图块使用政策</a>及<a
-          href="https://operations.osmfoundation.org/policies/nominatim/">名称服务使用政策</a>。
         contributors_title_html: 我们的贡献者
         contributors_intro_html: 我们的数据来源于成千上万人的贡献。但我们也从国家测绘机构等处获取公共版权的数据，其中包括：
-        contributors_at_html: <strong>奥地利</strong>：包含来自 <a href="https://data.wien.gv.at/">Stadt
-          Wien</a>(<a href="https://creativecommons.org/licenses/by/3.0/at/deed.zh">CC
-          BY</a>协议)、<a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
-          Vorarlberg</a>及 Land Tirol (修订的 <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY
-          AT</a>协议)的数据。
-        contributors_au_html: |-
-          <strong>澳大利亚</strong>：使用行政边界纳入或开发&copy;
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape澳大利亚</a>依据<a href="https://creativecommons.org/licenses/by/4.0/">知识共享署名4.0国际许可协议（CC BY 4.0）</a>由澳大利亚联邦条款授权。
-        contributors_ca_html: <strong>加拿大</strong>：含有来自GeoBase&reg;，GeoGratis（&copy;
-          加拿大自然资源部），CanVec（&copy; 加拿大自然资源部）和StatCan（加拿大统计局地理处）的数据。
-        contributors_fi_html: <strong>芬兰</strong>：包含来自芬兰国家测绘局地形数据库和其他测绘机构的数据，依据 <a
-          href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI
-          协议</a>授权。
-        contributors_fr_html: <strong>法国</strong>：含有来自 Direction Générale des Impôts
-          的数据。
-        contributors_nl_html: <strong>荷兰</strong>：含有&copy; AND data, 2007(<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: <strong>新西兰</strong>：包含来源自<a href="https://data.linz.govt.nz/">LINZ数据服务</a>的数据，依据<a
-          href="https://creativecommons.org/licenses/by/4.0/deed.zh">CC BY 4.0</a>授权复用。
-        contributors_si_html: |-
-          <strong>斯洛文尼亚</strong>：包含来自
-          <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a>和
-          <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>（斯洛文尼亚公开信息）的数据。
-        contributors_es_html: <strong>西班牙</strong>：包含来自西班牙国家地理研究所（<a href="http://www.ign.es/">IGN</a>）和国家制图系统（<a
-          href="http://www.scne.es/">SCNE</a>）的数据，这些数据以<a href="https://creativecommons.org/licenses/by/4.0/">知识共享
-          署名 4.0协议</a>授权。
-        contributors_za_html: <strong>南非</strong>：包含来自<a href="http://www.ngi.gov.za/">行政局：国家地球空间信息</a>，国家版权所有。
-        contributors_gb_html: <strong>英国</strong>：包含来自 Ordnance 的调查数据，&copy; Crown
-          版权所有及数据库权利，2010-2023。
-        contributors_footer_1_html: |-
-          关于其进一步的细节，及其他被用来帮助提升 OpenStreetMap 的来源，详见 OpenStreetMap Wiki 的<a
-          href="https://wiki.openstreetmap.org/wiki/Zh-hans:Contributors">贡献者页面</a>。
+        contributors_at_austria: 奥地利
+        contributors_at_stadt_wien: 维也纳
+        contributors_au_australia: 澳大利亚
+        contributors_ca_canada: 加拿大
+        contributors_fi_finland: 芬兰
+        contributors_fr_france: 法国
+        contributors_nl_netherlands: 荷兰
+        contributors_nz_new_zealand: 新西兰
+        contributors_si_slovenia: 斯洛文尼亚
+        contributors_es_spain: 西班牙
+        contributors_za_south_africa: 南非
+        contributors_gb_united_kingdom: 英国
+        contributors_2_contributors_page: 贡献者页面
         contributors_footer_2_html: OpenStreetMap 纳入数据并不意味着原始数据提供者认可 OpenStreetMap、提供任何担保或担负任何法律责任。
         infringement_title_html: 著作权侵犯
         infringement_1_html: OSM 的贡献者会被提醒，绝不要在没有著作权人的明确许可时添加来自任何有著作权的来源的数据(如谷歌地图或印刷地图)。
-        infringement_2_html: 如果您认为版权的材料已被不恰当地添加的 OpenStreetMap 数据库或该网站，请参见我们的<a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">撤除程序</a>，或直接在我们的<a
-          href="https://dmca.openstreetmap.org/">在线申报页面</a>上提出。
-        trademarks_title_html: <span id="trademarks"></span>商标
-        trademarks_1_html: OpenStreetMap、放大镜标志和地图状态是OpenStreetMap基金会的注册商标。如果您对使用这些标志有任何问题，请参见我们的<a
-          href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">商标方针</a>。
+        trademarks_title: 商标
+        trademarks_1_1_trademark_policy: 商标政策
     index:
       js_1: 您或许正在使用不支持 JavaScript 的浏览器，或您禁用了 JavaScript。
       js_2: OpenStreetMap 使用 JavaScript 让地图更平滑。
@@ -2004,6 +1970,8 @@ zh-CN:
       map_image: 地图图像 (显示标准图层)
       embeddable_html: 可嵌入HTML
       licence: 许可协议
+      licence_details_html: OpenStreetMap 数据以 %{odbl_link} (ODbL) 许可。
+      odbl: 开放数据共享开放数据库许可协议
       too_large:
         advice: 如果用上面的导出工具失败了，请考虑使用下面列出的来源来导出：
         body: 该区域过大，不能导出为 OpenStreetMap XML 数据。请放大地图或选择一个更小的区域，或使用以下大量数据下载来源之一：
@@ -2043,6 +2011,9 @@ zh-CN:
           instructions_html: 只需点击<a class='icon note'></a>或地图上显示的相同图标。这会在地图上添加标记，您可以拖动它来改变位置。添加您所知信息后点击保存，其他绘图者将进行核查。
       other_concerns:
         title: 其他问题
+        concerns_html: 如果您对我们的数据使用方式或内容有疑虑，请参阅我们的%{copyright_link}来了解更多法律信息，或者联系相应的%{working_group_link}。
+        copyright: 版权页面
+        working_group: OSMF 工作小组
     help:
       title: 获得帮助
       introduction: OpenStreetMap 有若干资源用于学习该项目，提问和回答问题，以及讨论与制作地图相关的话题并且撰写相关文档。
@@ -2077,8 +2048,16 @@ zh-CN:
         description: 浏览 wiki 深入了解 OpenStreetMap 文档。
     potlatch:
       removed: 您的默认OpenStreetMap编辑器设置为Potlatch。由于Adobe Flash Player已停止支持，因此Potlatch不再可在Web浏览器中使用。
+      desktop_application_html: 您仍然可以通过%{download_link}使用 Potlatch。
+      download: 下载适用于 Mac 和 Windows 的桌面应用程序
+      id_editor_html: 或者，您可以将默认编辑器设置为 iD，它会像先前的 Potlatch 一样在您的网络浏览器上运行。%{change_preferences_link}。
+      change_preferences: 在这里更改您的参数设置
     any_questions:
       title: 还有疑问吗？
+      paragraph_1_html: 有多种资源可用于了解该项目、提出和回答与 OpenStreetMap 有关的问题，并且协作讨论和记录地图主题。%{help_link}。以组织形式为
+        OpenStreetMap 制定计划吗？%{welcome_mat_link}。
+      get_help_here: 在这里寻求帮助
+      welcome_mat: 查看欢迎垫
     sidebar:
       search_results: 搜索结果
       close: 关闭
@@ -2171,6 +2150,10 @@ zh-CN:
       basic_terms:
         title: 绘制地图的基本术语
         paragraph_1: OpenStreetMap 有一些自己的术语。这里是一些常用的关键词。
+        an_editor_html: '%{editor}是您可以用于编辑地图的程序或网站。'
+        a_node_html: '%{node}是地图上的一个点，例如一间餐厅或者一棵树。'
+        a_way_html: '%{way}是一条线或一片区域，例如一条道路、一条溪流、一个湖泊或者一栋建筑物。'
+        a_tag_html: '%{tag}是关于节点或路径的数据，例如餐厅名称或者道路限速。'
         editor: 编辑器
         node: 节点
         way: 路径
@@ -2181,6 +2164,8 @@ zh-CN:
           OpenStreetMap 几乎没有正式规则，但我们希望所有参与者都能与社群合作并与之沟通。如果您正在考虑
           除手动编辑之外的任何活动，请阅读并遵循
           %{imports_link} 和 %{automated_edits_link} 上的指南。
+        imports: 导入
+        automated_edits: 自动化编辑
       start_mapping: 开始绘制地图
       add_a_note:
         title: 没有时间编辑？添加注记！
@@ -2199,6 +2184,7 @@ zh-CN:
         list_text: 以下社区正式成立为地方分会：
       other_groups:
         title: 其他团体
+        communities_wiki: 社区 wiki 页面
   traces:
     visibility:
       private: 私有 (只以匿名分享，无顺序的点)
@@ -2252,7 +2238,7 @@ zh-CN:
     trace:
       pending: 挂起
       count_points:
-        one: 1个点
+        one: '%{count}个点'
         other: '%{count}个点'
       more: 更多
       trace_details: 查看轨迹详情
@@ -2271,6 +2257,8 @@ zh-CN:
       description: 浏览最近的GPS轨迹上传
       tagged_with: ' 标签为%{tags}'
       empty_title: 这里还没有东西
+      empty_upload_html: '%{upload_link}或者在%{wiki_link}了解更多有关 GPS 追踪的信息。'
+      upload_new: 上传新轨迹
       wiki_page: Wiki页面
       upload_trace: 上传轨迹
       all_traces: 所有轨迹
@@ -2489,7 +2477,7 @@ zh-CN:
       notes: 地图注记
       remove as friend: 删除朋友
       add as friend: 添加朋友
-      mapper since: 绘图始于：
+      mapper since: 绘图者注册于：
       ct status: 贡献者条款：
       ct undecided: 未决定
       ct declined: 已拒绝
@@ -2613,19 +2601,19 @@ zh-CN:
       time_past_html: 结束于%{time}。
       block_duration:
         hours:
-          one: 1 小时
+          one: '%{count} 小时'
           other: '%{count} 小时'
         days:
-          one: 1日
+          one: '%{count}日'
           other: '%{count}日'
         weeks:
-          one: 1周
+          one: '%{count}周'
           other: '%{count}周'
         months:
-          one: 1个月
+          one: '%{count}个月'
           other: '%{count}个月'
         years:
-          one: 1å¹´
+          one: '%{count}å¹´'
           other: '%{count}å¹´'
     blocks_on:
       title: 对 %{name} 的封禁
@@ -2740,10 +2728,10 @@ zh-CN:
       locate:
         title: 显示我的位置
         metersPopup:
-          one: 你距离该点1米
+          one: 你距离该点%{count}米
           other: 你距离该点%{count}米
         feetPopup:
-          one: 你就在这个位置的一英尺范围内
+          one: 你就在这个位置的%{count}英尺范围内
           other: 你就在这个位置的%{count}英尺范围内
       base:
         standard: 标准
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index fb84e818a..991652e90 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -9,6 +9,7 @@
 # Author: Cwlin0416
 # Author: EagerLin
 # Author: Foothsu
+# Author: GuoPC
 # Author: HTan (WMF)
 # Author: Hlaw
 # Author: Impersonator 1
@@ -204,42 +205,42 @@ zh-TW:
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: 約一小時前
-        other: 約%{count}小時前
+        one: 約 %{count} 小時前
+        other: 約 %{count} 小時前
       about_x_months:
-        one: 約一個月前
-        other: 約%{count}個月前
+        one: 約 %{count} 個月前
+        other: 約 %{count} 個月前
       about_x_years:
-        one: 約一年
-        other: 約%{count}年前
+        one: 約 %{count} 年前
+        other: 約 %{count} 年前
       almost_x_years:
-        one: 將近一年前
-        other: 將近%{count}年前
+        one: 將近 %{count} 年前
+        other: 將近 %{count} 年前
       half_a_minute: 半分鐘前
       less_than_x_seconds:
-        one: 小於 1 秒前
+        one: 小於 %{count} 秒前
         other: 小於 %{count} 秒前
       less_than_x_minutes:
-        one: 小於 1 分前
+        one: 小於 %{count} 分前
         other: 小於 %{count} 分前
       over_x_years:
-        one: 超過1年前
-        other: 超過%{count}年前
+        one: 超過 %{count} 年前
+        other: 超過 %{count} 年前
       x_seconds:
-        one: 1秒前
-        other: '%{count}秒前'
+        one: '%{count} 秒前'
+        other: '%{count} 秒前'
       x_minutes:
-        one: 1分鐘前
-        other: '%{count}分鐘前'
+        one: '%{count} 分鐘前'
+        other: '%{count} 分鐘前'
       x_days:
-        one: 1日前
-        other: '%{count}日前'
+        one: '%{count} 天前'
+        other: '%{count} 天前'
       x_months:
-        one: 1個月前
-        other: '%{count}個月前'
+        one: '%{count} 個月前'
+        other: '%{count} 個月前'
       x_years:
-        one: 1年前
-        other: '%{count}年前'
+        one: '%{count} 年前'
+        other: '%{count} 年前'
   printable_name:
     with_version: '%{id}，版本%{version}'
   editor:
@@ -353,11 +354,11 @@ zh-TW:
     no_comment: (沒有評論)
     part_of: 屬於：
     part_of_relations:
-      one: 1 個關聯
+      one: '%{count} 個關聯'
       other: '%{count} 個關聯'
     part_of_ways:
-      one: 1 條路
-      other: '%{count} 條路'
+      one: '%{count} 條路徑'
+      other: '%{count} 條路徑'
     download_xml: 下載 XML
     view_history: 檢視歷史
     view_details: 檢視詳細資料
@@ -399,8 +400,8 @@ zh-TW:
       history_title_html: 關聯歷史：%{name}
       members: 成員
       members_count:
-        one: 1 個成員
-        other: '%{count} 個成員'
+        one: '%{count} 名成員'
+        other: '%{count} 名成員'
     relation_member:
       entry_role_html: '%{type} %{name} 作為 %{role}'
       type:
@@ -611,7 +612,7 @@ zh-TW:
       description: OpenStreetMap 伺服器遇到意外情況，而無法滿足請求（HTTP 500）
     not_found:
       title: 檔案未找到
-      description: 在 OpenStreetMap 服務器上找不到該名稱的文件/目錄/API 操作 (HTTP 404)
+      description: 在 OpenStreetMap 伺服器上找不到該名稱的檔案/目錄/API 操作（HTTP 404）
   friendships:
     make_friend:
       heading: 將 %{user} 加入為好友？
@@ -1429,8 +1430,8 @@ zh-TW:
       last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr>由%{user}
       link_to_reports: 檢視回報
       reports_count:
-        one: 1 個回報
-        other: '%{count} 個回報'
+        one: '%{count} 份回報'
+        other: '%{count} 份回報'
       reported_item: 已回報項目
       states:
         ignored: 已忽略
@@ -1440,8 +1441,8 @@ zh-TW:
       title: '%{status} 問題 #%{issue_id}'
       reports:
         zero: 無回報
-        one: 1 個回報
-        other: '%{count} 個回報'
+        one: '%{count} 份回報'
+        other: '%{count} 份回報'
       report_created_at: 首次回報是在 %{datetime}
       last_resolved_at: 最後回報是在 %{datetime}
       last_updated_at: 最後更新是由 %{displayname} 在 %{datetime}
@@ -1587,13 +1588,9 @@ zh-TW:
       subject: '[OpenStreetMap] GPX 匯入失敗'
     gpx_success:
       hi: '%{to_user} 您好，'
-      loaded_successfully:
-        one: |-
-          成功載入 1 點中的
-          %{trace_points}。
-        other: |-
-          l成功載入 %{possible_points} 點中的
-          %{trace_points}。
+      loaded:
+        one: 成功載入 %{count} 個可能軌跡點中的 %{trace_points} 個。
+        other: 成功載入 %{count} 個可能軌跡點中的 %{trace_points} 個。
       subject: '[OpenStreetMap] GPX 匯入成功'
     signup_confirm:
       subject: '[OpenStreetMap] 歡迎加入 OpenStreetMap'
@@ -1842,8 +1839,6 @@ zh-TW:
   shared:
     markdown_help:
       heading_html: 以%{kramdown_link}解析
-      kramdown_url: https://kramdown.gettalong.org/quickref.html
-      kramdown: kramdown
       headings: 標題
       heading: 標題
       subheading: 副標題
@@ -1900,98 +1895,102 @@ zh-TW:
         mapping_link: 開始製圖
       legal_babble:
         title_html: 版權與授權條款
-        intro_1_html: OpenStreetMap 為<i>開放資料</i>，以<a href="https://osmfoundation.org/">
-          OpenStreetMap 基金會</a>（OSMF）採用的<a href="https://opendatacommons.org/licenses/odbl/">
-          Open Data Commons 開放資料庫授權條款</a>（ODbL）授權。
-        intro_2_html: |-
-          您可以自由地複製、散布、傳輸及修改我們的資料，前提是您須標明作者為 OpenStreetMap 及其貢獻者。若您在我們的資料上作修改或據之衍生其他資料
-          ，則只可依相同授權條款散佈有關成果。授權的<a href="https://opendatacommons.org/licenses/odbl/1.0/">法律原文</a>詳述您的權責。
-        intro_3_1_html: 我們的文件以<a href="https://creativecommons.org/licenses/by-sa/2.0/deed.zh_TW">創用
-          CC 姓名標示-相同方式分享（CC BY-SA 2.0版）</a>條款授權。
+        introduction_1_html: OpenStreetMap%{registered_trademark_link}是%{open_data}，透過%{osm_foundation_link}（OSMF）在%{odc_odbl_link}（ODbL）下授權。
+        introduction_1_open_data: 開放資料
+        introduction_1_odc_odbl: 開放資料共享開放資料庫授權
+        introduction_1_osm_foundation: OpenStreetMap 基金會
+        introduction_2_html: 您可以自由地複製、散布、傳輸及修改我們的資料，前提是您須標明作者為 OpenStreetMap 及其貢獻者。若您在我們的資料上作變動或以此來建立其他資料，您只能依照相同授權條款來散佈成果。%{legal_code_link}有詳述您的權責。
+        introduction_2_legal_code: 法律條款
+        introduction_3_html: 我們的文件是依據 %{creative_commons_link} 授權條款（CC BY-SA 2.0）獲得許可。
+        introduction_3_creative_commons: 創用 CC 姓名標示-相同方式分享
+        introduction_3_creative_commons_url: https://creativecommons.org/licenses/by-sa/2.0/deed.zh_TW
         credit_title_html: 如何標明作者是 OpenStreetMap
         credit_1_html: 當您使用 OpenStreetMap 的資料，您會被要求遵循兩件事：
-        credit_2_1_html: |-
-          <ul>
-            <li>顯示出我們的版權聲明來表達歸屬於 OpenStreetMap 的內容。</li>
-            <li>清楚表明資料在開放資料庫授權條款下可用。</li>
-          </ul>
-        credit_3_1_html: 對於版權聲明的顯示，我們會依據於您如何使用我們的資料，而有不同的要求。例如，不同的規則要如何顯示版權聲明，具體取決於您是否有建立了可瀏覽的地圖、列印的地圖或是靜態圖片。完整的詳細資訊要求可以在<a
-          href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">屬名指南</a>上查看。
-        credit_4_html: |-
-          請明確表示資料在開放資料庫授權條款下可用，您可以連結到<a href="https://www.openstreetmap.org/copyright">這個版權頁面</a>。
+        credit_2_1: 透過顯示我們的版權聲明為 OpenStreetMap 提供屬名。
+        credit_2_2: 明確資料在開放資料共享開放資料庫授權下可用。
+        credit_3_html: 對於版權聲明的顯示，我們會依據您如何使用我們的資料，而有不同的要求。例如，不同的規則要如何顯示版權聲明，具體取決於您是否有建立可瀏覽的地圖、列印的地圖、或靜態圖片。完整的詳細資訊要求可以在%{attribution_guidelines_link}上查看。
+        credit_3_attribution_guidelines: 姓名標示指南
+        credit_4_1_html: |-
+          請明確表示資料在開放資料庫授權條款下可用，您可以連結到%{this_copyright_page_link}。
           相對地，如果您以資料表來分發 OSM，您可以命名並直接連結到授權條款。在一些無法作出連結的媒體（例如印刷品），我們建議您引導您的讀者到 openstreetmap.org（像是註明「OpenStreetMap」的完整網址）以及 opendatacommons.org。
-          在此範例中，版權相關的歸屬會出現在地圖的角落。
+          在此範例中，版權相關聲明會出現在地圖的角落處。
+        credit_4_1_this_copyright_page: 此版權頁面
         attribution_example:
           alt: 如何在網頁上署名 OpenStreetMap 的例子
-          title: 署名的例子
+          title: 姓名標示例子
         more_title_html: 尋找更多
-        more_1_html: |-
-          在<a
-          href="https://osmfoundation.org/Licence"> OSMF 授權條款頁面</a>可閱讀更多關於使用我們的資料，以及如何標明我們是作者的資料。
-        more_2_html: 雖然 OpenStreetMap 是開放資料，但我們無法為第三方提供免費的地圖 API。詳見我們的<a href="https://operations.osmfoundation.org/policies/api/">API
-          使用政策</a>、<a href="https://operations.osmfoundation.org/policies/tiles/">地圖影像塊使用政策</a>及<a
-          href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim
-          服務使用政策</a>。
+        more_1_1_html: 在%{osmf_licence_page_link}閱讀更多關於使用我們的資料，以及如何屬名我們的方式。
+        more_1_1_osmf_licence_page: OSMF 授權條款頁面
+        more_2_1_html: |-
+          儘管 OpenStreetMap 是開放資料，我們不對第三方提供免費的地圖 API。
+          請參閱我們的%{api_usage_policy_link}、%{tile_usage_policy_link}、和%{nominatim_usage_policy_link}。
+        more_2_1_api_usage_policy: API 使用方針
+        more_2_1_tile_usage_policy: 影像塊使用方針
+        more_2_1_nominatim_usage_policy: 提名使用方針
         contributors_title_html: 我們的貢獻者
         contributors_intro_html: 我們的貢獻者為成千上萬的人。我們也收納了從國家測繪機構及其他來源等取得的開放版權資料，其中包括：
-        contributors_at_html: <strong>奧地利</strong>：包含來自 <a href="https://data.wien.gv.at/">Stadt
-          Wien</a> (<a href="https://creativecommons.org/licenses/by/3.0/at/deed.zh_TW">CC
-          BY</a>授權) 、<a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
-          Vorarlberg</a>及 Land Tirol (修訂的<a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY
-          AT</a>授權) 的資料。
-        contributors_au_html: |-
-          <strong>澳大利亞</strong>：使用行政區劃納入或開發&copy;
-          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape 澳大利亞</a>是依據<a href="https://creativecommons.org/licenses/by/4.0/deed.zh_TW">姓名標示 4.0 國際（CC BY 4.0）</a>澳大利亞聯邦條款授權。
-        contributors_ca_html: |-
-          <strong>加拿大</strong>：包含來自 GeoBase&reg;，GeoGratis (&copy; Department of Natural
-          Resources Canada) ，CanVec (&copy; Department of Natural
-          Resources Canada) 和 StatCan (Geography Division,
-          Statistics Canada) 的資料。
-        contributors_fi_html: |-
-          <strong>芬蘭</strong>: 包含來自
-          National Land Survey of Finland's Topographic Database
-          及其他資料集的資料，以
-          <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1"> NLSFI License </a>授權。
-        contributors_fr_html: |-
-          <strong>法國</strong>: 包含來自
+        contributors_at_credit_html: '%{austria}：包含來自%{stadt_wien_link}（under %{cc_by_link}）、%{land_vorarlberg_link}、與
+          Land Tirol（依據%{cc_by_at_with_amendments_link}）的資料。'
+        contributors_at_austria: 奧地利
+        contributors_at_stadt_wien: 維也納
+        contributors_at_cc_by: 創用 CC 姓名標示
+        contributors_at_cc_by_url: https://creativecommons.org/licenses/by/3.0/at/deed.zh_TW
+        contributors_at_land_vorarlberg: 福拉爾貝格邦
+        contributors_at_cc_by_at_with_amendments: CC BY AT 修正條款
+        contributors_au_credit_html: '%{australia}：使用行政區域界線&copy; %{geoscape_australia_link}來合併或開發，由澳大利亞聯邦依據%{cc_licence_link}授權。'
+        contributors_au_australia: 澳洲
+        contributors_au_geoscape_australia: Geoscape Australia
+        contributors_au_cc_licence: 創用 CC 姓名標示 4.0 國際授權條款（CC BY 4.0）
+        contributors_au_cc_licence_url: https://creativecommons.org/licenses/by/4.0/deed.zh_TW
+        contributors_ca_credit_html: '%{canada}：包含來自 GeoBase&reg;、GeoGratis（&copy;加拿大自然資源處）、CanVec（&copy;加拿大自然資源處）、和
+          StatCan（地理部，加拿大統計局）的資料。'
+        contributors_ca_canada: 加拿大
+        contributors_fi_credit_html: '%{finland}：包含來自芬蘭測量局地形資料庫與其他資料集的資料，依據%{nlsfi_license_link}授權。'
+        contributors_fi_finland: 芬蘭
+        contributors_fi_nlsfi_license: NLSFI 授權條款
+        contributors_fr_credit_html: |-
+          %{france}：包含來自
           Direction Générale des Impôts 的資料。
-        contributors_nl_html: |-
-          <strong>荷蘭</strong>: 包含來自&copy; AND data, 2007
-          (<a href="https://www.and.com">www.and.com</a>) 的資料。
-        contributors_nz_html: |-
-          <strong>紐西蘭</strong>：包含來自
-          <a href="https://data.linz.govt.nz/">LINZ 資料服務</a> 的資料來源，並依據
-          <a href="https://creativecommons.org/licenses/by/4.0/deed.zh_TW">姓名標示 4.0 國際</a>條款授權。
-        contributors_si_html: |-
-          <strong>斯洛維尼亞</strong>：包含來自<a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a>和
-          <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
-          (斯洛維尼亞公開資訊).
-        contributors_es_html: |-
-          <strong>西班牙</strong>：包含來自西班牙國家地理研究所（<a href="http://www.ign.es/">IGN</a>）以及國家製圖系統<a href="http://www.scne.es/">SCNE</a>）的資料來源，並依據
-          <a href="https://creativecommons.org/licenses/by/4.0/deed.zh_TW">姓名標示 4.0 國際</a>條款授權。
-        contributors_za_html: |-
-          <strong>南非</strong>: 包含來自
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a> (State copyright reserved) 的資料。
-        contributors_gb_html: |-
-          <strong>英國</strong>: 包含來自 Ordnance
-          Survey data &copy; Crown copyright and database right
-          2010-23 的資料。
-        contributors_footer_1_html: |-
-          若需要進一步詳情，以及其他曾用以協助改進
-           OpenStreetMap 的資料來源，請參閱 OpenStreetMap Wiki 上的<a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">貢獻者
-          頁面</a>。
+        contributors_fr_france: 法國
+        contributors_nl_credit_html: '%{netherlands}：包含 &copy; AND 資料，2007（%{and_link}）'
+        contributors_nl_netherlands: 荷蘭
+        contributors_nz_credit_html: |-
+          %{new_zealand}：包含來自 %{linz_data_service_link}
+          與基於 %{cc_by_link} 的重複使用授權條款。
+        contributors_nz_new_zealand: 紐西蘭
+        contributors_nz_linz_data_service: LINZ 資料服務
+        contributors_nz_cc_by: 創用 CC 姓名標示 4.0
+        contributors_nz_cc_by_url: https://creativecommons.org/licenses/by/4.0/deed.zh_TW
+        contributors_si_credit_html: |-
+          %{slovenia}：包含來自 %{gu_link} 和 %{mkgp_link}
+          （斯洛維尼亞公開資訊）的資料。
+        contributors_si_slovenia: 斯洛維尼亞
+        contributors_si_gu: 測繪局
+        contributors_si_mkgp: 農林食品部
+        contributors_es_credit_html: '%{spain}：包含來自西班牙國家地理研究所（%{ign_link}）和國家製圖系統（%{scne_link}）的資料，在%{cc_by_link}下授權重複使用。'
+        contributors_es_spain: 西班牙
+        contributors_es_ign: IGN
+        contributors_es_cc_by: 創用 CC 姓名標示 4.0
+        contributors_es_cc_by_url: https://creativecommons.org/licenses/by/4.0/deed.zh_TW
+        contributors_za_credit_html: '%{south_africa}：包含來自%{ngi_link}的資料，國家版權所有。'
+        contributors_za_south_africa: 南非
+        contributors_za_ngi: 總局：國家地理空間資訊局
+        contributors_gb_credit_html: '%{united_kingdom}：包含軍械調查資料&copy;皇家版權與資料庫版權 2010-2023。'
+        contributors_gb_united_kingdom: 英國
+        contributors_2_html: 關於這些的進一步詳細資訊，與其他已使用來改善 OpenStreetMap 的來源，請參閱 OpenStreetMap
+          Wiki 上的%{contributors_page_link}。
+        contributors_2_contributors_page: 貢獻者頁面
         contributors_footer_2_html: OpenStreetMap 收錄一項資料，並不意味原本的資料提供者認可 OpenStreetMap、提供任何保證或承擔任何法律責任。
         infringement_title_html: 侵犯版權
         infringement_1_html: OSM 的貢獻者會被提醒，絕不要在沒有版權所有人的明確淮許下，加入來自任何有版權的來源的資料 (如 Google
           地圖或印刷地圖)。
-        infringement_2_html: 如果你認為有含有著作權的材料被不恰當地加入到 OpenStreetMap 資料庫或此網站，請參考我們的<a
-          href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">撤除程序</a>或直接在我們的<a
-          href="https://dmca.openstreetmap.org/">線上申報頁面</a>提出。
-        trademarks_title_html: <span id="trademarks"></span>商標
-        trademarks_1_html: OpenStreetMap、放大鏡標誌和 OpenStreetMap 研討會是 OpenStreetMap 基金會的註冊商標。如果你對於使用這些商標有疑問的話，請查看我們的<a
-          href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">商標方針</a>。
+        infringement_2_1_html: 如果您認為有受版權保護的素材被不恰當地加到 OpenStreetMap 資料庫或本網站，請參考我們的%{takedown_procedure_link}，或直接在我們的%{online_filing_page_link}反應。
+        infringement_2_1_takedown_procedure: 侵權處理程序
+        infringement_2_1_online_filing_page: 線上申請頁面
+        trademarks_title: 商標
+        trademarks_1_1_html: OpenStreetMap、網站上的放大鏡標誌，和 State of the Map 是 OpenStreetMap
+          基金會的註冊商標。如果您對商標的使用有任何疑問，請參閱我們的%{trademark_policy_link}。
+        trademarks_1_1_trademark_policy: 商標方針
     index:
       js_1: 您使用不支援 JavaScript 的瀏覽器，或者停用了 JavaScript。
       js_2: OpenStreetMap 使用 JavaScript 讓地圖更平順。
@@ -2064,7 +2063,6 @@ zh-TW:
         concerns_html: 如果您對我們的資料使用方面或內容有所疑慮，請參考我們的%{copyright_link}來了解更多法律資訊，或是聯繫相應的%{working_group_link}。
         copyright: 版權頁面
         working_group: OSMF 工作小組
-        working_group_url: https://wiki.osmfoundation.org/wiki/Working_Groups
     help:
       title: 取得協助
       introduction: OpenStreetMap 有一些資源，可用於學習本專案、提出和回答問題，以及討論和紀錄與製作地圖相關的話題。
@@ -2101,7 +2099,6 @@ zh-TW:
       removed: 您預設的開放街圖編輯器是設定成 Potlatch。因為 Adobe Flash Player 已終止維護，Potlatch 已不在網路瀏覽器上可用。
       desktop_application_html: 您仍然可以透過 %{download_link} 使用 Potlatch。
       download: 下載適用於 Mac 和 Windows 的桌面應用程式
-      download_url: https://www.systemed.net/potlatch/
       id_editor_html: 除此之外，您可以設定您的預設編輯器成 iD，這可以和先前的 Potlatch 一樣在您的網路瀏覽器上運作。%{change_preferences_link}。
       change_preferences: 在此更改您的偏好設定
     any_questions:
@@ -2254,7 +2251,6 @@ zh-TW:
           沒有需要正式建立一個與地方分會同等規模的團體。
           事實上，許多團體作為人們的非正式集會或是社群團體而非常成功地存在。任何人都可以設定或是加入這些團體。請在%{communities_wiki_link}上閱讀更多內容。
         communities_wiki: 社群 wiki 頁面
-        communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group
   traces:
     visibility:
       private: 私人 (以匿名方式分享，節點無順序)
@@ -2308,7 +2304,7 @@ zh-TW:
     trace:
       pending: 等候
       count_points:
-        one: 1 個點
+        one: '%{count} 個點'
         other: '%{count} 個點'
       more: 更多
       trace_details: 檢視軌跡詳細資料
@@ -2677,20 +2673,20 @@ zh-TW:
       time_past_html: 於%{time}結束。
       block_duration:
         hours:
-          one: 1 小時
+          one: '%{count} 小時'
           other: '%{count} 小時'
         days:
-          one: 1日
-          other: '%{count}日'
+          one: '%{count} 天'
+          other: '%{count} 天'
         weeks:
-          one: 1週
-          other: '%{count}週'
+          one: '%{count} 週'
+          other: '%{count} 週'
         months:
-          one: 1個月
-          other: '%{count}個月'
+          one: '%{count} 個月'
+          other: '%{count} 個月'
         years:
-          one: 1å¹´
-          other: '%{count}å¹´'
+          one: '%{count} å¹´'
+          other: '%{count} å¹´'
     blocks_on:
       title: 對 %{name} 的封鎖
       heading_html: 對 %{name} 封鎖的清單
@@ -2804,10 +2800,10 @@ zh-TW:
       locate:
         title: 顯示我的位置
         metersPopup:
-          one: 您距離此地點在 1 公尺內
+          one: 您距離此地點在 %{count} 公尺內
           other: 您距離此地點在 %{count} 公尺內
         feetPopup:
-          one: 您距離此地點在 1 英尺內
+          one: 您距離此地點在 %{count} 英尺內
           other: 您距離此地點在 %{count} 英尺內
       base:
         standard: 標準
diff --git a/test/helpers/changesets_helper_test.rb b/test/helpers/changesets_helper_test.rb
index a25eed6fa..f6cfb3c06 100644
--- a/test/helpers/changesets_helper_test.rb
+++ b/test/helpers/changesets_helper_test.rb
@@ -17,11 +17,11 @@ class ChangesetsHelperTest < ActionView::TestCase
     # We need to explicitly reset the closed_at to some point in the future, and avoid the before_save callback
     changeset.update_column(:closed_at, Time.now.utc + 1.day) # rubocop:disable Rails/SkipsModelValidations
 
-    assert_match %r{^Created <abbr title='Mon, 01 Jan 2007 00:00:00 \+0000'>.*</abbr> by anonymous$}, changeset_details(changeset)
+    assert_match %r{^Created <abbr title="Mon, 01 Jan 2007 00:00:00 \+0000">.*</abbr> by anonymous$}, changeset_details(changeset)
 
     changeset = create(:changeset, :created_at => Time.utc(2007, 1, 1, 0, 0, 0), :closed_at => Time.utc(2007, 1, 2, 0, 0, 0))
     user_link = %(<a href="/user/#{ERB::Util.u(changeset.user.display_name)}">#{changeset.user.display_name}</a>)
 
-    assert_match %r{^Closed <abbr title='Created: Mon, 01 Jan 2007 00:00:00 \+0000&#10;Closed: Tue, 02 Jan 2007 00:00:00 \+0000'>.*</abbr> by #{user_link}$}, changeset_details(changeset)
+    assert_match %r{^Closed <abbr title="Created: Mon, 01 Jan 2007 00:00:00 \+0000&#10;Closed: Tue, 02 Jan 2007 00:00:00 \+0000">.*</abbr> by #{user_link}$}, changeset_details(changeset)
   end
 end