--- strings.txt.old	2004-07-21 00:34:00.000000000 -0700
+++ strings.txt	2004-07-23 12:15:55.000000000 -0700
@@ -1,4 +1,4 @@
-# $Id: strings.txt,v 1.4 2004/07/21 00:34:44 kdf Exp $
+# $Id: strings.txt,v 1.3 2004/07/17 01:44:43 kdf Exp $
 #
 # This tab-delimited file contains all the text strings used in the SlimServer
 # The format should be self explanatory. To submit a new language, or a better
@@ -4706,6 +4706,9 @@ ADD_TO_PLAYLIST
 	PT	Adicionar à lista
 	SE	Lägg till i låtlistan
 
+CONFIRM
+	EN	Confirm Overwrite
+
 TRACK
 	DE	Lied
 	DK	Track
@@ -5499,7 +5502,7 @@ NOTE
 RENAME_WARNING
 	DE	Der gewählte Name wird bereits verwendet. Bitte verwenden Sie einen anderen Namen für die Playlist.
 	DK	Det valgte navn er optaget. Vælg venligst et andet navn for din playliste.
-	EN	The name you chose is already taken. Please choose another name for your playlist.
+	EN	The name you chose is already taken. Please choose another name for your playlist, or check 'confirm overwrite' to replace your existing playlist.
 	FR	Ce nom est déjà utilisé. Veuillez choisir un autre nom pour votre liste de lecture.
 	NL	De gekozen naam is al in gebruik. Kies een andere naam voor Uw playlist.
 	NO	Navnet du brukte er allerede i bruk. Velg et annet navn for din spilleliste.
