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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6869e966b821503bafb3b4e568ef033cecb95ca7..7a2aba1aa055e0da4352a3e6c2145ac56969eb67 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1864,9 +1864,8 @@ en:
         credit_3_1_html: |
           The map tiles in the “standard style” at www.openstreetmap.org are a
           Produced Work by the OpenStreetMap Foundation using OpenStreetMap data
-          under the Open Database License. If you are using these tiles please use
-          the following attribution:
-          “Base map and data from OpenStreetMap and OpenStreetMap Foundation”.
+          under the Open Database License. When using this map style, the same attribution is
+          required as for the map data.
         credit_4_html: |
           For a browsable electronic map, the credit should appear in the corner of the map.
           For example:
@@ -2368,6 +2367,8 @@ en:
       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"