synced

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7a6f4bc899fa5ee74b46d5a28da116a7a4899db3..f8dc9535f3cc6d7725867baf51b938536f01241c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -111,6 +111,7 @@ en:
       part_of: "Part of:"
     node_history:
       node_history: "Node History"
       part_of: "Part of:"
     node_history:
       node_history: "Node History"

+      node_history_title: "Node History: {{node_name}}"

       download: "{{download_xml_link}} or {{view_details_link}}"
       download_xml: "Download XML"
       view_details: "view details"
       download: "{{download_xml_link}} or {{view_details_link}}"
       download_xml: "Download XML"
       view_details: "view details"


@@ -541,6 +542,7 @@ en:
       js_2: "OpenStreetMap uses javascript for its slippy map."
       js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
       permalink: Permalink
       js_2: "OpenStreetMap uses javascript for its slippy map."
       js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
       permalink: Permalink

+      shortlink: Shortlink

       license:
         notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
         license_name: "Creative Commons Attribution-Share Alike 2.0"
       license:
         notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
         license_name: "Creative Commons Attribution-Share Alike 2.0"


@@ -569,7 +571,7 @@ en:
       map_key: "Map key"
       map_key_tooltip: "Map key for the mapnik rendering at this zoom level"
       table:
       map_key: "Map key"
       map_key_tooltip: "Map key for the mapnik rendering at this zoom level"
       table:

-        heading: "Legend for z[[zoom_level]]"
+        heading: "Legend for z{{zoom_level}}"

         entry:
           motorway: "Motorway"
           trunk: "Trunk road"
         entry:
           motorway: "Motorway"
           trunk: "Trunk road"


@@ -584,10 +586,18 @@ en:
           footway: "Footway"
           rail: "Railway"
           subway: "Subway"
           footway: "Footway"
           rail: "Railway"
           subway: "Subway"

-          tram: "Light rail; tram"
-          cable: "Cable car; chair lift"
-          runway: "Airport Runway; taxiway"
-          apron: "Airport apron; terminal"
+          tram:
+            - Light rail
+            - tram
+          cable:
+            - Cable car
+            - chair lift
+          runway:
+            - Airport Runway
+            - taxiway
+          apron:
+            - Airport apron
+            - terminal

           admin: "Administrative boundary"
           forest: "Forest"
           wood: "Wood"
           admin: "Administrative boundary"
           forest: "Forest"
           wood: "Wood"


@@ -595,12 +605,16 @@ en:
           park: "Park"
           resident: "Residential area"
           tourist: "Tourist attraction"
           park: "Park"
           resident: "Residential area"
           tourist: "Tourist attraction"

-          common: "Common; meadow"
+          common:
+            - Common
+            - meadow

           retail: "Retail area"
           industrial: "Industrial area"
           commercial: "Commercial area"
           heathland: "Heathland"
           retail: "Retail area"
           industrial: "Industrial area"
           commercial: "Commercial area"
           heathland: "Heathland"

-          lake: "Lake; reservoir"
+          lake:
+            - Lake
+            - reservoir

           farm: "Farm"
           brownfield: "Brownfield site"
           cemetery: "Cemetery"
           farm: "Farm"
           brownfield: "Brownfield site"
           cemetery: "Cemetery"


@@ -612,7 +626,9 @@ en:
           school: "School; university"
           building: "Significant building"
           station: "Railway station"
           school: "School; university"
           building: "Significant building"
           station: "Railway station"

-          summit: "Summit; peak"
+          summit:
+            - Summit
+            - peak

           tunnel: "Dashed casing = tunnel"
           bridge: "Black casing = bridge"
           private: "Private access"
           tunnel: "Dashed casing = tunnel"
           bridge: "Black casing = bridge"
           private: "Private access"


@@ -646,7 +662,7 @@ en:
       description: "Description"
       tags: "Tags"
       public: "Public?"
       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"
       public_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
       upload_button: "Upload"
       help: "Help"


@@ -671,7 +687,7 @@ en:
       edit: "edit"
       owner: "Owner:"
       description: "Description:"
       edit: "edit"
       owner: "Owner:"
       description: "Description:"

-      tags: "Tags"
+      tags: "Tags:"

       none: "None"
       make_public: "Make this track public permanently"
       edit_track: "Edit this track"
       none: "None"
       make_public: "Make this track public permanently"
       edit_track: "Edit this track"


@@ -784,7 +800,7 @@ en:
       public editing:
         heading: "Public editing: "
         enabled: "Enabled. Not anonymous and can edit data."
       public editing:
         heading: "Public editing: "
         enabled: "Enabled. Not anonymous and can edit data."

-        enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+        enabled link: "http://wiki.openstreetmap.org/wiki/Anonymous_edits"

         enabled link text: "what's this?"
         disabled: "Disabled and cannot edit data, all previous edits are anonymous."
         disabled link text: "why can't I edit?"
         enabled link text: "what's this?"
         disabled: "Disabled and cannot edit data, all previous edits are anonymous."
         disabled link text: "why can't I edit?"