X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/76bc5eba0617e36ebb853d24212543d0e1d4904d..908f9b5276602f21f7d492c9949c934dfb1e9365:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a2a575492..e948ca37e 100644
--- 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
@@ -1569,7 +1569,7 @@ en:
Just go to the map and click the note icon:
. 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)"
@@ -1578,6 +1578,19 @@ 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."
+ 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:"
+ tags_help: "comma delimited"
+ visibility: "Visibility:"
+ visibility_help: "what does this mean?"
+ visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
+ upload_button: "Upload"
+ help: "Help"
+ help_url: "https://wiki.openstreetmap.org/wiki/Upload"
edit:
title: "Editing trace %{name}"
heading: "Editing trace %{name}"
@@ -1596,24 +1609,6 @@ en:
visibility: "Visibility:"
visibility_help: "what does this mean?"
visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
- trace_form:
- upload_gpx: "Upload GPX File:"
- description: "Description:"
- tags: "Tags:"
- tags_help: "comma delimited"
- visibility: "Visibility:"
- visibility_help: "what does this mean?"
- visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
- upload_button: "Upload"
- help: "Help"
- help_url: "https://wiki.openstreetmap.org/wiki/Upload"
- trace_header:
- upload_trace: "Upload a trace"
- see_all_traces: "See all traces"
- see_my_traces: "See my traces"
- 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."
trace_optionals:
tags: "Tags"
view:
@@ -1663,6 +1658,9 @@ en:
description: "Browse recent GPS trace uploads"
tagged_with: " tagged with %{tags}"
empty_html: "Nothing here yet. Upload a new trace or learn more about GPS tracing on the wiki page."
+ upload_trace: "Upload a trace"
+ see_all_traces: "See all traces"
+ see_my_traces: "See my traces"
delete:
scheduled_for_deletion: "Trace scheduled for deletion"
make_public:
@@ -2377,25 +2375,21 @@ en:
against_oneway_without_exit: Go against one-way on %{name}
end_oneway_without_exit: End of one-way on %{name}
roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
- turn_left_with_exit: Exit onto %{name}
- slight_left_with_exit: Exit onto %{name}
- turn_right_with_exit: Exit onto %{name}
- slight_right_with_exit: Exit onto %{name}
- continue_with_exit: Exit onto %{name}
+ roundabout_with_exit_ordinal: At roundabout take %{exit} exit onto %{name}
+ exit_roundabout: Exit roundabout onto %{name}
unnamed: "unnamed road"
courtesy: "Directions courtesy of %{link}"
exit_counts:
- one: "1st"
- two: "2nd"
- three: "3rd"
- four: "4th"
- five: "5th"
- six: "6th"
- seven: "7th"
- eight: "8th"
- nine: "9th"
- ten: "10th"
- gt_ten: ""
+ first: "1st"
+ second: "2nd"
+ third: "3rd"
+ fourth: "4th"
+ fifth: "5th"
+ sixth: "6th"
+ seventh: "7th"
+ eighth: "8th"
+ ninth: "9th"
+ tenth: "10th"
time: "Time"
query:
node: Node