Merge remote-tracking branch 'upstream/pull/4486'

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7ff2bfd0676ed460f1b4a66afc209529e34da16c..653e363a67bcfb6d39927c5df0c99457a4e09192 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1439,9 +1439,9 @@ en:
         one: "%{count} report"
         other: "%{count} reports"
       no_reports: No reports
         one: "%{count} report"
         other: "%{count} reports"
       no_reports: No reports

-      report_created_at: "First reported at %{datetime}"
-      last_resolved_at: "Last resolved at %{datetime}"
-      last_updated_at: "Last updated at %{datetime} by %{displayname}"
+      report_created_at_html: "First reported at %{datetime}"
+      last_resolved_at_html: "Last resolved at %{datetime}"
+      last_updated_at_html: "Last updated at %{datetime} by %{displayname}"

       resolve: Resolve
       ignore: Ignore
       reopen: Reopen
       resolve: Resolve
       ignore: Ignore
       reopen: Reopen


@@ -1590,6 +1590,7 @@ en:
       loaded:
         one: "loaded successfully with %{trace_points} out of a possible %{count} point."
         other: "loaded successfully with %{trace_points} out of a possible %{count} points."
       loaded:
         one: "loaded successfully with %{trace_points} out of a possible %{count} point."
         other: "loaded successfully with %{trace_points} out of a possible %{count} points."

+      all_your_traces_html: "All your successfully uploaded GPX traces can be found at %{url}."

       subject: "[OpenStreetMap] GPX Import success"
     signup_confirm:
       subject: "[OpenStreetMap] Welcome to OpenStreetMap"
       subject: "[OpenStreetMap] GPX Import success"
     signup_confirm:
       subject: "[OpenStreetMap] Welcome to OpenStreetMap"


@@ -1870,6 +1871,7 @@ en:
       image: Image
       alt: Alt text
       url: URL
       image: Image
       alt: Alt text
       url: URL

+      codeblock: Code block

     richtext_field:
       edit: Edit
       preview: Preview
     richtext_field:
       edit: Edit
       preview: Preview


@@ -2305,41 +2307,36 @@ en:
           cycleway_national: "National cycleway"
           cycleway_regional: "Regional cycleway"
           cycleway_local: "Local 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"
           footway: "Footway"
           rail: "Railway"
           train: "Train"
           subway: "Subway"
           ferry: "Ferry"
           light_rail: "Light rail"

-          tram_only: "Tram"
+          tram: "Tram"

           trolleybus: "Trolleybus"
           bus: "Bus"
           trolleybus: "Trolleybus"
           bus: "Bus"

-          cable:
-            - Cable car
-            - chair lift
-          runway:
-            - Airport Runway
-            - taxiway
-          apron_only: "Airport apron"
+          cable_car: "Cable car"
+          chair_lift: "Chair lift"
+          runway: "Airport Runway"
+          taxiway: "Taxiway"
+          apron: "Airport apron"

           admin: "Administrative boundary"
           admin: "Administrative boundary"

-          orchard:
-            - Orchard
-            - vineyard
-          forest:
-            - Forest
-            - wood
+          capital: "Capital"
+          city: "City"
+          orchard: "Orchard"
+          vineyard: "Vineyard"
+          forest: "Forest"
+          wood: "Wood"

           farmland: "Farmland"
           farmland: "Farmland"

-          grass:
-            - Grass
-            - meadow
+          grass: "Grass"
+          meadow: "Meadow"

           bare_rock: "Bare rock"
           sand: "Sand"
           golf: "Golf course"
           park: "Park"
           bare_rock: "Bare rock"
           sand: "Sand"
           golf: "Golf course"
           park: "Park"

-          common:
-            - Common
-            - meadow
-            - garden
+          common: "Common"

           built_up: "Built-up area"
           resident: "Residential area"
           retail: "Retail area"
           built_up: "Built-up area"
           resident: "Residential area"
           retail: "Retail area"


@@ -2347,9 +2344,8 @@ en:
           commercial: "Commercial area"
           heathland: "Heathland"
           scrubland: "Scrubland"
           commercial: "Commercial area"
           heathland: "Heathland"
           scrubland: "Scrubland"

-          lake:
-            - Lake
-            - reservoir
+          lake: "Lake"
+          reservoir: "Reservoir"

           intermittent_water: "Intermittent waterbody"
           glacier: "Glacier"
           reef: "Reef"
           intermittent_water: "Intermittent waterbody"
           glacier: "Glacier"
           reef: "Reef"


