X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a859fe1acf600640b922ac0a160b4a993d35778c..d7b9f70c808bbca9f7b21dcc9b2f403fcf4a7d17:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fd84a48bf..1a41dcce8 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
@@ -154,7 +156,6 @@ 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:
@@ -213,7 +214,7 @@ en:
openid: OpenID
google: Google
facebook: Facebook
- windowslive: Windows Live
+ microsoft: Microsoft
github: GitHub
wikipedia: Wikipedia
api:
@@ -229,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})"
@@ -300,12 +302,12 @@ 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"
@@ -351,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}"
@@ -462,6 +465,7 @@ en:
contact:
km away: "%{count}km away"
m away: "%{count}m away"
+ latest_edit_html: "Latest edit (%{ago}):"
popup:
your location: "Your location"
nearby mapper: "Nearby mapper"
@@ -516,9 +520,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
@@ -556,10 +560,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
@@ -591,9 +616,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:
@@ -1400,9 +1429,9 @@ en:
show:
title: "%{status} Issue #%{issue_id}"
reports:
- zero: No reports
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}"
@@ -1750,6 +1779,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.
@@ -1778,9 +1810,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
@@ -1988,6 +2020,12 @@ en:
Resources Canada), and StatCan (Geography Division,
Statistics Canada).
contributors_ca_canada: Canada
+ contributors_cz_credit_html: |
+ %{czechia}: Contains data from the State Administration of Land Surveying
+ and Cadastre licensed under %{cc_licence_link}
+ contributors_cz_czechia: Czechia
+ contributors_cz_cc_licence: Creative Commons Attribution 4.0 International licence (CC BY 4.0)
+ contributors_cz_cc_licence_url: https://creativecommons.org/licenses/by/4.0/
contributors_fi_credit_html: |
%{finland}: Contains data from the
National Land Survey of Finland's Topographic Database
@@ -2012,14 +2050,22 @@ en:
contributors_nz_linz_data_service_url: https://data.linz.govt.nz/
contributors_nz_cc_by: CC BY 4.0
contributors_nz_cc_by_url: https://creativecommons.org/licenses/by/4.0/
+ contributors_rs_credit_html: |
+ %{serbia}: Contains data from the %{rgz_link} and %{open_data_portal}
+ (public information of Serbia), 2018.
+ contributors_rs_serbia: Serbia
+ contributors_rs_rgz: Serbian Geodetic Authority
+ contributors_rs_rgz_url: https://geosrbija.rs/
+ contributors_rs_open_data_portal: National Open Data Portal
+ contributors_rs_open_data_portal_url: https://data.gov.rs/sr/
contributors_si_credit_html: |
%{slovenia}: Contains data from the %{gu_link} and %{mkgp_link}
(public information of Slovenia).
contributors_si_slovenia: Slovenia
contributors_si_gu: Surveying and Mapping Authority
- contributors_si_gu_url: http://www.gu.gov.si/en/
+ contributors_si_gu_url: https://www.gov.si/en/state-authorities/bodies-within-ministries/surveying-and-mapping-authority/
contributors_si_mkgp: Ministry of Agriculture, Forestry and Food
- contributors_si_mkgp_url: http://www.mkgp.gov.si/en/
+ contributors_si_mkgp_url: https://www.gov.si/en/state-authorities/ministries/ministry-of-agriculture-forestry-and-food/
contributors_es_credit_html: |
%{spain}: Contains data sourced from the
Spanish National Geographic Institute (%{ign_link}) and
@@ -2027,16 +2073,16 @@ en:
licensed for reuse under %{cc_by_link}.
contributors_es_spain: Spain
contributors_es_ign: IGN
- contributors_es_ign_url: http://www.ign.es/
+ contributors_es_ign_url: https://www.ign.es/
contributors_es_scne: SCNE
- contributors_es_scne_url: http://www.scne.es/
+ contributors_es_scne_url: https://www.scne.es/
contributors_es_cc_by: CC BY 4.0
contributors_es_cc_by_url: https://creativecommons.org/licenses/by/4.0/
contributors_za_credit_html: |
%{south_africa}: Contains data sourced from %{ngi_link}, State copyright reserved.
contributors_za_south_africa: South Africa
contributors_za_ngi: "Chief Directorate: National Geo-Spatial Information"
- contributors_za_ngi_url: http://www.ngi.gov.za/
+ contributors_za_ngi_url: https://ngi.dalrrd.gov.za/
contributors_gb_credit_html: |
%{united_kingdom}: Contains Ordnance
Survey data © Crown copyright and database right
@@ -2141,8 +2187,8 @@ en:
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 or the same icon on the map display.
+ instructions_1_html: |
+ Just click %{note_icon} 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:
@@ -2422,7 +2468,6 @@ en:
visibility: "Visibility:"
confirm_delete: "Delete this trace?"
trace_paging_nav:
- showing_page: "Page %{page}"
older: "Older Traces"
newer: "Newer Traces"
trace:
@@ -2513,6 +2558,7 @@ en:
permissions:
missing: "You have not permitted the application access to this facility"
scopes:
+ openid: Sign-in using OpenStreetMap
read_prefs: Read user preferences
write_prefs: Modify user preferences
write_diary: Create diary entries, comments and make friends
@@ -2623,6 +2669,10 @@ en:
auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one."
continue: Sign Up
terms accepted: "Thanks for accepting the new contributor terms!"
+ email_confirmation_help_html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.'
+ privacy_policy: privacy policy
+ privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
+ privacy_policy_title: OSMF privacy policy including section on email addresses
terms:
title: "Terms"
heading: "Terms"
@@ -2678,10 +2728,10 @@ en:
remove as friend: Unfriend
add as friend: Add Friend
mapper since: "Mapper since:"
+ uid: "User id:"
ct status: "Contributor terms:"
ct undecided: Undecided
ct declined: Declined
- latest edit: "Latest edit (%{ago}):"
email address: "Email address:"
created from: "Created from:"
status: "Status:"
@@ -2689,12 +2739,15 @@ en:
role:
administrator: "This user is an administrator"
moderator: "This user is a moderator"
+ importer: "This user is a importer"
grant:
administrator: "Grant administrator access"
moderator: "Grant moderator access"
+ importer: "Grant importer access"
revoke:
administrator: "Revoke administrator access"
moderator: "Revoke moderator access"
+ importer: "Revoke importer access"
block_history: "Active Blocks"
moderator_history: "Blocks Given"
comments: "Comments"
@@ -2794,8 +2847,8 @@ en:
revoke:
title: "Revoking block on %{block_on}"
heading_html: "Revoking block on %{block_on} by %{block_by}"
- time_future: "This block will end in %{time}."
- past: "This block ended %{time} and cannot be revoked now."
+ time_future_html: "This block will end in %{time}."
+ past_html: "This block ended %{time} and cannot be revoked now."
confirm: "Are you sure you wish to revoke this block?"
revoke: "Revoke!"
flash: "This block has been revoked."
@@ -2860,7 +2913,9 @@ en:
index:
title: "Notes submitted or commented on by %{user}"
heading: "%{user}'s Notes"
- subheading_html: "Notes submitted or commented on by %{user}"
+ subheading_html: "Notes %{submitted} or %{commented} by %{user}"
+ subheading_submitted: "submitted"
+ subheading_commented: "commented on"
no_notes: No notes
id: "Id"
creator: "Creator"
@@ -2873,15 +2928,15 @@ en:
open_title: "Unresolved note #%{note_name}"
closed_title: "Resolved note #%{note_name}"
hidden_title: "Hidden note #%{note_name}"
- opened_by_html: "Created by %{user} %{when}"
- opened_by_anonymous_html: "Created by anonymous %{when}"
- commented_by_html: "Comment from %{user} %{when}"
- commented_by_anonymous_html: "Comment from anonymous %{when}"
- closed_by_html: "Resolved by %{user} %{when}"
- closed_by_anonymous_html: "Resolved by anonymous %{when}"
- reopened_by_html: "Reactivated by %{user} %{when}"
- reopened_by_anonymous_html: "Reactivated by anonymous %{when}"
- hidden_by_html: "Hidden by %{user} %{when}"
+ event_opened_by_html: "Created by %{user} %{time_ago}"
+ event_opened_by_anonymous_html: "Created by anonymous %{time_ago}"
+ event_commented_by_html: "Comment from %{user} %{time_ago}"
+ event_commented_by_anonymous_html: "Comment from anonymous %{time_ago}"
+ event_closed_by_html: "Resolved by %{user} %{time_ago}"
+ event_closed_by_anonymous_html: "Resolved by anonymous %{time_ago}"
+ event_reopened_by_html: "Reactivated by %{user} %{time_ago}"
+ event_reopened_by_anonymous_html: "Reactivated by anonymous %{time_ago}"
+ event_hidden_by_html: "Hidden by %{user} %{time_ago}"
report: report this note
coordinates_html: "%{latitude}, %{longitude}"
anonymous_warning: This note includes comments from anonymous users which should be independently verified.
@@ -2944,6 +2999,7 @@ en:
cyclosm: CyclOSM
cycle_map: Cycle Map
transport_map: Transport Map
+ tracestracktop_topo: Tracestrack Topo
hot: Humanitarian
opnvkarte: ÃPNVKarte
layers:
@@ -2953,13 +3009,21 @@ en:
gps: Public GPS Traces
overlays: Enable overlays for troubleshooting the map
title: "Layers"
- copyright: "© OpenStreetMap contributors"
- donate_link_text: "Make a Donation"
- terms: "Website and API terms"
- cyclosm: "Tiles style by CyclOSM hosted by OpenStreetMap France"
- thunderforest: "Tiles courtesy of Andy Allan"
- opnvkarte: "Tiles courtesy of MeMoMaps"
- hotosm: "Tiles style by Humanitarian OpenStreetMap Team hosted by OpenStreetMap France"
+ copyright_text: "© %{copyright_link}"
+ openstreetmap_contributors: "OpenStreetMap contributors"
+ make_a_donation: Make a Donation
+ website_and_api_terms: Website and API terms
+ cyclosm_credit: "Tiles style by %{cyclosm_link} hosted by %{osm_france_link}"
+ cyclosm_name: CyclOSM
+ osm_france: OpenStreetMap France
+ thunderforest_credit: "Tiles courtesy of %{thunderforest_link}"
+ andy_allan: Andy Allan
+ opnvkarte_credit: "Tiles courtesy of %{memomaps_link}"
+ memomaps: MeMoMaps
+ tracestrack_credit: "Tiles courtesy of %{tracestrack_link}"
+ tracestrack: Tracestrack
+ hotosm_credit: "Tiles style by %{hotosm_link} hosted by %{osm_france_link}"
+ hotosm_name: Humanitarian OpenStreetMap Team
site:
edit_tooltip: Edit the map
edit_disabled_tooltip: Zoom in to edit the map