]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en.yml
Merge remote-tracking branch 'upstream/pull/5857'
[rails.git] / config / locales / en.yml
index 164e70c8d7659e2daa14d16ecf23ec4a47f86013..a2b15d754efa023d55046d8bbe62ac7ed22f55af 100644 (file)
@@ -486,7 +486,7 @@ en:
       title: "Changesets"
       title_user: "Changesets by %{user}"
       title_user_link_html: "Changesets by %{user_link}"
-      title_followed: "Changesets by followings"
+      title_followed: "Changesets by users you follow"
       title_nearby: "Changesets by nearby users"
       empty: "No changesets found."
       empty_area: "No changesets in this area."
@@ -522,12 +522,13 @@ en:
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
     paging_nav:
-      nodes: "Nodes (%{count})"
+      nodes_title: "Nodes"
       nodes_paginated: "Nodes (%{x}-%{y} of %{count})"
-      ways: "Ways (%{count})"
+      ways_title: "Ways"
       ways_paginated: "Ways (%{x}-%{y} of %{count})"
-      relations: "Relations (%{count})"
+      relations_title: "Relations"
       relations_paginated: "Relations (%{x}-%{y} of %{count})"
+      range: "%{x}-%{y} of %{count}"
     not_found_message:
       sorry: "Sorry, changeset #%{id} could not be found."
     timeout:
@@ -561,7 +562,7 @@ en:
       title: My Dashboard
       no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users."
       edit_your_profile: Edit your profile
-      followings: Followings
+      followings: Users you follow
       no followings: You have not followed any user yet.
       nearby users: "Other nearby users"
       no nearby users: "There are no other users who admit to mapping nearby yet."
@@ -577,7 +578,7 @@ en:
       use_map_link: Use Map
     index:
       title: "Users' Diaries"
-      title_followed: "Followings' Diaries"
+      title_followed: "Followed Users' diaries"
       title_nearby: "Nearby Users' Diaries"
       user_title: "%{user}'s Diary"
       in_language_title: "Diary Entries in %{language}"
@@ -1607,9 +1608,11 @@ en:
       reportable_title:
         diary_comment: "%{entry_title}, comment #%{comment_id}"
         note: "Note #%{note_id}"
-      reportable_dates:
-        created_on_html: "created on %{datetime_created}"
-        created_on_updated_on_html: "created on %{datetime_created}, updated on %{datetime_updated}"
+      reportable_heading:
+        diary_comment_html: "Diary Comment %{title} created on %{datetime_created}, updated on %{datetime_updated}"
+        diary_entry_html: "Diary Entry %{title} created on %{datetime_created}, updated on %{datetime_updated}"
+        note_html: "%{title} created on %{datetime_created}, updated on %{datetime_updated}"
+        user_html: "User %{title} created on %{datetime_created}"
     reporters:
       index:
         title: "Issue #%{issue_id} Reporters"
@@ -2434,95 +2437,6 @@ en:
         fossgis_osrm: "OSRM"
         graphhopper: "GraphHopper"
         fossgis_valhalla: "Valhalla"
-    key:
-      table:
-        entry:
-          motorway: "Motorway"
-          main_road: "Main road"
-          trunk: "Trunk road"
-          primary: "Primary road"
-          secondary: "Secondary road"
-          unclassified: "Unclassified road"
-          pedestrian: "Pedestrian way"
-          track: "Track"
-          bridleway: "Bridleway"
-          cycleway: "Cycleway"
-          cycleway_national: "National cycleway"
-          cycleway_regional: "Regional cycleway"
-          cycleway_local: "Local cycleway"
-          cycleway_mtb: "Mountain bike route"
-          footway: "Footway"
-          rail: "Railway"
-          train: "Train"
-          subway: "Subway"
-          ferry: "Ferry"
-          light_rail: "Light rail"
-          tram: "Tram"
-          trolleybus: "Trolleybus"
-          bus: "Bus"
-          cable_car: "Cable car"
-          chair_lift: "Chair lift"
-          runway: "Airport Runway"
-          taxiway: "Taxiway"
-          apron: "Airport apron"
-          admin: "Administrative boundary"
-          capital: "Capital"
-          city: "City"
-          orchard: "Orchard"
-          vineyard: "Vineyard"
-          forest: "Forest"
-          wood: "Wood"
-          farmland: "Farmland"
-          grass: "Grass"
-          meadow: "Meadow"
-          bare_rock: "Bare rock"
-          sand: "Sand"
-          golf: "Golf course"
-          park: "Park"
-          common: "Common"
-          built_up: "Built-up area"
-          resident: "Residential area"
-          retail: "Retail area"
-          industrial: "Industrial area"
-          commercial: "Commercial area"
-          heathland: "Heathland"
-          scrubland: "Scrubland"
-          lake: "Lake"
-          reservoir: "Reservoir"
-          intermittent_water: "Intermittent waterbody"
-          glacier: "Glacier"
-          reef: "Reef"
-          wetland: "Wetland"
-          farm: "Farm"
-          brownfield: "Brownfield site"
-          cemetery: "Cemetery"
-          allotments: "Allotments"
-          pitch: "Sports pitch"
-          centre: "Sports centre"
-          beach: "Beach"
-          reserve: "Nature reserve"
-          military: "Military area"
-          school: "School"
-          university: "University"
-          hospital: "Hospital"
-          building: "Significant building"
-          station: "Railway station"
-          railway_halt: "Railway halt"
-          subway_station: "Subway station"
-          tram_stop: "Tram stop"
-          summit: "Summit"
-          peak: "Peak"
-          tunnel: "Dashed casing = tunnel"
-          bridge: "Black casing = bridge"
-          private: "Private access"
-          destination: "Destination access"
-          construction: "Roads under construction"
-          bus_stop: "Bus stop"
-          bicycle_shop: "Bicycle shop"
-          bicycle_rental: "Bicycle rental"
-          bicycle_parking: "Bicycle parking"
-          bicycle_parking_small: "Small bicycle parking"
-          toilets: "Toilets"
     welcome:
       title: Welcome!
       introduction: |
