X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e2609b9758bce891629a6b1949b810e3bcc8a83f..dcaefd0d6fdbcab582a610faafc5a6604037d831:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 65b7f3639..701bae2dd 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -759,7 +759,7 @@ en:
           spur: "Railway Spur"
           station: "Railway Station"
           stop: "Railway Stop"
-          subway: "Subway Station"
+          subway: "Subway"
           subway_entrance: "Subway Entrance"
           switch: "Railway Points"
           tram: "Tramway"
@@ -968,7 +968,8 @@ en:
       intro_1_html: |
         OpenStreetMap is <i>open data</i>, licensed under the <a
         href="http://opendatacommons.org/licenses/odbl/">Open Data
-        Commons Open Database License</a> (ODbL).
+        Commons Open Database License</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
@@ -1004,6 +1005,7 @@ en:
       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: |
@@ -1043,6 +1045,11 @@ en:
       contributors_nz_html: |
         <strong>New Zealand</strong>: Contains data sourced from
         Land Information New Zealand. Crown Copyright reserved.
+      contributors_si_html: |
+        <strong>Slovenia</strong>: Contains data from the
+        <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and
+        <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
+        (public information of Slovenia).
       contributors_za_html: |
         <strong>South Africa</strong>: Contains data sourced from
         <a href="http://www.ngi.gov.za/">Chief Directorate:
@@ -1145,10 +1152,22 @@ en:
       url: /welcome
       title: Welcome to OSM
       description: Start with this quick guide covering the OpenStreetMap basics.
+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide
+      title: Beginners' Guide
+      description: Community maintained guide for beginners.
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Ask a question or look up answers on OSM's question-and-answer site.
+    mailing_lists:
+      url: http://lists.openstreetmap.org/
+      title: Mailing Lists
+      description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists.
+    forums:
+      url: http://forum.openstreetmap.org/
+      title: Forums
+      description: The same as above for those that prefer a bulletin board style interface.
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
@@ -1367,8 +1386,6 @@ en:
       search: Search
       get_directions: "Get directions"
       get_directions_title: "Find directions between two points"
-      close_directions: "Close directions"
-      close_directions_title: "Close the directions panel"
       from: "From"
       to: "To"
       where_am_i: "Where am I?"
@@ -1897,6 +1914,7 @@ en:
         Confirm your account by clicking on the link in the email and you'll be able to start mapping.
       press confirm button: "Press the confirm button below to activate your account."
       button: Confirm
+      success: "Confirmed your account, thanks for signing up!"
       already active: "This account has already been confirmed."
       unknown token: "That confirmation code has expired or does not exist."
       reconfirm_html: "If you need us to resend the confirmation email, <a href=\"%{reconfirm}\">click here</a>."
@@ -1907,8 +1925,9 @@ en:
       heading: Confirm a change of email address
       press confirm button: "Press the confirm button below to confirm your new email address."
       button: Confirm
-      success: "Confirmed your email address, thanks for signing up!"
+      success: "Confirmed your change of email address!"
       failure: "An email address has already been confirmed with this token."
+      unknown_token: "That confirmation code has expired or does not exist."
     set_home:
       flash success: "Home location saved successfully"
     go_public: