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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 986a30db9464c8ec0f88d73538f0460dbd73e79d..16bef0bd0919a0a803b4f19dc49b34032be835b2 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -59,6 +59,7 @@ en:
       message: "Message"
       node: "Node"
       node_tag: "Node Tag"
+      note: "Note"
       old_node: "Old Node"
       old_node_tag: "Old Node Tag"
       old_relation: "Old Relation"
@@ -356,8 +357,7 @@ en:
         way: "Way"
         relation: "Relation"
     containing_relation:
-      entry_html: "Relation %{relation_name}"
-      entry_role_html: "Relation %{relation_name} (as %{relation_role})"
+      entry_role_html: "%{relation_name} (as %{relation_role})"
     not_found:
       title: Not Found
       sorry: "Sorry, %{type} #%{id} could not be found."
@@ -1001,6 +1001,14 @@ en:
           wayside_shrine: "Wayside Shrine"
           wreck: "Wreck"
           "yes": "Historic Site"
+        information:
+          guidepost: "Guidepost"
+          board: "Information Board"
+          map: "Map"
+          office: "Tourist Office"
+          terminal: "Information Terminal"
+          sign: "Information Sign"
+          stele: "Information Stele"
         junction:
           "yes": "Junction"
         landuse:
@@ -1073,6 +1081,8 @@ en:
           track: "Running Track"
           water_park: "Water Park"
           "yes": "Leisure"
+        lock:
+          "yes": "Lock"
         man_made:
           adit: "Adit"
           advertising: "Advertising"
@@ -1413,6 +1423,17 @@ en:
           building_passage: "Building Passage"
           culvert: "Culvert"
           "yes": "Tunnel"
+        water:
+          lake: "Lake"
+          pond: "Pond"
+          reservoir: "Reservoir"
+          basin: "Water basin"
+          fishpond: "Fish Pond"
+          lagoon: "Lagoon"
+          wastewater: "Waste Water"
+          oxbow: "Oxbow"
+          stream_pool: "Stream Pool"
+          lock: "Lock"
         waterway:
           artificial: "Artificial Waterway"
           boatyard: "Boatyard"
@@ -1477,7 +1498,10 @@ en:
         open: Open
         resolved: Resolved
     show:
-      title: "%{status} Issue #%{issue_id}"
+      title:
+        open: "Open Issue #%{issue_id}"
+        ignored: "Ignored Issue #%{issue_id}"
+        resolved: "Resolved Issue #%{issue_id}"
       reports:
         one: "%{count} report"
         other: "%{count} reports"
@@ -1807,6 +1831,16 @@ en:
       title: My Preferences
       preferred_editor: Preferred Editor
       preferred_languages: Preferred Languages
+      preferred_site_color_scheme: Preferred Website Color Scheme
+      site_color_schemes:
+        auto: Auto
+        light: Light
+        dark: Dark
+      preferred_map_color_scheme: Preferred Map Color Scheme
+      map_color_schemes:
+        auto: Auto
+        light: Light
+        dark: Dark
       edit_preferences: Edit Preferences
     edit:
       title: Edit Preferences
@@ -2594,6 +2628,25 @@ en:
       wikipedia:
         title: Log in with Wikipedia
         alt: Wikipedia logo
+    share:
+      email:
+        title: Share via Email
+        alt: Email icon
+      facebook:
+        title: Share via Facebook
+        alt: Facebook Icon
+      linkedin:
+        title: Share via LinkedIn
+        alt: LinkedIn Icon
+      mastodon:
+        title: Share on Mastodon
+        alt: Mastodon Icon
+      telegram:
+        title: Share on Telegram
+        alt: Telegram Icon
+      x:
+        title: Share on X
+        alt: X Icon
   oauth:
     permissions:
       missing: "You have not permitted the application access to this facility"
@@ -2790,18 +2843,20 @@ en:
       report: Report this User
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."
-    index:
-      title: Users
-      heading: Users
-      summary_html: "%{name} created from %{ip_address} on %{date}"
-      summary_no_ip_html: "%{name} created on %{date}"
-      empty: No matching users found
-    page:
-      found_users:
-        one: "%{count} user found"
-        other: "%{count} users found"
-      confirm: Confirm Selected Users
-      hide: Hide Selected Users
+    lists:
+      show:
+        title: Users
+        heading: Users
+        empty: No matching users found
+      page:
+        found_users:
+          one: "%{count} user found"
+          other: "%{count} users found"
+        confirm: Confirm Selected Users
+        hide: Hide Selected Users
+      user:
+        summary_html: "%{name} created from %{ip_address} on %{date}"
+        summary_no_ip_html: "%{name} created on %{date}"
     suspended:
       title: Account Suspended
       heading: Account Suspended
@@ -2895,6 +2950,15 @@ en:
         years:
           one: "%{count} year"
           other: "%{count} years"
+      short:
+        ended: "ended"
+        revoked_html: "revoked by %{name}"
+        active: "active"
+        active_unread: "active unread"
+        expired_unread: "expired unread"
+        read_html: "read at %{time}"
+        time_in_future_title: "%{time_absolute}; in %{time_relative}"
+        time_in_past_title: "%{time_absolute}; %{time_relative}"
     blocks_on:
       title: "Blocks on %{name}"
       heading_html: "List of Blocks on %{name}"
@@ -2913,15 +2977,15 @@ en:
       reason: "Reason for block:"
       revoker: "Revoker:"
     block:
-      not_revoked: "(not revoked)"
       show: "Show"
       edit: "Edit"
     page:
       display_name: "Blocked User"
       creator_name: "Creator"
       reason: "Reason for block"
+      start: "Start"
+      end: "End"
       status: "Status"
-      revoker_name: "Revoked by"
     navigation:
       all_blocks: "All Blocks"
       blocks_on_me: "Blocks on Me"
@@ -3010,6 +3074,9 @@ en:
       anonymous_warning_sign_up: "sign up"
       advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
       add: Add Note
+    new_readonly:
+      title: "New Note"
+      warning: "New notes cannot be created because the OpenStreetMap API is currently in read-only mode."
     notes_paging_nav:
       showing_page: "Page %{page}"
       next: "Next"