@@ -2601,6 +2515,95 @@ en:
           community group. Anyone can set up or join these. Read more on the %{communities_wiki_link}.
         communities_wiki: Communities wiki page
         communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group
+  map_keys:
+    show:
+      entries:
+        motorway: "Motorway"
+        main_road: "Main road"
+        trunk: "Trunk road"
+        primary: "Primary road"
+        secondary: "Secondary road"
+        unclassified: "Unclassified road"
+        pedestrian: "Pedestrian way"
+        track: "Track"
+        bridleway: "Bridleway"
+        cycleway: "Cycleway"
+        cycleway_national: "National cycleway"
+        cycleway_regional: "Regional cycleway"
+        cycleway_local: "Local cycleway"
+        cycleway_mtb: "Mountain bike route"
+        footway: "Footway"
+        rail: "Railway"
+        train: "Train"
+        subway: "Subway"
+        ferry: "Ferry"
+        light_rail: "Light rail"
+        tram: "Tram"
+        trolleybus: "Trolleybus"
+        bus: "Bus"
+        cable_car: "Cable car"
+        chair_lift: "Chair lift"
+        runway: "Airport Runway"
+        taxiway: "Taxiway"
+        apron: "Airport apron"
+        admin: "Administrative boundary"
+        capital: "Capital"
+        city: "City"
+        orchard: "Orchard"
+        vineyard: "Vineyard"
+        forest: "Forest"
+        wood: "Wood"
+        farmland: "Farmland"
+        grass: "Grass"
+        meadow: "Meadow"
+        bare_rock: "Bare rock"
+        sand: "Sand"
+        golf: "Golf course"
+        park: "Park"
+        common: "Common"
+        built_up: "Built-up area"
+        resident: "Residential area"
+        retail: "Retail area"
+        industrial: "Industrial area"
+        commercial: "Commercial area"
+        heathland: "Heathland"
+        scrubland: "Scrubland"
+        lake: "Lake"
+        reservoir: "Reservoir"
+        intermittent_water: "Intermittent waterbody"
+        glacier: "Glacier"
+        reef: "Reef"
+        wetland: "Wetland"
+        farm: "Farm"
+        brownfield: "Brownfield site"
+        cemetery: "Cemetery"
+        allotments: "Allotments"
+        pitch: "Sports pitch"
+        centre: "Sports centre"
+        beach: "Beach"
+        reserve: "Nature reserve"
+        military: "Military area"
+        school: "School"
+        university: "University"
+        hospital: "Hospital"
+        building: "Significant building"
+        station: "Railway station"
+        railway_halt: "Railway halt"
+        subway_station: "Subway station"
+        tram_stop: "Tram stop"
+        summit: "Summit"
+        peak: "Peak"
+        tunnel: "Dashed casing = tunnel"
+        bridge: "Black casing = bridge"
+        private: "Private access"
+        destination: "Destination access"
+        construction: "Roads under construction"
+        bus_stop: "Bus stop"
+        bicycle_shop: "Bicycle shop"
+        bicycle_rental: "Bicycle rental"
+        bicycle_parking: "Bicycle parking"
+        bicycle_parking_small: "Small bicycle parking"
+        toilets: "Toilets"
   traces:
     visibility:
       private: "Private (only shared as anonymous, unordered points)"
@@ -3377,6 +3380,12 @@ en:
     home:
       marker_title: My home location
       not_set: Home location is not set for your account
+    heatmap:
+      tooltip:
+        no_contributions: "No contributions on %{date}"
+        contributions:
+          one: "%{count} contribution on %{date}"
+          other: "%{count} contributions on %{date}"
   redactions:
     edit:
       heading: "Edit Redaction"