X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/15b550182cd893468d4f12f89e94dedc95097e0c..0d01d06f224c7c7606d39862150d132c3fe2590b:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 30fae4945..a577db1a9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -162,6 +162,7 @@ en:
         way: way
         relation: relation
         changeset: changeset
+        note: note
     timeout:
       sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve."
       type:
@@ -169,6 +170,7 @@ en:
         way: way
         relation: relation
         changeset: changeset
+        note: note
     redacted:
       redaction: "Redaction %{id}"
       message_html: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details."
@@ -759,7 +761,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"
@@ -966,9 +968,10 @@ en:
     legal_babble:
       title_html: Copyright and License
       intro_1_html: |
-        OpenStreetMap is <i>open data</i>, licensed under the <a
+        OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> 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 +1007,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 +1047,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:
@@ -1071,6 +1080,9 @@ en:
         to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
         procedure</a> or file directly at our
         <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
+      trademarks_title_html: <span id="trademarks"></span>Trademarks
+      trademarks_1_html: |
+        OpenStreetMap and the looking glass logo are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please send your questions to the <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence Working Group</a>.
   welcome_page:
     title: Welcome!
     introduction_html: |
@@ -1100,6 +1112,14 @@ en:
       tag_html: |
         A <strong>tag</strong> is a bit of data about a node or way, like a
         restaurant's name or a road's speed limit.
+    rules:
+      title: Rules!
+      paragraph_1_html: |
+        OpenStreetMap has few formal rules but we expect all participants to collaborate
+        with, and communicate with, the community. If you are considering
+        any activities other than editing by hand, please read and follow the guidelines on 
+        <a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and 
+        <a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated Edits</a>.
     questions:
       title: Any questions?
       paragraph_1_html: |
@@ -1145,10 +1165,30 @@ 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: Questions and discussions for those that prefer a bulletin board style interface.
+    irc:
+      url: http://irc.openstreetmap.org/
+      title: IRC
+      description: Interactive chat in many different languages and on many topics.
+    switch2osm:
+      url: https://switch2osm.org/
+      title: switch2osm
+      description: Help for companies and organisations switching to OpenStreetMap based maps and other services.
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
@@ -1181,6 +1221,14 @@ en:
       build upon the data in certain ways, you may distribute the result only
       under the same licence. See the <a href='%{copyright_path}'>Copyright and
       License page</a> for details.
+    legal_title: Legal
+    legal_html: |
+      This site and many other related services are formally operated by the  
+      <a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF) 
+      on behalf of the community.
+      <br> 
+      Please <a href='http://osmfoundation.org/Contact'>contact the OSMF</a> 
+      if you have licensing, copyright or other legal questions and issues.
     partners_title: Partners
   notifier:
     diary_comment_notification:
@@ -1367,8 +1415,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?"
@@ -1382,9 +1428,7 @@ en:
           primary: "Primary road"
           secondary: "Secondary road"
           unclassified: "Unclassified road"
-          unsurfaced: "Unsurfaced road"
           track: "Track"
-          byway: "Byway"
           bridleway: "Bridleway"
           cycleway: "Cycleway"
           footway: "Footway"
@@ -1408,7 +1452,6 @@ en:
           golf: "Golf course"
           park: "Park"
           resident: "Residential area"
-          tourist: "Tourist attraction"
           common:
             - Common
             - meadow
@@ -1438,7 +1481,6 @@ en:
           tunnel: "Dashed casing = tunnel"
           bridge: "Black casing = bridge"
           private: "Private access"
-          permissive: "Permissive access"
           destination: "Destination access"
           construction: "Roads under construction"
     richtext_area:
@@ -1684,6 +1726,12 @@ en:
         google:
           title: Login with Google
           alt: Login with a Google OpenID
+        facebook:
+          title: Login with Facebook
+          alt: Login with a Facebook Account
+        windowslive:
+          title: Login with Windows Live
+          alt: Login with a Windows Live Account
         yahoo:
           title: Login with Yahoo
           alt: Login with a Yahoo OpenID
@@ -1955,6 +2003,9 @@ en:
     auth_failure:
       connection_failed: Connection to authentication provider failed
       invalid_credentials: Invalid authentication credentials
+      no_authorization_code: No authorization code
+      unknown_signature_algorithm: Unknown signature algorithm
+      invalid_scope: Invalid scope
   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
@@ -2055,6 +2106,8 @@ en:
       heading: "%{block_on} blocked by %{block_by}"
       time_future: "Ends in %{time}"
       time_past: "Ended %{time} ago"
+      created: "Created"
+      ago: "%{time} ago"
       status: "Status"
       show: "Show"
       edit: "Edit"
@@ -2104,6 +2157,7 @@ en:
       link: "Link or HTML"
       long_link: "Link"
       short_link: "Short Link"
+      geo_uri: "Geo URI"
       embed: "HTML"
       custom_dimensions: "Set custom dimensions"
       format: "Format:"
@@ -2182,25 +2236,25 @@ en:
         no_route: "Couldn't find a route between those two places."
         no_place: "Sorry - couldn't find that place."
       instructions:
-        continue_on: Continue on
-        slight_right: Slight right onto
-        turn_right: Turn right onto
-        sharp_right: Sharp right onto
-        uturn: U-turn along
-        sharp_left: Sharp left onto
-        turn_left: Turn left onto
-        slight_left: Slight left onto
-        via_point: (via point)
-        follow: Follow
-        roundabout: At roundabout take
-        leave_roundabout: Leave roundabout -
-        stay_roundabout: Stay on roundabout -
-        start: Start at end of
-        destination: Reach destination
-        against_oneway: Go against one-way on
-        end_oneway: End of one-way on
-        exit: exit %{exit}
-        unnamed: "(unnamed)"
+        continue_without_exit: Continue on %{name}
+        slight_right_without_exit: Slight right onto %{name}
+        turn_right_without_exit: Turn right onto %{name}
+        sharp_right_without_exit: Sharp right onto %{name}
+        uturn_without_exit: U-turn along %{name}
+        sharp_left_without_exit: Sharp left onto %{name}
+        turn_left_without_exit: Turn left onto %{name}
+        slight_left_without_exit: Slight left onto %{name}
+        via_point_without_exit: (via point)
+        follow_without_exit: Follow %{name}
+        roundabout_without_exit: At roundabout take %{name}
+        leave_roundabout_without_exit: Leave roundabout - %{name}
+        stay_roundabout_without_exit: Stay on roundabout - %{name}
+        start_without_exit: Start at end of %{name}
+        destination_without_exit: Reach destination
+        against_oneway_without_exit: Go against one-way on %{name}
+        end_oneway_without_exit: End of one-way on %{name}
+        roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
+        unnamed: "unnamed road"
         courtesy: "Directions courtesy of %{link}"
       time: "Time"
     query: