X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0a3a4014d9ec26d8a818fc2fb55ff98a83ee8152..db1094c1145754f0ba9ac982aa0920f0f6760b54:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4f6734b32..2c1f0ad2b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -207,12 +207,13 @@ en:
reopened_by: "Reactivated by %{user} %{when} ago"
reopened_by_anonymous: "Reactivated by anonymous %{when} ago"
hidden_by: "Hidden by %{user} %{when} ago"
+ report: Report this note
query:
title: "Query Features"
introduction: "Click on the map to find nearby features."
nearby: "Nearby features"
enclosing: "Enclosing features"
- changeset:
+ changesets:
changeset_paging_nav:
showing_page: "Page %{page}"
next: "Next »"
@@ -227,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"
@@ -241,18 +242,22 @@ en:
load_more: "Load more"
timeout:
sorry: "Sorry, the list of changesets you requested took too long to retrieve."
- rss:
- title_all: OpenStreetMap changeset discussion
- title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
+ changeset_comments:
+ comment:
comment: "New comment on changeset #%{changeset_id} by %{author}"
- commented_at_html: "Updated %{when} ago"
commented_at_by_html: "Updated %{when} ago by %{user}"
- full: Full discussion
- diary_entry:
+ comments:
+ comment: "New comment on changeset #%{changeset_id} by %{author}"
+ index:
+ title_all: OpenStreetMap changeset discussion
+ title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
+ timeout:
+ sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
+ diary_entries:
new:
title: New Diary Entry
publish_button: "Publish"
- list:
+ index:
title: "Users' diaries"
title_friends: "Friends' diaries"
title_nearby: "Nearby Users' diaries"
@@ -275,7 +280,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"
@@ -297,10 +302,12 @@ en:
edit_link: Edit this entry
hide_link: Hide this entry
confirm: Confirm
+ report: Report this entry
diary_comment:
comment_from: "Comment from %{link_user} on %{comment_created_at}"
hide_link: Hide this comment
confirm: Confirm
+ report: Report this comment
location:
location: "Location:"
view: "View"
@@ -857,7 +864,7 @@ en:
"yes": "Shop"
tourism:
alpine_hut: "Alpine Hut"
- apartment: "Apartment"
+ apartment: "Holiday Apartment"
artwork: "Artwork"
attraction: "Attraction"
bed_and_breakfast: "Bed and Breakfast"
@@ -918,6 +925,110 @@ en:
results:
no_results: "No results found"
more_results: "More results"
+ issues:
+ index:
+ title: Issues
+ select_status: Select Status
+ select_type: Select Type
+ select_last_updated_by: Select Last Updated By
+ reported_user: Reported User
+ not_updated: Not Updated
+ search: Search
+ search_guidance: "Search Issues:"
+ user_not_found: User does not exist
+ issues_not_found: No such issues found
+ status: Status
+ reports: Reports
+ last_updated: Last Updated
+ last_updated_time_html: "%{time} ago"
+ last_updated_time_user_html: "%{time} ago by %{user}"
+ link_to_reports: View Reports
+ reported_user: Reported User
+ reports_count:
+ one: "1 Report"
+ other: "%{count} Reports"
+ reported_item: Reported Item
+ states:
+ ignored: Ignored
+ open: Open
+ resolved: Resolved
+ update:
+ new_report: Your report has been registered sucessfully
+ successful_update: Your report has been updated successfully
+ provide_details: Please provide the required details
+ show:
+ title: "%{status} Issue #%{issue_id}"
+ reports:
+ zero: No reports
+ one: 1 report
+ other: "%{count} reports"
+ report_created_at: "First reported at %{datetime}"
+ last_resolved_at: "Last resolved at %{datetime}"
+ last_updated_at: "Last updated at %{datetime} by %{displayname}"
+ resolve: Resolve
+ ignore: Ignore
+ reopen: Reopen
+ reports_of_this_issue: Reports of this Issue
+ read_reports: Read Reports
+ new_reports: New Reports
+ other_issues_against_this_user: Other issues against this user
+ no_other_issues: No other issues against this user.
+ comments_on_this_issue: Comments on this issue
+ resolve:
+ resolved: Issue status has been set to 'Resolved'
+ ignore:
+ ignored: Issue status has been set to 'Ignored'
+ reopen:
+ reopened: Issue status has been set to 'Open'
+ comments:
+ created_at: "On %{datetime}"
+ reassign_param: Reassign Issue?
+ reports:
+ updated_at: "On %{datetime}"
+ reported_by_html: "Reported as %{category} by %{user}"
+ helper:
+ reportable_title:
+ diary_comment: "%{entry_title}, comment #%{comment_id}"
+ note: "Note #%{note_id}"
+ issue_comments:
+ create:
+ comment_created: Your comment was successfully created
+ reports:
+ new:
+ title_html: "Report %{link}"
+ missing_params: "Cannot create a new report"
+ details: Please provide some more details about the problem (required).
+ select: "Select a reason for your report:"
+ disclaimer:
+ intro: "Before sending your report to the site moderators, please ensure that:"
+ not_just_mistake: You are certain that the problem is not just a mistake
+ unable_to_fix: You are unable to fix the problem yourself or with the help of your fellow community members
+ resolve_with_user: You have already tried to resolve the problem with the user concerned
+ categories:
+ diary_entry:
+ 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_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_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_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
layouts:
project_name:
# in
@@ -936,6 +1047,7 @@ en:
edit: Edit
history: History
export: Export
+ issues: Issues
data: Data
export_data: Export Data
gps_traces: GPS Traces
@@ -947,9 +1059,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."
@@ -1086,6 +1197,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:
@@ -1239,6 +1351,11 @@ en:
CC BY),
Land Vorarlberg and
Land Tirol (under CC BY AT with amendments).
+ contributors_au_html: |
+ Australia: Contains data sourced from
+ PSMA Australia Limited
+ licensed by the Commonwealth of Australia under
+ CC BY 4.0.
contributors_ca_html: |
Canada: Contains data from
GeoBase®, GeoGratis (© Department of Natural
@@ -1414,6 +1531,10 @@ en:
url: https://switch2osm.org/
title: switch2osm
description: Help for companies and organisations switching to OpenStreetMap based maps and other services.
+ welcomemat:
+ url: https://welcome.openstreetmap.org/
+ title: For Organizations
+ description: With an organization making plans for OpenStreetMap? Find what you need to know in the Welcome Mat.
wiki:
url: https://wiki.openstreetmap.org/
title: wiki.openstreetmap.org
@@ -1505,7 +1626,7 @@ en:
edit: Edit
preview: Preview
markdown_help:
- title_html: Parsed with Markdown
+ title_html: Parsed with kramdown
headings: Headings
heading: Heading
subheading: Subheading
@@ -1560,7 +1681,7 @@ en:
paragraph_1_html: |
OpenStreetMap has several resources for learning about the project, asking and answering
questions, and collaboratively discussing and documenting mapping topics.
- Get help here.
+ Get help here. With an organization making plans for OpenStreetMap? Check out the Welcome Mat.
start_mapping: Start Mapping
add_a_note:
title: No Time To Edit? Add a Note!
@@ -1577,12 +1698,8 @@ en:
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)"
- create:
+ new:
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:"
@@ -1593,6 +1710,13 @@ en:
upload_button: "Upload"
help: "Help"
help_url: "https://wiki.openstreetmap.org/wiki/Upload"
+ 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."
edit:
title: "Editing trace %{name}"
heading: "Editing trace %{name}"
@@ -1611,9 +1735,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"
@@ -1628,8 +1754,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?"
@@ -1653,7 +1779,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}"
@@ -1680,10 +1806,11 @@ en:
other: "GPX file with %{count} points from %{user}"
description_without_count: "GPX file from %{user}"
application:
+ permission_denied: You do not have permission to access that action
require_cookies:
cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
- require_moderator:
- not_a_moderator: "You need to be a moderator to perform that action."
+ require_admin:
+ not_an_admin: You need to be an admin to perform that action.
setup_user_auth:
blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits."
blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
@@ -1772,7 +1899,7 @@ en:
flash: "Updated the client information successfully"
destroy:
flash: "Destroyed the client application registration"
- user:
+ users:
login:
title: "Login"
heading: "Login"
@@ -1888,7 +2015,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
@@ -1953,6 +2080,7 @@ en:
friends_diaries: "friends' diary entries"
nearby_changesets: "nearby user changesets"
nearby_diaries: "nearby user diary entries"
+ report: Report this User
popup:
your location: "Your location"
nearby mapper: "Nearby mapper"
@@ -2047,9 +2175,7 @@ en:
button: "Unfriend"
success: "%{name} was removed from your friends."
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:
@@ -2090,7 +2216,6 @@ en:
with your ID in your user settings.
user_role:
filter:
- not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
not_a_role: "The string `%{role}' is not a valid role."
already_has_role: "The user already has role %{role}."
doesnt_have_role: "The user does not have role %{role}."
@@ -2438,3 +2563,8 @@ en:
not_empty: "Redaction is not empty. Please un-redact all versions belonging to this redaction before destroying it."
flash: "Redaction destroyed."
error: "There was an error destroying this redaction."
+ validations:
+ leading_whitespace: "has leading whitespace"
+ trailing_whitespace: "has trailing whitespace"
+ invalid_characters: "contains invalid characters"
+ url_characters: "contains special URL characters (%{characters})"