Link to help page from welcome

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index f3397411a7fd45d5c9807a1e6c452caa77ed12bb..06837c24aae34e59904a1b674c7f7d4f089b9229 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -462,15 +462,20 @@ en:
   geocoder:
     search:
       title:
   geocoder:
     search:
       title:

-        latlon: 'Results from <a href="http://openstreetmap.org/">Internal</a>'

         us_postcode: 'Results from <a href="http://geocoder.us/">Geocoder.us</a>'
         uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
         ca_postcode: 'Results from <a href="http://geocoder.ca/">Geocoder.CA</a>'
         osm_nominatim: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
         geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
         us_postcode: 'Results from <a href="http://geocoder.us/">Geocoder.us</a>'
         uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
         ca_postcode: 'Results from <a href="http://geocoder.ca/">Geocoder.CA</a>'
         osm_nominatim: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
         geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'

+        osm_nominatim_reverse: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
+        geonames_reverse: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'

     search_osm_nominatim:
       prefix_format: "%{name}"
       prefix:
     search_osm_nominatim:
       prefix_format: "%{name}"
       prefix:

+        aerialway:
+          chair_lift: "Chair Lift"
+          drag_lift: "Drag Lift"
+          station: "Aerialway Station"

         aeroway:
           aerodrome: "Aerodrome"
           apron: "Apron"
         aeroway:
           aerodrome: "Aerodrome"
           apron: "Apron"


@@ -563,6 +568,7 @@ en:
           shower: "Shower"
           social_centre: "Social Centre"
           social_club: "Social Club"
           shower: "Shower"
           social_centre: "Social Centre"
           social_club: "Social Club"

+          social_facility: "Social Facility"

           studio: "Studio"
           supermarket: "Supermarket"
           swimming_pool: "Swimming Pool"
           studio: "Studio"
           supermarket: "Supermarket"
           swimming_pool: "Swimming Pool"


@@ -592,6 +598,9 @@ en:
           "yes": "Bridge"
         building:
           "yes": "Building"
           "yes": "Bridge"
         building:
           "yes": "Building"

+        emergency:
+          fire_hydrant: "Fire Hydrant"
+          phone: "Emergency Phone"

         highway:
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
         highway:
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"


@@ -613,6 +622,7 @@ en:
           platform: "Platform"
           primary: "Primary Road"
           primary_link: "Primary Road"
           platform: "Platform"
           primary: "Primary Road"
           primary_link: "Primary Road"

+          proposed: "Proposed Road"

           raceway: "Raceway"
           residential: "Residential"
           rest_area: "Rest Area"
           raceway: "Raceway"
           residential: "Residential"
           rest_area: "Rest Area"


@@ -623,6 +633,7 @@ en:
           services: "Motorway Services"
           speed_camera: "Speed Camera"
           steps: "Steps"
           services: "Motorway Services"
           speed_camera: "Speed Camera"
           steps: "Steps"

+          street_lamp: "Street Lamp"

           stile: "Stile"
           tertiary: "Tertiary Road"
           tertiary_link: "Tertiary Road"
           stile: "Stile"
           tertiary: "Tertiary Road"
           tertiary_link: "Tertiary Road"


@@ -639,6 +650,7 @@ en:
           building: "Building"
           castle: "Castle"
           church: "Church"
           building: "Building"
           castle: "Castle"
           church: "Church"

+          citywalls: "City Walls"

           fort: "Fort"
           house: "House"
           icon: "Icon"
           fort: "Fort"
           house: "House"
           icon: "Icon"


@@ -648,6 +660,7 @@ en:
           monument: "Monument"
           museum: "Museum"
           ruins: "Ruins"
           monument: "Monument"
           museum: "Museum"
           ruins: "Ruins"

+          tomb: "Tomb"

           tower: "Tower"
           wayside_cross: "Wayside Cross"
           wayside_shrine: "Wayside Shrine"
           tower: "Tower"
           wayside_cross: "Wayside Cross"
           wayside_shrine: "Wayside Shrine"


@@ -786,6 +799,7 @@ en:
           locality: "Locality"
           moor: "Moor"
           municipality: "Municipality"
           locality: "Locality"
           moor: "Moor"
           municipality: "Municipality"

