Change Where am I to Where is this on left sidebar

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 9f908a63c41ac19fd3a150af5be10c1744137f6d..ebbc14dd79e26c20daef19d0e27d858a4b841c42 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -6,6 +6,9 @@
 # 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: Jagwar
+# Author: Kosovastar
+# Author: Meno25

 # Author: Shirayuki
 ---
 en-GB:
 # Author: Shirayuki
 ---
 en-GB:


@@ -936,9 +939,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 +976,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


@@ -1358,9 +1363,7 @@ en-GB:
           primary: Primary road
           secondary: Secondary road
           unclassified: Unclassified road
           primary: Primary road
           secondary: Secondary road
           unclassified: Unclassified road

-          unsurfaced: Unsurfaced road

           track: Track
           track: Track

-          byway: Byway

           bridleway: Bridleway
           cycleway: Cycleway
           footway: Footway
           bridleway: Bridleway
           cycleway: Cycleway
           footway: Footway


@@ -1384,7 +1387,6 @@ en-GB:
           golf: Golf course
           park: Park
           resident: Residential area
           golf: Golf course
           park: Park
           resident: Residential area

-          tourist: Tourist attraction

           common:
           - Common
           - meadow
           common:
           - Common
           - meadow


@@ -1414,7 +1416,6 @@ en-GB:
           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge
           private: Private access
           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge
           private: Private access

-          permissive: Permissive access

           destination: Destination access
           construction: Roads under construction
     richtext_area:
           destination: Destination access
           construction: Roads under construction
     richtext_area:


@@ -1905,7 +1906,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