* Changed "t'trace.edit.start_coord' %>Start coordinate:" to "t'trace.edit.start_coor...

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index dd76441ca57e1ae504340e06b1ee6b2e967b09d1..7bd004e16108b10d3bce4078b9a82760dc2ddff3 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -199,9 +199,10 @@ en:
     way:
       way: "Way"
       way_title: "Way: {{way_name}}"
     way:
       way: "Way"
       way_title: "Way: {{way_name}}"

-      download: "{{download_xml_link}} or {{view_history_link}}"
+      download: "{{download_xml_link}}, {{view_history_link}} or {{edit_link}}"

       download_xml: "Download XML"
       view_history: "view history"
       download_xml: "Download XML"
       view_history: "view history"

+      edit: "edit"

   changeset:
     changeset_paging_nav: 
       showing_page: "Showing page"
   changeset:
     changeset_paging_nav: 
       showing_page: "Showing page"


@@ -377,7 +378,7 @@ en:
     news_blog: "News blog"
     news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
     shop: Shop
     news_blog: "News blog"
     news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
     shop: Shop

-    shop_tooltip: Shop with branded OpenStreetMap 
+    shop_tooltip: Shop with branded OpenStreetMap merchandise

     shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
     sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
     alt_donation: Make a Donation
     shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
     sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
     alt_donation: Make a Donation


@@ -571,10 +572,14 @@ en:
       upload_trace: "Upload GPS Trace"
       trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
     edit:
       upload_trace: "Upload GPS Trace"
       trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
     edit:

+      title: "Editing trace {{name}}"
+      heading: "Editing trace {{name}}"

       filename: "Filename:"
       filename: "Filename:"

+      download: "download"

       uploaded_at: "Uploaded at:"
       points: "Points:"
       start_coord: "Start coordinate:"
       uploaded_at: "Uploaded at:"
       points: "Points:"
       start_coord: "Start coordinate:"

+      map: "map"

       edit: "edit"
       owner: "Owner:"
       description: "Description:"
       edit: "edit"
       owner: "Owner:"
       description: "Description:"


@@ -600,6 +605,8 @@ en:
     trace_optionals:
       tags: "Tags"
     view:
     trace_optionals:
       tags: "Tags"
     view:

+      title: "Viewing trace {{name}}"
+      heading: "Viewing trace {{name}}"

       pending: "PENDING"
       filename: "Filename:"
       download: "download"
       pending: "PENDING"
       filename: "Filename:"
       download: "download"


@@ -615,7 +622,6 @@ en:
       make_public: "Make this track public permanently"
       edit_track: "Edit this track"
       delete_track: "Delete this track"
       make_public: "Make this track public permanently"
       edit_track: "Edit this track"
       delete_track: "Delete this track"

-      viewing_trace: "Viewing trace {{name}}"

       trace_not_found: "Trace not found!"
     trace_paging_nav:
       showing: "Showing page"
       trace_not_found: "Trace not found!"
     trace_paging_nav:
       showing: "Showing page"


@@ -643,6 +649,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"


@@ -740,6 +761,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."