X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f7d0a60fc184bb3549868977c2d8dafde7b10208..ce761b3193c41081182e129d4f4aa18268e69264:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 5b0807dba..6e126e27e 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" @@ -985,7 +985,7 @@ en: helper: reportable_title: diary_comment: "%{entry_title}, comment #%{comment_id}" - note: "Note #{note_id}" + note: "Note #%{note_id}" issue_comments: create: comment_created: Your comment was successfully created @@ -1002,29 +1002,29 @@ en: resolve_with_user: You have already tried to resolve the problem with the user concerned categories: diary_entry: - spam: This diary entry is/contains spam - offensive: This diary entry is obscene/offensive - threat: This diary entry contains a threat - other: Other + spam_label: This diary entry is/contains spam + offensive_label: This diary entry is obscene/offensive + threat_label: This diary entry contains a threat + other_label: Other diary_comment: - spam: This diary comment is/contains spam - offensive: This diary comment is obscene/offensive - threat: This diary comment contains a threat - other: Other + spam_label: This diary comment is/contains spam + offensive_label: This diary comment is obscene/offensive + threat_label: This diary comment contains a threat + other_label: Other user: - spam: This user profile is/contains spam - offensive: This user profile is obscene/offensive - threat: This user profile contains a threat - vandal: This user is a vandal - other: Other + spam_label: This user profile is/contains spam + offensive_label: This user profile is obscene/offensive + threat_label: This user profile contains a threat + vandal_label: This user is a vandal + other_label: Other note: - spam: This note is spam - personal: This note contains personal data - abusive: This note is abusive - other: Other + spam_label: This note is spam + personal_label: This note contains personal data + abusive_label: This note is abusive + other_label: Other create: successful_report: Your report has been registered sucessfully - provide_details: Please provide the required details + provide_details: Please provide the required details layouts: project_name: # in @@ -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: @@ -1700,6 +1700,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 +1722,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 +1741,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 +1766,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 +1889,7 @@ en: flash: "Updated the client information successfully" destroy: flash: "Destroyed the client application registration" - user: + users: login: title: "Login" heading: "Login" @@ -2002,7 +2005,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 +2167,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: