=== modified file 'rhythmbox.xml'
--- rhythmbox.xml	2006-10-02 00:38:26 +0000
+++ rhythmbox.xml	2008-05-04 00:20:01 +0000
@@ -2,9 +2,7 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
   <!ENTITY legal SYSTEM "legal.xml">
-  <!ENTITY appversion "0.9.4">
-  <!ENTITY manrevision "2.0.2">
-  <!ENTITY date "April 2006">
+  <!ENTITY appversion "0.11.5">
   <!ENTITY app "Rhythmbox Music Player">
 ]>
 <!--
@@ -34,7 +32,7 @@
 <!-- please do not change the id; for translations, change lang to -->
 <!-- appropriate code -->
   <articleinfo>
-  	<title>&app; Manual V&manrevision;</title>
+  	<title>&app;</title>
 	<copyright>
 		<year>2002</year>
 		<holder>Mark Finlay</holder>
@@ -53,6 +51,10 @@
 		<year>2006</year>
 		<holder>Victor Osadci</holder>
 	</copyright>
+	<copyright>
+		<year>2008</year>
+		<holder>Dean Sas</holder>
+	</copyright>
 
 <!-- translators: uncomment this:
   <copyright>
@@ -105,6 +107,14 @@
 				<address><email>Victor.Osadci.GNOME@xhtml.md</email></address>
 			</affiliation>
 		</author>
+		<author>
+			<firstname>Dean</firstname>
+			<surname>Sas</surname>
+			<affiliation>
+				<orgname>Ubuntu Documentation Project</orgname>	
+				<address><email>dean@deansas.org</email></address>
+			</affiliation>
+		</author>
    </authorgroup>
 
 <!-- According to GNU FDL, revision history is mandatory if you are -->
@@ -138,14 +148,22 @@
 		</revdescription> 
       </revision> 
       <revision> 
-		<revnumber>&app; Manual V&manrevision;</revnumber> 
-		<date>&date;</date> 
+		<revnumber>&app; Manual V2.0.2</revnumber> 
+		<date>April 2006</date> 
 		<revdescription> 
 	  		<para role="author">Luca Ferretti
 	  		</para>
 	  		<para role="publisher">GNOME Documentation Project</para>
 		</revdescription> 
       </revision> 
+	  <revision>
+		<revnumber>&app; Manual V2.0.3</revnumber>
+		<date>May 2008</date>
+		<revdescription>
+			<para role="author">Dean Sas</para>
+			<para role="publisher">GNOME Documentation Project</para>
+        </revdescription>
+      </revision>
     </revhistory> 
 
     <releaseinfo>This manual describes version &appversion; of Rhythmbox Music Player.
@@ -217,6 +235,10 @@
           <listitem>
             <para>Burn Audio CDs from playlists.</para>
           </listitem>
+          <listitem>
+            <para>Transfer music to iPod, MTP and USB Mass Storage music players
+            .</para>
+          </listitem>
         </itemizedlist>
   </sect1>
   <sect1 id="rb-getting-started">
@@ -367,6 +389,8 @@
 				  </para></listitem>
 				  <listitem><para>The DAAP Music shares discovered on the local network.
 				  </para></listitem>
+				  <listitem><para>Music stores like Jamendo and Magnatune.
+				  </para></listitem>
 				</itemizedlist>
 		</para>
       	<para>
@@ -457,7 +481,7 @@
       press the <guibutton>Play</guibutton> button on the toolbar, or simply 
       double-click on the track to start playing.
 		</para>
-      <para>When track ends, <application>&app;</application> jumps to play next 
+      <para>When the track ends, <application>&app;</application> jumps to play  the next 
       track in the list showed in view pane.
 		</para>
       <para>In the Library you can play all songs from an artist or a single 
@@ -575,9 +599,9 @@
 			in the tags embedded on the tracks. <application>&app;</application> uses 
 			these tags to display the tracks in an organized manner.
 			<tip>
-				<para>At this time <application>&app;</application> is not able to modify the tags of
-				your music files, but you can use another software like
-				<application>Easytag</application>.</para>
+				<para>Tags can be modified by choosing <menuchoice><guimenu>
+				Music</guimenu><guimenuitem>Properties</guimenuitem> 
+				</menuchoice> and filling in the details on the window that appears.</para>
 			</tip>
 		</para>
     <sect2 id="library-tracks-add">
