Copy updates

* Less !!!
* Discourage copying from other sources
* Don't mention creating a profile page
* Don't explicitly instruct users to ask questions
* Cut editor list
* Refine note instructions

diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb
index d97b08d9aaa49adcf02a57835169ea8ee5270dd4..8190ac1f87deb73607c90054d5f2a92dd9a9ba54 100644 (file)
--- a/app/views/site/welcome.html.erb
+++ b/app/views/site/welcome.html.erb
@@ -83,7 +83,6 @@
   <% else %>
     <p><%= t "welcome_page.section_6.paragraph_1_no_user_html" %></p>
   <% end %>
-  <p><%= t "welcome_page.section_6.paragraph_2_html" %></p>
 </div>
 
 <div class='note-box pad2 drop'>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index f1fda060303c5faefe37c0dbf74ec7f86026aad9..5a02fae8702a261adab092320fddf369fdb59fd8 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1155,7 +1155,7 @@ en:
       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!
+      Here's a quick guide to get you started.
     section_1:
       title: 'One Map: Many Websites'
       paragraph_1_html: |
@@ -1169,22 +1169,23 @@ en:
     section_2:
       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: |
-        What it <em>doesn't</em> include is opinionated data, like ratings, or data that isn't
-        current, like historical buildings or hypothetical structures.
+        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.
     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>.
+        To edit OpenStreetMap, you'll need a user account.
+        <a href="https://www.openstreetmap.org/user/new">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.
+        With your user account, you can edit the map and <abbr title="Users on OpenStreetMap talk
+        over mailing lists, chat, and private messages you can send on the website">collaborate
+        with other mappers</abbr>.
     section_4:
       title: Basic Terms For Mapping
       paragraph_1_html: |
@@ -1202,30 +1203,24 @@ en:
     section_5:
       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>!
+        Need help mapping, or not clear on how to use OpenStreetMap? Get your questions answered
+        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>.
+        Once you have an account, you can zoom in anywhere in the world and click the <em>Edit</em>
+        button to start editing.
     section_7:
       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: |
         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.
+        the green plus sign. Add your message, then click save, and other mappers will investigate.
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] %{user} commented on your diary entry"