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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3fabe13c1ff39502935a9dbe39e7898bd40ded3d..fcaf6ddfe8ddd0f27a3b5d2256f7adb3240624cc 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -323,17 +323,13 @@ en:
     view_history: "View History"
     view_unredacted_history: "View Unredacted History"
     view_details: "View Details"
     view_history: "View History"
     view_unredacted_history: "View Unredacted History"
     view_details: "View Details"

-    view_redacted_data: "View Redacted Data"
-    view_redaction_message: "View Redaction Message"

     location: "Location:"
     common_details:
       coordinates_html: "%{latitude}, %{longitude}"
     node:
       title_html: "Node: %{name}"
     location: "Location:"
     common_details:
       coordinates_html: "%{latitude}, %{longitude}"
     node:
       title_html: "Node: %{name}"

-      history_title_html: "Node History: %{name}"

     way:
       title_html: "Way: %{name}"
     way:
       title_html: "Way: %{name}"

-      history_title_html: "Way History: %{name}"

       nodes: "Nodes"
       nodes_count:
         one: "%{count} node"
       nodes: "Nodes"
       nodes_count:
         one: "%{count} node"


@@ -343,7 +339,6 @@ en:
         other: "part of ways %{related_ways}"
     relation:
       title_html: "Relation: %{name}"
         other: "part of ways %{related_ways}"
     relation:
       title_html: "Relation: %{name}"

-      history_title_html: "Relation History: %{name}"

       members: "Members"
       members_count:
         one: "%{count} member"
       members: "Members"
       members_count:
         one: "%{count} member"


@@ -359,13 +354,6 @@ en:
       entry_role_html: "%{relation_name} (as %{relation_role})"
     not_found:
       title: Not Found
       entry_role_html: "%{relation_name} (as %{relation_role})"
     not_found:
       title: Not Found

-      sorry: "Sorry, %{type} #%{id} could not be found."
-      type:
-        node: node
-        way: way
-        relation: relation
-        changeset: changeset
-        note: note

     timeout:
       title: Timeout Error
       sorry: "Sorry, the data for the %{type} with the id %{id} took too long to retrieve."
     timeout:
       title: Timeout Error
       sorry: "Sorry, the data for the %{type} with the id %{id} took too long to retrieve."


@@ -402,27 +390,44 @@ en:
       introduction: "Click on the map to find nearby features."
       nearby: "Nearby features"
       enclosing: "Enclosing features"
       introduction: "Click on the map to find nearby features."
       nearby: "Nearby features"
       enclosing: "Enclosing features"

+  old_elements:
+    index:
+      node:
+        title_html: "Node History: %{name}"
+      way:
+        title_html: "Way History: %{name}"
+      relation:
+        title_html: "Relation History: %{name}"
+    actions:
+      view_redacted_data: "View Redacted Data"
+      view_redaction_message: "View Redaction Message"

   nodes:
   nodes:

+    not_found_message:
+      sorry: "Sorry, node #%{id} could not be found."

     timeout:
       sorry: "Sorry, the data for the node with the id %{id} took too long to retrieve."
   old_nodes:
     timeout:
       sorry: "Sorry, the data for the node with the id %{id} took too long to retrieve."
   old_nodes:

-    not_found:
+    not_found_message:

       sorry: "Sorry, node #%{id} version %{version} could not be found."
     timeout:
       sorry: "Sorry, the history of the node with the id %{id} took too long to retrieve."
   ways:
       sorry: "Sorry, node #%{id} version %{version} could not be found."
     timeout:
       sorry: "Sorry, the history of the node with the id %{id} took too long to retrieve."
   ways:

+    not_found_message:
+      sorry: "Sorry, way #%{id} could not be found."

     timeout:
       sorry: "Sorry, the data for the way with the id %{id} took too long to retrieve."
   old_ways:
     timeout:
       sorry: "Sorry, the data for the way with the id %{id} took too long to retrieve."
   old_ways:

-    not_found:
+    not_found_message:

       sorry: "Sorry, way #%{id} version %{version} could not be found."
     timeout:
       sorry: "Sorry, the history of the way with the id %{id} took too long to retrieve."
   relations:
       sorry: "Sorry, way #%{id} version %{version} could not be found."
     timeout:
       sorry: "Sorry, the history of the way with the id %{id} took too long to retrieve."
   relations:

+    not_found_message:
+      sorry: "Sorry, relation #%{id} could not be found."

     timeout:
       sorry: "Sorry, the data for the relation with the id %{id} took too long to retrieve."
   old_relations:
     timeout:
       sorry: "Sorry, the data for the relation with the id %{id} took too long to retrieve."
   old_relations:

-    not_found:
+    not_found_message:

       sorry: "Sorry, relation #%{id} version %{version} could not be found."
     timeout:
       sorry: "Sorry, the history of the relation with the id %{id} took too long to retrieve."
       sorry: "Sorry, relation #%{id} version %{version} could not be found."
     timeout:
       sorry: "Sorry, the history of the relation with the id %{id} took too long to retrieve."


@@ -498,6 +503,8 @@ en:
       ways_paginated: "Ways (%{x}-%{y} of %{count})"
       relations: "Relations (%{count})"
       relations_paginated: "Relations (%{x}-%{y} of %{count})"
       ways_paginated: "Ways (%{x}-%{y} of %{count})"
       relations: "Relations (%{count})"
       relations_paginated: "Relations (%{x}-%{y} of %{count})"

+    not_found_message:
+      sorry: "Sorry, changeset #%{id} could not be found."

     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
   dashboards:
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
   dashboards:


@@ -3090,6 +3097,8 @@ en:
       showing_page: "Page %{page}"
       next: "Next"
       previous: "Previous"
       showing_page: "Page %{page}"
       next: "Next"
       previous: "Previous"

+    not_found_message:
+      sorry: "Sorry, note #%{id} could not be found."

   javascripts:
     close: Close
     share:
   javascripts:
     close: Close
     share: