Move redacted version locale strings to old_elements

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4f2174206548e2f5267daf6ad4c39a896c9e710d..b60549894ebb131546284f2c29e69745141ef598 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -245,25 +245,6 @@ en:
       entry:
         comment: Comment
         full: Full note
       entry:
         comment: Comment
         full: Full note

-  account:
-    deletions:
-      show:
-        title: Delete My Account
-        warning: Warning! The account deletion process is final, and cannot be reversed.
-        delete_account: Delete Account
-        delete_introduction: "You can delete your OpenStreetMap account using the button below. Please note the following details:"
-        delete_profile: Your profile information, including your avatar, description and home location will be removed.
-        delete_display_name: Your display name will be removed, and can be reused by other accounts.
-        retain_caveats: "However, some information about you will be retained on OpenStreetMap, even after your account is deleted:"
-        retain_edits: Your edits to the map database, if any, will be retained.
-        retain_traces: Your uploaded traces, if any, will be retained.
-        retain_diary_entries: Your diary entries and diary comments, if any, will be retained but hidden from view.
-        retain_notes: Your map notes and note comments, if any, will be retained but hidden from view.
-        retain_changeset_discussions: Your changeset discussions, if any, will be retained.
-        retain_email: Your email address will be retained.
-        recent_editing_html: "As you have edited recently your account cannot currently be deleted. Deletion will be possible in %{time}."
-        confirm_delete: Are you sure?
-        cancel: Cancel

   accounts:
     edit:
       title: "Edit account"
   accounts:
     edit:
       title: "Edit account"


@@ -305,6 +286,24 @@ en:
       success: "User information updated successfully."
     destroy:
       success: "Account Deleted."
       success: "User information updated successfully."
     destroy:
       success: "Account Deleted."

+    deletions:
+      show:
+        title: Delete My Account
+        warning: Warning! The account deletion process is final, and cannot be reversed.
+        delete_account: Delete Account
+        delete_introduction: "You can delete your OpenStreetMap account using the button below. Please note the following details:"
+        delete_profile: Your profile information, including your avatar, description and home location will be removed.
+        delete_display_name: Your display name will be removed, and can be reused by other accounts.
+        retain_caveats: "However, some information about you will be retained on OpenStreetMap, even after your account is deleted:"
+        retain_edits: Your edits to the map database, if any, will be retained.
+        retain_traces: Your uploaded traces, if any, will be retained.
+        retain_diary_entries: Your diary entries and diary comments, if any, will be retained but hidden from view.
+        retain_notes: Your map notes and note comments, if any, will be retained but hidden from view.
+        retain_changeset_discussions: Your changeset discussions, if any, will be retained.
+        retain_email: Your email address will be retained.
+        recent_editing_html: "As you have edited recently your account cannot currently be deleted. Deletion will be possible in %{time}."
+        confirm_delete: Are you sure?
+        cancel: Cancel

   browse:
     deleted_ago_by_html: "Deleted %{time_ago} by %{user}"
     edited_ago_by_html: "Edited %{time_ago} by %{user}"
   browse:
     deleted_ago_by_html: "Deleted %{time_ago} by %{user}"
     edited_ago_by_html: "Edited %{time_ago} by %{user}"


@@ -324,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"


@@ -344,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"


@@ -403,6 +397,17 @@ 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:
     timeout:
       sorry: "Sorry, the data for the node with the id %{id} took too long to retrieve."
   nodes:
     timeout:
       sorry: "Sorry, the data for the node with the id %{id} took too long to retrieve."


@@ -1752,8 +1757,6 @@ en:
       title: "No such message"
       heading: "No such message"
       body: "Sorry there is no message with that id."
       title: "No such message"
       heading: "No such message"
       body: "Sorry there is no message with that id."

-    reply:
-      wrong_user: "You are logged in as '%{user}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply."

     show:
       title: "Read message"
       reply_button: "Reply"
     show:
       title: "Read message"
       reply_button: "Reply"


@@ -1813,6 +1816,9 @@ en:
         people_mapping_nearby: "people mapping nearby"
       message:
         destroy_button: "Delete"
         people_mapping_nearby: "people mapping nearby"
       message:
         destroy_button: "Delete"

+    replies:
+      new:
+        wrong_user: "You are logged in as '%{user}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply."

   passwords:
     new:
       title: "Lost password"
   passwords:
     new:
       title: "Lost password"


@@ -2972,8 +2978,7 @@ en:
         ended: "ended"
         revoked_html: "revoked by %{name}"
         active: "active"
         ended: "ended"
         revoked_html: "revoked by %{name}"
         active: "active"

-        active_unread: "active unread"
-        expired_unread: "expired unread"
+        active_until_read: "active until read"

         read_html: "read at %{time}"
         time_in_future_title: "%{time_absolute}; in %{time_relative}"
         time_in_past_title: "%{time_absolute}; %{time_relative}"
         read_html: "read at %{time}"
         time_in_future_title: "%{time_absolute}; in %{time_relative}"
         time_in_past_title: "%{time_absolute}; %{time_relative}"