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

diff --combined config/locales/en.yml
index a97925be6e92136cf885b686f1301af89238f32b,f09afa48d9e4dbec6312bf93935339f9e9d401ed..aa0d99fb798a83ba491af88b748697924acbd828
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -608,7 -608,6 +608,7 @@@ en
      diary_entry:
        posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}."
        updated_at_html: "Last updated on %{updated}."
 +      full_entry: See full entry
        comment_link: Comment on this entry
        reply_link: Send a message to the author
        comment_count:
@@@ -709,6 -708,11 +709,6 @@@
        success: "You successfully unfollowed %{name}."
        not_followed: "You are not following %{name}."
    geocoder:
 -    search:
 -      title:
 -        latlon: Internal
 -        osm_nominatim: OpenStreetMap Nominatim
 -        osm_nominatim_reverse: OpenStreetMap Nominatim
      search_osm_nominatim:
        prefix_format: "%{name}"
        prefix:
@@@ -1531,16 -1535,9 +1531,16 @@@
          town: "Town Boundary"
          township: "Township Boundary"
          village: "Village Boundary"
 -    results:
 -      no_results: "No results found"
 -      more_results: "More results"
 +  searches:
 +    show:
 +      title:
 +        latlon: Internal
 +        nominatim: Nominatim
 +        nominatim_reverse: Nominatim
 +    queries:
 +      create:
 +        no_results: "No results found"
 +        more_results: "More results"
    directions:
      search:
        title: Directions
@@@ -2532,11 -2529,10 +2532,11 @@@
          track: "Track"
          bridleway: "Bridleway"
          cycleway: "Cycleway"
 -        cycleway_national: "National cycleway"
 -        cycleway_regional: "Regional cycleway"
 -        cycleway_local: "Local cycleway"
 -        cycleway_mtb: "Mountain bike route"
 +        international_bike_route: "International bike route"
 +        national_bike_route: "National bike route"
 +        regional_bike_route: "Regional bike route"
 +        local_bike_route: "Local bike route"
 +        mountain_bike_route: "Mountain bike route"
          footway: "Footway"
          rail: "Railway"
          train: "Train"
@@@ -2738,6 -2734,9 +2738,9 @@@
          title: Log in with Wikipedia
          alt: Wikipedia logo
      share:
+       share:
+         title: Share
+         alt: Share Icon
        email:
          title: Share via Email
          alt: Email icon
@@@ -3352,7 -3351,6 +3355,7 @@@
          roundabout_with_exit: At the roundabout take the exit %{exit} onto %{name}
          roundabout_with_exit_ordinal: At the roundabout take the %{exit} exit onto %{name}
          exit_roundabout: Exit the roundabout onto %{name}
 +        ferry_without_exit: Take the ferry %{name}
          unnamed: "unnamed road"
          courtesy: "Directions courtesy of %{link}"
          exit_counts: