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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index d788820e131f23525352afa2003bdd2b1ef64095..4be9b4510ea6ccec691464b3bc421fba09e14f71 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -2112,9 +2112,6 @@ en-GB:
       spam score: 'Spam Score:'
       description: Description
       user location: User location
-      if_set_location_html: Set your home location on the %{settings_link} page to
-        see nearby users.
-      settings_link_text: settings
       no friends: You have not added any friends yet.
       km away: '%{count}km away'
       m away: '%{count}m away'
@@ -2184,7 +2181,6 @@ en-GB:
         link text: what is this?
       save changes button: Save Changes
       make edits public button: Make all my edits public
-      return to profile: Return to profile
       flash update success confirm needed: User information updated successfully.
         Check your email for a note to confirm your new email address.
       flash update success: User information updated successfully.