Localisation updates from https://translatewiki.net.

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index e0d622b084fc7e6f870eef66a135c9a2a4a29d05..ad640a6cd2b21c8d8fc481502ff21ad258622d1f 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1038,7 +1038,7 @@ en-GB:
       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
@@ -1060,7 +1060,7 @@ en-GB:
       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}
@@ -1068,6 +1068,7 @@ en-GB:
       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.
@@ -1093,26 +1094,26 @@ en-GB:
       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
@@ -1552,13 +1553,24 @@ en-GB:
           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)
       trackable: Trackable (only shared as anonymous, ordered points with timestamps)
       identifiable: Identifiable (shown in trace list and as identifiable, ordered
         points with timestamps)
+    new:
+      upload_gpx: 'Upload GPX File:'
+      description: 'Description:'
+      tags: 'Tags:'
+      tags_help: comma delimited
+      visibility: 'Visibility:'
+      visibility_help: what does this mean?
+      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
+      upload_button: Upload
+      help: Help
+      help_url: http://wiki.openstreetmap.org/wiki/Upload
     create:
       upload_trace: Upload GPS Trace
       trace_uploaded: Your GPX file has been uploaded and is awaiting insertion in
@@ -1571,16 +1583,6 @@ en-GB:
         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:'
-      tags_help: comma delimited
-      visibility: 'Visibility:'
-      visibility_help: what does this mean?
-      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
-      upload_button: Upload
-      help: Help
-      help_url: http://wiki.openstreetmap.org/wiki/Upload
     edit:
       title: Editing trace %{name}
       heading: Editing trace %{name}
@@ -1601,7 +1603,7 @@ en-GB:
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     trace_optionals:
       tags: Tags
-    view:
+    show:
       title: Viewing trace %{name}
       heading: Viewing trace %{name}
       pending: PENDING
@@ -1616,8 +1618,8 @@ en-GB:
       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:'
     trace_paging_nav:
@@ -1640,7 +1642,7 @@ en-GB:
       by: by
       in: in
       map: map
-    list:
+    index:
       public_traces: Public GPS traces
       public_traces_from: Public GPS traces from %{user}
       description: Browse recent GPS track uploads