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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 062486f2a14ec3c867015359f4ed3927e8d8b66f..6a7f2eb8d3105ab4b7baba618574cc1d605a9904 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -11,6 +11,7 @@
 # Author: Caliburn
 # Author: Captaindogfish
 # Author: Chase me ladies, I'm the Cavalry
 # Author: Caliburn
 # Author: Captaindogfish
 # Author: Chase me ladies, I'm the Cavalry

+# Author: Danieldegroot2

 # Author: E THP
 # Author: EdLoach
 # Author: Eduard Popov
 # Author: E THP
 # Author: EdLoach
 # Author: Eduard Popov


@@ -252,6 +253,47 @@ en-GB:
       entry:
         comment: Comment
         full: Full note
       entry:
         comment: Comment
         full: Full note

+  accounts:
+    edit:
+      title: Edit account
+      my settings: My settings
+      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:
+        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?
+        disabled: Disabled and cannot edit data, all previous edits are anonymous.
+        disabled link text: why can't I edit?
+      public editing note:
+        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 e-mail 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
+        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: http://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link text: what is this?
+      save changes button: Save Changes
+      make edits public button: Make all my edits public
+    update:
+      success_confirm_needed: User information updated successfully. Check your email
+        for a note to confirm your new email address.
+      success: User information updated successfully.

   browse:
     created: Created
     closed: Closed
   browse:
     created: Created
     closed: Closed


@@ -422,6 +464,22 @@ en-GB:
     timeout:
       sorry: Sorry, the list of changeset comments you requested took too long to
         retrieve.
     timeout:
       sorry: Sorry, the list of changeset comments you requested took too long to
         retrieve.

+  dashboards:
+    contact:
+      km away: '%{count}km away'
+      m away: '%{count}m away'
+    popup:
+      your location: Your location
+      nearby mapper: Nearby mapper
+      friend: Friend
+    show:
+      no friends: You have not added any friends yet.
+      nearby users: Other nearby users
+      no nearby users: There are no other users who admit to mapping nearby yet.
+      friends_changesets: friends' changesets
+      friends_diaries: friends' diary entries
+      nearby_changesets: nearby user changesets
+      nearby_diaries: nearby user diary entries

   diary_entries:
     new:
       title: New Diary Entry
   diary_entries:
     new:
       title: New Diary Entry


@@ -490,7 +548,6 @@ en-GB:
         title: OpenStreetMap diary entries
         description: Recent diary entries from users of OpenStreetMap
     comments:
         title: OpenStreetMap diary entries
         description: Recent diary entries from users of OpenStreetMap
     comments:

-      has_commented_on: '%{display_name} has commented on the following diary entries'

       post: Post
       when: When
       comment: Comment
       post: Post
       when: When
       comment: Comment


@@ -689,7 +746,6 @@ en-GB:
           landing_site: Emergency Landing Site
           phone: Emergency Phone
           water_tank: Emergency Water Tank
           landing_site: Emergency Landing Site
           phone: Emergency Phone
           water_tank: Emergency Water Tank

-          "yes": Emergency

         highway:
           abandoned: Abandoned Highway
           bridleway: Bridleway
         highway:
           abandoned: Abandoned Highway
           bridleway: Bridleway


@@ -1376,6 +1432,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?
       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
   sessions:
     new:
       title: Login


@@ -2014,6 +2086,9 @@ en-GB:
       flash: Updated the client information successfully
     destroy:
       flash: Destroyed the client application registration
       flash: Updated the client information successfully
     destroy:
       flash: Destroyed the client application registration

+  oauth2_applications:
+    new:
+      title: Register a new application

   users:
     new:
       title: Sign Up
   users:
     new:
       title: Sign Up


@@ -2096,14 +2171,6 @@ en-GB:
       spam score: 'Spam Score:'
       description: Description
       user location: User location
       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'
-      nearby users: Other nearby users
-      no nearby users: There are no other users who admit to mapping nearby yet.

       role:
         administrator: This user is an administrator
         moderator: This user is a moderator
       role:
         administrator: This user is an administrator
         moderator: This user is a moderator


@@ -2124,68 +2191,6 @@ en-GB:
       unhide_user: Unhide this User
       delete_user: Delete this User
       confirm: Confirm
       unhide_user: Unhide this User
       delete_user: Delete this User
       confirm: Confirm

-      friends_changesets: friends' changesets
-      friends_diaries: friends' diary entries
-      nearby_changesets: nearby user changesets
-      nearby_diaries: nearby user diary entries
-    popup:
-      your location: Your location
-      nearby mapper: Nearby mapper
-      friend: Friend
-    account:
-      title: Edit account
-      my settings: My settings
-      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:
-        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?
-        disabled: Disabled and cannot edit data, all previous edits are anonymous.
-        disabled link text: why can't I edit?
-      public editing note:
-        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 e-mail 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
-        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: 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.

     set_home:
       flash success: Home location saved successfully
     go_public:
     set_home:
       flash success: Home location saved successfully
     go_public: