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

diff --combined config/locales/en.yml
index 0278bb8f2fc6a2a3ef0a46286ca7de337de51ddc,92ca501b4027621ef506b1b9a83aa005a6dd8369..cffc13823c98b1eb11fd9edfa580adf957db04d7
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -386,7 -386,7 +386,7 @@@ en
          way: "way"
          relation: "relation"
      start_rjs:
 -      feature_warning: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are sure you want to display this data?"
 +      feature_warning: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are you sure you want to display this data?"
        load_data: "Load Data"
        loading: "Loading..."
      tag_details:
@@@ -609,8 -609,6 +609,8 @@@
        comment: Comment
        newer_comments: "Newer Comments"
        older_comments: "Older Comments"
 +    new:
 +      heading: Add a comment to the following diary entry discussion?
    doorkeeper:
      errors:
        messages:
@@@ -2585,7 -2583,8 +2585,7 @@@
        oauth2_authorizations: OAuth 2 authorizations
        muted_users: Muted Users
      auth_providers:
 -      openid_logo_alt: "Log in with an OpenID"
 -      openid_html: "%{logo} OpenID"
 +      openid_url: "OpenID URL"
        openid_login_button: "Continue"
        openid:
          title: Log in with OpenID
@@@ -3112,14 -3111,14 +3112,14 @@@
        custom_dimensions: "Set custom dimensions"
        format: "Format:"
        scale: "Scale:"
-       image_dimensions: "Image will show standard layer at %{width} x %{height}"
+       image_dimensions: "Image will show %{layer} layer at %{width} x %{height}"
        download: "Download"
        short_url: "Short URL"
        include_marker: "Include marker"
        center_marker: "Center map on marker"
        paste_html: "Paste HTML to embed in website"
        view_larger_map: "View Larger Map"
-       only_standard_layer: "Only the standard layer can be exported as an image"
+       only_standard_layer: "Only the Standard, Cycle Map and Transport layers can be exported as an image"
      embed:
        report_problem: "Report a problem"
      key: