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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4c743b03353487a3db53bb9de125f29d8e596eac..0278bb8f2fc6a2a3ef0a46286ca7de337de51ddc 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -386,7 +386,7 @@ en:
         way: "way"
         relation: "relation"
     start_rjs:
         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:
       load_data: "Load Data"
       loading: "Loading..."
     tag_details:


@@ -609,6 +609,8 @@ en:
       comment: Comment
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
       comment: Comment
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"

+    new:
+      heading: Add a comment to the following diary entry discussion?

   doorkeeper:
     errors:
       messages:
   doorkeeper:
     errors:
       messages:


@@ -2583,8 +2585,7 @@ en:
       oauth2_authorizations: OAuth 2 authorizations
       muted_users: Muted Users
     auth_providers:
       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
       openid_login_button: "Continue"
       openid:
         title: Log in with OpenID