--- Pages.pm.old	2004-07-23 04:29:00.000000000 -0700
+++ Pages.pm	2004-07-23 12:13:42.000000000 -0700
@@ -204,7 +204,7 @@ sub browser {
 
 			$::d_http && msg("renaming $fulldir to $newfullname\n");
 
-			if ($newfullname ne $fulldir && !-e Slim::Utils::Misc::pathFromFileURL($newfullname) && rename(Slim::Utils::Misc::pathFromFileURL($fulldir), Slim::Utils::Misc::pathFromFileURL($newfullname))) {
+			if ($newfullname ne $fulldir && (!-e Slim::Utils::Misc::pathFromFileURL($newfullname) || defined $params->{'overwrite'}) && rename(Slim::Utils::Misc::pathFromFileURL($fulldir), Slim::Utils::Misc::pathFromFileURL($newfullname))) {
 
 				Slim::Music::Info::clearCache($container);
 				Slim::Music::Info::clearCache($fulldir);
--- Fishbone/browse_playlist.html.old	2004-07-22 21:20:00.000000000 -0700
+++ Fishbone/browse_playlist.html	2004-07-23 12:19:26.000000000 -0700
@@ -7,12 +7,13 @@
 		[% IF warn %]<div class="nowplaying"><b>[% "NOTE" | string %]</b> [% "SCAN_WARNING" | string %] [% IF not itunes %][% "SCAN_CLICK" | string %] <a href="browse.html?player=[% player | uri %]">[% "HERE" | string %]</a>.[% END %]
 		</div>[% END %]
 		[% IF RENAME_WARNING %]<div class="nowplaying"><p><b>[% "NOTE" | string %]</b> [% "RENAME_WARNING" | string %]</div>[% END %]
-		[% IF titled %]<div class="nowplaying">
-			<table border="0" cellspacing="0" cellpadding="0" width="100%">[% END %]
-				[% IF playlistname %]<tr><form method="get" action="browse.html"><td>[% savebuttonname %] [% "THIS_PLAYLIST_AS" | string %]
-						<input name="newname" value="[% playlistname %]" class="stdedit" size="30">
+		[% IF playlistname %]<div class="nowplaying">
+			<table border="0" cellspacing="0" cellpadding="0" width="100%">
+				<tr><form method="get" action="browse.html"><td width="325">[% savebuttonname %] [% "THIS_PLAYLIST_AS" | string %]
+						<input name="newname" value="[% IF newname %][% newname %][% ELSE %][% playlistname %][% END %]" class="stdedit" size="30">
 						<input type=submit value="[% savebuttonname %]" class="stdclick">
 						<input type=hidden value="[% player %]" name="player">
+						[% IF RENAME_WARNING %]</td><td valign="absmiddle" width="25"><input align="absmiddle" type="checkbox" name="overwrite" class="stdedit"></td><td>[% "CONFIRM" | string %][% END %]
 						<input type=hidden name="dir" value="[% dir %]"></td></form></tr>
 				</table>[% END %]
 			[% IF titled %]
@@ -20,8 +21,8 @@
 				<tr><td><a href="browse.html?player=[% player | uri %]&dir=[% dir | uri %]&delete=1">[% "DELETE_THIS_PLAYLIST" | string %]</a></td>
 				<td>&nbsp;&nbsp;<img src="html/pixel.grey.gif" width="1" height="100%" border="0">&nbsp;&nbsp;</td>
 				<td><a href="edit_playlist.html?dir=[% dir | uri %]&player=[% player | uri %]">[% "EDIT_PLAYLIST" | string %]</a></td></tr>
-			</table>
-		</div>[% END %]
+			</table>[% END %]
+		</div>
 		<center><p>[% IF song_count %][% "LIBRARY_CONTAINS" | string %] <B>[% song_count %]</B> [% "BY" | string %] <B>[% artist_count %]</B>[% END %]</p></center>
 		<table border="0" cellspacing="0" cellpadding="0" width="100%">
 			<tr><td><a href="browse.html?player=[% player | uri %]&dir=__playlists">[% "SAVED_PLAYLISTS" | string %]</a>
--- Default/browse_playlist.html.old	2004-07-08 06:44:00.000000000 -0700
+++ Default/browse_playlist.html	2004-07-23 12:24:19.000000000 -0700
@@ -42,8 +42,9 @@
     <p>
     <form method="get" action="browse.html">
       [% savebuttonname %] [% "THIS_PLAYLIST_AS" | string %] 
-      <input name="newname" value="[% playlistname %]" size=20>
+      <input name="newname" value="[% IF newname %][% newname %][% ELSE %][% playlistname %][% END %]" size=20>
       <input name="submit" type=submit value="[% savebuttonname %]">
+      [% IF RENAME_WARNING %]<input align="absmiddle" type="checkbox" name="overwrite">[% "CONFIRM" | string %][% END %]
       <input type=hidden value="[% player %]" name="player">
       <input type=hidden name="dir" value="[% dir %]">
     </form>
--- EN/browse_playlist.html.old	2004-07-08 06:44:00.000000000 -0700
+++ EN/browse_playlist.html	2004-07-23 12:23:37.000000000 -0700
@@ -17,9 +17,11 @@
 
 	[% IF RENAME_WARNING %]<p><b>[% "NOTE" | string %]</b> [% "RENAME_WARNING" | string %]<p><hr>[% END %]
 	
-	[% IF playlistname %]<p><form method="get" action="browse.html">[% savebuttonname %] [% "THIS_PLAYLIST_AS" | string %] <input name="newname" value="[% playlistname %]" size=40>
+	[% IF playlistname %]<p><form method="get" action="browse.html">[% savebuttonname %] [% "THIS_PLAYLIST_AS" | string %] 
+			<input name="newname" value="[% IF newname %][% newname %][% ELSE %][% playlistname %][% END %]" size=40>
 			<input type=submit value="[% savebuttonname %]"><input type=hidden value="[% player %]" name="player">
 			<input type=hidden name="dir" value="[% dir %]"></form>
+			[% IF RENAME_WARNING %]<input align="absmiddle" type="checkbox" name="overwrite">[% "CONFIRM" | string %][% END %]
 	[% END %]
 	
 	[% IF titled %]<p><a href="browse.html?player=[% player | uri %]&dir=[% dir | uri %]&delete=1">[% "DELETE_THIS_PLAYLIST" | string %]</a></p>[% END %]