+          neighbourhood: "Neighbourhood"

           postcode: "Postcode"
           region: "Region"
           sea: "Sea"
           postcode: "Postcode"
           region: "Region"
           sea: "Sea"


@@ -811,8 +825,10 @@ en:
           narrow_gauge: "Narrow Gauge Railway"
           platform: "Railway Platform"
           preserved: "Preserved Railway"
           narrow_gauge: "Narrow Gauge Railway"
           platform: "Railway Platform"
           preserved: "Preserved Railway"

+          proposed: "Proposed Railway"

           spur: "Railway Spur"
           station: "Railway Station"
           spur: "Railway Spur"
           station: "Railway Station"

+          stop: "Railway Stop"

           subway: "Subway Station"
           subway_entrance: "Subway Entrance"
           switch: "Railway Points"
           subway: "Subway Station"
           subway_entrance: "Subway Entrance"
           switch: "Railway Points"


@@ -828,9 +844,11 @@ en:
           beverages: "Beverages Shop"
           bicycle: "Bicycle Shop"
           books: "Book Shop"
           beverages: "Beverages Shop"
           bicycle: "Bicycle Shop"
           books: "Book Shop"

+          boutique: "Boutique"

           butcher: "Butcher"
           car: "Car Shop"
           car_parts: "Car Parts"
           butcher: "Butcher"
           car: "Car Shop"
           car_parts: "Car Parts"

+          car_repair: "Car Repair"

           carpet: "Carpet Shop"
           car_repair: "Car Repair"
           charity: "Charity Shop"
           carpet: "Carpet Shop"
           car_repair: "Car Repair"
           charity: "Charity Shop"


@@ -841,6 +859,7 @@ en:
           convenience: "Convenience Store"
           copyshop: "Copy Shop"
           cosmetics: "Cosmetics Shop"
           convenience: "Convenience Store"
           copyshop: "Copy Shop"
           cosmetics: "Cosmetics Shop"

+          deli: "Deli"

           department_store: "Department Store"
           discount: "Discount Items Shop"
           doityourself: "Do-It-Yourself"
           department_store: "Department Store"
           discount: "Discount Items Shop"
           doityourself: "Do-It-Yourself"


@@ -877,17 +896,21 @@ en:
           organic: "Organic Food Shop"
           outdoor: "Outdoor Shop"
           pet: "Pet Shop"
           organic: "Organic Food Shop"
           outdoor: "Outdoor Shop"
           pet: "Pet Shop"

+          pharmacy: "Pharmacy"

           photo: "Photo Shop"
           salon: "Salon"
           photo: "Photo Shop"
           salon: "Salon"

+          second_hand: "Second-hand Shop"

           shoes: "Shoe Shop"
           shopping_centre: "Shopping Centre"
           sports: "Sports Shop"
           stationery: "Stationery Shop"
           supermarket: "Supermarket"
           shoes: "Shoe Shop"
           shopping_centre: "Shopping Centre"
           sports: "Sports Shop"
           stationery: "Stationery Shop"
           supermarket: "Supermarket"

+          tailor: "Tailor"

           toys: "Toy Shop"
           travel_agency: "Travel Agency"
           video: "Video Shop"
           wine: "Off License"
           toys: "Toy Shop"
           travel_agency: "Travel Agency"
           video: "Video Shop"
           wine: "Off License"

+          "yes": "Shop"

         tourism:
           alpine_hut: "Alpine Hut"
           artwork: "Artwork"
         tourism:
           alpine_hut: "Alpine Hut"
           artwork: "Artwork"


@@ -910,6 +933,7 @@ en:
           viewpoint: "Viewpoint"
           zoo: "Zoo"
         tunnel:
           viewpoint: "Viewpoint"
           zoo: "Zoo"
         tunnel:

+          culvert: "Culvert"

           "yes": "Tunnel"
         waterway:
           artificial: "Artificial Waterway"
           "yes": "Tunnel"
         waterway:
           artificial: "Artificial Waterway"


