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

diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 225078a515e380b5a7ddf48f2f14ef809277f015..2ed3b2e91d41919de31ccddd9a5a2b132565e2a9 100644 (file)
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -123,6 +123,7 @@ ignore_unused:
   - 'geocoder.search_osm_nominatim.prefix.*'
   - 'javascripts.*'
   - 'doorkeeper.*'
+  - 'users.auth_failure.*'   # OmniAuth provider callback error messages
   - 'activerecord.attributes.*'
   - 'activerecord.models.*'
   - 'activerecord.help.*'

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 06a60f977e03506df919c7ce64b266fe9c01acd3..d114e0a88865e5783979454282b676b782468399 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1449,10 +1449,6 @@ en:
         level9: "Village Boundary"
         level10: "Suburb Boundary"
         level11: "Neighbourhood Boundary"
-      types:
-        cities: Cities
-        towns: Towns
-        places: Places
     results:
       no_results: "No results found"
       more_results: "More results"
@@ -1687,7 +1683,6 @@ en:
     changeset_comment_notification:
       description: "OpenStreetMap Changeset #%{id}"
       hi: "Hi %{to_user},"
-      greeting: "Hi,"
       commented:
         subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
         subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in"
@@ -2699,7 +2694,6 @@ en:
         contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
         contributor_terms: "contributor terms"
       tou: "terms of use"
-      external auth: "Third Party Authentication:"
       continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"
       email_help: