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

diff --combined config/locales/en.yml
index c48a940177da36de6d00838f19c5301b239f5fd4,f6b1edf35d499aa29e1797607882251736385e4b..4b4f6b301807fd6cb5198e1ae8d4a8391e127e97
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1732,21 -1732,18 +1732,21 @@@ en
      destroy:
        destroyed: "Message deleted"
    passwords:
 -    lost_password:
 +    new:
        title: "Lost password"
        heading: "Forgotten Password?"
        email address: "Email Address:"
        new password button: "Reset password"
        help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
 +    create:
        notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
        notice email cannot find: "Could not find that email address, sorry."
 -    reset_password:
 +    edit:
        title: "Reset password"
        heading: "Reset Password for %{user}"
        reset: "Reset Password"
 +      flash token bad: "Did not find that token, check the URL maybe?"
 +    update:
        flash changed: "Your password has been changed."
        flash token bad: "Did not find that token, check the URL maybe?"
    preferences:
@@@ -2290,10 -2287,16 +2290,16 @@@
            cycleway_local: "Local cycleway"
            footway: "Footway"
            rail: "Railway"
+           train: "Train"
            subway: "Subway"
+           ferry: "Ferry"
            tram:
              - Light rail
              - tram
+           light_rail: "Light rail"
+           tram_only: "Tram"
+           trolleybus: "Trolleybus"
+           bus: "Bus"
            cable:
              - Cable car
              - chair lift
@@@ -2341,6 -2344,8 +2347,8 @@@
            private: "Private access"
            destination: "Destination access"
            construction: "Roads under construction"
+           bus_stop: "Bus stop"
+           stop: "Stop"
            bicycle_shop: "Bicycle shop"
            bicycle_parking: "Bicycle parking"
            toilets: "Toilets"