X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/86e51d7b678b7ad17c3c3ac0175a3233853ede5d..bbd6140f4bdc7746ecbd4d109316b2dd0b6d047f:/config/locales/en.yml?ds=sidebyside
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 526234a2d..3f2e8a93b 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
@@ -38,6 +40,13 @@ en:
messages:
invalid_email_address: does not appear to be a valid e-mail address
email_address_not_routable: is not routable
+ display_name_is_user_n: can't be user_n unless n is your user id
+ models:
+ user_mute:
+ attributes:
+ subject:
+ format: "%{message}"
+ is_already_muted: "is already muted"
# Translates all the model names, which is used in error handling on the website
models:
acl: "Access Control List"
@@ -133,7 +142,6 @@ en:
auth_provider: Authentication Provider
auth_uid: Authentication UID
email: "Email"
- email_confirmation: "Email Confirmation"
new_email: "New Email Address"
active: "Active"
display_name: "Display Name"
@@ -154,51 +162,50 @@ 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}"
- with_version: "%{id}, v%{version}"
+ version: "v%{version}"
with_name_html: "%{name} (%{id})"
+ current_and_old_links_html: "%{current_link}, %{old_link}"
editor:
default: "Default (currently %{name})"
id:
@@ -213,7 +220,7 @@ en:
openid: OpenID
google: Google
facebook: Facebook
- windowslive: Windows Live
+ microsoft: Microsoft
github: GitHub
wikipedia: Wikipedia
api:
@@ -229,6 +236,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})"
@@ -254,6 +262,7 @@ en:
retain_notes: Your map notes and note comments, if any, will be retained but hidden from view.
retain_changeset_discussions: Your changeset discussions, if any, will be retained.
retain_email: Your email address will be retained.
+ recent_editing_html: "As you have edited recently your account cannot currently be deleted. Deletion will be possible in %{time}."
confirm_delete: Are you sure?
cancel: Cancel
accounts:
@@ -298,51 +307,29 @@ en:
destroy:
success: "Account Deleted."
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}"
+ deleted_ago_by_html: "Deleted %{time_ago} by %{user}"
+ edited_ago_by_html: "Edited %{time_ago} by %{user}"
version: "Version"
+ redacted_version: "Redacted 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"
+ view_unredacted_history: "View Unredacted History"
view_details: "View Details"
+ view_redacted_data: "View Redacted Data"
+ view_redaction_message: "View Redaction Message"
location: "Location:"
common_details:
coordinates_html: "%{latitude}, %{longitude}"
- changeset:
- title: "Changeset: %{id}"
- belongs_to: "Author"
- node: "Nodes (%{count})"
- node_paginated: "Nodes (%{x}-%{y} of %{count})"
- way: "Ways (%{count})"
- way_paginated: "Ways (%{x}-%{y} of %{count})"
- 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}"
- changesetxml: "Changeset XML"
- osmchangexml: "osmChange XML"
- feed:
- title: "Changeset %{id}"
- title_comment: "Changeset %{id} - %{comment}"
- join_discussion: "Log in to join the discussion"
- discussion: Discussion
- still_open: "Changeset still open - discussion will open once the changeset is closed."
node:
title_html: "Node: %{name}"
history_title_html: "Node History: %{name}"
@@ -351,6 +338,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}"
@@ -360,7 +348,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}"
@@ -398,7 +386,7 @@ en:
way: "way"
relation: "relation"
start_rjs:
- feature_warning: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are sure you want to display this data?"
+ feature_warning: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are you sure you want to display this data?"
load_data: "Load Data"
loading: "Loading..."
tag_details:
@@ -417,6 +405,15 @@ en:
introduction: "Click on the map to find nearby features."
nearby: "Nearby features"
enclosing: "Enclosing features"
+ old_nodes:
+ not_found:
+ sorry: "Sorry, node #%{id} version %{version} could not be found."
+ old_ways:
+ not_found:
+ sorry: "Sorry, way #%{id} version %{version} could not be found."
+ old_relations:
+ not_found:
+ sorry: "Sorry, relation #%{id} version %{version} could not be found."
changesets:
changeset_paging_nav:
showing_page: "Page %{page}"
@@ -445,6 +442,52 @@ en:
no_more_area: "No more changesets in this area."
no_more_user: "No more changesets by this user."
load_more: "Load more"
+ feed:
+ title: "Changeset %{id}"
+ title_comment: "Changeset %{id} - %{comment}"
+ created: "Created"
+ closed: "Closed"
+ belongs_to: "Author"
+ subscribe:
+ heading: Subscribe to the following changeset discussion?
+ button: Subscribe to discussion
+ unsubscribe:
+ heading: Unsubscribe from the following changeset discussion?
+ button: Unsubscribe from discussion
+ heading:
+ title: "Changeset %{id}"
+ created_by_html: "Created by %{link_user} on %{created}."
+ no_such_entry:
+ title: "No such changeset"
+ heading: "No entry with the id: %{id}"
+ body: "Sorry, there is no changeset with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
+ show:
+ title: "Changeset: %{id}"
+ created: "Created: %{when}"
+ closed: "Closed: %{when}"
+ 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}"
+ discussion: Discussion
+ join_discussion: "Log in to join the discussion"
+ still_open: "Changeset still open - discussion will open once the changeset is closed."
+ subscribe: "Subscribe"
+ unsubscribe: "Unsubscribe"
+ comment_by_html: "Comment from %{user} %{time_ago}"
+ hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}"
+ hide_comment: "hide"
+ unhide_comment: "unhide"
+ comment: "Comment"
+ changesetxml: "Changeset XML"
+ osmchangexml: "osmChange XML"
+ paging_nav:
+ nodes: "Nodes (%{count})"
+ nodes_paginated: "Nodes (%{x}-%{y} of %{count})"
+ ways: "Ways (%{count})"
+ ways_paginated: "Ways (%{x}-%{y} of %{count})"
+ relations: "Relations (%{count})"
+ relations_paginated: "Relations (%{x}-%{y} of %{count})"
timeout:
sorry: "Sorry, the list of changesets you requested took too long to retrieve."
changeset_comments:
@@ -462,6 +505,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"
@@ -503,9 +547,12 @@ en:
show:
title: "%{user}'s Diary | %{title}"
user_title: "%{user}'s Diary"
+ discussion: "Discussion"
+ subscribe: "Subscribe"
+ unsubscribe: "Unsubscribe"
leave_a_comment: "Leave a comment"
login_to_leave_a_comment_html: "%{login_link} to leave a comment"
- login: "Login"
+ login: "Log in"
no_such_entry:
title: "No such diary entry"
heading: "No entry with the id: %{id}"
@@ -516,9 +563,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
@@ -545,7 +592,14 @@ en:
all:
title: "OpenStreetMap diary entries"
description: "Recent diary entries from users of OpenStreetMap"
- comments:
+ subscribe:
+ heading: Subscribe to the following diary entry discussion?
+ button: Subscribe to discussion
+ unsubscribe:
+ heading: Unsubscribe from the following diary entry discussion?
+ button: Unsubscribe from discussion
+ diary_comments:
+ index:
title: "Diary Comments added by %{user}"
heading: "%{user}'s Diary Comments"
subheading_html: "Diary Comments added by %{user}"
@@ -555,17 +609,43 @@ en:
comment: Comment
newer_comments: "Newer Comments"
older_comments: "Older Comments"
+ new:
+ heading: Add a comment to the following diary entry discussion?
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
contact_url_title: Various contact channels explained
contact: contact
contact_the_community_html: Feel free to %{contact_link} the OpenStreetMap community if you have found a broken link / bug. Make a note of the exact URL of your request.
+ bad_request:
+ title: Bad request
+ description: The operation you requested on the OpenStreetMap server is not valid (HTTP 400)
forbidden:
title: Forbidden
description: The operation you requested on the OpenStreetMap server is only available to administrators (HTTP 403)
@@ -591,9 +671,10 @@ 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
+ osm_nominatim: OpenStreetMap Nominatim
+ osm_nominatim_reverse: OpenStreetMap Nominatim
search_osm_nominatim:
prefix_format: "%{name}"
prefix:
@@ -758,6 +839,7 @@ en:
college: "College Building"
commercial: "Commercial Building"
construction: "Building under Construction"
+ cowshed: "Cowshed"
detached: "Detached House"
dormitory: "Dormitory"
duplex: "Duplex House"
@@ -787,6 +869,7 @@ en:
shed: "Shed"
stable: "Stable"
static_caravan: "Caravan"
+ sty: "Sty"
temple: "Temple Building"
terrace: "Terrace Building"
train_station: "Train Station Building"
@@ -1387,30 +1470,25 @@ 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"
- report_created_at: "First reported at %{datetime}"
- last_resolved_at: "Last resolved at %{datetime}"
- last_updated_at: "Last updated at %{datetime} by %{displayname}"
+ no_reports: No reports
+ report_created_at_html: "First reported at %{datetime}"
+ last_resolved_at_html: "Last resolved at %{datetime}"
+ last_updated_at_html: "Last updated at %{datetime} by %{displayname}"
resolve: Resolve
ignore: Ignore
reopen: Reopen
@@ -1501,10 +1579,9 @@ 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"
- hosting_partners_html: "Hosting is supported by %{ucl}, %{fastly}, %{bytemark}, and other %{partners}."
- partners_ucl: "UCL"
+ hosting_partners_2024_html: "Hosting is supported by %{fastly}, %{corpmembers}, and other %{partners}."
partners_fastly: "Fastly"
- partners_bytemark: "Bytemark Hosting"
+ partners_corpmembers: "OSMF corporate members"
partners_partners: "partners"
tou: "Terms of Use"
osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
@@ -1524,12 +1601,15 @@ en:
more: More
user_mailer:
diary_comment_notification:
+ description: "OpenStreetMap Diary Entry #%{id}"
subject: "[OpenStreetMap] %{user} commented on a diary entry"
hi: "Hi %{to_user},"
header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
header_html: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
footer_html: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
+ footer_unsubscribe: "You can unsubscribe from the discussion at %{unsubscribeurl}"
+ footer_unsubscribe_html: "You can unsubscribe from the discussion at %{unsubscribeurl}"
message_notification:
subject: "[OpenStreetMap] %{message_title}"
hi: "Hi %{to_user},"
@@ -1556,9 +1636,10 @@ 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."
+ all_your_traces_html: "All your successfully uploaded GPX traces can be found at %{url}."
subject: "[OpenStreetMap] GPX Import success"
signup_confirm:
subject: "[OpenStreetMap] Welcome to OpenStreetMap"
@@ -1577,6 +1658,7 @@ en:
hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
click_the_link: "If this is you, please click the link below to reset your password."
note_comment_notification:
+ description: "OpenStreetMap Note #%{id}"
anonymous: An anonymous user
greeting: "Hi,"
commented:
@@ -1600,9 +1682,10 @@ en:
your_note_html: "%{commenter} has reactivated one of your map notes near %{place}."
commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
commented_note_html: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
- details: "More details about the note can be found at %{url}."
- details_html: "More details about the note can be found at %{url}."
+ details: "Reply or learn more about the note at %{url}."
+ details_html: "Reply or learn more about the note at %{url}."
changeset_comment_notification:
+ description: "OpenStreetMap Changeset #%{id}"
hi: "Hi %{to_user},"
greeting: "Hi,"
commented:
@@ -1615,10 +1698,10 @@ en:
partial_changeset_with_comment: "with comment '%{changeset_comment}'"
partial_changeset_with_comment_html: "with comment '%{changeset_comment}'"
partial_changeset_without_comment: "without comment"
- details: "More details about the changeset can be found at %{url}."
- details_html: "More details about the changeset can be found at %{url}."
- unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
- unsubscribe_html: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
+ details: "Reply or learn more about the changeset at %{url}."
+ details_html: "Reply or learn more about the changeset at %{url}."
+ unsubscribe: "You can unsubscribe from updates to this changeset at %{url}."
+ unsubscribe_html: "You can unsubscribe from updates to this changeset at %{url}."
confirmations:
confirm:
heading: Check your email!
@@ -1631,7 +1714,8 @@ en:
success: "Confirmed your account, thanks for signing up!"
already active: "This account has already been confirmed."
unknown token: "That confirmation code has expired or does not exist."
- reconfirm_html: "If you need us to resend the confirmation email, click here."
+ resend_html: "If you need us to resend the confirmation email, %{reconfirm_link}."
+ click_here: click here
confirm_resend:
failure: "User %{name} not found."
confirm_email:
@@ -1647,8 +1731,6 @@ en:
messages:
inbox:
title: "Inbox"
- my_inbox: "My Inbox"
- my_outbox: "My Outbox"
messages: "You have %{new_messages} and %{old_messages}"
new_messages:
one: "%{count} new message"
@@ -1656,16 +1738,20 @@ en:
old_messages:
one: "%{count} old message"
other: "%{count} old messages"
+ no_messages_yet_html: "You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
+ people_mapping_nearby: "people mapping nearby"
+ messages_table:
from: "From"
+ to: "To"
subject: "Subject"
date: "Date"
- no_messages_yet_html: "You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
- people_mapping_nearby: "people mapping nearby"
+ actions: "Actions"
message_summary:
unread_button: "Mark as unread"
read_button: "Mark as read"
reply_button: "Reply"
destroy_button: "Delete"
+ unmute_button: "Move to Inbox"
new:
title: "Send message"
send_message_to_html: "Send a new message to %{name}"
@@ -1679,45 +1765,55 @@ en:
body: "Sorry there is no message with that id."
outbox:
title: "Outbox"
- my_inbox: "My Inbox"
- my_outbox: "My Outbox"
+ actions: "Actions"
messages:
one: "You have %{count} sent message"
other: "You have %{count} sent messages"
- to: "To"
- subject: "Subject"
- date: "Date"
no_sent_messages_html: "You have no sent messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
people_mapping_nearby: "people mapping nearby"
+ muted:
+ title: "Muted Messages"
+ messages:
+ one: "%{count} muted message"
+ other: "You have %{count} muted messages"
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."
+ wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply."
show:
title: "Read message"
reply_button: "Reply"
unread_button: "Mark as unread"
destroy_button: "Delete"
back: "Back"
- 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."
+ 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 log in as the correct user in order to read it."
sent_message_summary:
destroy_button: "Delete"
+ heading:
+ my_inbox: "My Inbox"
+ my_outbox: "My Outbox"
+ muted_messages: "Muted messages"
mark:
as_read: "Message marked as read"
as_unread: "Message marked as unread"
+ unmute:
+ notice: "Message has been moved to Inbox"
+ error: "The message could not be moved to the Inbox."
destroy:
destroyed: "Message deleted"
passwords:
- lost_password:
+ new:
title: "Lost password"
heading: "Forgotten Password?"
- email address: "Email Address:"
+ email address: "Email Address"
new password button: "Reset password"
help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
- notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
- notice email cannot find: "Could not find that email address, sorry."
- reset_password:
+ create:
+ send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+ edit:
title: "Reset password"
heading: "Reset Password for %{user}"
reset: "Reset Password"
+ flash token bad: "Did not find that token, check the URL maybe?"
+ update:
flash changed: "Your password has been changed."
flash token bad: "Did not find that token, check the URL maybe?"
preferences:
@@ -1754,49 +1850,26 @@ 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.
sessions:
new:
- title: "Login"
- heading: "Login"
- email or username: "Email Address or Username:"
- password: "Password:"
- openid_html: "%{logo} OpenID:"
+ title: "Log in"
+ tab_title: "Log in"
+ login_to_authorize_html: "Log in to OpenStreetMap to access %{client_app_name}."
+ email or username: "Email Address or Username"
+ password: "Password"
remember: "Remember me"
lost password link: "Lost your password?"
- login_button: "Login"
+ login_button: "Log in"
register now: Register now
- with external: "Alternatively, use a third party to login:"
- no account: Don't have an account?
+ with external: "or log in with a third party"
+ or: "or"
auth failure: "Sorry, could not log in with those details."
- openid_logo_alt: "Log in with an OpenID"
- auth_providers:
- openid:
- title: Login with OpenID
- alt: Login with an OpenID URL
- google:
- title: Login with Google
- alt: Login with a Google OpenID
- facebook:
- title: Login with Facebook
- alt: Login with a Facebook Account
- windowslive:
- title: Login with Windows Live
- alt: Login with a Windows Live Account
- github:
- title: Login with GitHub
- alt: Login with a GitHub Account
- wikipedia:
- title: Login with Wikipedia
- alt: Login with a Wikipedia Account
- wordpress:
- title: Login with Wordpress
- alt: Login with a Wordpress OpenID
- aol:
- title: Login with AOL
- alt: Login with an AOL OpenID
destroy:
title: "Logout"
heading: "Logout from OpenStreetMap"
@@ -1807,7 +1880,9 @@ en:
support: support
shared:
markdown_help:
- title_html: Parsed with kramdown
+ heading_html: Parsed with %{kramdown_link}
+ kramdown_url: https://kramdown.gettalong.org/quickref.html
+ kramdown: kramdown
headings: Headings
heading: Heading
subheading: Subheading
@@ -1820,13 +1895,15 @@ en:
image: Image
alt: Alt text
url: URL
+ codeblock: Code block
richtext_field:
edit: Edit
preview: Preview
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
@@ -1837,37 +1914,55 @@ 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:
+ title: Copyright and License
foreign:
title: About this translation
html: In the event of a conflict between this translated page and %{english_original_link}, the English page shall take precedence
@@ -1878,123 +1973,180 @@ en:
native_link: THIS_LANGUAGE_NAME_HERE version
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: |
-