Update en.yml

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7dce96dd681caba5df412f03319a29114325e17d..4f1edfab48b5686c47804779046282f84a1ea94b 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1838,9 +1838,8 @@ en:
         credit_3_1_html: |
           The map tiles in the “standard style” at www.openstreetmap.org are a
           Produced Work by the OpenStreetMap Foundation using OpenStreetMap data
-          under the Open Database License. If you are using these tiles please use
-          the following attribution:
-          “Base map and data from OpenStreetMap and OpenStreetMap Foundation”.
+          under the Open Database License. When using this map style, the same attribution is
+          required as for the map data.
         credit_4_html: |
           For a browsable electronic map, the credit should appear in the corner of the map.
           For example:
@@ -2060,7 +2059,7 @@ en:
     potlatch:
       removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser.
       desktop_html: You can still use Potlatch by <a href="https://www.systemed.net/potlatch/">downloading the desktop application for Mac and Windows</a>.
-      id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. <a href="%{settings_url}">Change your user settings here</a>.
+      id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. <a href="%{settings_url}">Change your preferences here</a>.
     sidebar:
       search_results: Search Results
       close: Close
@@ -2304,6 +2303,11 @@ en:
       blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits."
       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
+    settings_menu:
+      account_settings: Account Settings
+      oauth1_settings: OAuth 1 settings
+      oauth2_applications: OAuth 2 applications
+      oauth2_authorizations: OAuth 2 authorizations
   oauth:
     authorize:
       title: "Authorize access to your account"
@@ -2505,8 +2509,8 @@ en:
       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_home_location_html: "%{edit_profile_link} and set your home location to see nearby users."
+      edit_your_profile: Edit your profile
       my friends: My friends
       no friends: You have not added any friends yet.
       km away: "%{count}km away"
@@ -2570,10 +2574,6 @@ en:
         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
-      oauth1 settings: OAuth 1 settings
-      oauth2 applications: OAuth 2 applications
-      oauth2 authorizations: OAuth 2 authorizations
       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."
     set_home: