X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f38824856d6eb3b51bc7c340deff487f5d49516d..4530f6e3e4a327f5adf348f1cb69fd1ef0bd90f9:/config/locales/en-GB.yml?ds=inline diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index e0d622b08..434b88c13 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -252,7 +252,7 @@ en-GB: user: User comment: Comment area: Area - list: + index: title: Changesets title_user: Changesets by %{user} title_friend: Changesets by your friends @@ -277,7 +277,7 @@ en-GB: new: title: New Diary Entry publish_button: Publish - list: + index: title: Users' diaries title_friends: Friends' diaries title_nearby: Nearby Users' diaries @@ -300,7 +300,7 @@ en-GB: 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 @@ -903,10 +903,7 @@ en-GB: intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open licence. intro_2_create_account: Create a user account - partners_html: Hosting is supported by %{ucl}, %{ic} and %{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 @@ -1038,7 +1035,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 +1057,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 +1065,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 +1091,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 +1550,24 @@ en-GB: 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) 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 +1580,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 +1600,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 +1615,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 +1639,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 @@ -1769,7 +1768,7 @@ en-GB: flash: Updated the client information successfully destroy: flash: Destroyed the client application registration - user: + users: login: title: Login heading: Login @@ -1907,7 +1906,7 @@ en-GB: 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 @@ -2081,7 +2080,7 @@ en-GB: 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: