Merge pull request #5362 from AntonKhorev/color-mode-preference-map

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 986a30db9464c8ec0f88d73538f0460dbd73e79d..94fc77247b8cadc74f8f433dbbc18a05ddedf1a2 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"
       message: "Message"
       node: "Node"
       node_tag: "Node Tag"

+      note: "Note"

       old_node: "Old Node"
       old_node_tag: "Old Node Tag"
       old_relation: "Old Relation"
       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:
         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."
     not_found:
       title: Not Found
       sorry: "Sorry, %{type} #%{id} could not be found."


@@ -1477,7 +1477,10 @@ en:
         open: Open
         resolved: Resolved
     show:
         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"
       reports:
         one: "%{count} report"
         other: "%{count} reports"


@@ -1807,6 +1810,16 @@ en:
       title: My Preferences
       preferred_editor: Preferred Editor
       preferred_languages: Preferred Languages
       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
       edit_preferences: Edit Preferences
     edit:
       title: Edit Preferences


@@ -2895,6 +2908,15 @@ en:
         years:
           one: "%{count} year"
           other: "%{count} years"
         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}"
     blocks_on:
       title: "Blocks on %{name}"
       heading_html: "List of Blocks on %{name}"


@@ -2913,15 +2935,15 @@ en:
       reason: "Reason for block:"
       revoker: "Revoker:"
     block:
       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"
       show: "Show"
       edit: "Edit"
     page:
       display_name: "Blocked User"
       creator_name: "Creator"
       reason: "Reason for block"

+      start: "Start"
+      end: "End"

       status: "Status"
       status: "Status"

-      revoker_name: "Revoked by"

     navigation:
       all_blocks: "All Blocks"
       blocks_on_me: "Blocks on Me"
     navigation:
       all_blocks: "All Blocks"
       blocks_on_me: "Blocks on Me"