@@ -973,16 +997,8 @@ en:
       h1: OpenStreetMap
     logo:
       alt_text: OpenStreetMap logo
       h1: OpenStreetMap
     logo:
       alt_text: OpenStreetMap logo

-    welcome_user_link_tooltip: Your user page
-    home: home
-    home_tooltip: Go to home location
-    inbox_html: "inbox %{count}"
-    inbox_tooltip:
-      zero: Your inbox contains no unread messages
-      one: Your inbox contains 1 unread message
-      other: Your inbox contains %{count} unread messages
-    logout: logout
-    logout_tooltip: "Log out"
+    home: Go to Home Location
+    logout: Logout

     log_in: log in
     log_in_tooltip: Log in with an existing account
     sign_up: sign up
     log_in: log in
     log_in_tooltip: Log in with an existing account
     sign_up: sign up


@@ -1016,15 +1032,7 @@ en:
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
     donate_link_text: donating
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
     donate_link_text: donating

-    help: Help
-    help_centre: Help Centre
-    help_url: http://help.openstreetmap.org/
-    help_title: Help site for the project
-    wiki: Wiki
-    wiki_url: http://wiki.openstreetmap.org/
-    wiki_title: Wiki site for the project
-    documentation: Documentation
-    documentation_title: Documentation for the project
+    help: help

     copyright: "Copyright & License"
     community: Community
     community_blogs: "Community Blogs"
     copyright: "Copyright & License"
     community: Community
     community_blogs: "Community Blogs"


@@ -1061,7 +1069,7 @@ en:
       intro_3_html: |
         The cartography in our map tiles, and our documentation, are
         licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
       intro_3_html: |
         The cartography in our map tiles, and our documentation, are
         licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative

-        Commons Attribution-ShareAlike 2.0</a> license (CC-BY-SA).
+        Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).

       credit_title_html: How to credit OpenStreetMap
       credit_1_html: |
         We require that you use the credit &ldquo;&copy; OpenStreetMap
       credit_title_html: How to credit OpenStreetMap
       credit_1_html: |
         We require that you use the credit &ldquo;&copy; OpenStreetMap


@@ -1069,7 +1077,7 @@ en:
       credit_2_html: |
         You must also make it clear that the data is available under the Open
         Database License, and if using our map tiles, that the cartography is
       credit_2_html: |
         You must also make it clear that the data is available under the Open
         Database License, and if using our map tiles, that the cartography is

-        licensed as CC-BY-SA. You may do this by linking to
+        licensed as CC BY-SA. You may do this by linking to

         <a href="http://www.openstreetmap.org/copyright">this copyright page</a>.
         Alternatively, and as a requirement if you are distributing OSM in a
         data form, you can name and link directly to the license(s). In media
         <a href="http://www.openstreetmap.org/copyright">this copyright page</a>.
         Alternatively, and as a requirement if you are distributing OSM in a
         data form, you can name and link directly to the license(s). In media


