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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 72f02fbf14d1efd58ca74872de871f8f91ccb68d..83b697e8c315db58258df8c0203b8a7c00050611 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -152,7 +152,7 @@ en:
       trace:
         tagstring: comma delimited
       user_block:
       trace:
         tagstring: comma delimited
       user_block:

-        reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms.
+        reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use layman's terms.

         needs_view: Does the user need to log in before this block will be cleared?
       user:
         email_confirmation: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information.'
         needs_view: Does the user need to log in before this block will be cleared?
       user:
         email_confirmation: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information.'


@@ -697,7 +697,7 @@ en:
           houseboat: "Houseboat"
           hut: "Hut"
           industrial: "Industrial Building"
           houseboat: "Houseboat"
           hut: "Hut"
           industrial: "Industrial Building"

-          kindergarten: "Kindergarden Building"
+          kindergarten: "Kindergarten Building"

           manufacture: "Manufacturing Building"
           office: "Office Building"
           public: "Public Building"
           manufacture: "Manufacturing Building"
           office: "Office Building"
           public: "Public Building"


@@ -722,7 +722,7 @@ en:
           sport: "Sportsclub"
           "yes": "Club"
         craft:
           sport: "Sportsclub"
           "yes": "Club"
         craft:

-          beekeper: "Beekeeper"
+          beekeeper: "Beekeeper"

           blacksmith: "Blacksmith"
           brewery: "Brewery"
           carpenter: "Carpenter"
           blacksmith: "Blacksmith"
           brewery: "Brewery"
           carpenter: "Carpenter"


@@ -752,7 +752,7 @@ en:
           ambulance_station: "Ambulance Station"
           assembly_point: "Assembly Point"
           defibrillator: "Defibrillator"
           ambulance_station: "Ambulance Station"
           assembly_point: "Assembly Point"
           defibrillator: "Defibrillator"

-          fire_xtinguisher: "Fire Extinguisher"
+          fire_extinguisher: "Fire Extinguisher"

           fire_water_pond: "Fire Water Pond"
           landing_site: "Emergency Landing Site"
           life_ring: "Emergency Life Ring"
           fire_water_pond: "Fire Water Pond"
           landing_site: "Emergency Landing Site"
           life_ring: "Emergency Life Ring"


@@ -1645,6 +1645,43 @@ en:
       reset: "Reset Password"
       flash changed: "Your password has been changed."
       flash token bad: "Did not find that token, check the URL maybe?"
       reset: "Reset Password"
       flash changed: "Your password has been changed."
       flash token bad: "Did not find that token, check the URL maybe?"

+  preferences:
+    show:
+      title: My Preferences
+      preferred_editor: Preferred Editor
+      preferred_languages: Preferred Languages
+      edit_preferences: Edit Preferences
+    edit:
+      title: Edit Preferences
+      save: Update Preferences
+      cancel: Cancel
+    update:
+      failure: Couldn't update preferences.
+    update_success_flash:
+      message: Preferences updated.
+  profiles:
+    edit:
+      title: Edit Profile
+      save: Update Profile
+      cancel: Cancel
+      image: Image
+      gravatar:
+        gravatar: "Use Gravatar"
+        link: "https://wiki.openstreetmap.org/wiki/Gravatar"
+        what_is_gravatar: "What is 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?"
+    update:
+      success: Profile updated.
+      failure: Couldn't update profile.

   sessions:
     new:
       title: "Login"
   sessions:
     new:
       title: "Login"


@@ -2446,8 +2483,10 @@ en:
       my profile: My Profile
       my settings: My Settings
       my comments: My Comments
       my profile: My Profile
       my settings: My Settings
       my comments: My Comments

+      my_preferences: My Preferences

       blocks on me: Blocks on Me
       blocks by me: Blocks by Me
       blocks on me: Blocks on Me
       blocks by me: Blocks by Me

+      edit_profile: Edit Profile

       send message: Send Message
       diary: Diary
       edits: Edits
       send message: Send Message
       diary: Diary
       edits: Edits


@@ -2529,21 +2568,6 @@ en:
         agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
         link: "https://www.osmfoundation.org/wiki/License/Contributor_Terms"
         link text: "what is this?"
         agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
         link: "https://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"
-        what_is_gravatar: "What is 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
       save changes button: Save Changes
       make edits public button: Make all my edits public
       return to profile: Return to profile