X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/fcddf920a395011ff67fe43fe3e8440254835513..49666ecf11e6316bb3dfe73dac43e6331ab9c5ad:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cef8431cc..bc43ab4bf 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -438,14 +438,8 @@ en:
us_postcode: 'Results from Geocoder.us'
uk_postcode: 'Results from NPEMap / FreeThe Postcode'
ca_postcode: 'Results from Geocoder.CA'
- osm_namefinder: 'Results from OpenStreetMap Namefinder'
osm_nominatim: 'Results from OpenStreetMap Nominatim'
geonames: 'Results from GeoNames'
- search_osm_namefinder:
- prefix: "%{type}"
- suffix_place: ", %{distance} %{direction} of %{placename}"
- suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} of %{parentname})"
- suffix_suburb: "%{suffix}, %{parentname}"
search_osm_nominatim:
prefix_format: "%{name}"
prefix:
@@ -911,15 +905,12 @@ en:
weir: "Weir"
description:
title:
- osm_namefinder: '%{types} from OpenStreetMap Namefinder'
osm_nominatim: 'Location from OpenStreetMap Nominatim'
geonames: 'Location from GeoNames'
types:
cities: Cities
towns: Towns
places: Places
- description_osm_namefinder:
- prefix: "%{distance} %{direction} of %{type}"
results:
no_results: "No results found"
more_results: "More results"
@@ -1032,23 +1023,29 @@ en:
code explains your rights and responsibilities.
intro_3_html: |
The cartography in our map tiles, and our documentation, are
- licensed under the Creative
+ licensed under the Creative
Commons Attribution-ShareAlike 2.0 license (CC-BY-SA).
credit_title_html: How to credit OpenStreetMap
credit_1_html: |
- We require that you use the credit “© OpenStreetMap
+ We require that you use the credit “© OpenStreetMap
contributors”.
credit_2_html: |
- You must also make it clear that the data is available under the Open
- Database License, and if using our map tiles, that the cartography is
- licensed as CC-BY-SA. You may do this by linking to
- this copyright page.
- Alternatively, and as a requirement if you are distributing OSM in a
- data form, you can name and link directly to the license(s). In media
- where links are not possible (e.g. printed works), we suggest you
- direct your readers to openstreetmap.org (perhaps by expanding
- 'OpenStreetMap' to this full address), to opendatacommons.org, and
+ You must also make it clear that the data is available under the Open
+ Database License, and if using our map tiles, that the cartography is
+ licensed as CC-BY-SA. You may do this by linking to
+ this copyright page.
+ Alternatively, and as a requirement if you are distributing OSM in a
+ data form, you can name and link directly to the license(s). In media
+ where links are not possible (e.g. printed works), we suggest you
+ direct your readers to openstreetmap.org (perhaps by expanding
+ 'OpenStreetMap' to this full address), to opendatacommons.org, and
if relevant, to creativecommons.org.
+ credit_3_html: |
+ For a browsable electronic map, the credit should appear in the corner of the map.
+ For example:
+ attribution_example:
+ alt: Example of how to attribute OpenStreetMap on a webpage
+ title: Attribution example
more_title_html: Finding out more
more_1_html: |
Read more about using our data, and how to credit us, at the takedown
- procedure or file directly at our
+ If you believe that copyrighted material has been inappropriately
+ added to the OpenStreetMap database or this site, please refer
+ to our takedown
+ procedure or file directly at our
on-line filing page.
notifier:
diary_comment_notification:
@@ -1779,6 +1776,10 @@ en:
preferred languages: "Preferred Languages:"
preferred editor: "Preferred Editor:"
image: "Image:"
+ gravatar:
+ gravatar: "Use Gravatar"
+ link: "http://wiki.openstreetmap.org/wiki/Gravatar"
+ link text: "what is this?"
new image: "Add an image"
keep image: "Keep the current image"
delete image: "Remove the current image"