X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c7e514a56b7b420ebe3d32a9ad2d6751587b1faa..94a48482e0bef11bdaf11f0200b4296ee8fabf23:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fca925e2c..8a0c62b03 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"
@@ -323,47 +330,6 @@ en:
ago: "%{ago} ago"
newer_comments: "Newer Comments"
older_comments: "Older Comments"
- export:
- title: "Export"
- start:
- area_to_export: "Area to Export"
- manually_select: "Manually select a different area"
- format_to_export: "Format to Export"
- osm_xml_data: "OpenStreetMap XML Data"
- map_image: "Map Image (shows standard layer)"
- embeddable_html: "Embeddable HTML"
- licence: "Licence"
- export_details: 'OpenStreetMap data is licensed under the Open Data Commons Open Database License (ODbL).'
- too_large:
- advice: "If the above export fails, please consider using one of the sources listed below:"
- body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads."
- planet:
- title: "Planet OSM"
- description: "Regularly-updated copies of the complete OpenStreetMap database"
- overpass:
- title: "Overpass API"
- description: "Download this bounding box from a mirror of the OpenStreetMap database"
- geofabrik:
- title: "Geofabrik Downloads"
- description: "Regularly-updated extracts of continents, countries, and selected cities"
- metro:
- title: "Metro Extracts"
- description: "Extracts for major world cities and their surrounding areas"
- other:
- title: "Other Sources"
- description: "Additional sources listed on the OpenStreetMap wiki"
- options: "Options"
- format: "Format"
- scale: "Scale"
- max: "max"
- image_size: "Image Size"
- zoom: "Zoom"
- add_marker: "Add a marker to the map"
- latitude: "Lat:"
- longitude: "Lon:"
- output: "Output"
- paste_html: "Paste HTML to embed in website"
- export_button: "Export"
geocoder:
search:
title:
@@ -959,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
@@ -977,6 +1047,7 @@ en:
edit: Edit
history: History
export: Export
+ issues: Issues
data: Data
export_data: Export Data
gps_traces: GPS Traces
@@ -988,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."
@@ -1009,63 +1079,6 @@ en:
text: Make a Donation
learn_more: "Learn More"
more: More
- fixthemap:
- title: Report a problem / Fix the map
- how_to_help:
- title: How to Help
- join_the_community:
- title: Join the community
- explanation_html: |
- If you have noticed a problem with our map data, for example a road is missing or your address, the best way to
- proceed is to join the OpenStreetMap community and add or repair the data yourself.
- add_a_note:
- instructions_html: |
- Just click <a class='icon note'></a> or the same icon on the map display.
- 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.
- other_concerns:
- title: Other concerns
- explanation_html: |
- If you have concerns about how our data is being used or about the contents please consult our
- <a href='/copyright'>copyright page</a> for more legal information, or contact the appropriate
- <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.
- help_page:
- title: Getting Help
- introduction: |
- OpenStreetMap has several resources for learning about the project, asking and answering questions,
- and collaboratively discussing and documenting mapping topics.
- welcome:
- url: /welcome
- title: Welcome to OSM
- description: Start with this quick guide covering the OpenStreetMap basics.
- beginners_guide:
- url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
- title: Beginners' Guide
- description: Community maintained guide for beginners.
- help:
- url: https://help.openstreetmap.org/
- title: help.openstreetmap.org
- description: Ask a question or look up answers on OSM's question-and-answer site.
- mailing_lists:
- url: https://lists.openstreetmap.org/
- title: Mailing Lists
- description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists.
- forums:
- url: https://forum.openstreetmap.org/
- title: Forums
- description: Questions and discussions for those that prefer a bulletin board style interface.
- irc:
- url: https://irc.openstreetmap.org/
- title: IRC
- description: Interactive chat in many different languages and on many topics.
- switch2osm:
- url: https://switch2osm.org/
- title: switch2osm
- description: Help for companies and organisations switching to OpenStreetMap based maps and other services.
- wiki:
- url: https://wiki.openstreetmap.org/
- title: wiki.openstreetmap.org
- description: Browse the wiki for in-depth OSM documentation.
notifier:
diary_comment_notification:
subject: "[OpenStreetMap] %{user} commented on a diary entry"
@@ -1155,7 +1168,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"
@@ -1176,7 +1189,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}"
@@ -1184,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:
@@ -1205,24 +1219,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
@@ -1337,6 +1351,11 @@ en:
<a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
<a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
+ contributors_au_html: |
+ <strong>Australia</strong>: Contains data sourced from
+ <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a>
+ licensed by the Commonwealth of Australia under
+ <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
contributors_ca_html: |
<strong>Canada</strong>: Contains data from
GeoBase®, GeoGratis (© Department of Natural
@@ -1355,8 +1374,10 @@ en:
<strong>Netherlands</strong>: Contains © AND data, 2007
(<a href="https://www.and.com">www.and.com</a>)
contributors_nz_html: |
- <strong>New Zealand</strong>: Contains data sourced from
- Land Information New Zealand. Crown Copyright reserved.
+ <strong>New Zealand</strong>: Contains data sourced from the
+ <a href="https://data.linz.govt.nz/">LINZ Data Service</a> and
+ licensed for reuse under
+ <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
contributors_si_html: |
<strong>Slovenia</strong>: Contains data from the
<a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and
@@ -1417,6 +1438,103 @@ en:
potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)"
id_not_configured: "iD has not been configured"
no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
+ export:
+ title: "Export"
+ area_to_export: "Area to Export"
+ manually_select: "Manually select a different area"
+ format_to_export: "Format to Export"
+ osm_xml_data: "OpenStreetMap XML Data"
+ map_image: "Map Image (shows standard layer)"
+ embeddable_html: "Embeddable HTML"
+ licence: "Licence"
+ export_details: 'OpenStreetMap data is licensed under the <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).'
+ too_large:
+ advice: "If the above export fails, please consider using one of the sources listed below:"
+ body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads."
+ planet:
+ title: "Planet OSM"
+ description: "Regularly-updated copies of the complete OpenStreetMap database"
+ overpass:
+ title: "Overpass API"
+ description: "Download this bounding box from a mirror of the OpenStreetMap database"
+ geofabrik:
+ title: "Geofabrik Downloads"
+ description: "Regularly-updated extracts of continents, countries, and selected cities"
+ metro:
+ title: "Metro Extracts"
+ description: "Extracts for major world cities and their surrounding areas"
+ other:
+ title: "Other Sources"
+ description: "Additional sources listed on the OpenStreetMap wiki"
+ options: "Options"
+ format: "Format"
+ scale: "Scale"
+ max: "max"
+ image_size: "Image Size"
+ zoom: "Zoom"
+ add_marker: "Add a marker to the map"
+ latitude: "Lat:"
+ longitude: "Lon:"
+ output: "Output"
+ paste_html: "Paste HTML to embed in website"
+ export_button: "Export"
+ fixthemap:
+ title: Report a problem / Fix the map
+ how_to_help:
+ title: How to Help
+ join_the_community:
+ title: Join the community
+ explanation_html: |
+ If you have noticed a problem with our map data, for example a road is missing or your address, the best way to
+ proceed is to join the OpenStreetMap community and add or repair the data yourself.
+ add_a_note:
+ instructions_html: |
+ Just click <a class='icon note'></a> or the same icon on the map display.
+ 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.
+ other_concerns:
+ title: Other concerns
+ explanation_html: |
+ If you have concerns about how our data is being used or about the contents please consult our
+ <a href='/copyright'>copyright page</a> for more legal information, or contact the appropriate
+ <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.
+ help:
+ title: Getting Help
+ introduction: |
+ OpenStreetMap has several resources for learning about the project, asking and answering questions,
+ and collaboratively discussing and documenting mapping topics.
+ welcome:
+ url: /welcome
+ title: Welcome to OSM
+ description: Start with this quick guide covering the OpenStreetMap basics.
+ beginners_guide:
+ url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
+ title: Beginners' Guide
+ description: Community maintained guide for beginners.
+ help:
+ url: https://help.openstreetmap.org/
+ title: help.openstreetmap.org
+ description: Ask a question or look up answers on OSM's question-and-answer site.
+ mailing_lists:
+ url: https://lists.openstreetmap.org/
+ title: Mailing Lists
+ description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists.
+ forums:
+ url: https://forum.openstreetmap.org/
+ title: Forums
+ description: Questions and discussions for those that prefer a bulletin board style interface.
+ irc:
+ url: https://irc.openstreetmap.org/
+ title: IRC
+ description: Interactive chat in many different languages and on many topics.
+ switch2osm:
+ url: https://switch2osm.org/
+ title: switch2osm
+ description: Help for companies and organisations switching to OpenStreetMap based maps and other services.
+ wiki:
+ url: https://wiki.openstreetmap.org/
+ title: wiki.openstreetmap.org
+ description: Browse the wiki for in-depth OSM documentation.
sidebar:
search_results: Search Results
close: Close
@@ -1570,15 +1688,31 @@ en:
Just go to <a href='%{map_url}'>the map</a> and click 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_trace: "Upload GPS Trace"
+ 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"
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}"
@@ -1597,27 +1731,11 @@ 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."
+ update:
+ updated: Trace updated
trace_optionals:
tags: "Tags"
- view:
+ show:
title: "Viewing trace %{name}"
heading: "Viewing trace %{name}"
pending: "PENDING"
@@ -1632,8 +1750,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?"
@@ -1657,13 +1775,16 @@ 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}"
description: "Browse recent GPS trace uploads"
tagged_with: " tagged with %{tags}"
empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
+ 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:
@@ -1681,16 +1802,21 @@ 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_admin:
+ not_an_admin: You need to be an admin to perform that action.
require_moderator:
not_a_moderator: "You need to be a moderator to perform that action."
+ require_moderator_or_admin:
+ not_a_moderator_or_admin: You need to be a moderator or 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."
need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
oauth:
- oauthorize:
+ authorize:
title: "Authorize access to your account"
request_access: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
allow_to: "Allow the client application to:"
@@ -1702,11 +1828,11 @@ en:
allow_write_gpx: "upload GPS traces."
allow_write_notes: "modify notes."
grant_access: "Grant Access"
- oauthorize_success:
+ authorize_success:
title: "Authorization request allowed"
allowed: "You have granted application %{app_name} access to your account."
verification: "The verification code is %{code}."
- oauthorize_failure:
+ authorize_failure:
title: "Authorization request failed"
denied: "You have denied application %{app_name} access to your account."
invalid: "The authorization token is not valid."
@@ -1773,7 +1899,7 @@ en:
flash: "Updated the client information successfully"
destroy:
flash: "Destroyed the client application registration"
- user:
+ users:
login:
title: "Login"
heading: "Login"
@@ -1889,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
@@ -1954,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"
@@ -2050,7 +2177,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:
@@ -2108,7 +2235,7 @@ en:
are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"
confirm: "Confirm"
fail: "Could not revoke role `%{role}' from user `%{name}'. Please check that the user and role are both valid."
- user_block:
+ user_blocks:
model:
non_moderator_update: "Must be a moderator to create or update a block."
non_moderator_revoke: "Must be a moderator to revoke a block."
@@ -2188,7 +2315,6 @@ en:
back: "View all blocks"
revoker: "Revoker:"
needs_view: "The user needs to log in before this block will be cleared."
- user_blocks:
block:
not_revoked: "(not revoked)"
show: "Show"
@@ -2203,8 +2329,8 @@ en:
showing_page: "Page %{page}"
next: "Next »"
previous: "« Previous"
- note:
- description:
+ notes:
+ comment:
opened_at_html: "Created %{when} ago"
opened_at_by_html: "Created %{when} ago by %{user}"
commented_at_html: "Updated %{when} ago"
@@ -2379,13 +2505,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: At roundabout turn left onto %{name}
- slight_left_with_exit: At roundabout slight left onto %{name}
- turn_right_with_exit: At roundabout turn right onto %{name}
- slight_right_with_exit: At roundabout slight right onto %{name}
- continue_with_exit: At roundabout continue straight 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:
+ 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
@@ -2401,7 +2535,7 @@ en:
show_address: Show address
query_features: Query features
centre_map: Centre map here
- redaction:
+ redactions:
edit:
description: "Description"
heading: "Edit redaction"
@@ -2432,3 +2566,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})"