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

diff --combined config/locales/en.yml
index 4ad1687a6cf991dda1161a66a5434488852a18d5,e13fff498c017d80f66c83d26b77b316a899c97f..6c90eacc9ea1e603dd5817dd06d710a4f8c7e078
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -671,8 -671,11 +671,8 @@@ en
        title:
          results_from_html: 'Results from %{results_link}'
          latlon: Internal
 -        latlon_url: https://openstreetmap.org/
          osm_nominatim: OpenStreetMap Nominatim
 -        osm_nominatim_url: https://nominatim.openstreetmap.org/
          osm_nominatim_reverse: OpenStreetMap Nominatim
 -        osm_nominatim_reverse_url: https://nominatim.openstreetmap.org/
      search_osm_nominatim:
        prefix_format: "%{name}"
        prefix:
@@@ -837,6 -840,7 +837,7 @@@
            college: "College Building"
            commercial: "Commercial Building"
            construction: "Building under Construction"
+           cowshed: "Cowshed"
            detached: "Detached House"
            dormitory: "Dormitory"
            duplex: "Duplex House"
@@@ -866,6 -870,7 +867,7 @@@
            shed: "Shed"
            stable: "Stable"
            static_caravan: "Caravan"
+           sty: "Sty"
            temple: "Temple Building"
            terrace: "Terrace Building"
            train_station: "Train Station Building"