Merge branch 'master' into moderation

[rails.git] / config / locales / en-GB.yml

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index c5b2630cfb9debf5fc0e4f0b8a107f634828323b..e6ebbb6a87b4ceef301ca49e869701909ddfb69c 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -403,7 +403,6 @@ en-GB:
     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>
@@ -1545,6 +1544,7 @@ en-GB:
       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
@@ -2508,6 +2508,7 @@ en-GB:
       ascend: Ascend
       engines:
         graphhopper_bicycle: Bicycle (GraphHopper)
+        graphhopper_car: Car (GraphHopper)
         graphhopper_foot: Foot (GraphHopper)
         mapquest_bicycle: Bicycle (MapQuest)
         mapquest_car: Car (MapQuest)