@@ -2360,17 +2356,16 @@ en:
           allotments: "Allotments"
           pitch: "Sports pitch"
           centre: "Sports centre"
           allotments: "Allotments"
           pitch: "Sports pitch"
           centre: "Sports centre"

+          beach: "Beach"

           reserve: "Nature reserve"
           military: "Military area"
           reserve: "Nature reserve"
           military: "Military area"

-          school:
-            - School
-            - university
-            - hospital
+          school: "School"
+          university: "University"
+          hospital: "Hospital"

           building: "Significant building"
           station: "Railway station"
           building: "Significant building"
           station: "Railway station"

-          summit:
-            - Summit
-            - peak
+          summit: "Summit"
+          peak: "Peak"

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


@@ -2379,7 +2374,9 @@ en:
           bus_stop: "Bus stop"
           stop: "Stop"
           bicycle_shop: "Bicycle shop"
           bus_stop: "Bus stop"
           stop: "Stop"
           bicycle_shop: "Bicycle shop"

+          bicycle_rental: "Bicycle rental"

           bicycle_parking: "Bicycle parking"
           bicycle_parking: "Bicycle parking"

+          bicycle_parking_small: "Small bicycle parking"

           toilets: "Toilets"
     welcome:
       title: Welcome!
           toilets: "Toilets"
     welcome:
       title: Welcome!


@@ -2609,6 +2606,7 @@ en:
       read_gpx: Read private GPS traces
       write_gpx: Upload GPS traces
       write_notes: Modify notes
       read_gpx: Read private GPS traces
       write_gpx: Upload GPS traces
       write_notes: Modify notes

+      write_redactions: Redact map data

       read_email: Read user email address
       skip_authorization: Auto approve application
   oauth_clients:
       read_email: Read user email address
       skip_authorization: Auto approve application
   oauth_clients:


@@ -2693,6 +2691,7 @@ en:
       application: "Application"
       permissions: "Permissions"
       no_applications_html: "You have not yet authorized any %{oauth2} applications."
       application: "Application"
       permissions: "Permissions"
       no_applications_html: "You have not yet authorized any %{oauth2} applications."

+      oauth_2: "OAuth 2"

     application:
       revoke: "Revoke Access"
       confirm_revoke: "Revoke access for this application?"
     application:
       revoke: "Revoke Access"
       confirm_revoke: "Revoke access for this application?"


@@ -2795,6 +2794,7 @@ en:
           importer: "Revoke importer access"
       block_history: "Active Blocks"
       moderator_history: "Blocks Given"
           importer: "Revoke importer access"
       block_history: "Active Blocks"
       moderator_history: "Blocks Given"

+      revoke_all_blocks: "Revoke all blocks"

       comments: "Comments"
       create_block: "Block this User"
       activate_user: "Activate this User"
       comments: "Comments"
       create_block: "Block this User"
       activate_user: "Activate this User"


@@ -2897,6 +2897,16 @@ en:
       confirm: "Are you sure you wish to revoke this block?"
       revoke: "Revoke!"
       flash: "This block has been revoked."
       confirm: "Are you sure you wish to revoke this block?"
       revoke: "Revoke!"
       flash: "This block has been revoked."

+    revoke_all:
+      title: "Revoking all blocks on %{block_on}"
+      heading_html: "Revoking all blocks on %{block_on}"
+      empty: "%{name} has no active blocks."
+      confirm: "Are you sure you wish to revoke %{active_blocks}?"
+      active_blocks:
+        one: "%{count} active block"
+        other: "%{count} active blocks"
+      revoke: "Revoke!"
+      flash: "All active blocks have been revoked."

     helper:
       time_future_html: "Ends in %{time}."
       until_login: "Active until the user logs in."
     helper:
       time_future_html: "Ends in %{time}."
       until_login: "Active until the user logs in."


@@ -3013,6 +3023,7 @@ en:
       reactivate: Reactivate
       comment_and_resolve: Comment & Resolve
       comment: Comment
       reactivate: Reactivate
       comment_and_resolve: Comment & Resolve
       comment: Comment

+      log_in_to_comment: "Log in to comment on this note"

       report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}."
       other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment."
       other_problems_resolved: "For all other problems, resolving is sufficient."
       report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}."
       other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment."
       other_problems_resolved: "For all other problems, resolving is sufficient."