X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3b75e9241507c0672dabaec44ecb83148df979b6..7f24a2f1d621a4a3e784fd289604a17086b88d6d:/config/locales/en.yml?ds=sidebyside
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1a146701a..263663ce0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1169,8 +1169,8 @@ en:
paragraph_1_html: |
OpenStreetMap has few formal rules but we expect all participants to collaborate
with, and communicate with, the community. If you are considering
- any activities other than editing by hand, please read and follow the guidelines on
- Imports and
+ any activities other than editing by hand, please read and follow the guidelines on
+ Imports and
Automated Edits.
questions:
title: Any questions?
@@ -1196,7 +1196,7 @@ en:
title: Join the community
explanation_html: |
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.
+ 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.
@@ -1206,8 +1206,8 @@ en:
title: Other concerns
explanation_html: |
If you have concerns about how our data is being used or about the contents please consult our
- copyright page for more legal information, or contact the appropriate
- OSMF working group.
+ copyright page for more legal information, or contact the appropriate
+ OSMF working group.
help_page:
title: Getting Help
introduction: |
@@ -1277,13 +1277,13 @@ en:
License page for details.
legal_title: Legal
legal_html: |
- This site and many other related services are formally operated by the
- OpenStreetMap Foundation (OSMF)
- on behalf of the community. Use of all OSMF operated services is subject
+ This site and many other related services are formally operated by the
+ OpenStreetMap Foundation (OSMF)
+ on behalf of the community. Use of all OSMF operated services is subject
to our
Acceptable Use Policies and our Privacy Policy
-
- Please contact the OSMF
+
+ Please contact the OSMF
if you have licensing, copyright or other legal questions.
OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OSMF.
@@ -1636,6 +1636,7 @@ en:
delete_track: "Delete this trace"
trace_not_found: "Trace not found!"
visibility: "Visibility:"
+ confirm_delete: "Delete this trace?"
trace_paging_nav:
showing_page: "Page %{page}"
older: "Older Traces"
@@ -2107,7 +2108,7 @@ en:
are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"
confirm: "Confirm"
fail: "Could not revoke role `%{role}' from user `%{name}'. Please check that the user and role are both valid."
- user_block:
+ user_blocks:
model:
non_moderator_update: "Must be a moderator to create or update a block."
non_moderator_revoke: "Must be a moderator to revoke a block."
@@ -2158,20 +2159,6 @@ en:
period:
one: "1 hour"
other: "%{count} hours"
- partial:
- show: "Show"
- edit: "Edit"
- revoke: "Revoke!"
- confirm: "Are you sure?"
- display_name: "Blocked User"
- creator_name: "Creator"
- reason: "Reason for block"
- status: "Status"
- revoker_name: "Revoked by"
- not_revoked: "(not revoked)"
- showing_page: "Page %{page}"
- next: "Next »"
- previous: "« Previous"
helper:
time_future: "Ends in %{time}."
until_login: "Active until the user logs in."
@@ -2201,6 +2188,20 @@ en:
back: "View all blocks"
revoker: "Revoker:"
needs_view: "The user needs to log in before this block will be cleared."
+ block:
+ not_revoked: "(not revoked)"
+ show: "Show"
+ edit: "Edit"
+ revoke: "Revoke!"
+ blocks:
+ display_name: "Blocked User"
+ creator_name: "Creator"
+ reason: "Reason for block"
+ status: "Status"
+ revoker_name: "Revoked by"
+ showing_page: "Page %{page}"
+ next: "Next »"
+ previous: "« Previous"
note:
description:
opened_at_html: "Created %{when} ago"
@@ -2325,7 +2326,7 @@ en:
distance: "Distance"
errors:
no_route: "Couldn't find a route between those two places."
- no_place: "Sorry - couldn't find that place."
+ no_place: "Sorry - couldn't locate '%{place}'."
instructions:
continue_without_exit: Continue on %{name}
slight_right_without_exit: Slight right onto %{name}
@@ -2341,6 +2342,7 @@ en:
onramp_right_with_directions: Turn right onto the ramp towards %{directions}
onramp_right_with_name_directions: Turn right on the ramp onto %{name}, towards %{directions}
onramp_right_without_directions: Turn right onto the ramp
+ onramp_right: Turn right onto the ramp
endofroad_right_without_exit: At the end of the road turn right onto %{name}
merge_right_without_exit: Merge right onto %{name}
fork_right_without_exit: At the fork turn right onto %{name}
@@ -2361,6 +2363,7 @@ en:
onramp_left_with_directions: Turn left onto the ramp towards %{directions}
onramp_left_with_name_directions: Turn left on the ramp onto %{name}, towards %{directions}
onramp_left_without_directions: Turn left onto the ramp
+ onramp_left: Turn left onto the ramp
endofroad_left_without_exit: At the end of the road turn left onto %{name}
merge_left_without_exit: Merge left onto %{name}
fork_left_without_exit: At the fork turn left onto %{name}