X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/45e90cfd2416a6023f2e3f6b81f8f8bbb0261cbd..5401055ce16a7bd74dd0dc2a0caf2dbc66e0d986:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8cd04e3ce..4cc81750c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -782,7 +782,6 @@ en:
           car_parts: "Car Parts"
           car_repair: "Car Repair"
           carpet: "Carpet Shop"
-          car_repair: "Car Repair"
           charity: "Charity Shop"
           chemist: "Chemist"
           clothes: "Clothes Shop"
@@ -1310,25 +1309,17 @@ en:
         commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
       details: "More details about the note can be found at %{url}."
     changeset_comment_notification:
+      hi: "Hi %{to_user},"
       greeting: "Hi,"
       commented:
         subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
         subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in"
         your_changeset: "%{commenter} has left a comment on one of your changesets created at %{time}"
-        your_changeset_html: '<a href="%{commenter_url}" target="_blank" style="text-decoration: none; color: #222"><strong>%{commenter}</strong></a>
-           has left a comment on one of your changesets
-           created at %{time}'
         commented_changeset: "%{commenter} has left a comment on a map changeset you are watching created by %{changeset_author} at %{time}"
-        commented_changeset_html: '<a href="%{commenter_url}" target="_blank" style="text-decoration: none; color: #222"><strong>%{commenter}</strong></a>
-          has left a comment on a map changeset you are watching created by
-          %{changeset_author}
-          at %{time}'
         partial_changeset_with_comment: "with comment '%{changeset_comment}'"
-        partial_changeset_with_comment_html: 'with comment <em>%{changeset_comment}</em>'
         partial_changeset_without_comment: "without comment"
       details: "More details about the changeset can be found at %{url}."
-      details_html: 'More details about the changeset can be found at
-         <nobr>%{url}</nobr>.'
+      unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
   message:
     inbox:
       title: "Inbox"
@@ -2221,6 +2212,7 @@ en:
         header: Map Layers
         notes: Map Notes
         data: Map Data
+        gps: Public GPS Traces
         overlays: Enable overlays for troubleshooting the map
         title: "Layers"
       copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
@@ -2254,6 +2246,7 @@ en:
         comment: Comment
     edit_help: Move the map and zoom in on a location you want to edit, then click here.
     directions:
+      ascend: "Ascend"
       engines:
         graphhopper_bicycle: "Bicycle (GraphHopper)"
         graphhopper_foot: "Foot (GraphHopper)"
@@ -2264,6 +2257,7 @@ en:
         mapzen_bicycle: "Bicycle (Mapzen)"
         mapzen_car: "Car (Mapzen)"
         mapzen_foot: "Foot (Mapzen)"
+      descend: "Descend"
       directions: "Directions"
       distance: "Distance"
       errors: