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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 3769543d929cf02e26243dda1a85f50513907b7c..ce7f9d925f9de3c06533a1fbd9406f8e1e0abba2 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -3,7 +3,6 @@
 # Export driver: phpyaml
 # Author: Abijeet Patro
 # Author: Alefar
 # Export driver: phpyaml
 # Author: Abijeet Patro
 # Author: Alefar

-# Author: Amire80

 # Author: Andibing
 # Author: BEANS
 # Author: Back ache
 # Author: Andibing
 # Author: BEANS
 # Author: Back ache


@@ -1666,7 +1665,6 @@ en-GB:
       consider_pd: In addition to the above, I consider my contributions to be in
         the Public Domain
       consider_pd_why: what's this?
       consider_pd: In addition to the above, 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

       you need to accept or decline: Please read and then either accept or decline
         the new Contributor Terms to continue.
       legale_select: 'Country of residence:'
       you need to accept or decline: Please read and then either accept or decline
         the new Contributor Terms to continue.
       legale_select: 'Country of residence:'