Adds cycleways and tracks

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 9f908a63c41ac19fd3a150af5be10c1744137f6d..feb0c4f2fab6a219b8ceeeefd5b94aa79b395f44 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -936,9 +936,10 @@ en-GB:
     legal_babble:
       title_html: Copyright and Licence
       intro_1_html: |-
     legal_babble:
       title_html: Copyright and Licence
       intro_1_html: |-

-        OpenStreetMap is <i>open data</i>, licenced under the <a
+        OpenStreetMap is <i>open data</i>, licensed under the <a

         href="http://opendatacommons.org/licenses/odbl/">Open Data
         href="http://opendatacommons.org/licenses/odbl/">Open Data

-        Commons Open Database Licence</a> (ODbL).
+        Commons Open Database Licence</a> (ODbL) by the  <a
+        href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).

       intro_2_html: You are free to copy, distribute,  transmit and adapt our data,
         as long as you credit OpenStreetMap and its contributors. If you alter or
         build upon our data, you may distribute the result only under the same licence.
       intro_2_html: You are free to copy, distribute,  transmit and adapt our data,
         as long as you credit OpenStreetMap and its contributors. If you alter or
         build upon our data, you may distribute the result only under the same licence.


@@ -972,6 +973,7 @@ en-GB:
       more_title_html: Finding out more
       more_1_html: |-
         Read more about using our data, and how to credit us, at the <a
       more_title_html: Finding out more
       more_1_html: |-
         Read more about using our data, and how to credit us, at the <a

+        href="http://osmfoundation.org/Licence">OSMF Licence page</a> and the community <a

         href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
         FAQ</a>.
       more_2_html: Although OpenStreetMap is open data, we cannot provide a free-of-charge
         href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
         FAQ</a>.
       more_2_html: Although OpenStreetMap is open data, we cannot provide a free-of-charge


@@ -1905,7 +1907,7 @@ en-GB:
       press confirm button: Press the confirm button below to confirm your new e-mail
         address.
       button: Confirm
       press confirm button: Press the confirm button below to confirm your new e-mail
         address.
       button: Confirm

-      success: Confirmed your e-mail address, thanks for signing up!
+      success: Confirmed your change of email address!

       failure: An e-mail address has already been confirmed with this token.
     set_home:
       flash success: Home location saved successfully
       failure: An e-mail address has already been confirmed with this token.
     set_home:
       flash success: Home location saved successfully