@@ -1104,7 +1112,7 @@ en:
         <a href="http://data.wien.gv.at/">Stadt Wien</a> (under
         <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
         <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
         <a href="http://data.wien.gv.at/">Stadt Wien</a> (under
         <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
         <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and

-        Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT with amendments</a>).
+        Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).

       contributors_ca_html: |
         <strong>Canada</strong>: Contains data from
         GeoBase&reg;, GeoGratis (&copy; Department of Natural
       contributors_ca_html: |
         <strong>Canada</strong>: Contains data from
         GeoBase&reg;, GeoGratis (&copy; Department of Natural


@@ -1149,83 +1157,71 @@ en:
         procedure</a> or file directly at our
         <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
   welcome_page:
         procedure</a> or file directly at our
         <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
   welcome_page:

-    title: Welcome to OpenStreetMap
-    subtitle: a free map that you can edit
+    title: Welcome!

     introduction_html: |
     introduction_html: |

-      Unlike other maps, OpenStreetMap is completely <abbr title="OpenStreetMap has over
-      1 million users, who add data based on local knowledge, GPS tracks, and more">created
-      by people like you</abbr>, and free for anyone to fix, update, download and use.
-      Here's a quick guide to get you started!
-    section_1:
-      title: 'One Map: Many Websites'
-      paragraph_1_html: |
-        If you're here to correct an error you found on a site like Foursquare or Craigslist,
-        you're in the right place - OpenStreetMap is the central map database used by hundreds
-        of websites.
-      paragraph_2_html: |
-        You just need to edit OpenStreetMap, and the changes will be visible everywhere else.
-        Copying the map data from place to place can take from a few minutes to a few hours,
-        so don't worry if it isn't instant.
-    section_2:
+      Welcome to OpenStreetMap, the free and editable map of the world. Now that you're signed
+      up, you're all set to get started mapping. Here's a quick guide with the most important
+      things you need to know.
+    whats_on_the_map:

       title: What's on the Map
       on_html: |
       title: What's on the Map
       on_html: |

-        OpenStreetMap is a place for any data that's both <em>real and current</em> - it includes
-        millions of buildings, roads, and other details about places.
+        OpenStreetMap is a place for mapping things that are both <em>real and current</em> -
+        it includes millions of buildings, roads, and other details about places. You can map
+        whatever real-world features are interesting to you.

       off_html: |
       off_html: |

-        What it <em>doesn't</em> include is opinionated data, like ratings, or data that isn't
-        current, like historical buildings or hypothetical structures.
-    section_3:
-      title: You're Signed Up
-      title_no_user: Get a Free Account
-      paragraph_1_html: |
-        To edit OpenStreetMap, you'll need <a target="_blank" href="https://www.openstreetmap.org/user/new">a
-        free user account - sign up here</a>.
-      paragraph_2_html: |
-        With your user account, you can edit the map,
-        <abbr title="Your profile shows off how much you have edited!">create a profile</abbr> page, and
-        <abbr title="Users on OpenStreetMap talk over mailing lists, chat, and private messages you can
-        send on the website">communicate with other people</abbr> working on improving the map.
-    section_4:
+        What it <em>doesn't</em> include is opinionated data like ratings, historical or
+        hypothetical features, and data from copyrighted sources. Unless you have special
+        permission, don't copy from online or paper maps.
+    basic_terms:

       title: Basic Terms For Mapping
       paragraph_1_html: |
         OpenStreetMap has some of its own lingo. Here are a few key words that'll come in handy.
       editor_html: |
       title: Basic Terms For Mapping
       paragraph_1_html: |
         OpenStreetMap has some of its own lingo. Here are a few key words that'll come in handy.
       editor_html: |

-        <strong>An Editor</strong> is a program or website you can use to edit the map.
+        An <strong>editor</strong> is a program or website you can use to edit the map.

       node_html: |
       node_html: |

-        <strong>A Node</strong> is a point on the map, like a single restauraunt or a tree.
+        A <strong>node</strong> is a point on the map, like a single restauraunt or a tree.

       way_html: |
       way_html: |

-        <strong>A Way</strong> is a line, like a road, stream, or shape.
-      changeset_html: |
-        <strong>A Changeset</strong> is <abbr title='changesets can have comments, like "adding a
-        road here", that let other users know what you were intending to change and why'>group of
-        changes</abbr> to the map saved by a user.
-    section_5:
+        A <strong>way</strong> is a line or area, like a road, stream, lake or building.
+      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.
+    questions:

       title: Any questions?
       paragraph_1_html: |
       title: Any questions?
       paragraph_1_html: |

-        Need help mapping, or not clear on how to use OpenStreetMap? Feel free to ask on
-        <a href='http://help.openstreetmap.org/'>the help website</a>!
-    section_6:
-      title: Start Editing
-      paragraph_1_html: |
-        You can zoom in anywhere in the world and click the <em>Edit</em> button to start editing.
-      paragraph_1_no_user_html: |
-        Once you have an account, you can zoom in anywhere in the world and click the <em>Edit</em> button
-        to start editing.
-      paragraph_2_html: |
-        Since OpenStreetMap is an open project, there are lots of different ways to edit the map - whether with
-        <a href='http://www.openstreetmap.org/edit?editor=id'>a web based editor like iD</a>, or
-        <a href='https://itunes.apple.com/us/app/pushpin-osm/id565850639?mt=8'>on your iPhone with Pushpin</a>,
-        or <a href='https://play.google.com/store/apps/details?id=net.osmand.plus'>with your Android phone
-        with OsmAnd+</a>.
-    section_7:
+        OpenStreetMap has several resources for learning about the project, asking and answering
+        questions, and collaboratively discussing and documenting mapping topics.
+        <a href='%{help_url}'>Get help here</a>.
+    start_mapping: Start Mapping
+    add_a_note:

       title: No Time To Edit? Add a Note!
       paragraph_1_html: |
         If you just want something small fixed and don't have the time to sign up and learn how to edit, it's
       title: No Time To Edit? Add a Note!
       paragraph_1_html: |
         If you just want something small fixed and don't have the time to sign up and learn how to edit, it's

-        easy to add a note!
+        easy to add a note.

       paragraph_2_html: |
       paragraph_2_html: |

-        Just go to <a href='http://www.openstreetmap.org/'>the map</a> and click <em>'Add a note'</em> in
-        the <em>bottom-right corner</em>. This will add a marker to the map, which you can move by dragging
-        the green plus sign. Click save to add a note, and experienced mappers will find and address your issue.
+        Just go to <a href='%{map_url}'>the map</a> and click the note icon:
+        <span class='icon note'></span>. This will add a marker to the map, which you can move
+        by dragging. Add your message, then click save, and other mappers will investigate.
+  help_page:
+    title: Getting Help
+    introduction: |
+      OpenStreetMap has several resources for learning about the project, asking and answering questions,
+      and collaboratively discussing and documenting mapping topics.
+    welcome:
+      url: http://www.openstreetmap.org/welcome
+      title: Welcome to OSM
+      description: Start with this quick guide covering the OpenStreetMap basics.
+    learnosm:
+      url: http://learnosm.org/
+      title: LearnOSM
+      description: Learn how to edit OpenStreetMap with the JOSM editor step-by-step.
+    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.
+    wiki:
+      url: http://wiki.openstreetmap.org/
+      title: wiki.openstreetmap.org
+      description: Browse the wiki for in-depth OSM documentation.

   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] %{user} commented on your diary entry"
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] %{user} commented on your diary entry"


