X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/357de642b32520cc6a899384b1f8ad078dc479b1..aebfbdcfbdb772914ca55c1b5f957f62c1c9cf24:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2aca45255..9c7ab2b49 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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,8 +2188,22 @@ en:
       back: "View all blocks"
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."
-  note:
-    description:
+    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"
+  notes:
+    comment:
       opened_at_html: "Created %{when} ago"
       opened_at_by_html: "Created %{when} ago by %{user}"
       commented_at_html: "Updated %{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}
@@ -2397,7 +2400,7 @@ en:
       show_address: Show address
       query_features: Query features
       centre_map: Centre map here
-  redaction:
+  redactions:
     edit:
       description: "Description"
       heading: "Edit redaction"