Merge 16070:16110 from trunk.

diff --combined config/locales/en.yml
index 3196531f107fe4c98179f9e2309cae45b1596356,ad24fa16c88af381a7327347f16487a566fc10f3..46accb8bdd0deb884ab502cfc82fd375f5337246
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -568,6 -568,57 +568,57 @@@ en
      key:
        map_key: "Map key"
        map_key_tooltip: "Map key for the mapnik rendering at this zoom level"
+       table:
+         heading: "Legend for z{{zoom_level}}"
+         entry:
+           motorway: "Motorway"
+           trunk: "Trunk road"
+           primary: "Primary road"
+           secondary: "Secondary road"
+           unclassified: "Unclassified road"
+           unsurfaced: "Unsurfaced road"
+           track: "Track"
+           byway: "Byway"
+           bridleway: "Bridleway"
+           cycleway: "Cycleway"
+           footway: "Footway"
+           rail: "Railway"
+           subway: "Subway"
+           tram: "Light rail; tram"
+           cable: "Cable car; chair lift"
+           runway: "Airport Runway; taxiway"
+           apron: "Airport apron; terminal"
+           admin: "Administrative boundary"
+           forest: "Forest"
+           wood: "Wood"
+           golf: "Golf course"
+           park: "Park"
+           resident: "Residential area"
+           tourist: "Tourist attraction"
+           common: "Common; meadow"
+           retail: "Retail area"
+           industrial: "Industrial area"
+           commercial: "Commercial area"
+           heathland: "Heathland"
+           lake: "Lake; reservoir"
+           farm: "Farm"
+           brownfield: "Brownfield site"
+           cemetery: "Cemetery"
+           allotments: "Allotments"
+           pitch: "Sports pitch"
+           centre: "Sports centre"
+           reserve: "Nature reserve"
+           military: "Military area"
+           school: "School; university"
+           building: "Significant building"
+           station: "Railway station"
+           summit: "Summit; peak"
+           tunnel: "Dashed casing = tunnel"
+           bridge: "Black casing = bridge"
+           private: "Private access"
+           permissive: "Permissive access"
+           destination: "Destination access"
+           construction: "Roads under construction"
    trace:
      create:
        upload_trace: "Upload GPS Trace"
@@@ -595,7 -646,7 +646,7 @@@
        description: "Description"
        tags: "Tags"
        public: "Public?"
-       public_help: "What does this mean?"
+       public_help: "what does this mean?"
        public_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
        upload_button: "Upload"
        help: "Help"
@@@ -652,21 -703,6 +703,21 @@@
        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"
@@@ -764,12 -800,6 +815,12 @@@
        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."

diff --combined config/routes.rb
index 8789c8437a7f706d3cab99c4b5346572258257ca,b410c2b90fd34701a8dc3ec3e13d51a0674acb82..486241fb36654df18196d3baeaad3b38c8ce5089
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -93,6 -93,7 +93,7 @@@ ActionController::Routing::Routes.draw 
    map.connect '/login', :controller => 'user', :action => 'login'
    map.connect '/logout', :controller => 'user', :action => 'logout'
    map.connect '/offline', :controller => 'site', :action => 'offline'
+   map.connect '/key', :controller => 'site', :action => 'key'
    map.connect '/user/new', :controller => 'user', :action => 'new'
    map.connect '/user/save', :controller => 'user', :action => 'save'
    map.connect '/user/confirm', :controller => 'user', :action => 'confirm'
@@@ -172,6 -173,7 +173,6 @@@
    map.connect '/export/finish', :controller => 'export', :action => 'finish'
  
    # messages
 -
    map.connect '/user/:display_name/inbox', :controller => 'message', :action => 'inbox'
    map.connect '/user/:display_name/outbox', :controller => 'message', :action => 'outbox'
    map.connect '/message/new/:display_name', :controller => 'message', :action => 'new'
@@@ -179,14 -181,6 +180,14 @@@
    map.connect '/message/mark/:message_id', :controller => 'message', :action => 'mark'
    map.connect '/message/reply/:message_id', :controller => 'message', :action => 'reply'
  
 +  # oauth admin pages (i.e: for setting up new clients, etc...)
 +  map.resources :oauth_clients
 +  map.connect '/oauth/revoke', :controller => 'oauth', :action => 'revoke'
 +  map.authorize '/oauth/authorize', :controller => 'oauth', :action => 'oauthorize'
 +  map.request_token '/oauth/request_token', :controller => 'oauth', :action => 'request_token'
 +  map.access_token '/oauth/access_token', :controller => 'oauth', :action => 'access_token'
 +  map.test_request '/oauth/test_request', :controller => 'oauth', :action => 'test_request'
 +
    # fall through
    map.connect ':controller/:id/:action'
    map.connect ':controller/:action'