Replace changeset definition with tag

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 78126bb8878691a7428e0b2ce7e2cc274c65df37..adcb01d5295fe0ac66a273d7e068554a54957245 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -2339,7 +2339,7 @@ a.button {
     background-position: -150px 0;
   }
 
     background-position: -150px 0;
   }
 

-  .sprite.changeset {
+  .sprite.tag {

     background-position: -200px 0;
   }
 
     background-position: -200px 0;
   }
 

diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb
index 115833cd35b4b46991b4ee94867e4f2753d5a5b4..45fededab16f26eaa458b3e6bee09a37014f5f61 100644 (file)
--- a/app/views/site/welcome.html.erb
+++ b/app/views/site/welcome.html.erb
@@ -43,8 +43,8 @@
     <p><%= t "welcome_page.basic_terms.way_html" %></p>
   </div>
   <div class='clearfix'>
     <p><%= t "welcome_page.basic_terms.way_html" %></p>
   </div>
   <div class='clearfix'>

-    <span class='sprite small term changeset'></span>
-    <p><%= t "welcome_page.basic_terms.changeset_html" %></p>
+    <span class='sprite small term tag'></span>
+    <p><%= t "welcome_page.basic_terms.tag_html" %></p>

   </div>
 </div>
 
   </div>
 </div>
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
index adc94066773e89aa9278b06458ec43c801e223ed..04573b6a7f9ff7a5caa61447e15193569cc9081a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1181,10 +1181,9 @@ en:
         A <strong>node</strong> is a point on the map, like a single restauraunt or a tree.
       way_html: |
         A <strong>way</strong> is a line or area, like a road, stream, lake or building.
         A <strong>node</strong> is a point on the map, like a single restauraunt or a tree.
       way_html: |
         A <strong>way</strong> is a line or area, like a road, stream, lake or building.

-      changeset_html: |
-        A <strong>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.
+      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: |
     questions:
       title: Any questions?
       paragraph_1_html: |