@@ -630,27 +654,27 @@
 			removed from the Rhythmbox database.
 		</para>
       	<para>
-			To delete a track from the Library but also from your disk, choose
-			menu <menuchoice><guimenu>Edit</guimenu><guimenuitem>Move to
+			To delete a track from the Library and also from your disk, choose
+			<menuchoice><guimenu>Edit</guimenu><guimenuitem>Move to
 			Trash</guimenuitem></menuchoice>. The track will be removed in the
-			same way as previous, but the file will be moved in the file
+			same way as previous, but the file will be moved in to the file
 			manager Trash.
 		</para>
     </sect2>
     <sect2 id="library-filter-search">
     	<title>Find tracks using Search</title>
       	<para>
-			Rhythmbox comes with a search function, which enables to find
+			Rhythmbox comes with a search function, which enables you to find
 			and filter tracks by using a search term.
 		</para>
       	<para>
 			Enter some text in the search entry, and as you type, only
 			the tracks that match the text entered will be displayed. The search
-			function does the lookup in all the tags of the tracks stored in the
-			Library.
+			function does the lookup in all of the tags of the tracks stored in
+			the Library.
 		</para>
 		<para>
-			To perform more precise search, you can choose to lookup only
+			To perform a more precise search, you can choose to lookup only
 			in specific tags <guilabel>Artists</guilabel>,
 			<guilabel>Albums</guilabel> or <guilabel>Titles</guilabel>.
 		</para>
@@ -676,11 +700,11 @@
 			</para>
       	</tip>
       		<para>
-				You can also find from a selected track in the track list, all the
-				tracks with the same genre, artist or album name. Select a track in
-				the track list, right-click on it, and choose <guilabel>Browse
-				this Genre/Artist/Album</guilabel>. Then the browser will filter the
-				tracks using the criteria chosen.
+				You can also find from a selected track in the track list, all 
+				of the tracks with the same genre, artist or album name. Select
+				a track in the track list, right-click on it, and choose
+				<guilabel>Browse this Genre/Artist/Album</guilabel>. Then the 
+				browser will filter the tracks using the criteria chosen.
 			</para>
   	</sect2>
   </sect1>
@@ -703,7 +727,7 @@
       	<title>Adding a station</title>
       	<para>
 			To add a new station to the Internet Radio tuner, choose <menuchoice><guimenu>Music</guimenu>
-			<guimenuitem>Add New Internet Radio Station</guimenuitem></menuchoice>, then enter the URL of
+			<guimenuitem>New Internet Radio Station</guimenuitem></menuchoice>, then enter the URL of
 			the Internet radio, then press the button <guibutton>Add</guibutton>.
 		</para>
     </sect2>
@@ -739,13 +763,13 @@
 		XML feed.
 	</para>
     <para>
-		Rhythmbox enables you to suscribe to podcast feeds, so when a new episode is 
-		available you'll be informed, it will download this episode and it will
-		play it.
+		&app; enables you to subscribe to podcast feeds, so when a new episode  
+		is available you'll be informed, it will download this episode and it 
+		will play it.
 	</para>
     <tip>
       	<para>
-		You can find more information about podcast and podcasting by visiting the
+		You can find more information about podcasts and podcasting by visiting the
 		definition of <ulink url="http://en.wikipedia.org/wiki/Podcast">Podcast</ulink> on the 
 		site <ulink url="http://en.wikipedia.org/">Wikipedia</ulink>.
 		</para>
@@ -798,12 +822,12 @@
 			To know if new episodes have been published for a podcast,
 			right-click over the podcast name in the browser and choose
 			<menuchoice><guimenuitem>Update Podcast	Feed</guimenuitem></menuchoice>. If new episodes
-			were pusblished, they will appear in the episode list.
+			were published, they will appear in the episode list.
 			</para>
         <tip>
           <para>
