message: "Message"
node: "Node"
node_tag: "Node Tag"
+ note: "Note"
old_node: "Old Node"
old_node_tag: "Old Node Tag"
old_relation: "Old Relation"
not yet agreed: "You have not yet agreed to the new Contributor Terms."
review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
- link: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
+ link: "https://osmfoundation.org/wiki/Licence/Contributor_Terms"
link text: "what is this?"
save changes button: Save Changes
delete_account: Delete Account...
way: "Way"
relation: "Relation"
containing_relation:
- entry_html: "Relation %{relation_name}"
- entry_role_html: "Relation %{relation_name} (as %{relation_role})"
+ entry_role_html: "%{relation_name} (as %{relation_role})"
not_found:
title: Not Found
sorry: "Sorry, %{type} #%{id} could not be found."
man_made:
adit: "Adit"
advertising: "Advertising"
- antenna: "Antenna"
+ antenna: "Antenna"
avalanche_protection: "Avalanche Protection"
beacon: "Beacon"
beam: "Beam"
open: Open
resolved: Resolved
show:
- title: "%{status} Issue #%{issue_id}"
+ title:
+ open: "Open Issue #%{issue_id}"
+ ignored: "Ignored Issue #%{issue_id}"
+ resolved: "Resolved Issue #%{issue_id}"
reports:
one: "%{count} report"
other: "%{count} reports"
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 log in 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 log in 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:
title: My Preferences
preferred_editor: Preferred Editor
preferred_languages: Preferred Languages
+ preferred_site_color_scheme: Preferred Website Color Scheme
+ site_color_schemes:
+ auto: Auto
+ light: Light
+ dark: Dark
+ preferred_map_color_scheme: Preferred Map Color Scheme
+ map_color_schemes:
+ auto: Auto
+ light: Light
+ dark: Dark
edit_preferences: Edit Preferences
edit:
title: Edit Preferences
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_terms_of_use_url: https://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_1_1_privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy
legal_2_1_html: |
Please %{contact_the_osmf_link}
if you have licensing, copyright or other legal questions.
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
+ legal_2_2_registered_trademarks_url: https://osmfoundation.org/wiki/Trademark_Policy
partners_title: Partners
copyright:
title: Copyright and License
created a browsable map, a printed map or a static image. Full details on the
requirements can be found in the %{attribution_guidelines_link}.
credit_3_attribution_guidelines: Attribution Guidelines
- credit_3_attribution_guidelines_url: https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines
+ credit_3_attribution_guidelines_url: https://osmfoundation.org/wiki/Licence/Attribution_Guidelines
credit_4_1_html: |
To make clear that the data is available under the Open
Database License, you may link to %{this_copyright_page_link}.
to our %{takedown_procedure_link} or file directly at our
%{online_filing_page_link}.
infringement_2_1_takedown_procedure: takedown procedure
- infringement_2_1_takedown_procedure_url: https://wiki.osmfoundation.org/wiki/Takedown_procedure
+ infringement_2_1_takedown_procedure_url: https://osmfoundation.org/wiki/Takedown_procedure
infringement_2_1_online_filing_page: on-line filing page
infringement_2_1_online_filing_page_url: https://dmca.openstreetmap.org/
trademarks_title: Trademarks
OpenStreetMap Foundation. If you have questions about your use of the marks, please see our
%{trademark_policy_link}.
trademarks_1_1_trademark_policy: Trademark Policy
- trademarks_1_1_trademark_policy_url: https://wiki.osmfoundation.org/wiki/Trademark_Policy
+ trademarks_1_1_trademark_policy_url: https://osmfoundation.org/wiki/Trademark_Policy
index:
js_1: "You are either using a browser that does not support JavaScript, or you have disabled JavaScript."
js_2: "OpenStreetMap uses JavaScript for its slippy map."
%{copyright_link} for more legal information, or contact the appropriate %{working_group_link}.
copyright: copyright page
working_group: OSMF working group
- working_group_url: https://wiki.osmfoundation.org/wiki/Working_Groups
+ working_group_url: https://osmfoundation.org/wiki/Working_Groups
help:
title: Getting Help
introduction: |
upload_trace: "Upload a trace"
all_traces: "All Traces"
my_traces: "My Traces"
- traces_from: "Public Traces from %{user}"
+ traces_from_html: "Public Traces from %{user}"
remove_tag_filter: "Remove Tag Filter"
destroy:
scheduled_for_deletion: "Trace scheduled for deletion"
by_signing_up:
html: "By signing up, you agree to our %{tou_link}, %{privacy_policy_link} and %{contributor_terms_link}."
privacy_policy: privacy policy
- privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
+ privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy
privacy_policy_title: OSMF privacy policy including section on email addresses
- contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
+ contributor_terms_url: "https://osmfoundation.org/wiki/Licence/Contributor_Terms"
contributor_terms: "contributor terms"
continue: Sign Up
terms accepted: "Thanks for accepting the new contributor terms!"
email_help:
privacy_policy: privacy policy
- privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
+ privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy
privacy_policy_title: OSMF privacy policy including section on email addresses
html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.'
consider_pd_html: "I consider my contributions to be in the %{consider_pd_link}."
consider_pd: "public domain"
- consider_pd_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
+ consider_pd_url: https://osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
or: "or"
use external auth: "or sign up with a third party"
terms:
read_tou: "I have read and agree to the Terms of Use"
consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain"
consider_pd_why: "what's this?"
- consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
+ consider_pd_why_url: https://osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
guidance_info_html: "Information to help understand these terms: a %{readable_summary_link} and some %{informal_translations_link}"
readable_summary: human readable summary
informal_translations: informal translations
with your ID in your user settings.
user_role:
filter:
- not_a_role: "The string `%{role}' is not a valid role."
+ not_a_role: "The string '%{role}' is not a valid role."
already_has_role: "The user already has role %{role}."
doesnt_have_role: "The user does not have role %{role}."
not_revoke_admin_current_user: "Cannot revoke administrator role from current user."
grant:
- are_you_sure: "Are you sure you want to grant the role `%{role}' to the user `%{name}'?"
+ are_you_sure: "Are you sure you want to grant the role '%{role}' to the user '%{name}'?"
revoke:
- are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"
+ are_you_sure: "Are you sure you want to revoke the role '%{role}' from the user '%{name}'?"
user_blocks:
model:
non_moderator_update: "Must be a moderator to create or update a block."
years:
one: "%{count} year"
other: "%{count} years"
+ short:
+ ended: "ended"
+ revoked_html: "revoked by %{name}"
+ active: "active"
+ active_unread: "active unread"
+ expired_unread: "expired unread"
+ read_html: "read at %{time}"
+ time_in_future_title: "%{time_absolute}; in %{time_relative}"
+ time_in_past_title: "%{time_absolute}; %{time_relative}"
blocks_on:
title: "Blocks on %{name}"
heading_html: "List of Blocks on %{name}"
reason: "Reason for block:"
revoker: "Revoker:"
block:
- not_revoked: "(not revoked)"
show: "Show"
edit: "Edit"
page:
display_name: "Blocked User"
creator_name: "Creator"
reason: "Reason for block"
+ start: "Start"
+ end: "End"
status: "Status"
- revoker_name: "Revoked by"
navigation:
all_blocks: "All Blocks"
blocks_on_me: "Blocks on Me"
- blocks_on_user: "Blocks on %{user}"
+ blocks_on_user_html: "Blocks on %{user}"
blocks_by_me: "Blocks by Me"
- blocks_by_user: "Blocks by %{user}"
+ blocks_by_user_html: "Blocks by %{user}"
block: "Block #%{id}"
new_block: "New Block"
user_mutes:
description: "Description"
created_at: "Created at"
last_changed: "Last changed"
+ apply: "Apply"
+ all: "All"
+ open: "Open"
+ closed: "Closed"
+ status: "Status"
show:
title: "Note: %{id}"
description: "Description"
report: report this note
coordinates_html: "%{latitude}, %{longitude}"
anonymous_warning: This note includes comments from anonymous users which should be independently verified.
+ discussion: Discussion
+ subscribe: Subscribe
+ unsubscribe: Unsubscribe
hide: Hide
resolve: Resolve
reactivate: Reactivate
slight_left_without_exit: Slight left onto %{name}
via_point_without_exit: (via point)
follow_without_exit: Follow %{name}
- roundabout_without_exit: At roundabout take exit onto %{name}
- leave_roundabout_without_exit: Leave roundabout - %{name}
- stay_roundabout_without_exit: Stay on roundabout - %{name}
+ roundabout_without_exit: At the roundabout take the exit onto %{name}
+ leave_roundabout_without_exit: Leave the roundabout - %{name}
+ stay_roundabout_without_exit: Stay on the roundabout - %{name}
start_without_exit: Start on %{name}
destination_without_exit: Reach destination
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}
- roundabout_with_exit_ordinal: At roundabout take %{exit} exit onto %{name}
- exit_roundabout: Exit roundabout onto %{name}
+ roundabout_with_exit: At the roundabout take the exit %{exit} onto %{name}
+ roundabout_with_exit_ordinal: At the roundabout take the %{exit} exit onto %{name}
+ exit_roundabout: Exit the roundabout onto %{name}
unnamed: "unnamed road"
courtesy: "Directions courtesy of %{link}"
exit_counts:
projects / rails.git / blobdiff