Merge 16110:16487 from trunk.

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5ae59e38d63d0b90b42b0e26c3475795e8949a64..95fd929d09c4c58f2657168bb43bf7384066cb63 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -769,6 +769,21 @@ en:
       scheduled_for_deletion: "Track scheduled for deletion"
     make_public:
       made_public: "Track made public"
       scheduled_for_deletion: "Track scheduled for deletion"
     make_public:
       made_public: "Track made public"

+  oauth:
+    client_application:
+      request_access: "The application {{app_name}} is requesting access to your account. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
+      allow_to: "Allow the client application to:"
+      allow_read_prefs:  "read your user preferences."
+      allow_write_prefs: "modify your user preferences."
+      allow_write_diary: "create diary entries, comments and make friends."
+      allow_write_api:   "modify the map."
+      allow_read_gpx:    "read your private GPS traces."
+      allow_write_gpx:   "upload GPS traces."
+    token:
+      none: "You have not authorised any clients to act on your behalf. You do not have to do anything now to authorise them, as they will ask for authorisation when they need it. After that time you can return here to revoke those permissions if you do not want the clients to have your authorisation any more."
+      application: "Application"
+      issued: "Issued"
+      revoke: "Revoke!"

   user:
     login:
       title: "Login"
   user:
     login:
       title: "Login"


@@ -867,6 +882,12 @@ en:
       return to profile: Return to profile
       flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       flash update success: "User information updated successfully."
       return to profile: Return to profile
       flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       flash update success: "User information updated successfully."

+      my apps: "My client applications"
+      developers: "Application Developers"
+      dev_intro: "Have you written an application which you would like to register to make {{link}} requests to the OpenStreetMap server?"
+      register_app: "Register your application"
+      apps_registered: "You have the following client applications registered:"
+      register_another_app: "Register another application"

     confirm:
       heading: Confirm a user account
       press confirm button: "Press the confirm button below to activate your account."
     confirm:
       heading: Confirm a user account
       press confirm button: "Press the confirm button below to activate your account."