-			Rhythmbox checks regularly, by its own, the podcast feeds list
-			to know if they	were updated.
+			&app; checks regularly, on its own, the podcast feeds list
+			to find out if they	were updated.
 			</para>
         </tip>
         <para>
@@ -819,14 +843,15 @@
 			choose
 			<menuchoice><guimenuitem>Properties</guimenuitem></menuchoice>.
 			<itemizedlist><listitem><para>
-						On the tab <guilabel>Basic</guilabel> you view the podcast
-						<guilabel>Title</guilabel>, <guilabel>Author</guilabel>, the
-						<guilabel>Last Updated</guilabel> date and the
-						<guilabel>Description</guilabel>.
+						On the <guilabel>Basic</guilabel> tab you view the 
+						podcast <guilabel>Title</guilabel>, <guilabel>Author
+						</guilabel>, the <guilabel>Last Updated</guilabel>
+						date and the <guilabel>Description</guilabel>.
 					</para></listitem><listitem><para>
-						On the tab <guilabel>Details</guilabel> you view the feed 
-						<guilabel>Source</guilabel>, <guilabel>Language</guilabel>, 
-						and the <guilabel>Copyright</guilabel> properties.
+						On the <guilabel>Details</guilabel> tab you view the 
+						feed <guilabel>Source</guilabel>, <guilabel>Language
+						</guilabel>and the <guilabel>Copyright</guilabel> 
+						properties.
 					</para></listitem></itemizedlist>
 			You can view the properties, and also edit the rating.
 			</para>
@@ -874,7 +899,7 @@
 			</para>
         <warning>
           <para>
-			When you delete an episode, it won't be available no more in the
+			After you delete an episode, it will no longer be available in the
 			list of episodes, even if you update the podcast.
 			</para>
         </warning>
@@ -904,19 +929,19 @@
   <sect1 id="playqueue">
   	<title>Play Queue Source</title>
 	<para>
-		Play queue is a source designed to store temporary the next tracks you
-		want to play. When you add a track in Play Queue,
+		Play queue is a source designed to temporarily store the next tracks you
+		want to play. When you add a track to the Play Queue,
 		<application>&app;</application> will automatically switch to this
-		source, after the tracks played.
+		source, after the track has played.
 	</para>
 	<para>
-		Once a track been played, it will be automatically removed form the Play
-		Queue Source.
+		Once a track has been played, it will be automatically removed from the 
+		Play Queue Source.
 		Once the Play Queue is empty, <application>&app;</application> will play the source which was
 		played before.
 	</para>
 		<sect2 id="playqueue-track-add">
-			<title>Add a track in Play Queue</title>
+			<title>Add a track to the Play Queue</title>
 			<para>To add a track:
 				<orderedlist>
 					<listitem>
@@ -956,12 +981,12 @@
   	<title>Playlists Source</title>
     <para>
 			Playlists are sources which are created from the tracks available in
-			the Library source. They enable to gather tracks following a
+			the Library source. They enable you to gather tracks following a
 			particular 'genre', a specific group of artists, or even tracks that 
 			are of a particular 'mood', or whatever you want.
 	</para>
     <para>
-			Rhythmbox has 2 kinds of playlists:
+			&app; has 2 kinds of playlists:
 			<itemizedlist>
 				<listitem>
 					<para>Static Playlists</para>
@@ -1039,9 +1064,9 @@
     <sect2 id="playlist-smart">
       <title>Smart Playlists</title>
       <para>
-				Smart Playlists are playlists built from criterias, so their
-				content is build dynamically; all the tracks matching criterias 
-				will be added in the playlist.
+				Smart Playlists are playlists built from criteria, so tracks
+				are added to it dynamically; all of the tracks matching the 
+				criteria will be added to the playlist.
 			</para>
       <sect3 id="playlist-smart-new">
         <title>Create a smart playlist</title>
@@ -1051,9 +1076,9 @@
 								Choose <menuchoice><guimenu>Music</guimenu><guisubmenu>Playlist</guisubmenu><guimenuitem>New
 								Automatic Playlist...</guimenuitem></menuchoice>.
 							</para></listitem><listitem><para>
-								Edit the playlist criterias through the query editor. 
+								Edit the playlist criteria through the query editor. 
 							</para></listitem><listitem><para>
