X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5bc8abbe059ca72187277830e10d89f73858a580..c29ff027793a54b96d77877c776055ed80adfaea:/config/locales/en.yml?ds=sidebyside
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5bc88547a..a81172de2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -213,7 +213,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 »"
@@ -228,7 +228,7 @@ en:
user: "User"
comment: "Comment"
area: "Area"
- list:
+ index:
title: "Changesets"
title_user: "Changesets by %{user}"
title_friend: "Changesets by my friends"
@@ -242,18 +242,22 @@ 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"
- list:
+ index:
title: "Users' diaries"
title_friends: "Friends' diaries"
title_nearby: "Nearby Users' diaries"
@@ -276,7 +280,7 @@ en:
use_map_link: "use map"
save_button: "Save"
marker_text: Diary entry location
- view:
+ show:
title: "%{user}'s diary | %{title}"
user_title: "%{user}'s diary"
leave_a_comment: "Leave a comment"
@@ -860,7 +864,7 @@ en:
"yes": "Shop"
tourism:
alpine_hut: "Alpine Hut"
- apartment: "Apartment"
+ apartment: "Holiday Apartment"
artwork: "Artwork"
attraction: "Attraction"
bed_and_breakfast: "Bed and Breakfast"
@@ -1024,7 +1028,7 @@ en:
other_label: Other
create:
successful_report: Your report has been registered sucessfully
- provide_details: Please provide the required details
+ provide_details: Please provide the required details
layouts:
project_name:
# in
@@ -1055,9 +1059,8 @@ en:
intro_header: Welcome to OpenStreetMap!
intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
intro_2_create_account: "Create a user account"
- partners_html: "Hosting is supported by %{ucl}, %{bytemark}, %{ic}, and other %{partners}."
+ hosting_partners_html: "Hosting is supported by %{ucl}, %{bytemark}, and other %{partners}."
partners_ucl: "UCL"
- partners_ic: "Imperial College London"
partners_bytemark: "Bytemark Hosting"
partners_partners: "partners"
osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
@@ -1194,6 +1197,7 @@ en:
body: "Body"
send_button: "Send"
back_to_inbox: "Back to inbox"
+ create:
message_sent: "Message sent"
limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more."
no_such_message:
@@ -1347,6 +1351,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
@@ -1522,6 +1531,10 @@ en:
url: https://switch2osm.org/
title: switch2osm
description: Help for companies and organisations switching to OpenStreetMap based maps and other services.
+ welcomemat:
+ url: https://welcome.openstreetmap.org/
+ title: For Organizations
+ description: With an organization making plans for OpenStreetMap? Find what you need to know in the Welcome Mat.
wiki:
url: https://wiki.openstreetmap.org/
title: wiki.openstreetmap.org
@@ -1613,7 +1626,7 @@ en:
edit: Edit
preview: Preview
markdown_help:
- title_html: Parsed with Markdown
+ title_html: Parsed with kramdown
headings: Headings
heading: Heading
subheading: Subheading
@@ -1668,7 +1681,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!
@@ -1722,9 +1735,11 @@ en:
visibility: "Visibility:"
visibility_help: "what does this mean?"
visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
+ update:
+ updated: Trace updated
trace_optionals:
tags: "Tags"
- view:
+ show:
title: "Viewing trace %{name}"
heading: "Viewing trace %{name}"
pending: "PENDING"
@@ -1739,8 +1754,8 @@ en:
description: "Description:"
tags: "Tags:"
none: "None"
- edit_track: "Edit this trace"
- delete_track: "Delete this trace"
+ edit_trace: "Edit this trace"
+ delete_trace: "Delete this trace"
trace_not_found: "Trace not found!"
visibility: "Visibility:"
confirm_delete: "Delete this trace?"
@@ -1764,7 +1779,7 @@ en:
by: "by"
in: "in"
map: "map"
- list:
+ index:
public_traces: "Public GPS traces"
my_traces: "My GPS traces"
public_traces_from: "Public GPS traces from %{user}"
@@ -1791,14 +1806,11 @@ en:
other: "GPX file with %{count} points from %{user}"
description_without_count: "GPX file from %{user}"
application:
+ permission_denied: You do not have permission to access that action
require_cookies:
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."
@@ -1887,7 +1899,7 @@ en:
flash: "Updated the client information successfully"
destroy:
flash: "Destroyed the client application registration"
- user:
+ users:
login:
title: "Login"
heading: "Login"
@@ -2003,7 +2015,7 @@ en:
heading: "The user %{user} does not exist"
body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
deleted: "deleted"
- view:
+ show:
my diary: My Diary
new diary entry: new diary entry
my edits: My Edits
@@ -2163,9 +2175,7 @@ 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."
- list:
+ index:
title: Users
heading: Users
showing:
@@ -2206,7 +2216,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}."
@@ -2429,13 +2438,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"
@@ -2554,3 +2562,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})"