]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en.yml
Merge 16012:16110 from trunk.
[rails.git] / config / locales / en.yml
index 6e42e0306df1b53e14bcf8fa7d991ef81bf0dc76..a7d1b222cb8abfec807315134ed288380ddb3e45 100644 (file)
@@ -83,6 +83,19 @@ en:
       download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
+    changeset_navigation:
+      user:
+        name: "{{user}}"
+        name_tooltip: "View edits by {{user}}"
+        prev: "← {{id}}"
+        prev_tooltip: "Previous edit by {{user}}"
+        next: "{{id}} →"
+        next_tooltip: "Next edit by {{user}}"
+      all:
+        prev: "← {{id}}"
+        next: "{{id}} →"
+        prev_tooltip: "Previous changeset"
+        next_tooltip: "Next changeset"
     changeset_details:
       created_at: "Created at:"
       closed_at: "Closed at:"
@@ -117,9 +130,10 @@ en:
     node:
       node: "Node"
       node_title: "Node: {{node_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"
+      edit: "edit"
     not_found:
       sorry: "Sorry, the {{type}} with the id {{id}}, could not be found."
       type:
@@ -198,9 +212,10 @@ en:
     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"
+      edit: "edit"
   changeset:
     changeset_paging_nav: 
       showing_page: "Showing page"
@@ -220,33 +235,19 @@ en:
       user: "User"
       comment: "Comment"
       area: "Area"
-    list_bbox:
-      history: "History"
-      changesets_within_the_area: "Changesets within the area:"
-      show_area_box: "show area box"
-      no_changesets: "No changesets"
-      all_changes_everywhere: "For all changes everywhere see {{recent_changes_link}}"
-      recent_changes: "Recent Changes"
-      no_area_specified: "No area specified"
-      first_use_view: "First use the {{view_tab_link}} to pan and zoom to an area of interest, then click the history tab."
-      view_the_map: "view the map"
-      view_tab: "view tab"
-      alternatively_view: "Alternatively, view all {{recent_changes_link}}"
     list:
-      recent_changes: "Recent Changes"
-      recently_edited_changesets: "Recently edited changesets:"
-      for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area."
-    list_user:
-      edits_by_username: "Edits by {{username_link}}"
-      no_visible_edits_by: "No visible edits by {{name}}."
-      for_all_changes: "For changes by all users see {{recent_changes_link}}"
-      recent_changes: "Recent Changes"
+      title: "Changesets"
+      description: "Recent edits"
+      description_user: "Recent edits by {{user}}"
+      description_bbox: "Recent edits within {{bbox}}"
+      description_user_bbox: "Recent edits by {{user}} within {{bbox}}"
   diary_entry:
     new:
       title: New Diary Entry
     list:
       title: "Users' diaries"
       user_title: "{{user}}'s diary"
+      in_language_title: "Diary Entries in {{language}}"
       new: New Diary Entry
       new_title: Compose a new entry in your user diary
       no_entries: No diary entries
@@ -272,6 +273,7 @@ en:
       login: "Login"
       save_button: "Save"
     no_such_entry:
+      title: "No such diary entry"
       heading: "No entry with the id: {{id}}"
       body: "Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong."
     no_such_user:
@@ -279,7 +281,7 @@ en:
       heading: "The user {{user}} does not exist"
       body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
     diary_entry:
-      posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
+      posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
       comment_link: Comment on this entry
       reply_link: Reply to this entry
       comment_count:
@@ -375,7 +377,7 @@ en:
     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
@@ -564,15 +566,70 @@ 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"
       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:"
+      download: "download"
       uploaded_at: "Uploaded at:"
       points: "Points:"
       start_coord: "Start coordinate:"
+      map: "map"
       edit: "edit"
       owner: "Owner:"
       description: "Description:"
@@ -587,6 +644,8 @@ en:
       description: "Description"
       tags: "Tags"
       public: "Public?"
+      public_help: "what does this mean?"
+      public_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
       upload_button: "Upload"
       help: "Help"
       help_url: "http://wiki.openstreetmap.org/wiki/Upload"
@@ -598,6 +657,8 @@ en:
     trace_optionals:
       tags: "Tags"
     view:
+      title: "Viewing trace {{name}}"
+      heading: "Viewing trace {{name}}"
       pending: "PENDING"
       filename: "Filename:"
       download: "download"
@@ -613,7 +674,6 @@ en:
       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"
@@ -670,7 +730,7 @@ en:
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible. '
       fill_form: "Fill in the form and we'll send you a quick email to activate your account."
-      license_agreement: 'By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools which connect to openstreetmap.org is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
+      license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
       email address: "Email Address: "
       confirm email address: "Confirm Email Address: "
       not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'