@@ -1262,28 +1258,7 @@ en:
       greeting: "Hi there!"
       created: "Someone (hopefully you) just created an account at %{site_url}."
       confirm: "Before we do anything else, we need to confirm that this request came from you, so if it did then please click the link below to confirm your account:"
       greeting: "Hi there!"
       created: "Someone (hopefully you) just created an account at %{site_url}."
       confirm: "Before we do anything else, we need to confirm that this request came from you, so if it did then please click the link below to confirm your account:"

-      welcome: "We would like to welcome you and provide you with some additional information to get you started."
-    signup_confirm_plain:
-      introductory_video: "You can watch an introductory video to OpenStreetMap here:"
-      more_videos: "There are more videos here:"
-      the_wiki: "Get reading about OpenStreetMap on the wiki:"
-      the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_guide"
-      blog_and_twitter: "Catch up with the latest news via the OpenStreetMap blog or Twitter:"
-      ask_questions: "You can ask any questions you may have about OpenStreetMap at our question and answer site:"
-      wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
-      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
-      user_wiki_page: "It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]]."
-      current_user: "A list of current users in categories, based on where in the world they are, is available from:"
-    signup_confirm_html:
-      introductory_video: "You can watch an %{introductory_video_link}."
-      video_to_openstreetmap: "introductory video to OpenStreetMap"
-      more_videos: "There are %{more_videos_link}."
-      more_videos_here: "more videos here"
-      get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_guide">on the wiki</a>, and catch up with the latest news via the <a href="http://blog.openstreetmap.org/">OpenStreetMap blog</a> or <a href="http://twitter.com/openstreetmap">Twitter</a>.
-      ask_questions: You can ask any questions you may have about OpenStreetMap at our <a href="http://help.openstreetmap.org/">question and answer site</a>.
-      wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
-      user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
-      current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
+      welcome: "After you confirm your account, we'll provide you with some additional information to get you started."

     email_confirm:
       subject: "[OpenStreetMap] Confirm your email address"
     email_confirm_plain:
     email_confirm:
       subject: "[OpenStreetMap] Confirm your email address"
     email_confirm_plain:


