Update to iD v2.15.1

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 706e0477817bf674eafa8261a47daf06e86aeb45..ae70009abd434149fd1ec31f4ecee414b28f50d1 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1,6 +1,7 @@
 # Messages for British English (British English)
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Messages for British English (British English)
 # Exported from translatewiki.net
 # Export driver: phpyaml

+# Author: Abijeet Patro

 # Author: Andibing
 # Author: Bpfhjquevaps
 # Author: Bruce89
 # Author: Andibing
 # Author: Bpfhjquevaps
 # Author: Bruce89


@@ -1904,15 +1905,12 @@ en-GB:
     terms:
       title: Contributor terms
       heading: Contributor terms
     terms:
       title: Contributor terms
       heading: Contributor terms

-      read and accept: Please read the agreement and press the agree button to confirm
-        that you accept the terms of this agreement for your existing and future contributions.

       consider_pd: In addition to the above agreement, I consider my contributions
         to be in the Public Domain
       consider_pd_why: what's this?
       consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
       guidance: 'Information to help understand these terms: a <a href="%{summary}">human
         readable summary</a> and some <a href="%{translations}">informal translations</a>'
       consider_pd: In addition to the above agreement, I consider my contributions
         to be in the Public Domain
       consider_pd_why: what's this?
       consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
       guidance: 'Information to help understand these terms: a <a href="%{summary}">human
         readable summary</a> and some <a href="%{translations}">informal translations</a>'

-      agree: Agree

       declined: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
       decline: Decline
       you need to accept or decline: Please read and then either accept or decline
       declined: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
       decline: Decline
       you need to accept or decline: Please read and then either accept or decline


@@ -2266,7 +2264,7 @@ en-GB:
     mine:
       title: Notes submitted or commented on by %{user}
       heading: '%{user}''s notes'
     mine:
       title: Notes submitted or commented on by %{user}
       heading: '%{user}''s notes'

-      subheading: Notes submitted or commented on by %{user}
+      subheading_html: Notes submitted or commented on by %{user}

       id: Id
       creator: Creator
       description: Description
       id: Id
       creator: Creator
       description: Description