X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dff0c82f17d15ebed01941b9a24f9e0ab8feb1df..62bc77b79014fc4932596e99a472933f5edbc02d:/config/locales/en.yml?ds=inline
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0a9ca9980..e8fa8ddee 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -154,7 +154,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:
@@ -300,12 +299,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"
@@ -333,8 +332,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:
@@ -591,9 +590,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:
@@ -2017,9 +2020,9 @@ en:
(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 +2030,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 +2144,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:
@@ -2623,6 +2626,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"
@@ -2873,15 +2880,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.
@@ -2953,13 +2960,19 @@ 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
+ 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