X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/59ed461a5d6c6c2ee5e89bba01d3f40a5bbd78af..be7248bace3b5dcd4498df75d09a70fff75a86e5:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 54404e583..cd7d67947 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -5,6 +5,8 @@ en:
formats:
friendly: "%e %B %Y at %H:%M"
blog: "%e %B %Y"
+ count:
+ at_least_pattern: "%{count}+"
helpers:
file:
prompt: Choose file
@@ -52,7 +54,6 @@ en:
message: "Message"
node: "Node"
node_tag: "Node Tag"
- notifier: "Notifier"
old_node: "Old Node"
old_node_tag: "Old Node Tag"
old_relation: "Old Relation"
@@ -155,46 +156,45 @@ en:
reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use layman's terms.
needs_view: Does the user need to log in before this block will be cleared?
user:
- email_confirmation: 'Your address is not displayed publicly, see our privacy policy for more information.'
new_email: "(never displayed publicly)"
datetime:
distance_in_words_ago:
about_x_hours:
- one: about 1 hour ago
+ one: about %{count} hour ago
other: about %{count} hours ago
about_x_months:
- one: about 1 month ago
+ one: about %{count} month ago
other: about %{count} months ago
about_x_years:
- one: about 1 year ago
+ one: about %{count} year ago
other: about %{count} years ago
almost_x_years:
- one: almost 1 year ago
+ one: almost %{count} year ago
other: almost %{count} years ago
half_a_minute: half a minute ago
less_than_x_seconds:
- one: less than 1 second ago
+ one: less than %{count} second ago
other: less than %{count} seconds ago
less_than_x_minutes:
- one: less than a minute ago
+ one: less than %{count} minute ago
other: less than %{count} minutes ago
over_x_years:
- one: over 1 year ago
+ one: over %{count} year ago
other: over %{count} years ago
x_seconds:
- one: 1 second ago
+ one: "%{count} second ago"
other: "%{count} seconds ago"
x_minutes:
- one: 1 minute ago
+ one: "%{count} minute ago"
other: "%{count} minutes ago"
x_days:
- one: 1 day ago
+ one: "%{count} day ago"
other: "%{count} days ago"
x_months:
- one: 1 month ago
+ one: "%{count} month ago"
other: "%{count} months ago"
x_years:
- one: 1 year ago
+ one: "%{count} year ago"
other: "%{count} years ago"
printable_name:
with_id: "%{id}"
@@ -214,7 +214,7 @@ en:
openid: OpenID
google: Google
facebook: Facebook
- windowslive: Windows Live
+ microsoft: Microsoft
github: GitHub
wikipedia: Wikipedia
api:
@@ -230,6 +230,7 @@ en:
reopened_at_by_html: "Reactivated %{when} by %{user}"
rss:
title: "OpenStreetMap Notes"
+ description_all: "A list of reported, commented on or closed notes"
description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"
description_item: "An rss feed for note %{id}"
opened: "new note (near %{place})"
@@ -301,22 +302,22 @@ en:
browse:
created: "Created"
closed: "Closed"
- created_html: "Created %{time}"
- closed_html: "Closed %{time}"
- created_by_html: "Created %{time} by %{user}"
- deleted_by_html: "Deleted %{time} by %{user}"
- edited_by_html: "Edited %{time} by %{user}"
- closed_by_html: "Closed %{time} by %{user}"
+ created_ago_html: "Created %{time_ago}"
+ closed_ago_html: "Closed %{time_ago}"
+ created_ago_by_html: "Created %{time_ago} by %{user}"
+ closed_ago_by_html: "Closed %{time_ago} by %{user}"
+ deleted_ago_by_html: "Deleted %{time_ago} by %{user}"
+ edited_ago_by_html: "Edited %{time_ago} by %{user}"
version: "Version"
in_changeset: "Changeset"
anonymous: "anonymous"
no_comment: "(no comment)"
part_of: "Part of"
part_of_relations:
- one: 1 relation
+ one: "%{count} relation"
other: "%{count} relations"
part_of_ways:
- one: 1 way
+ one: "%{count} way"
other: "%{count} ways"
download_xml: "Download XML"
view_history: "View History"
@@ -334,8 +335,8 @@ en:
relation: "Relations (%{count})"
relation_paginated: "Relations (%{x}-%{y} of %{count})"
comment: "Comments (%{count})"
- hidden_commented_by_html: "Hidden comment from %{user} %{when}"
- commented_by_html: "Comment from %{user} %{when}"
+ hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}"
+ comment_by_html: "Comment from %{user} %{time_ago}"
changesetxml: "Changeset XML"
osmchangexml: "osmChange XML"
feed:
@@ -352,6 +353,7 @@ en:
history_title_html: "Way History: %{name}"
nodes: "Nodes"
nodes_count:
+ one: "%{count} node"
other: "%{count} nodes"
also_part_of_html:
one: "part of way %{related_ways}"
@@ -361,7 +363,7 @@ en:
history_title_html: "Relation History: %{name}"
members: "Members"
members_count:
- one: 1 member
+ one: "%{count} member"
other: "%{count} members"
relation_member:
entry_html: "%{type} %{name}"
@@ -517,9 +519,9 @@ en:
comment_link: Comment on this entry
reply_link: Send a message to the author
comment_count:
- zero: No comments
one: "%{count} comment"
other: "%{count} comments"
+ no_comments: No comments
edit_link: Edit this entry
hide_link: Hide this entry
unhide_link: Unhide this entry
@@ -557,10 +559,31 @@ en:
newer_comments: "Newer Comments"
older_comments: "Older Comments"
doorkeeper:
+ errors:
+ messages:
+ account_selection_required: "The authorization server requires end-user account selection"
+ consent_required: "The authorization server requires end-user consent"
+ interaction_required: "The authorization server requires end-user interaction"
+ login_required: "The authorization server requires end-user authentication"
flash:
applications:
create:
notice: Application Registered.
+ openid_connect:
+ errors:
+ messages:
+ # Configuration error messages
+ auth_time_from_resource_owner_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.auth_time_from_resource_owner missing configuration."
+ reauthenticate_resource_owner_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.reauthenticate_resource_owner missing configuration."
+ resource_owner_from_access_token_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.resource_owner_from_access_token missing configuration."
+ select_account_for_resource_owner_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.select_account_for_resource_owner missing configuration."
+ subject_not_configured: "ID Token generation failed due to Doorkeeper::OpenidConnect.configure.subject missing configuration."
+ scopes:
+ address: "View your physical address"
+ email: "View your email address"
+ openid: "Authenticate your account"
+ phone: "View your phone number"
+ profile: "View your profile information"
errors:
contact:
contact_url: https://wiki.openstreetmap.org/wiki/Contact
@@ -592,9 +615,13 @@ en:
geocoder:
search:
title:
- latlon_html: 'Results from Internal'
- osm_nominatim_html: 'Results from OpenStreetMap Nominatim'
- osm_nominatim_reverse_html: 'Results from OpenStreetMap Nominatim'
+ results_from_html: 'Results from %{results_link}'
+ latlon: Internal
+ latlon_url: https://openstreetmap.org/
+ osm_nominatim: OpenStreetMap Nominatim
+ osm_nominatim_url: https://nominatim.openstreetmap.org/
+ osm_nominatim_reverse: OpenStreetMap Nominatim
+ osm_nominatim_reverse_url: https://nominatim.openstreetmap.org/
search_osm_nominatim:
prefix_format: "%{name}"
prefix:
@@ -1388,27 +1415,22 @@ en:
status: Status
reports: Reports
last_updated: Last Updated
- last_updated_time_html: "%{time}"
- last_updated_time_user_html: "%{time} by %{user}"
+ last_updated_time_ago_user_html: "%{time_ago} by %{user}"
link_to_reports: View Reports
reports_count:
- one: "1 Report"
+ one: "%{count} Report"
other: "%{count} Reports"
reported_item: Reported Item
states:
ignored: Ignored
open: Open
resolved: Resolved
- update:
- new_report: Your report has been registered successfully
- 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
+ one: "%{count} report"
other: "%{count} reports"
+ no_reports: No reports
report_created_at: "First reported at %{datetime}"
last_resolved_at: "Last resolved at %{datetime}"
last_updated_at: "Last updated at %{datetime} by %{displayname}"
@@ -1485,10 +1507,8 @@ en:
home: Go to Home Location
logout: Log Out
log_in: Log In
- log_in_tooltip: Log in with an existing account
sign_up: Sign Up
start_mapping: Start Mapping
- sign_up_tooltip: Create an account for editing
edit: Edit
history: History
export: Export
@@ -1520,8 +1540,6 @@ en:
community: Community
community_blogs: "Community Blogs"
community_blogs_title: "Blogs from members of the OpenStreetMap community"
- foundation: Foundation
- foundation_title: The OpenStreetMap Foundation
make_a_donation:
title: Support OpenStreetMap with a monetary donation
text: Make a Donation
@@ -1561,9 +1579,9 @@ en:
subject: "[OpenStreetMap] GPX Import failure"
gpx_success:
hi: "Hi %{to_user},"
- loaded_successfully:
- one: loaded successfully with %{trace_points} out of a possible 1 point.
- other: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
+ loaded:
+ one: "loaded successfully with %{trace_points} out of a possible %{count} point."
+ other: "loaded successfully with %{trace_points} out of a possible %{count} points."
subject: "[OpenStreetMap] GPX Import success"
signup_confirm:
subject: "[OpenStreetMap] Welcome to OpenStreetMap"
@@ -1675,8 +1693,6 @@ en:
new:
title: "Send message"
send_message_to_html: "Send a new message to %{name}"
- subject: "Subject"
- body: "Body"
back_to_inbox: "Back to inbox"
create:
message_sent: "Message sent"
@@ -1701,14 +1717,10 @@ en:
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."
show:
title: "Read message"
- from: "From"
- subject: "Subject"
- date: "Date"
reply_button: "Reply"
unread_button: "Mark as unread"
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:
destroy_button: "Delete"
@@ -1766,6 +1778,9 @@ en:
home location: "Home Location"
no home location: "You have not entered your home location."
update home location on click: "Update home location when I click on the map?"
+ show: "Show"
+ delete: "Delete"
+ undelete: "Undo delete"
update:
success: Profile updated.
failure: Couldn't update profile.
@@ -1780,13 +1795,8 @@ en:
lost password link: "Lost your password?"
login_button: "Login"
register now: Register now
- with username: "Already have an OpenStreetMap account? Please login with your username and password:"
with external: "Alternatively, use a third party to login:"
- new to osm: New to OpenStreetMap?
- to make changes: To make changes to the OpenStreetMap data, you must have an account.
- create account minute: Create an account. It only takes a minute.
no account: Don't have an account?
- account not active: "Sorry, your account is not active yet.
Please use the link in the account confirmation email to activate your account, or request a new confirmation email."
auth failure: "Sorry, could not log in with those details."
openid_logo_alt: "Log in with an OpenID"
auth_providers:
@@ -1799,9 +1809,9 @@ en:
facebook:
title: Login with Facebook
alt: Login with a Facebook Account
- windowslive:
- title: Login with Windows Live
- alt: Login with a Windows Live Account
+ microsoft:
+ title: Login with Microsoft
+ alt: Login with a Microsoft Account
github:
title: Login with GitHub
alt: Login with a GitHub Account
@@ -1845,7 +1855,8 @@ en:
site:
about:
next: Next
- copyright_html: ©OpenStreetMap
contributors
+ heading_html: "%{copyright}OpenStreetMap %{br} contributors"
+ copyright_symbol_html: "©"
used_by_html: "%{name} provides map data for thousands of websites, mobile apps, and hardware devices"
lede_text: |
OpenStreetMap is built by a community of mappers that contribute and maintain data
@@ -1856,35 +1867,52 @@ en:
aerial imagery, GPS devices, and low-tech field maps to verify that OSM
is accurate and up to date.
community_driven_title: Community Driven
- community_driven_html: |
+ community_driven_1_html: |
OpenStreetMap's community is diverse, passionate, and growing every day.
Our contributors include enthusiast mappers, GIS professionals, engineers
running the OSM servers, humanitarians mapping disaster-affected areas,
and many more.
- To learn more about the community, see the
- OpenStreetMap Blog,
- user diaries,
- community blogs, and
- the OSM Foundation website.
+ To learn more about the community, see the %{osm_blog_link},
+ %{user_diaries_link}, %{community_blogs_link}, and the
+ %{osm_foundation_link} website.
+ community_driven_osm_blog: OpenStreetMap Blog
+ community_driven_osm_blog_url: https://blog.openstreetmap.org
+ community_driven_user_diaries: user diaries
+ community_driven_community_blogs: community blogs
+ community_driven_community_blogs_url: https://blogs.openstreetmap.org/
+ community_driven_osm_foundation: OSM Foundation
+ community_driven_osm_foundation_url: https://www.osmfoundation.org/
open_data_title: Open Data
- open_data_html: |
- OpenStreetMap is open data: you are free to use it for any purpose
+ open_data_1_html: |
+ OpenStreetMap is %{open_data}: you are free to use it for any purpose
as long as you credit OpenStreetMap and its contributors. If you alter or
build upon the data in certain ways, you may distribute the result only
- under the same licence. See the Copyright and
- License page for details.
+ under the same licence. See the %{copyright_license_link} for details.
+ open_data_open_data: open data
+ open_data_copyright_license: Copyright and License page
legal_title: Legal
- legal_1_html: |
+ legal_1_1_html: |
This site and many other related services are formally operated by the
- OpenStreetMap Foundation (OSMF)
+ %{openstreetmap_foundation_link} (OSMF)
on behalf of the community. Use of all OSMF operated services is subject
- to our Terms of Use,
- Acceptable Use Policies and our Privacy Policy.
- legal_2_html: |
- Please contact the OSMF
+ to our %{terms_of_use_link}, %{aup_link} and our %{privacy_policy_link}.
+ legal_1_1_openstreetmap_foundation: OpenStreetMap Foundation
+ legal_1_1_openstreetmap_foundation_url: https://osmfoundation.org/
+ legal_1_1_terms_of_use: Terms of Use
+ legal_1_1_terms_of_use_url: https://wiki.osmfoundation.org/wiki/Terms_of_Use
+ legal_1_1_aup: Acceptable Use Policies
+ legal_1_1_aup_url: https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy
+ legal_1_1_privacy_policy: Privacy Policy
+ legal_1_1_privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
+ legal_2_1_html: |
+ Please %{contact_the_osmf_link}
if you have licensing, copyright or other legal questions.
-
- OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OSMF.
+ legal_2_1_contact_the_osmf: contact the OSMF
+ legal_2_1_contact_the_osmf_url: https://osmfoundation.org/Contact
+ legal_2_2_html: |
+ OpenStreetMap, the magnifying glass logo and State of the Map are %{registered_trademarks_link}.
+ legal_2_2_registered_trademarks: registered trademarks of the OSMF
+ legal_2_2_registered_trademarks_url: https://wiki.osmfoundation.org/wiki/Trademark_Policy
partners_title: Partners
copyright:
foreign:
@@ -1898,122 +1926,166 @@ en:
mapping_link: start mapping
legal_babble:
title_html: Copyright and License
- intro_1_html: |
- OpenStreetMap® is open data, licensed under the Open Data
- Commons Open Database License (ODbL) by the OpenStreetMap Foundation (OSMF).
- intro_2_html: |
+ introduction_1_html: |
+ OpenStreetMap%{registered_trademark_link} is %{open_data}, licensed under the
+ %{odc_odbl_link} (ODbL) by the %{osm_foundation_link} (OSMF).
+ introduction_1_registered_trademark_html: "®"
+ introduction_1_open_data: open data
+ introduction_1_odc_odbl: Open Data Commons Open Database License
+ introduction_1_odc_odbl_url: https://opendatacommons.org/licenses/odbl/
+ introduction_1_osm_foundation: OpenStreetMap Foundation
+ introduction_1_osm_foundation_url: https://osmfoundation.org/
+ introduction_2_html: |
You are free to copy, distribute, transmit and adapt our data,
as long as you credit OpenStreetMap and its
contributors. If you alter or build upon our data, you
may distribute the result only under the same licence. The
- full legal
- code explains your rights and responsibilities.
- intro_3_1_html: |
- Our documentation is licensed under the
- Creative
- Commons Attribution-ShareAlike 2.0 license (CC BY-SA 2.0).
+ full %{legal_code_link} explains your rights and responsibilities.
+ introduction_2_legal_code: legal code
+ introduction_2_legal_code_url: https://opendatacommons.org/licenses/odbl/1.0/
+ introduction_3_html: |
+ Our documentation is licensed under the %{creative_commons_link} license (CC BY-SA 2.0).
+ introduction_3_creative_commons: Creative Commons Attribution-ShareAlike 2.0
+ introduction_3_creative_commons_url: https://creativecommons.org/licenses/by-sa/2.0/
credit_title_html: How to credit OpenStreetMap
credit_1_html: |
Where you use OpenStreetMap data, you are required to do the following two things:
- credit_2_1_html: |
-