Fix warnings arising from geocoder translations, and use count magic

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7a6f4bc899fa5ee74b46d5a28da116a7a4899db3..35bb5a67cef939c8bdfb0ab2e55108a080e9269f 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -72,6 +72,10 @@ en:
         description: "Description"
         languages: "Languages"
         pass_crypt: "Password"
+  printable_name:
+    with_id: "{{id}}"
+    with_version: "{{id}}, v{{version}}"
+    with_name: "{{name}} ({{id}})"
   map:
     view: View
     edit: Edit
@@ -100,17 +104,22 @@ en:
       version: "Version:"
       in_changeset: "In changeset:"
     containing_relation:
-      relation: "Relation {{relation_name}}"
-      relation_as: "(as {{relation_role}})"
+      entry: "Relation {{relation_name}}"
+      entry_role: "Relation {{relation_name}} (as {{relation_role}})"
     map:
       loading: "Loading..."
       deleted: "Deleted"
-      view_larger_map: "View Larger Map"
+      larger:
+        area: "View area on larger map"
+        node: "View node on larger map"
+        way: "View way on larger map"
+        relation: "View relation on larger map"
     node_details:
       coordinates: "Coordinates: "
       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"
@@ -137,7 +146,12 @@ en:
       relation_history: "Relation History"
       relation_history_title: "Relation History: {{relation_name}}"
     relation_member:
-      as: "as"
+      entry: "{{type}} {{name}}"
+      entry_role: "{{type}} {{name}} as {{role}}"
+      type:
+        node: "Node"
+        way: "Way"
+        relation: "Relation"
     relation:
       relation: "Relation"
       relation_title: "Relation: {{relation_name}}"
@@ -328,6 +342,24 @@ en:
       results: "Results"
       type_from_source: "{{type}} from {{source_link}}"
       no_results: "No results found"
+      namefinder:
+        prefix: "{{type}} "
+        suffix_place: ", {{distance}} {{direction}} of {{placename}}"
+        suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
+        suffix_suburb: "{{suffix}}, {{parentname}}"
+      distance:
+        zero: "less than 1km"
+        one: "about 1km"
+        other: "about {{count}}km"
+      direction:
+        south_west: "south-west"
+        south: "south"
+        south_east: "south-east"
+        east: "east"
+        north_east: "north-east"
+        north: "north"
+        north_west: "north-west"
+        west: "west"
   layouts:
     project_name:
       # in <title>
@@ -541,6 +573,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
+      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"
@@ -569,7 +602,7 @@ en:
       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"
@@ -584,10 +617,18 @@ en:
           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"
@@ -595,12 +636,16 @@ en:
           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"
-          lake: "Lake; reservoir"
+          lake:
+            - Lake
+            - reservoir
           farm: "Farm"
           brownfield: "Brownfield site"
           cemetery: "Cemetery"
@@ -612,7 +657,9 @@ en:
           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"
@@ -646,7 +693,7 @@ en:
       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"
@@ -671,7 +718,7 @@ en:
       edit: "edit"
       owner: "Owner:"
       description: "Description:"
-      tags: "Tags"
+      tags: "Tags:"
       none: "None"
       make_public: "Make this track public permanently"
       edit_track: "Edit this track"
@@ -784,7 +831,7 @@ en:
       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?"