Merge remote-tracking branch 'openstreetmap/pull/1437'

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3afa7e805600df14b8c1937c0dfd504f11afea54..7edeea7d0cbd0b49c1d5de59380d52af4b621c7b 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1243,6 +1243,7 @@ en:
       header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
       footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
     friend_notification:
       header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
       footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
     friend_notification:

+      hi: "Hi %{to_user},"

       subject: "[OpenStreetMap] %{user} added you as a friend"
       had_added_you: "%{user} has added you as a friend on OpenStreetMap."
       see_their_profile: "You can see their profile at %{userurl}."
       subject: "[OpenStreetMap] %{user} added you as a friend"
       had_added_you: "%{user} has added you as a friend on OpenStreetMap."
       see_their_profile: "You can see their profile at %{userurl}."


@@ -1651,6 +1652,8 @@ en:
       invalid: "The authorization token is not valid."
     revoke:
       flash: "You've revoked the token for %{application}"
       invalid: "The authorization token is not valid."
     revoke:
       flash: "You've revoked the token for %{application}"

+    permissions:
+      missing: "You have not permitted the application access to this facility"

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


@@ -2247,6 +2250,7 @@ en:
         comment: Comment
     edit_help: Move the map and zoom in on a location you want to edit, then click here.
     directions:
         comment: Comment
     edit_help: Move the map and zoom in on a location you want to edit, then click here.
     directions:

+      ascend: "Ascend"

       engines:
         graphhopper_bicycle: "Bicycle (GraphHopper)"
         graphhopper_foot: "Foot (GraphHopper)"
       engines:
         graphhopper_bicycle: "Bicycle (GraphHopper)"
         graphhopper_foot: "Foot (GraphHopper)"


@@ -2257,6 +2261,7 @@ en:
         mapzen_bicycle: "Bicycle (Mapzen)"
         mapzen_car: "Car (Mapzen)"
         mapzen_foot: "Foot (Mapzen)"
         mapzen_bicycle: "Bicycle (Mapzen)"
         mapzen_car: "Car (Mapzen)"
         mapzen_foot: "Foot (Mapzen)"

+      descend: "Descend"

       directions: "Directions"
       distance: "Distance"
       errors:
       directions: "Directions"
       distance: "Distance"
       errors: