X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/71b76a21aea7456a5e5eb4b618fed24a9ff49535..b54362d4581075308ad277fd7023ee11f530e0a0:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 66eba938d..f6d396f76 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -228,7 +228,7 @@ en:
       user: "User"
       comment: "Comment"
       area: "Area"
-    list:
+    index:
       title: "Changesets"
       title_user: "Changesets by %{user}"
       title_friend: "Changesets by my friends"
@@ -253,7 +253,7 @@ en:
     new:
       title: New Diary Entry
       publish_button: "Publish"
-    list:
+    index:
       title: "Users' diaries"
       title_friends: "Friends' diaries"
       title_nearby: "Nearby Users' diaries"
@@ -276,7 +276,7 @@ en:
       use_map_link: "use map"
       save_button: "Save"
       marker_text: Diary entry location
-    view:
+    show:
       title: "%{user}'s diary | %{title}"
       user_title: "%{user}'s diary"
       leave_a_comment: "Leave a comment"
@@ -1055,9 +1055,8 @@ en:
     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
     intro_2_create_account: "Create a user account"
-    partners_html: "Hosting is supported by %{ucl}, %{bytemark}, %{ic}, and other %{partners}."
+    hosting_partners_html: "Hosting is supported by %{ucl}, %{bytemark}, and other %{partners}."
     partners_ucl: "UCL"
-    partners_ic: "Imperial College London"
     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
@@ -1194,6 +1193,7 @@ en:
       body: "Body"
       send_button: "Send"
       back_to_inbox: "Back to inbox"
+    create:
       message_sent: "Message sent"
       limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more."
     no_such_message:
@@ -1347,6 +1347,11 @@ en:
           <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
           <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
           Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
+        contributors_au_html: |
+          <strong>Australia</strong>: Contains data sourced from
+          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a>
+          licensed by the Commonwealth of Australia under
+          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
         contributors_ca_html: |
           <strong>Canada</strong>: Contains data from
           GeoBase&reg;, GeoGratis (&copy; Department of Natural
@@ -1700,6 +1705,7 @@ en:
     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."
+      upload_failed: "Sorry, the GPX upload failed. An administrator has been alerted to the error. Please try again"
       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."
@@ -1721,9 +1727,11 @@ en:
       visibility: "Visibility:"
       visibility_help: "what does this mean?"
       visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
+    update:
+      updated: Trace updated
     trace_optionals:
       tags: "Tags"
-    view:
+    show:
       title: "Viewing trace %{name}"
       heading: "Viewing trace %{name}"
       pending: "PENDING"
@@ -1738,8 +1746,8 @@ en:
       description: "Description:"
       tags: "Tags:"
       none: "None"
-      edit_track: "Edit this trace"
-      delete_track: "Delete this trace"
+      edit_trace: "Edit this trace"
+      delete_trace: "Delete this trace"
       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
       confirm_delete: "Delete this trace?"
@@ -1763,7 +1771,7 @@ en:
       by: "by"
       in: "in"
       map: "map"
-    list:
+    index:
       public_traces: "Public GPS traces"
       my_traces: "My GPS traces"
       public_traces_from: "Public GPS traces from %{user}"
@@ -1886,7 +1894,7 @@ en:
       flash: "Updated the client information successfully"
     destroy:
       flash: "Destroyed the client application registration"
-  user:
+  users:
     login:
       title: "Login"
       heading: "Login"
@@ -2002,7 +2010,7 @@ en:
       heading: "The user %{user} does not exist"
       body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
       deleted: "deleted"
-    view:
+    show:
       my diary: My Diary
       new diary entry: new diary entry
       my edits: My Edits
@@ -2164,7 +2172,7 @@ en:
       not_a_friend: "%{name} is not one of your friends."
     filter:
       not_an_administrator: "You need to be an administrator to perform that action."
-    list:
+    index:
       title: Users
       heading: Users
       showing: