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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c8392231e2f2bfcadbbd09c8a631ce4ccb13a644..25e3b8e1a56dc7bbb77ada726fa284eeb7eb24e8 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -504,7 +504,9 @@ en:
         title: "OpenStreetMap diary entries"
         description: "Recent diary entries from users of OpenStreetMap"
     comments:
         title: "OpenStreetMap diary entries"
         description: "Recent diary entries from users of OpenStreetMap"
     comments:

-      has_commented_on: "%{display_name} has commented on the following diary entries"
+      title: "Diary Comments added by %{user}"
+      heading: "%{user}'s Diary Comments"
+      subheading_html: "Diary Comments added by %{user}"

       no_comments: "No diary comments"
       post: Post
       when: When
       no_comments: "No diary comments"
       post: Post
       when: When


@@ -2367,6 +2369,8 @@ en:
       read_gpx: Read private GPS traces
       write_gpx: Upload GPS traces
       write_notes: Modify notes
       read_gpx: Read private GPS traces
       write_gpx: Upload GPS traces
       write_notes: Modify notes

+      read_email: Read user email address
+      skip_authorization: Auto approve application

   oauth_clients:
     new:
       title: "Register a new application"
   oauth_clients:
     new:
       title: "Register a new application"


@@ -2621,6 +2625,7 @@ en:
       no_authorization_code: No authorization code
       unknown_signature_algorithm: Unknown signature algorithm
       invalid_scope: Invalid scope
       no_authorization_code: No authorization code
       unknown_signature_algorithm: Unknown signature algorithm
       invalid_scope: Invalid scope

+      unknown_error: Authentication failed

     auth_association:
       heading: Your ID is not associated with a OpenStreetMap account yet.
       option_1: |
     auth_association:
       heading: Your ID is not associated with a OpenStreetMap account yet.
       option_1: |