Fix lazy i18n lookups for browse error pages

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1a1aa83b8ab34aedc0bda1c8bdee4279453bcb74..4f6734b329b415cd338cadafc1d85c346e290251 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1057,7 +1057,7 @@ en:
         partial_changeset_without_comment: "without comment"
       details: "More details about the changeset can be found at %{url}."
       unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
-  message:
+  messages:
     inbox:
       title: "Inbox"
       my_inbox: "My Inbox"
@@ -1078,7 +1078,7 @@ en:
       unread_button: "Mark as unread"
       read_button: "Mark as read"
       reply_button: "Reply"
-      delete_button: "Delete"
+      destroy_button: "Delete"
     new:
       title: "Send message"
       send_message_to: "Send a new message to %{name}"
@@ -1107,24 +1107,24 @@ en:
       people_mapping_nearby: "people mapping nearby"
     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 login as the correct user in order to reply."
-    read:
+    show:
       title: "Read message"
       from: "From"
       subject: "Subject"
       date: "Date"
       reply_button: "Reply"
       unread_button: "Mark as unread"
-      delete_button: "Delete"
+      destroy_button: "Delete"
       back: "Back"
       to: "To"
       wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
     sent_message_summary:
-      delete_button: "Delete"
+      destroy_button: "Delete"
     mark:
       as_read: "Message marked as read"
       as_unread: "Message marked as unread"
-    delete:
-      deleted: "Message deleted"
+    destroy:
+      destroyed: "Message deleted"
   site:
     about:
       next: Next
@@ -1257,8 +1257,10 @@ en:
           <strong>Netherlands</strong>: Contains &copy; AND data, 2007
           (<a href="https://www.and.com">www.and.com</a>)
         contributors_nz_html: |
-          <strong>New Zealand</strong>: Contains data sourced from
-          Land Information New Zealand. Crown Copyright reserved.
+          <strong>New Zealand</strong>: Contains data sourced from the
+          <a href="https://data.linz.govt.nz/">LINZ Data Service</a> and
+          licensed for reuse under
+          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
         contributors_si_html: |
           <strong>Slovenia</strong>: Contains data from the
           <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and
@@ -1569,7 +1571,7 @@ en:
           Just go to <a href='%{map_url}'>the map</a> and click the note icon:
           <span class='icon note'></span>. This will add a marker to the map, which you can move
           by dragging. Add your message, then click save, and other mappers will investigate.
-  trace:
+  traces:
     visibility:
       private: "Private (only shared as anonymous, unordered points)"
       public: "Public (shown in trace list and as anonymous, unordered points)"