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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3f2a4cb1408c7337ef826ef5b6451154b717ad29..112b540440303c6cbf3e3cedcc153b6eef1fa1b3 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."


@@ -1001,6 +1001,14 @@ en:
           wayside_shrine: "Wayside Shrine"
           wreck: "Wreck"
           "yes": "Historic Site"
           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:
         junction:
           "yes": "Junction"
         landuse:


@@ -1073,6 +1081,8 @@ en:
           track: "Running Track"
           water_park: "Water Park"
           "yes": "Leisure"
           track: "Running Track"
           water_park: "Water Park"
           "yes": "Leisure"

+        lock:
+          "yes": "Lock"

         man_made:
           adit: "Adit"
           advertising: "Advertising"
         man_made:
           adit: "Adit"
           advertising: "Advertising"


@@ -1413,6 +1423,17 @@ en:
           building_passage: "Building Passage"
           culvert: "Culvert"
           "yes": "Tunnel"
           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"
         waterway:
           artificial: "Artificial Waterway"
           boatyard: "Boatyard"


@@ -1477,7 +1498,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 +1831,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


@@ -2544,7 +2578,7 @@ en:
       upload_trace: "Upload a trace"
       all_traces: "All Traces"
       my_traces: "My Traces"
       upload_trace: "Upload a trace"
       all_traces: "All Traces"
       my_traces: "My Traces"

-      traces_from: "Public Traces from %{user}"
+      traces_from_html: "Public Traces from %{user}"

       remove_tag_filter: "Remove Tag Filter"
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"
       remove_tag_filter: "Remove Tag Filter"
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"


@@ -2895,6 +2929,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,21 +2956,21 @@ 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"

-      blocks_on_user: "Blocks on %{user}"
+      blocks_on_user_html: "Blocks on %{user}"

       blocks_by_me: "Blocks by Me"
       blocks_by_me: "Blocks by Me"

-      blocks_by_user: "Blocks by %{user}"
+      blocks_by_user_html: "Blocks by %{user}"

       block: "Block #%{id}"
       new_block: "New Block"
   user_mutes:
       block: "Block #%{id}"
       new_block: "New Block"
   user_mutes:


@@ -2989,6 +3032,9 @@ en:
       report: report this note
       coordinates_html: "%{latitude}, %{longitude}"
       anonymous_warning: This note includes comments from anonymous users which should be independently verified.
       report: report this note
       coordinates_html: "%{latitude}, %{longitude}"
       anonymous_warning: This note includes comments from anonymous users which should be independently verified.

+      discussion: Discussion
+      subscribe: Subscribe
+      unsubscribe: Unsubscribe

       hide: Hide
       resolve: Resolve
       reactivate: Reactivate
       hide: Hide
       resolve: Resolve
       reactivate: Reactivate