Merge remote-tracking branch 'upstream/pull/5754'

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index c4a56827adf701efb5c2725827a894c820a800ae..c3b958802bc83c1070f49634249a4c20c979e1cc 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -235,9 +235,8 @@ en-GB:
         comment: Comment
         full: Full note
   accounts:
-    edit:
+    show:
       title: Edit account
-      my settings: My settings
       external auth: External Authentication
       openid:
         link text: what is this?
@@ -260,9 +259,6 @@ en-GB:
       show:
         title: Terms
         heading: Terms
-        consider_pd: In addition to the above, I consider my contributions to be in
-          the Public Domain
-        consider_pd_why: what's this?
         you need to accept or decline: Please read and then either accept or decline
           the new Contributor Terms to continue.
         legale_select: 'Country of residence:'
@@ -335,7 +331,8 @@ en-GB:
       wikimedia_commons_link: The %{page} item on Wikimedia Commons
       telephone_link: Call %{phone_number}
       colour_preview: Colour %{colour_value} preview
-    query:
+  feature_queries:
+    show:
       title: Query Features
       introduction: Click on the map to find nearby features.
       nearby: Nearby features
@@ -1618,7 +1615,6 @@ en-GB:
       my notes: My Notes
       my messages: My Messages
       my profile: My Profile
-      my settings: My Settings
       my comments: My Comments
       blocks on me: Blocks on Me
       blocks by me: Blocks by Me
@@ -1667,10 +1663,10 @@ en-GB:
       show:
         title: Users
         heading: Users
-        empty: No matching users found
       page:
         confirm: Confirm Selected Users
         hide: Hide Selected Users
+        empty: No matching users found
       user:
         summary_html: '%{name} created from %{ip_address} on %{date}'
         summary_no_ip_html: '%{name} created on %{date}'
@@ -1841,11 +1837,6 @@ en-GB:
       here.
     directions:
       ascend: Ascend
-      engines:
-        fossgis_osrm_car: Car (OSRM)
-        graphhopper_bicycle: Bicycle (GraphHopper)
-        graphhopper_car: Car (GraphHopper)
-        graphhopper_foot: Foot (GraphHopper)
       descend: Descend
       directions: Directions
       distance: Distance