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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 22d2ded9240ea1f1821d177d9be607af2bd9d6f1..ab6bf8fd238670300bb83bad9aa386da98135b4a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -40,6 +40,7 @@ en:
       messages:
         invalid_email_address: does not appear to be a valid e-mail address
         email_address_not_routable: is not routable
       messages:
         invalid_email_address: does not appear to be a valid e-mail address
         email_address_not_routable: is not routable

+        display_name_is_user_n: can't be user_n unless n is your user id

       models:
         user_mute:
           attributes:
       models:
         user_mute:
           attributes:


@@ -1439,9 +1440,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 +1591,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"


@@ -1751,7 +1753,7 @@ en:
     new:
       title: "Lost password"
       heading: "Forgotten Password?"
     new:
       title: "Lost password"
       heading: "Forgotten Password?"

-      email address: "Email Address:"
+      email address: "Email Address"

       new password button: "Reset password"
       help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
     create:
       new password button: "Reset password"
       help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
     create:


@@ -1809,9 +1811,9 @@ en:
     new:
       title: "Login"
       heading: "Login"
     new:
       title: "Login"
       heading: "Login"

-      email or username: "Email Address or Username:"
-      password: "Password:"
-      openid_html: "%{logo} OpenID:"
+      email or username: "Email Address or Username"
+      password: "Password"
+      openid_html: "%{logo} OpenID"

       remember: "Remember me"
       lost password link: "Lost your password?"
       login_button: "Login"
       remember: "Remember me"
       lost password link: "Lost your password?"
       login_button: "Login"


@@ -2161,12 +2163,7 @@ en:
       no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
     export:
       title: "Export"
       no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
     export:
       title: "Export"

-      area_to_export: "Area to Export"

       manually_select: "Manually select a different area"
       manually_select: "Manually select a different area"

-      format_to_export: "Format to Export"
-      osm_xml_data: "OpenStreetMap XML Data"
-      map_image: "Map Image (shows standard layer)"
-      embeddable_html: "Embeddable HTML"

       licence: "Licence"
       licence_details_html: OpenStreetMap data is licensed under the %{odbl_link} (ODbL).
       odbl: Open Data Commons Open Database License
       licence: "Licence"
       licence_details_html: OpenStreetMap data is licensed under the %{odbl_link} (ODbL).
       odbl: Open Data Commons Open Database License


@@ -2186,17 +2183,6 @@ en:
         other:
           title: "Other Sources"
           description: "Additional sources listed on the OpenStreetMap Wiki"
         other:
           title: "Other Sources"
           description: "Additional sources listed on the OpenStreetMap Wiki"

-      options: "Options"
-      format: "Format"
-      scale: "Scale"
-      max: "max"
-      image_size: "Image Size"
-      zoom: "Zoom"
-      add_marker: "Add a marker to the map"
-      latitude: "Lat:"
-      longitude: "Lon:"
-      output: "Output"
-      paste_html: "Paste HTML to embed in website"

       export_button: "Export"
     fixthemap:
       title: Report a problem / Fix the map
       export_button: "Export"
     fixthemap:
       title: Report a problem / Fix the map


@@ -2306,33 +2292,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"
           cable_car: "Cable car"
           chair_lift: "Chair lift"
           trolleybus: "Trolleybus"
           bus: "Bus"
           cable_car: "Cable car"
           chair_lift: "Chair lift"

-          runway_only: "Airport Runway"
+          runway: "Airport Runway"

           taxiway: "Taxiway"
           taxiway: "Taxiway"

-          apron_only: "Airport apron"
+          apron: "Airport apron"

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

-          orchard_only: "Orchard"
+          capital: "Capital"
+          city: "City"
+          orchard: "Orchard"

           vineyard: "Vineyard"
           vineyard: "Vineyard"

-          forest_only: "Forest"
+          forest: "Forest"

           wood: "Wood"
           farmland: "Farmland"
           wood: "Wood"
           farmland: "Farmland"

-          grass_only: "Grass"
+          grass: "Grass"

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

-          common_only: "Common"
+          common: "Common"

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


@@ -2340,7 +2329,7 @@ en:
           commercial: "Commercial area"
           heathland: "Heathland"
           scrubland: "Scrubland"
           commercial: "Commercial area"
           heathland: "Heathland"
           scrubland: "Scrubland"

-          lake_only: "Lake"
+          lake: "Lake"

           reservoir: "Reservoir"
           intermittent_water: "Intermittent waterbody"
           glacier: "Glacier"
           reservoir: "Reservoir"
           intermittent_water: "Intermittent waterbody"
           glacier: "Glacier"


@@ -2352,14 +2341,15 @@ 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_only: "School"
+          school: "School"

           university: "University"
           hospital: "Hospital"
           building: "Significant building"
           station: "Railway station"
           university: "University"
           hospital: "Hospital"
           building: "Significant building"
           station: "Railway station"

-          summit_only: "Summit"
+          summit: "Summit"

           peak: "Peak"
           tunnel: "Dashed casing = tunnel"
           bridge: "Black casing = bridge"
           peak: "Peak"
           tunnel: "Dashed casing = tunnel"
           bridge: "Black casing = bridge"


@@ -2369,7 +2359,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!


@@ -2787,6 +2779,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"


@@ -2889,6 +2882,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."