CVSROOT: /web/www
Module name: www
Changes by: Jeanne Rasata <jrasata> 10/09/26 12:33:31
Modified files:
music : free-software-song.html
Log message:
made edits to the lyrics, song title, and the recording information,
and corrected a typo
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/music/free-software-song.html?cvsroot=www&r1=1.52&r2=1.53
Patches:
Index: free-software-song.html
===================================================================
RCS file: /web/www/www/music/free-software-song.html,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- free-software-song.html 17 Sep 2010 22:35:31 -0000 1.52
+++ free-software-song.html 26 Sep 2010 12:33:25 -0000 1.53
@@ -8,26 +8,32 @@
<div class="lyrics">
<p>
-[To the melody of <a href="free-software-song.html#SadiMoma"
name="REFSadiMoma">Sadi Moma</a>:]
+The lyrics of the "Free Software Song" are sung to the melody of the
+Bulgarian fold song <a href="free-software-song.html#SadiMoma"
+ name="REFSadiMoma">"Sadi moma bela loza"</a>:]
</p>
<p>Join us now and share the software;<br />
- You'll be free, <a
href="http://stallman.org/articles/on-hacking.html">hackers</a>, you'll be
free.<br />
- <em>x2</em></p>
+ You'll be
+ free, <a href="http://stallman.org/articles/on-hacking.html">hackers</a>,
+ you'll be free.<br />
+ Join us now and share the software;<br />
+ You'll be free, hackers, you'll be free.<br />
- <p>Hoarders may get piles of money,<br />
+ <p>Hoarders can get piles of money,<br />
That is true, hackers, that is true.<br />
But they cannot help their neighbors;<br />
That's not good, hackers, that's not good.</p>
<p>When we have enough free software<br />
At our call, hackers, at our call,<br />
- We'll throw out those dirty licenses<br />
+ We'll kick out those dirty licenses<br />
Ever more, hackers, ever more.</p>
<p>Join us now and share the software;<br />
You'll be free, hackers, you'll be free.<br />
- <em>x2</em></p>
+ Join us now and share the software;<br />
+ You'll be free, hackers, you'll be free.<br />
</div>
@@ -43,12 +49,12 @@
song, also available in <a href="/music/free-software-song.ogg">Ogg
Vorbis format</a>.</li>
-<li>Another <a href="./FreeSWSong.ogg">good performance
-(ogg)</a> in a more proper Bulgarian style.</li>
+<li><a href="./FreeSWSong.ogg">A recording (.ogg)</a> of the piece
+ accompanied by Bulgarian instruments played in traditional style.</li>
<li>A <a
href="http://audio-video.gnu.org/video/stallman_free_software_song_320x240.ogv">video
-of rms performing the song (ogg)</a>, released under GFDLv1.3+ by the
+of RMS performing the song (ogg)</a>, released under GFDLv1.3+ by the
videographer, Julian Coccia.</li>
</ul>
@@ -60,7 +66,7 @@
<li><a
href="http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg">Another
song</a>, inspired by this one but mostly different, sung by the band
-Fenster (4.5M)</li>
+Fenster (4.5M).</li>
<li>A rhythmic version of free software song in <a
href="/music/free-software-song-rhythmic.ogg">Ogg Vorbis</a> format by
@@ -86,7 +92,7 @@
<a href="http://www.phoeniximago.com/2010/01/the-free-software-song/">Robert
Kay</a>, released under
<a href="http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode">
- CC-BY-NC-SA</a></li>
+ CC-BY-NC-SA</a>.</li>
</ul>
@@ -105,10 +111,10 @@
</div>
-<h3 id="SadiMoma">Sadi Moma</h3>
+<h3 id="SadiMoma">"Sadi moma bela loza"</h3>
<p>
-Here is a description of the tune of Sadi Moma, a Bulgarian dance
+Here is a description of the tune of "Sadi moma bela loza", a Bulgarian dance
tune, in an ad-hoc form of notation using letters for notes. A dash
means the previous note continues. There are seven beats per measure,
thus seven characters in each group.
@@ -159,7 +165,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2010/09/17 22:35:31 $
+$Date: 2010/09/26 12:33:25 $
<!-- timestamp end -->
</p>