Localisation updates from https://translatewiki.net.

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 046bddc7dce54079552c2d8e38eed9e72c13ed94..30640be9ac1ad9aecc054daa6617e72599266f44 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -253,6 +253,47 @@ en-GB:
       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
@@ -375,7 +416,6 @@ en-GB:
       reopened_by_html: Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous_html: Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by_html: Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      report: Report this note
       coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: Query Features
@@ -507,7 +547,6 @@ en-GB:
         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
@@ -613,7 +652,6 @@ en-GB:
           ice_cream: Ice Cream
           internet_cafe: Internet Cafe
           kindergarten: Nursery School
-          language_school: Language school
           library: Library
           loading_dock: Loading Dock
           love_hotel: Love Hotel
@@ -706,7 +744,6 @@ en-GB:
           landing_site: Emergency Landing Site
           phone: Emergency Phone
           water_tank: Emergency Water Tank
-          "yes": Emergency
         highway:
           abandoned: Abandoned Highway
           bridleway: Bridleway
@@ -790,7 +827,6 @@ en-GB:
           commercial: Commercial Area
           conservation: Conservation
           construction: Construction
-          farm: Farm
           farmland: Farmland
           farmyard: Farmyard
           forest: Forest
@@ -2152,45 +2188,6 @@ en-GB:
       unhide_user: Unhide this User
       delete_user: Delete this User
       confirm: Confirm
-    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?
-      save changes button: Save Changes
-      make edits public button: Make all my edits public
-      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: