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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 062486f2a14ec3c867015359f4ed3927e8d8b66f..4be9b4510ea6ccec691464b3bc421fba09e14f71 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1376,6 +1376,22 @@ en-GB:
       reset: Reset Password
       flash changed: Your password has been changed.
       flash token bad: Did not find that token, check the URL maybe?
+  profiles:
+    edit:
+      image: Image
+      gravatar:
+        gravatar: Use Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        disabled: Gravatar has been disabled.
+        enabled: Display of your Gravatar has been enabled.
+      new image: Add an image
+      keep image: Keep the current image
+      delete image: Remove the current image
+      replace image: Replace the current image
+      image size hint: (square images at least 100x100 work best)
+      home location: Home Location
+      no home location: You have not entered your home location.
+      update home location on click: Update home location when I click on the map?
   sessions:
     new:
       title: Login
@@ -2096,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'
@@ -2166,23 +2179,8 @@ en-GB:
           in the Public Domain.
         link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: what is this?
-      image: Image
-      gravatar:
-        gravatar: Use Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        disabled: Gravatar has been disabled.
-        enabled: Display of your Gravatar has been enabled.
-      new image: Add an image
-      keep image: Keep the current image
-      delete image: Remove the current image
-      replace image: Replace the current image
-      image size hint: (square images at least 100x100 work best)
-      home location: Home Location
-      no home location: You have not entered your home location.
-      update home location on click: Update home location when I click on the map?
       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.