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

diff --combined config/locales/en.yml
index 16270548bd68c7ab3f925b9f07c35d1c34f4a9bd,a728fe183fb41a172f096c384e3d5ec4a74750df..f68488c09c4cfc416c9f6518188cff27fc86b057
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1076,7 -1076,7 +1076,7 @@@ en
          man_made:
            adit: "Adit"
            advertising: "Advertising"
 -          antenna:  "Antenna"
 +          antenna: "Antenna"
            avalanche_protection: "Avalanche Protection"
            beacon: "Beacon"
            beam: "Beam"
@@@ -1763,14 -1763,14 +1763,14 @@@
          one: "%{count} muted message"
          other: "You have %{count} muted messages"
      reply:
 -      wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply."
 +      wrong_user: "You are logged in as '%{user}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply."
      show:
        title: "Read message"
        reply_button: "Reply"
        unread_button: "Mark as unread"
        destroy_button: "Delete"
        back: "Back"
 -      wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it."
 +      wrong_user: "You are logged in as '%{user}' but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it."
      sent_message_summary:
        destroy_button: "Delete"
      heading:
@@@ -2826,14 -2826,14 +2826,14 @@@
          with your ID in your user settings.
    user_role:
      filter:
 -      not_a_role: "The string `%{role}' is not a valid role."
 +      not_a_role: "The string '%{role}' is not a valid role."
        already_has_role: "The user already has role %{role}."
        doesnt_have_role: "The user does not have role %{role}."
        not_revoke_admin_current_user: "Cannot revoke administrator role from current user."
      grant:
 -      are_you_sure: "Are you sure you want to grant the role `%{role}' to the user `%{name}'?"
 +      are_you_sure: "Are you sure you want to grant the role '%{role}' to the user '%{name}'?"
      revoke:
 -      are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"
 +      are_you_sure: "Are you sure you want to revoke the role '%{role}' from the user '%{name}'?"
    user_blocks:
      model:
        non_moderator_update: "Must be a moderator to create or update a block."
@@@ -3147,16 -3147,16 +3147,16 @@@
          slight_left_without_exit: Slight left onto %{name}
          via_point_without_exit: (via point)
          follow_without_exit: Follow %{name}
-         roundabout_without_exit: At roundabout take exit onto %{name}
-         leave_roundabout_without_exit: Leave roundabout - %{name}
-         stay_roundabout_without_exit: Stay on roundabout - %{name}
+         roundabout_without_exit: At the roundabout take the exit onto %{name}
+         leave_roundabout_without_exit: Leave the roundabout - %{name}
+         stay_roundabout_without_exit: Stay on the roundabout - %{name}
          start_without_exit: Start on %{name}
          destination_without_exit: Reach destination
          against_oneway_without_exit: Go against one-way on %{name}
          end_oneway_without_exit: End of one-way on %{name}
-         roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
-         roundabout_with_exit_ordinal: At roundabout take %{exit} exit onto %{name}
-         exit_roundabout: Exit roundabout onto %{name}
+         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}
          unnamed: "unnamed road"
          courtesy: "Directions courtesy of %{link}"
          exit_counts: