X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/721f8e00b287974d6346e3c62bb8d0d599cc7db3..4b1ceb22053823b36475568aa12ed1ae5524e1f7:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 425983318..f68488c09 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -285,7 +285,7 @@ en: 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... @@ -1076,7 +1076,7 @@ en: man_made: adit: "Adit" advertising: "Advertising" - antenna: "Antenna" + antenna: "Antenna" avalanche_protection: "Avalanche Protection" beacon: "Beacon" beam: "Beam" @@ -1763,14 +1763,14 @@ en: 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: @@ -1949,11 +1949,11 @@ en: 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. @@ -1962,7 +1962,7 @@ en: 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 @@ -2009,7 +2009,7 @@ en: 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}. @@ -2165,7 +2165,7 @@ en: 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 @@ -2174,7 +2174,7 @@ en: 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." @@ -2235,7 +2235,7 @@ en: %{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: | @@ -2679,20 +2679,20 @@ en: 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: @@ -2706,7 +2706,7 @@ en: 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 @@ -2826,14 +2826,14 @@ en: 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." @@ -3147,16 +3147,16 @@ en: 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: