X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/73df8447e3918f08156dd69ddf631652d048f191..57d3b3af55a0bb37eb964aa75a9f1549df9a771c:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 908d3755d..a7efaf985 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1107,7 +1107,7 @@ 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"
@@ -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
@@ -1575,12 +1577,8 @@ en:
       public: "Public (shown in trace list and as anonymous, unordered points)"
       trackable: "Trackable (only shared as anonymous, ordered points with timestamps)"
       identifiable: "Identifiable (shown in trace list and as identifiable, ordered points with timestamps)"
-    create:
+    new:
       upload_trace: "Upload GPS Trace"
-      trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
-      traces_waiting:
-        one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
-        other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
       upload_gpx: "Upload GPX File:"
       description: "Description:"
       tags: "Tags:"
@@ -1591,6 +1589,12 @@ en:
       upload_button: "Upload"
       help: "Help"
       help_url: "https://wiki.openstreetmap.org/wiki/Upload"
+    create:
+      upload_trace: "Upload GPS Trace"
+      trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
+      traces_waiting:
+        one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
+        other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
     edit:
       title: "Editing trace %{name}"
       heading: "Editing trace %{name}"