X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/428e7d6baa28ecb7d06f1f851fdd69ef00249bfb..6a23f0e4d445eb092f37b1bc20228fe65f9c2a8a:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c709726ac..4ce1ae69f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -367,7 +367,6 @@ en:
     search:
       title:
         latlon: 'Results from <a href="http://openstreetmap.org/">Internal</a>'
-        us_postcode: 'Results from <a href="http://geocoder.us/">Geocoder.us</a>'
         uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
         ca_postcode: 'Results from <a href="http://geocoder.ca/">Geocoder.CA</a>'
         osm_nominatim: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
@@ -933,8 +932,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} and %{ic}, and other %{partners}."
-    partners_ucl: "the UCL VR Centre"
+    partners_html: "Hosting is supported by %{ucl}, %{bytemark}, %{ic}, and other %{partners}."
+    partners_ucl: "UCL"
     partners_ic: "Imperial College London"
     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"
@@ -1006,9 +1005,7 @@ en:
       more_title_html: Finding out more
       more_1_html: |
         Read more about using our data, and how to credit us, at the <a
-        href="http://osmfoundation.org/Licence">OSMF Licence page</a> and the community <a
-        href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
-        FAQ</a>.
+        href="http://osmfoundation.org/Licence">OSMF Licence page</a>.
       more_2_html: |
         Although OpenStreetMap is open data, we cannot provide a
         free-of-charge map API for third-parties.
@@ -1210,7 +1207,9 @@ en:
       Our contributors include enthusiast mappers, GIS professionals, engineers
       running the OSM servers, humanitarians mapping disaster-affected areas,
       and many more.
-      To learn more about the community, see the <a href='%{diary_path}'>user diaries</a>,
+      To learn more about the community, see the
+      <a href='https://blog.openstreetmap.org'>OpenStreetMap Blog</a>,
+      <a href='%{diary_path}'>user diaries</a>,
       <a href='http://blogs.openstreetmap.org/'>community blogs</a>, and
       the <a href='http://www.osmfoundation.org/'>OSM Foundation</a> website.
     open_data_title: Open Data
@@ -1243,6 +1242,7 @@ en:
       header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
       footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
     friend_notification:
+      hi: "Hi %{to_user},"
       subject: "[OpenStreetMap] %{user} added you as a friend"
       had_added_you: "%{user} has added you as a friend on OpenStreetMap."
       see_their_profile: "You can see their profile at %{userurl}."
@@ -1376,6 +1376,7 @@ en:
       date: "Date"
       reply_button: "Reply"
       unread_button: "Mark as unread"
+      delete_button: "Delete"
       back: "Back"
       to: "To"
       wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
@@ -1420,7 +1421,7 @@ en:
       get_directions_title: "Find directions between two points"
       from: "From"
       to: "To"
-      where_am_i: "Where am I?"
+      where_am_i: "Where is this?"
       where_am_i_title: Describe the current location using the search engine
       submit_text: "Go"
     key:
@@ -2238,7 +2239,8 @@ en:
         unhide_comment: "unhide"
     notes:
       new:
-        intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem. (Please don't enter personal information or information from copyrighted maps or directory listings.)"
+        intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem."
+        advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
         add: Add Note
       show:
         anonymous_warning: This note includes comments from anonymous users which should be independently verified.
@@ -2249,8 +2251,10 @@ 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_car: "Car (GraphHopper)"
         graphhopper_foot: "Foot (GraphHopper)"
         mapquest_bicycle: "Bicycle (MapQuest)"
         mapquest_car: "Car (MapQuest)"
@@ -2259,6 +2263,7 @@ en:
         mapzen_bicycle: "Bicycle (Mapzen)"
         mapzen_car: "Car (Mapzen)"
         mapzen_foot: "Foot (Mapzen)"
+      descend: "Descend"
       directions: "Directions"
       distance: "Distance"
       errors: