Localisation updates from https://translatewiki.net.

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7ed296695ac9a50413347d2d830a74f0c9d1462e..6218bfea24fcb38c9b4fdca6a0e770377611a0b8 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1870,6 +1870,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,6 +2306,7 @@ 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"
           footway: "Footway"
           rail: "Railway"
           train: "Train"


@@ -2314,32 +2316,26 @@ en:
           tram_only: "Tram"
           trolleybus: "Trolleybus"
           bus: "Bus"
           tram_only: "Tram"
           trolleybus: "Trolleybus"
           bus: "Bus"

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

           apron_only: "Airport apron"
           admin: "Administrative boundary"
           apron_only: "Airport apron"
           admin: "Administrative boundary"

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

           farmland: "Farmland"
           farmland: "Farmland"

-          grass:
-            - Grass
-            - meadow
+          grass_only: "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_only: "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 +2343,8 @@ en:
           commercial: "Commercial area"
           heathland: "Heathland"
           scrubland: "Scrubland"
           commercial: "Commercial area"
           heathland: "Heathland"
           scrubland: "Scrubland"

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

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


@@ -2362,15 +2357,13 @@ en:
           centre: "Sports centre"
           reserve: "Nature reserve"
           military: "Military area"
           centre: "Sports centre"
           reserve: "Nature reserve"
           military: "Military area"

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

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

-          summit:
-            - Summit
-            - peak
+          summit_only: "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"


@@ -2694,6 +2687,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?"


@@ -2796,6 +2790,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"


@@ -2898,6 +2893,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."


@@ -3014,6 +3019,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."