X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ca596106f5e2a42940db5bbdf45a677b328794d6..19c2f6d485baf6ae5986a9eeaed412cb2e2039a1:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e87e8f8ee..71c081f49 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -6,6 +6,10 @@ en:
friendly: "%e %B %Y at %H:%M"
blog: "%e %B %Y"
activerecord:
+ errors:
+ messages:
+ invalid_email_address: does not appear to be a valid e-mail address
+ email_address_not_routable: is not routable
# Translates all the model names, which is used in error handling on the web site
models:
acl: "Access Control List"
@@ -94,6 +98,28 @@ en:
remote:
name: "Remote Control"
description: "Remote Control (JOSM or Merkaartor)"
+ api:
+ notes:
+ comment:
+ opened_at_html: "Created %{when} ago"
+ opened_at_by_html: "Created %{when} ago by %{user}"
+ commented_at_html: "Updated %{when} ago"
+ commented_at_by_html: "Updated %{when} ago by %{user}"
+ closed_at_html: "Resolved %{when} ago"
+ closed_at_by_html: "Resolved %{when} ago by %{user}"
+ reopened_at_html: "Reactivated %{when} ago"
+ reopened_at_by_html: "Reactivated %{when} ago by %{user}"
+ rss:
+ title: "OpenStreetMap 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})"
+ commented: "new comment (near %{place})"
+ closed: "closed note (near %{place})"
+ reopened: "reactivated note (near %{place})"
+ entry:
+ comment: Comment
+ full: Full note
browse:
created: "Created"
closed: "Closed"
@@ -864,7 +890,7 @@ en:
"yes": "Shop"
tourism:
alpine_hut: "Alpine Hut"
- apartment: "Apartment"
+ apartment: "Holiday Apartment"
artwork: "Artwork"
attraction: "Attraction"
bed_and_breakfast: "Bed and Breakfast"
@@ -1383,6 +1409,11 @@ en:
Surveying and Mapping Authority and
Ministry of Agriculture, Forestry and Food
(public information of Slovenia).
+ contributors_es_html: |
+ Spain: Contains data sourced from the
+ Spanish National Geographic Institute (IGN) and
+ National Cartographic System (SCNE)
+ licensed for reuse under CC BY 4.0.
contributors_za_html: |
South Africa: Contains data sourced from
Chief Directorate:
@@ -1390,7 +1421,7 @@ en:
contributors_gb_html: |
United Kingdom: Contains Ordnance
Survey data © Crown copyright and database right
- 2010-12.
+ 2010-19.
contributors_footer_1_html: |
For further details of these, and other sources that have been used
to help improve OpenStreetMap, please see the Markdown
+ title_html: Parsed with kramdown
headings: Headings
heading: Heading
subheading: Subheading
@@ -2327,26 +2358,6 @@ en:
next: "Next »"
previous: "« Previous"
notes:
- comment:
- opened_at_html: "Created %{when} ago"
- opened_at_by_html: "Created %{when} ago by %{user}"
- commented_at_html: "Updated %{when} ago"
- commented_at_by_html: "Updated %{when} ago by %{user}"
- closed_at_html: "Resolved %{when} ago"
- closed_at_by_html: "Resolved %{when} ago by %{user}"
- reopened_at_html: "Reactivated %{when} ago"
- reopened_at_by_html: "Reactivated %{when} ago by %{user}"
- rss:
- title: "OpenStreetMap 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})"
- commented: "new comment (near %{place})"
- closed: "closed note (near %{place})"
- reopened: "reactivated note (near %{place})"
- entry:
- comment: Comment
- full: Full note
mine:
title: "Notes submitted or commented on by %{user}"
heading: "%{user}'s notes"
@@ -2438,13 +2449,12 @@ en:
directions:
ascend: "Ascend"
engines:
+ fossgis_osrm_bike: "Bicycle (OSRM)"
+ fossgis_osrm_car: "Car (OSRM)"
+ fossgis_osrm_foot: "Foot (OSRM)"
graphhopper_bicycle: "Bicycle (GraphHopper)"
graphhopper_car: "Car (GraphHopper)"
graphhopper_foot: "Foot (GraphHopper)"
- mapquest_bicycle: "Bicycle (MapQuest)"
- mapquest_car: "Car (MapQuest)"
- mapquest_foot: "Foot (MapQuest)"
- osrm_car: "Car (OSRM)"
descend: "Descend"
directions: "Directions"
distance: "Distance"