Refactor account form to use bootstrap

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c28492a27bec5e9dcb2df0ffc14201806eded5d0..da86c283dab48ec75f525cbbcb6e4faa769bd9e0 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -122,10 +122,14 @@ en:
       user:
         email: "Email"
         email_confirmation: "Email Confirmation"
       user:
         email: "Email"
         email_confirmation: "Email Confirmation"

+        new_email: "New Email Address"

         active: "Active"
         display_name: "Display Name"
         active: "Active"
         display_name: "Display Name"

-        description: "Description"
-        languages: "Languages"
+        description: Profile Description
+        home_lat: Latitude
+        home_lon: Longitude
+        languages: Preferred Languages
+        preferred_editor: Preferred Editor

         pass_crypt: "Password"
         pass_crypt_confirmation: "Confirm Password"
     help:
         pass_crypt: "Password"
         pass_crypt_confirmation: "Confirm Password"
     help:


@@ -136,6 +140,7 @@ en:
         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.'

+        new_email: "(never displayed publicly)"

   datetime:
     distance_in_words_ago:
       about_x_hours:
   datetime:
     distance_in_words_ago:
       about_x_hours:


@@ -2308,8 +2313,6 @@ en:
       display name: "Display Name:"
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       external auth: "Third Party Authentication:"
       display name: "Display Name:"
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       external auth: "Third Party Authentication:"

-      password: "Password:"
-      confirm password: "Confirm Password:"

       use external auth: "Alternatively, use a third party to login"
       auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one."
       continue: Sign Up
       use external auth: "Alternatively, use a third party to login"
       auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one."
       continue: Sign Up


@@ -2414,15 +2417,13 @@ en:
     account:
       title: "Edit account"
       my settings: My settings
     account:
       title: "Edit account"
       my settings: My settings

-      current email address: "Current Email Address:"
-      new email address: "New Email Address:"
-      email never displayed publicly: "(never displayed publicly)"
-      external auth: "External Authentication:"
+      current email address: "Current Email Address"
+      external auth: "External Authentication"

       openid:
         link: "https://wiki.openstreetmap.org/wiki/OpenID"
         link text: "what is this?"
       public editing:
       openid:
         link: "https://wiki.openstreetmap.org/wiki/OpenID"
         link text: "what is this?"
       public editing:

-        heading: "Public editing:"
+        heading: "Public editing"

         enabled: "Enabled. Not anonymous and can edit data."
         enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits"
         enabled link text: "what is this?"
         enabled: "Enabled. Not anonymous and can edit data."
         enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits"
         enabled link text: "what is this?"


@@ -2432,21 +2433,18 @@ en:
         heading: "Public editing"
         html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
       contributor terms:
         heading: "Public editing"
         html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
       contributor terms:

-        heading: "Contributor Terms:"
+        heading: "Contributor Terms"

         agreed: "You have agreed to the new Contributor Terms."
         not yet agreed: "You have not yet agreed to the new Contributor Terms."
         review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
         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: "You have agreed to the new Contributor Terms."
         not yet agreed: "You have not yet agreed to the new Contributor Terms."
         review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
         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?"

-      profile description: "Profile Description:"
-      preferred languages: "Preferred Languages:"
-      preferred editor: "Preferred Editor:"
-      image: "Image:"
+      image: Image

       gravatar:
         gravatar: "Use Gravatar"
         link: "https://wiki.openstreetmap.org/wiki/Gravatar"
       gravatar:
         gravatar: "Use Gravatar"
         link: "https://wiki.openstreetmap.org/wiki/Gravatar"

-        link text: "what is this?"
+        what_is_gravatar: "What is Gravatar?"

         disabled: "Gravatar has been disabled."
         enabled: "Display of your Gravatar has been enabled."
       new image: "Add an image"
         disabled: "Gravatar has been disabled."
         enabled: "Display of your Gravatar has been enabled."
       new image: "Add an image"


@@ -2454,10 +2452,8 @@ en:
       delete image: "Remove the current image"
       replace image: "Replace the current image"
       image size hint: "(square images at least 100x100 work best)"
       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:"
+      home location: "Home Location"

       no home location: "You have not entered your home location."
       no home location: "You have not entered your home location."

-      latitude: "Latitude:"
-      longitude: "Longitude:"

       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
       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