-								Once your criterias chosen, click <guibutton>New</guibutton> to create the
+								Once your criteria have been chosen, click <guibutton>New</guibutton> to create the
 								query.
 							</para></listitem></orderedlist>
 				</para>
@@ -1061,10 +1086,10 @@
       <sect3 id="playlist-smart-edit">
         <title>Edit a smart playlist</title>
         <para>
-					Edit a smart playlist let you modify the criteria set for
-					this playlist. To edit a smart playlist, select the smart
-					playlist, choose
-					<menuchoice><guimenu>Music</guimenu><guisubmenu>Playlist</guisubmenu><guimenuitem>Edit...</guimenuitem></menuchoice>, and edit the criterias.
+					Editing a smart playlist lets you modify the criteria set 
+					for this playlist. To edit a smart playlist, select the 
+					smart playlist, choose
+					<menuchoice><guimenu>Music</guimenu><guisubmenu>Playlist</guisubmenu><guimenuitem>Edit...</guimenuitem></menuchoice>, and edit the criteria.
 					Once done, choose <guibutton>Close</guibutton>.
 				</para>
       </sect3>
@@ -1097,24 +1122,24 @@
 		duration (expressed in <guilabel>Minutes</guilabel>).
 		</para>
         <para>
-		Once you finish to set criteria for the playlist, choose
+		Once you finish setting the criteria for the playlist, choose
 		<guibutton>New</guibutton>; the playlist query editor window
-		closes, and the playlist display the tracks matched by your
-		criterias.
+		will close, and the playlist will display the tracks matched by your
+		criteria.
 		</para>
       </sect3>
     </sect2>
   </sect1>
   <sect1 id="AudioCD">
     <title>Audio CD Source</title>
-	<para><application>&app;</application> can also handle Audio CDs; it can play
-	it, but it lets you also burn your own compilations.</para>
+	<para><application>&app;</application> can also handle Audio CDs; it can 
+	play CDs and also let you burn your own.</para>
     <sect2 id="cd-playing">
       <title>Playing</title>
-      <para>When an Audio CD is inserted to the CD drive, it will appear in the
+      <para>When an Audio CD is inserted, it will appear in the
 	  Source list, and the tracks on it can be displayed in
 	  <application>&app;</application>'s main window. If you are connected to
-	  Internet, the tracks name will be retrieve and displayed.
+	  the Internet, the CD details will be retrieved and displayed.
 			</para>
       <para>To play and pause playback, or to skip forward or backwards,
 			use the same controls as used for playing from the library.
@@ -1123,10 +1148,10 @@
     <sect2 id="cd-import">
       <title>Importing Audio CD</title>
       <para>If you wish to keep the tracks of your Audio CDs on your computer,
-			you can import them; the tracks will be saved as music files.</para>
+			you can import them.</para>
       <para>To import Audio CD tracks, choose <menuchoice><guimenu>Music</guimenu>
 	  <guimenuitem>Import Audio CD...</guimenuitem></menuchoice>, it will start Sound-Juicer,
-			a GNOME application dedicated to Audio CD import. To know more about Sound-Juicer, 
+			an application dedicated to importing Audio CDs. To know more about Sound-Juicer, 
 			you can read the <ulink url="ghelp:sound-juicer">Sound-Juicer manual</ulink>.</para>
       <tip>
         <para>To get imported tracks from Sound-Juicer automatically added to you Rhythmbox Library,
@@ -1150,33 +1175,31 @@
     <title>Portable Audio Player Source</title>
     <para><application>Rhythmbox</application> can detect when an portable audio player is plugged to your
 	computer, and is able to read tracks stored on it.
-	<application>&app;</application> should be able to deals with most of
-	portable audio players like Apple iPod.</para>
-    <para>At this time, Rhythmbox can only read information but cannot write
-	(like tags modification, tracks deletion or copy track from
-	<application>&app;</application> to your player).</para>
+	<application>&app;</application> should be able to deal with most 
+	portable audio players including Apple iPod, MTP players and Mass Storage 
+	players.</para>
     <para>When you plug in a portable audio player, an icon for the Portable Audio Player
         is added to the Source List. This source works in the same way as the Library
         source.</para>