@@ -1326,7 +1301,7 @@ en:
   message:
     inbox:
       title: "Inbox"
   message:
     inbox:
       title: "Inbox"

-      my_inbox: "My inbox"
+      my_inbox: "My Inbox"

       outbox: "outbox"
       messages: "You have %{new_messages} and %{old_messages}"
       new_messages:
       outbox: "outbox"
       messages: "You have %{new_messages} and %{old_messages}"
       new_messages:


@@ -1610,6 +1585,13 @@ en:
     offline:
       heading: "GPX Storage Offline"
       message: "The GPX file storage and upload system is currently unavailable."
     offline:
       heading: "GPX Storage Offline"
       message: "The GPX file storage and upload system is currently unavailable."

+    georss:
+      title: "OpenStreetMap GPS Traces"
+    description:
+      description_with_count:
+        one: "GPX file with %{count} point from %{user}"
+        other: "GPX file with %{count} points from %{user}"
+      description_without_count: "GPX file from %{user}"

   application:
     require_cookies:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
   application:
     require_cookies:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."


@@ -1753,11 +1735,15 @@ en:
       flash changed: "Your password has been changed."
       flash token bad: "Did not find that token, check the URL maybe?"
     new:
       flash changed: "Your password has been changed."
       flash token bad: "Did not find that token, check the URL maybe?"
     new:

-      title: "Create account"
-      heading: "Create a User Account"
+      title: "Sign Up"

       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'

-      fill_form: "Fill in the form and we will send you a quick email to activate your account."
+      about:
+        header: Free and editable
+        html: |
+          <p>Unlike other maps, OpenStreetMap is completely created by people like you,
+          and it's free for anyone to fix, update, download and use.</p>
+          <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>

       license_agreement: 'When you confirm your account you will need to agree to the <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'
       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"
       license_agreement: 'When you confirm your account you will need to agree to the <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'
       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"


@@ -1779,16 +1765,14 @@ en:
             with your OpenID in your user settings.
           </li>
         </ul>
             with your OpenID in your user settings.
           </li>
         </ul>

-      continue: Continue
-      flash welcome: "Thanks for signing up. We've sent a welcome message to %{email} with some hints on getting started."
-      flash create success message: "Thanks for signing up. We've sent a confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
+      continue: Sign Up

       terms accepted: "Thanks for accepting the new contributor terms!"
       terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"%{url}\">this wiki page</a>."
       terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     terms:
       title: "Contributor terms"
       heading: "Contributor terms"
       terms accepted: "Thanks for accepting the new contributor terms!"
       terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"%{url}\">this wiki page</a>."
       terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     terms:
       title: "Contributor terms"
       heading: "Contributor terms"

-      read and accept: "Please read the agreement below and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions."
+      read and accept: "Please read the agreement and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions."

       consider_pd: "In addition to the above agreement, 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
       consider_pd: "In addition to the above agreement, 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


@@ -1797,7 +1781,7 @@ en:
       declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
       decline: "Decline"
       you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."
       declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
       decline: "Decline"
       you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."

-      legale_select: "Please select your country of residence:"
+      legale_select: "Country of residence:"

       legale_names:
         france: "France"
         italy: "Italy"
       legale_names:
         france: "France"
         italy: "Italy"


@@ -1807,23 +1791,24 @@ en:
       heading: "The user %{user} does not exist"
       body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
     view:
       heading: "The user %{user} does not exist"
       body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
     view:

-      my diary: my diary
+      my diary: My Diary

       new diary entry: new diary entry
       new diary entry: new diary entry

-      my edits: my edits
-      my traces: my traces
-      my notes: my map notes
-      my settings: my settings
-      my comments: my comments
+      my edits: My Edits
+      my traces: My Traces
+      my notes: My Notes
+      my profile: My Profile
+      my settings: My Settings
+      my comments: My Comments

       oauth settings: oauth settings
       oauth settings: oauth settings

