X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a50ad1c895f2d7ed3dfa4d40f3748ae6fb801256..19c2f6d485baf6ae5986a9eeaed412cb2e2039a1:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6942c1720..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"
@@ -213,7 +239,7 @@ en:
introduction: "Click on the map to find nearby features."
nearby: "Nearby features"
enclosing: "Enclosing features"
- changeset:
+ changesets:
changeset_paging_nav:
showing_page: "Page %{page}"
next: "Next »"
@@ -242,14 +268,18 @@ en:
load_more: "Load more"
timeout:
sorry: "Sorry, the list of changesets you requested took too long to retrieve."
- rss:
- title_all: OpenStreetMap changeset discussion
- title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
+ changeset_comments:
+ comment:
comment: "New comment on changeset #%{changeset_id} by %{author}"
- commented_at_html: "Updated %{when} ago"
commented_at_by_html: "Updated %{when} ago by %{user}"
- full: Full discussion
- diary_entry:
+ comments:
+ comment: "New comment on changeset #%{changeset_id} by %{author}"
+ index:
+ title_all: OpenStreetMap changeset discussion
+ title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
+ timeout:
+ sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
+ diary_entries:
new:
title: New Diary Entry
publish_button: "Publish"
@@ -860,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"
@@ -1347,6 +1377,11 @@ en:
CC BY),
Land Vorarlberg and
Land Tirol (under CC BY AT with amendments).
+ contributors_au_html: |
+ Australia: Contains data sourced from
+ PSMA Australia Limited
+ licensed by the Commonwealth of Australia under
+ CC BY 4.0.
contributors_ca_html: |
Canada: Contains data from
GeoBase®, GeoGratis (© Department of Natural
@@ -1374,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:
@@ -1381,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
@@ -1668,7 +1712,7 @@ en:
paragraph_1_html: |
OpenStreetMap has several resources for learning about the project, asking and answering
questions, and collaboratively discussing and documenting mapping topics.
- Get help here.
+ Get help here. With an organization making plans for OpenStreetMap? Check out the Welcome Mat.
start_mapping: Start Mapping
add_a_note:
title: No Time To Edit? Add a Note!
@@ -1798,10 +1842,6 @@ en:
cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
require_admin:
not_an_admin: You need to be an admin to perform that action.
- require_moderator:
- not_a_moderator: "You need to be a moderator to perform that action."
- require_moderator_or_admin:
- not_a_moderator_or_admin: You need to be a moderator or an admin to perform that action
setup_user_auth:
blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits."
blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
@@ -2166,8 +2206,6 @@ en:
button: "Unfriend"
success: "%{name} was removed from your friends."
not_a_friend: "%{name} is not one of your friends."
- filter:
- not_an_administrator: "You need to be an administrator to perform that action."
index:
title: Users
heading: Users
@@ -2209,7 +2247,6 @@ en:
with your ID in your user settings.
user_role:
filter:
- not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
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}."
@@ -2321,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"
@@ -2432,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"
@@ -2557,3 +2573,8 @@ en:
not_empty: "Redaction is not empty. Please un-redact all versions belonging to this redaction before destroying it."
flash: "Redaction destroyed."
error: "There was an error destroying this redaction."
+ validations:
+ leading_whitespace: "has leading whitespace"
+ trailing_whitespace: "has trailing whitespace"
+ invalid_characters: "contains invalid characters"
+ url_characters: "contains special URL characters (%{characters})"