-	<tip><para>If <application>&app;</application> do not detect your device as
-	an portable audio player, you can create an empty file
+	<tip><para>If <application>&app;</application> does not detect your device 
+	as a portable audio player, you can create an empty file named
 	<filename>.is_audio_player</filename> at the top level hierarchy of the
 	filesystem of your player.</para></tip>
   </sect1>
   <sect1 id="daap">
     <title>DAAP Share Source</title>
-    <para>DAAP is a network protocol that allow to share the music stored in Rhythmbox. 
+    <para>DAAP is a network protocol that allows you to share the music stored in Rhythmbox. 
 	DAAP stands for Digital Audio Access Protocol.</para>
     <para>As DAAP is a standard protocol for music sharing, you can listen and share music
-	not only with others Rhythmbox users, but also with other users who uses DAAP compatible
-	software like iTunes.</para>
-    <para>When you will start Rhythmbox, it will look for all DAAP shares published on
+	not only with other Rhythmbox users, but also with other users who use DAAP compatible
+	software, like iTunes.</para>
+    <para>When you start Rhythmbox, it will look for all DAAP shares published on
         your local network (your home or your office, not the whole Internet) by other
         users and will display them in the <guilabel>Source</guilabel> list. If sharing
         is enabled, at the same time Rhythmbox will publish your library and your
         playlists. In this way, you can listen to music stored on your friend's
         computers and they can listen your music.</para>
-    <para>To disable Rhythmbox DAAP sharing feature, see <xref
+    <para>To disable the Rhythmbox DAAP sharing feature, see <xref
 	linkend="prefs-sharing"/> in the preferences.</para>
   </sect1>
   <sect1 id="notification">
@@ -1287,23 +1310,25 @@
   <sect1 id="customize">
     <title>Customizing &app;</title>
     <para>
-	You can customize <application>&app;</application> to suit your requirements and
-	preferences. This section describes how to customize <application>&app;</application>.
+	This section describes how to customize <application>&app;</application> to
+	suit your requirements and preferences.
 	</para>
     <sect2 id="prefs">
       <title>Setting Your Preferences</title>
       <para>
-		Using the <guilabel>Preferences</guilabel> dialog you can customize how you 
-		want <application>&app;</application> to look and behave. To display the
-		<guilabel>Preferences</guilabel> dialog, choose 
+		Using the <guilabel>Preferences</guilabel> dialog you can customize how 
+		you want <application>&app;</application> to look and behave. To display
+		the <guilabel>Preferences</guilabel> dialog, choose 
 		<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>.
 		</para>
       <sect3 id="prefs-general">
       	<title>General</title>
+		<para>Choose the way the <guilabel>Browser View</guilabel> will be displayed. You can choose to use three or two panes and what the panes should display.
+		</para>
       	<para>
 			Choose the <guilabel>Visible Columns</guilabel> you want to
-			display in <application>&app;</application>. This option is global and affects the
-			following sources:
+			display in <application>&app;</application>. This option is affects 
+			the following sources:
 			<itemizedlist>
 				<listitem><para>Library</para></listitem>
 				<listitem><para>Audio CD</para></listitem>
@@ -1314,12 +1339,10 @@
 		</para>
       </sect3>
       <sect3 id="prefs-library">
-        <title>Library</title>
+        <title>Music</title>
         <itemizedlist>
           <listitem>
             <para>
-				Choose the way the <guilabel>Browser View</guilabel> will be displayed. 
-				You can choose to use three or two panes.
 			</para>
           </listitem>
           <listitem>
@@ -1355,11 +1378,11 @@
           <listitem>
             <para>
 				The <guilabel>Download Location</guilabel> of Podcasts is defined 
-				by default to Folder <filename class="directory">Podcasts/</filename>
-				in your home directory.
+				by default to the <filename class="directory">Podcasts/
+				</filename> folder in your home directory.
 			</para>
             <para>
-				If this location doesn't fit your	needs, select another folder 
+				If this location doesn't fit your needs, select another folder 
 				in the drop-down list or choose <guilabel>Other...</guilabel>
 				to make the File Selector appears.
 			</para>

