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

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 14df2ae4fba6ac4d962f6ac7f427cd348bb46628..dc7f1a1c0e76206f329668cac9f6363533210023 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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,6 +609,8 @@ en:
       comment: Comment
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
+    new:
+      heading: Add a comment to the following diary entry discussion?
   doorkeeper:
     errors:
       messages:
@@ -2583,27 +2585,26 @@ en:
       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
-        alt: Log in with an OpenID URL
+        alt: OpenID logo
       google:
         title: Log in with Google
-        alt: Log in with a Google OpenID
+        alt: Google logo
       facebook:
         title: Log in with Facebook
-        alt: Log in with a Facebook Account
+        alt: Facebook logo
       microsoft:
         title: Log in with Microsoft
-        alt: Log in with a Microsoft Account
+        alt: Microsoft logo
       github:
         title: Log in with GitHub
-        alt: Log in with a GitHub Account
+        alt: GitHub logo
       wikipedia:
         title: Log in with Wikipedia
-        alt: Log in with a Wikipedia Account
+        alt: Wikipedia logo
   oauth:
     authorize:
       title: "Authorize access to your account"
@@ -2934,12 +2935,12 @@ en:
       show: "View this block"
       back: "View all blocks"
     filter:
-      block_expired: "The block has already expired and cannot be edited."
       block_period: "The blocking period must be one of the values selectable in the drop-down list."
     create:
       flash: "Created a block on user %{name}."
     update:
       only_creator_can_edit: "Only the moderator who created this block can edit it."
+      only_creator_or_revoker_can_edit: "Only the moderators who created or revoked this block can edit it."
       success: "Block updated."
     index:
       title: "User blocks"
@@ -3111,14 +3112,14 @@ en:
       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 the %{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: