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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index b2ebffd61a273f7d4d329886ca0c07b8b6a34272..c709726ac7adc432090552cd1f97f5360fffbc36 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1651,6 +1651,8 @@ en:
       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"
@@ -2112,6 +2114,7 @@ en:
     helper:
       time_future: "Ends in %{time}."
       until_login: "Active until the user logs in."
+      time_future_and_until_login: "Ends in %{time} and after the user has logged in."
       time_past: "Ended %{time} ago."
     blocks_on:
       title: "Blocks on %{name}"