-      blocks on me: blocks on me
-      blocks by me: blocks by me
-      send message: send message
-      diary: diary
-      edits: edits
-      traces: traces
-      notes: map notes
-      remove as friend: unfriend
-      add as friend: add friend
+      blocks on me: Blocks on Me
+      blocks by me: Blocks by Me
+      send message: Send Message
+      diary: Diary
+      edits: Edits
+      traces: Traces
+      notes: Map Notes
+      remove as friend: Unfriend
+      add as friend: Add Friend

       mapper since: "Mapper since:"
       ago: "(%{time_in_words_ago} ago)"
       ct status: "Contributor terms:"
       mapper since: "Mapper since:"
       ago: "(%{time_in_words_ago} ago)"
       ct status: "Contributor terms:"


@@ -1856,7 +1841,7 @@ en:
           moderator: "Revoke moderator access"
       block_history: "blocks received"
       moderator_history: "blocks given"
           moderator: "Revoke moderator access"
       block_history: "blocks received"
       moderator_history: "blocks given"

-      comments: "comments"
+      comments: "Comments"

       create_block: "block this user"
       activate_user: "activate this user"
       deactivate_user: "deactivate this user"
       create_block: "block this user"
       activate_user: "activate this user"
       deactivate_user: "deactivate this user"


@@ -1925,14 +1910,16 @@ en:
       flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       flash update success: "User information updated successfully."
     confirm:
       flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       flash update success: "User information updated successfully."
     confirm:

-      heading: Confirm a user account
+      heading: Check your email!
+      introduction_1: |
+        We sent you a confirmation email.
+      introduction_2: |
+        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
       press confirm button: "Press the confirm button below to activate your account."
       button: Confirm

-      success: "Confirmed your account, thanks for signing up!"
-      before you start: "We know you're probably in a hurry to start mapping, but before you do you might like to fill in some more information about yourself in the form below."

       already active: "This account has already been confirmed."
       already active: "This account has already been confirmed."

-      unknown token: "That token doesn't seem to exist."
-      reconfirm: "If it's been a while since you signed up you might need to <a href=\"%{reconfirm}\">send yourself a new confirmation email</a>."
+      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>."

     confirm_resend:
       success: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
       failure: "User %{name} not found."
     confirm_resend:
       success: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
       failure: "User %{name} not found."


@@ -2159,22 +2146,21 @@ en:
         cycle_map: Cycle Map
         transport_map: Transport Map
         mapquest: MapQuest Open
         cycle_map: Cycle Map
         transport_map: Transport Map
         mapquest: MapQuest Open

+        hot: Humanitarian

       layers:
         header: Map Layers
         notes: Map Notes
         data: Map Data
         overlays: Enable overlays for troubleshooting the map
       layers:
         header: Map Layers
         notes: Map Notes
         data: Map Data
         overlays: Enable overlays for troubleshooting the map

+        title: "Layers"

       copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
     site:
       edit_tooltip: Edit the map
       edit_disabled_tooltip: Zoom in to edit the map
       copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
     site:
       edit_tooltip: Edit the map
       edit_disabled_tooltip: Zoom in to edit the map

-      edit_zoom_alert: You must zoom in to edit the map

       history_tooltip: View edits for this area
       history_disabled_tooltip: Zoom in to view edits for this area
       history_tooltip: View edits for this area
       history_disabled_tooltip: Zoom in to view edits for this area

-      history_zoom_alert: You must zoom in to view edits for this area

       createnote_tooltip: Add a note to the map
       createnote_disabled_tooltip: Zoom in to add a note to the map
       createnote_tooltip: Add a note to the map
       createnote_disabled_tooltip: Zoom in to add a note to the map

-      createnote_zoom_alert: You must zoom in to add a note to the map

     notes:
       new:
         intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below."
     notes:
       new:
         intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below."


@@ -2195,6 +2181,7 @@ en:
         reactivate: Reactivate
         comment_and_resolve: Comment & Resolve
         comment: Comment
         reactivate: Reactivate
         comment_and_resolve: Comment & Resolve
         comment: Comment

+    edit_help: Move the map and zoom in on a location you want to edit, then click here.

   redaction:
     edit:
       description: "Description"
   redaction:
     edit:
       description: "Description"