diff -urN ampache-3.3.2-alpha4/activate.php ampache-3.3.2-beta1/activate.php
--- ampache-3.3.2-alpha4/activate.php	1969-12-31 16:00:00.000000000 -0800
+++ ampache-3.3.2-beta1/activate.php	2006-01-08 23:06:20.000000000 -0800
@@ -0,0 +1,55 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2006 Ampache.org
+ All Rights Reserved
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+
+$no_session = true;
+require_once( "modules/init.php" );
+
+/* Keep them out if they shouldn't be here */
+if(!conf('allow_public_registration') || conf('demo_mode'))  {
+	access_denied();
+}
+
+?>
+<html><head>
+<?php show_template('style'); ?>
+<head><body>
+<?php 
+
+$username 	= scrub_in($_GET['u']);
+$validation  	= scrub_in($_GET['act_key']);
+$val1 		= $GLOBALS['user']->get_user_validation($username,$validation);
+
+if (!$val1) {
+	    $GLOBALS['error']->add_error('no_such_user',_("No user with this name registered"));    
+	    $GLOBALS['error']->print_error('no_such_user');    
+    }
+elseif ($val1 != $validation) {
+	    $GLOBALS['error']->add_error('validation_failed',_("The validation key used isn't correct."));    
+	    $GLOBALS['error']->print_error('validation_failed');    
+    }
+else { 
+	$activate = $GLOBALS['user']->activate_user($username);
+	show_confirmation(_('User activated'),_('This User ID is activated and can be used'),'/login.php');
+}
+?>
+</body>
+</html>
diff -urN ampache-3.3.2-alpha4/admin/access.php ampache-3.3.2-beta1/admin/access.php
--- ampache-3.3.2-alpha4/admin/access.php	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/admin/access.php	2006-01-08 23:06:19.000000000 -0800
@@ -36,40 +36,34 @@
 
 show_template('header');
 
-if ( $action == 'show_confirm_delete' ) {
-        show_confirm_action(_("Do you really want to delete this Access Record?"), "admin/access.php", "access_id=" . $_REQUEST['access_id'] . "&amp;action=delete_host");
-}
-/*!
-	@action delete_host
-	@discussion deletes an access list entry
-*/
-elseif ( $action == 'delete_host' ) {
-	$access->delete($_REQUEST['access_id']);
-	show_confirmation(_("Entry Deleted"),_("Your Access List Entry has been removed"),"admin/access.php");
-
-} // delete_host
-/*!
-	@action add_host
-	@discussion add a new access list entry
-*/
-elseif ($action == 'add_host') { 
-
-	$access->create($_REQUEST['name'], $_REQUEST['start'],$_REQUEST['end'],$_REQUEST['level']);
-	show_confirmation(_("Entry Added"),_("Your new Access List Entry has been created"),"admin/access.php");
-
-} // add_host
-/*!
-	@action show_add_host
-	@discussion show the add host box
-*/
-elseif ( $action == 'show_add_host' ) {
-	include(conf('prefix') . "/templates/show_add_access.inc");
-}
-else { 
-	$list = array();
-	$list = $access->get_access_list();
-	include(conf('prefix') ."/templates/show_access_list.inc");
-}
 
+switch ($action ) { 
+	case 'show_confirm_delete':
+		show_confim_action(_('Do you really want to delete this Access Reocrd?'),'admin/access.php','access_id=' . scrub_out($_REQUEST['access_id']) . '&amp;action=delete_host');
+	break;
+	case 'delete_host':
+		$access->delete($_REQUEST['access_id']);
+		show_confirmation(_('Entry Deleted'),_('Your Access List Entry has been removed'),'admin/access.php');
+	break;
+	case 'add_host':
+		$access->create($_REQUEST['name'],$_REQUEST['start'],$_REQUEST['end'],$_REQUEST['level']);
+		show_confirmation(_('Entry Added'),_('Your new Access List Entry has been created'),'admin/access.php');
+	break;
+	case 'update_host':
+		$access->update($_REQUEST);
+		show_confirmation(_('Entry Updated'),_('Access List Entry updated'),'admin/access.php');
+	break;
+	case 'show_add_host':
+		include(conf('prefix') . '/templates/show_add_access.inc');
+	break;
+	case 'show_edit_host':
+		include(conf('prefix') . '/templates/show_edit_access.inc');
+	break;
+	default:
+		$list = array();
+		$list = $access->get_access_list();
+		include(conf('prefix') ."/templates/show_access_list.inc");
+	break;
+} // end switch on action
 show_footer();
 ?>
diff -urN ampache-3.3.2-alpha4/admin/duplicates.php ampache-3.3.2-beta1/admin/duplicates.php
--- ampache-3.3.2-alpha4/admin/duplicates.php	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/admin/duplicates.php	2006-01-08 23:06:19.000000000 -0800
@@ -38,10 +38,6 @@
 
 show_template('header');
 
-show_menu_items('Admin');
-show_admin_menu('Catalog');
-
-
 switch ($action)
 {
     case 'search':
@@ -52,7 +48,4 @@
         show_duplicate_searchbox($search_type);
 }
 show_footer();
-show_clear();
-show_page_footer ('Admin', 'Catalog',$user->prefs['display_menu']);
-
 ?>
diff -urN ampache-3.3.2-alpha4/admin/flags.php ampache-3.3.2-beta1/admin/flags.php
--- ampache-3.3.2-alpha4/admin/flags.php	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/admin/flags.php	2006-01-08 23:06:19.000000000 -0800
@@ -37,9 +37,6 @@
 $action = scrub_in($_REQUEST['action']);
 show_template('header');
 
-show_menu_items('Admin');
-show_admin_menu('Catalog');
-
 switch ($action)
 {
     case 'show':
@@ -85,6 +82,4 @@
 }
 
 show_footer();
-show_page_footer ('Admin', 'Catalog',$user->prefs['display_menu']);
-
 ?>
diff -urN ampache-3.3.2-alpha4/admin/song.php ampache-3.3.2-beta1/admin/song.php
--- ampache-3.3.2-alpha4/admin/song.php	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/admin/song.php	2006-01-08 23:06:19.000000000 -0800
@@ -39,12 +39,9 @@
 $action = scrub_in($_REQUEST['action']);
 $song = scrub_in($_REQUEST['song']);
 
-
+$return_referer = return_referer();
 show_template('header');
 
-show_menu_items('Admin');
-show_admin_menu('Catalog');
-
 $song_obj = new Song($_REQUEST['song_id']);
 
 switch($action) {
@@ -65,7 +62,7 @@
 				$song_obj->update_enabled(0,$song_id);
 			} // end foreach
 		} // end else
-		show_confirmation(_("Songs Disabled"),_("The requested song(s) have been disabled"),return_referer());
+		show_confirmation(_("Songs Disabled"),_("The requested song(s) have been disabled"),htmlspecialchars($return_referer));
 	break;
 	case "enabled":
 		// If we pass just one, make it still work
@@ -75,7 +72,7 @@
 				$song_obj->update_enabled(1,$song_id);
 			} // end foreach
 		} // end else
-	        show_confirmation(_("Songs Enabled"),_("The requested song(s) have been enabled"),return_referer());
+	        show_confirmation(_("Songs Enabled"),_("The requested song(s) have been enabled"),htmlspecialchars($return_referer));
         break;
 	default:
 	        echo "Don't know what to do yet.";
@@ -180,9 +177,6 @@
 EDIT_SONG_6;
 }
 
+show_footer();
 ?>
 
-<hr />
-
-</body>
-</html>
diff -urN ampache-3.3.2-alpha4/admin/users.php ampache-3.3.2-beta1/admin/users.php
--- ampache-3.3.2-alpha4/admin/users.php	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/admin/users.php	2006-01-08 23:06:19.000000000 -0800
@@ -135,7 +135,7 @@
 		
 		/* If we end up with an error */
 		if ($GLOBALS['error']->error_state) { 
-		        show_user_form('','$username','$fullname','$email','$access','new_user','');
+		        show_user_form('','$username','$fullname','$email','new_user','');
 			break;
 		}	
 		show_confirmation("New User Added",$username . " has been created with an access level of " . $access,"admin/users.php");	
diff -urN ampache-3.3.2-alpha4/albumart.php ampache-3.3.2-beta1/albumart.php
--- ampache-3.3.2-alpha4/albumart.php	2005-12-27 01:33:03.000000000 -0800
+++ ampache-3.3.2-beta1/albumart.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -29,18 +29,6 @@
 
 require('modules/init.php');
 
-
-$album = new Album($_REQUEST['id']);
-
-// Check db first
-$r = $album->get_art($_REQUEST['fast']);
-
-if (isset($r->art)) {
-    $art = $r->art;
-    $mime = $r->art_mime;
-    $found = 1;
-}
-
 /* Decide what size this image is */
 switch ($_REQUEST['thumb']) { 
 	case '1':
@@ -57,23 +45,37 @@
 	break;
 }
 
-if (!$found) {
-	// Print a transparent gif instead
-	header('Content-type: image/gif');
-	readfile(conf('prefix') . conf('theme_path') . "/images/blankalbum.gif");
-}
-else {
-	// Print the album art
-	$extension = substr($mime,strlen($mime)-3,3);
-	header("Content-type: $mime");
-	header("Content-Disposition: filename=" . $album->name . "." . $extension);
-
-	if (!$_REQUEST['thumb']) { 
-		echo $art;
-	}
-	elseif (!img_resize($art,$size,$extension)) { 
-	    	echo $art;
-	}
-} 
+switch ($_REQUEST['type']) { 
+	case 'popup':
+		show_template('show_big_art');
+	break;
+	default: 
+		$album = new Album($_REQUEST['id']);
+
+		// Check db first
+		$r = $album->get_art($_REQUEST['fast']);
+
+		if (isset($r->art)) {
+		    $art = $r->art;
+		    $mime = $r->art_mime;
+		}
+		else { 
+			header('Content-type: image/gif');
+			readfile(conf('prefix') . conf('theme_path') . "/images/blankalbum.gif");
+			break;
+		} // else no image
+
+		// Print the album art
+		$extension = substr($mime,strlen($mime)-3,3);
+		header("Content-type: $mime");
+		header("Content-Disposition: filename=" . $album->name . "." . $extension);	
+		if (!$_REQUEST['thumb']) { 
+			echo $art;
+		}
+		elseif (!img_resize($art,$size,$extension)) { 
+		    	echo $art;
+		}
+	break;
+} // end switch type
 
 ?>
diff -urN ampache-3.3.2-alpha4/albums.php ampache-3.3.2-beta1/albums.php
--- ampache-3.3.2-alpha4/albums.php	2005-12-27 01:33:03.000000000 -0800
+++ ampache-3.3.2-beta1/albums.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,6 +1,9 @@
 <?php
 /*
 
+ Copyright (c) 2001 - 2006 Ampache.org
+ All Rights Reserved.
+
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
  as published by the Free Software Foundation; either version 2
@@ -43,20 +46,16 @@
 } // clear_art
 // if we have album
 elseif (isset($album)) { 
-	$album = new Album($album);
+	$album = new Album($_REQUEST['album']);
 	$album->format_album();
 
-	$artist_obj = new Artist($artist_obj);
-
 	require (conf('prefix') . "/templates/show_album.inc");
 	
-	if (isset($artist) && $artist_obj->name == "Unknown (Orphaned)" ) {
-		$song_ids = get_song_ids_from_artist_and_album($artist, $album->id);
-	}
-	else {
-		$song_ids = get_song_ids_from_album($album->id);
-	}
+	/* Get the song ids for this album */
+	$song_ids = $album->get_song_ids($_REQUEST['artist']);
+	
 	show_songs($song_ids,0,$album);
+	
 } // isset(album)
 
 // Finds the Album art from amazon
@@ -81,7 +80,7 @@
 	if (isset($_REQUEST['artist_name'])) { 
 		$artist = scrub_in($_REQUEST['artist_name']);
 	} 
-	else { 
+	elseif ($album->artist_count == '1') { 
 		$artist = $album->artist;
 	}
 
@@ -106,7 +105,7 @@
   	}
   
 	$albumname = $album->name;
-	$artistname = $album->artist;
+	$artistname = $artist;
 	
 	// Remember the last typed entry, if there was one
 	if (isset($_REQUEST['album_name'])) {   $albumname = scrub_in($_REQUEST['album_name']); }
diff -urN ampache-3.3.2-alpha4/amp-mpd.php ampache-3.3.2-beta1/amp-mpd.php
--- ampache-3.3.2-alpha4/amp-mpd.php	2005-12-27 01:33:03.000000000 -0800
+++ ampache-3.3.2-beta1/amp-mpd.php	2006-01-08 23:06:20.000000000 -0800
@@ -169,7 +169,7 @@
                                 $playlist = new Playlist($pl_id);
                                 if( $pl_id == 0 ) { // new playlist
                                   $playlist_name = _("New Playlist") . " - " . date("m/j/y, g:i a");
-                                  $playlist->create_playlist($playlist_name, $user->username, 'private');
+                                  $playlist->create($playlist_name, $user->username, 'private');
                                   $pl_id = $playlist->id;
                                 }
 
diff -urN ampache-3.3.2-alpha4/artists.php ampache-3.3.2-beta1/artists.php
--- ampache-3.3.2-alpha4/artists.php	2005-12-27 01:33:03.000000000 -0800
+++ ampache-3.3.2-beta1/artists.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,6 +1,9 @@
 <?php
 /*
 
+ Copyright (c) 2001 - 2006 Ampache.org
+ All Rights Reserved
+
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
  as published by the Free Software Foundation; either version 2
@@ -36,14 +39,15 @@
     case 'show':
     case 'Show':
 	show_alphabet_list('artists','artists.php');
-	$artist = new Artist(scrub_in($_REQUEST['artist']));
+	$artist = new Artist($_REQUEST['artist']);
 	$artist->show_albums();
 	break;
 
     case 'show_all_songs':
-        $artist = get_artist_name(scrub_in($_REQUEST['artist']));
-        echo "<h2>" . _("All songs by") . " $artist</h2>";
-	$song_ids = get_song_ids_from_artist($_REQUEST['artist']);
+    	$artist = new Artist($_REQUEST['artist']);
+	$artist->format_artist();
+	$song_ids = $artist->get_song_ids();
+	require(conf('prefix') . '/templates/show_artist_box.inc.php');
         show_songs($song_ids);
         break;
 
diff -urN ampache-3.3.2-alpha4/bin/catalog_update.php.inc ampache-3.3.2-beta1/bin/catalog_update.php.inc
--- ampache-3.3.2-alpha4/bin/catalog_update.php.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/bin/catalog_update.php.inc	2006-01-08 23:06:19.000000000 -0800
@@ -12,10 +12,19 @@
 	// Clean out dead files
 	$catalog->clean_catalog();
 
+	$catalog->count = 0;
+
 	// Verify Existing
 	$catalog->verify_catalog();
 
+	$catalog->count = 0;
+	
+	echo "\n\n";
+
 	// Look for new files
 	$catalog->add_to_catalog();
+	echo "\n\n";
 }
+
+
 ?>
diff -urN ampache-3.3.2-alpha4/bin/print_tags.php.inc ampache-3.3.2-beta1/bin/print_tags.php.inc
--- ampache-3.3.2-alpha4/bin/print_tags.php.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/bin/print_tags.php.inc	2006-01-08 23:06:19.000000000 -0800
@@ -19,7 +19,6 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-
 $no_session = '1';
 require ("../modules/init.php");
 
diff -urN ampache-3.3.2-alpha4/bin/sort_files.php.inc ampache-3.3.2-beta1/bin/sort_files.php.inc
--- ampache-3.3.2-alpha4/bin/sort_files.php.inc	1969-12-31 16:00:00.000000000 -0800
+++ ampache-3.3.2-beta1/bin/sort_files.php.inc	2006-01-08 23:06:19.000000000 -0800
@@ -0,0 +1,319 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2006 Ampache.org
+ All rights reserved
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+/**
+ * DON'T USE ME! THIS SCRIPT _WILL_ MESS UP YOUR AUDIO FILES!!! 
+ * sort_files
+ * This script has a lot of stuff to worry about. It's primary duty is to re-organize
+ * your files based on some sane, and predefined (in the interface) order using the
+ * tag information gathered and updated in ampache. Sort_Pattern defines the directory
+ * structure and rename_pattern defines the file pattern. This script should allow you
+ * to do both or neither. Oooh and allow you to sort with A,B,C,D prefix
+ * 
+ * Attempt 1 - Do each file one by one and satisfy the needs of each file by its self (this is going to be slow)
+ * Cache information so we don't have to check for every file! 
+ */
+
+/* Don't do anything just tell me what you would do */
+$test_mode = true;
+
+/* m(__)m */
+$alphabet_prefix = true;
+ 
+$no_session = '1';
+require ("../modules/init.php");
+
+/* First Clean the catalog to we don't try to write anything we shouldn't */
+
+$sql = "SELECT id FROM catalog WHERE catalog_type='local'";
+$db_results = mysql_query($sql, dbh());
+
+$catalogs = array();
+
+while ($r = mysql_fetch_row($db_results)) { 
+
+	$catalog = new Catalog($r['0']);
+	$songs = $catalog->get_catalog_files();
+
+	echo "Starting Catalog: " . stripslashes($catalog->name) . "\n";
+
+	/* Foreach through each file and find it a home! */
+	foreach ($songs as $song) { 
+		/* Find this poor song a home */
+		$song->format_song();
+		$directory 	= sort_find_home($song,$catalog->sort_pattern,$catalog->path);
+		$filename 	= sort_find_filename($song,$catalog->rename_pattern);
+		$fullpath = $directory . "/" . $filename;
+
+		/* Check for Demo Mode */
+		if ($test_mode) { 
+			/* We're just talking here... no work */
+			echo "Moving File:\n\tSource: $song->file\n\tDest: $fullpath\n";
+			flush();
+		}
+		/* We need to actually do the moving (fake it if we are testing) 
+		 * Don't try to move it, if it's already the same friggin thing!
+		 */
+		if ($song->file != $fullpath && strlen($fullpath)) { 
+			sort_move_file($song,$fullpath);
+		}
+
+
+
+	} // end foreach song
+
+} // end foreach catalogs
+
+
+/************** FUNCTIONS *****************/
+/**
+ * sort_find_filename 
+ * This gets the filename that this file should have, it takes the rename pattern of the catalog
+ * along with the song object. Nothing Special Here
+ */
+function sort_find_filename($song,$rename_pattern) { 
+	
+	$extension = ltrim(substr($song->file,strlen($song->file)-4,4),".");
+
+	/* Create the filename that this file should have */
+	$album 	= sort_clean_name($song->f_album_full);
+	$artist = sort_clean_name($song->f_artist_full);
+	$genre 	= sort_clean_name($song->f_genre);
+	$track	= sort_clean_name($song->track);
+	$title	= sort_clean_name($song->title);
+	$year	= sort_clean_name($song->year);
+        
+	/* Start replacing stuff */
+	$replace_array = array('%a','%A','%t','%T','%y','%g');
+	$content_array = array($artist,$album,$title,$track,$year,$genre);
+
+	$rename_pattern = str_replace($replace_array,$content_array,$rename_pattern);
+
+	$rename_pattern = preg_replace("[^A-Za-z0-9\-\_\ \'\,\(\)]","_",$rename_pattern);
+
+	return $rename_pattern . "." . $extension;
+
+} // sort_find_filename
+
+/**
+ * sort_find_home
+ * Get the directory for this file from the catalog and the song info using the sort_pattern 
+ * takes into account various artists and the alphabet_prefix
+ */
+function sort_find_home($song,$sort_pattern,$base) { 
+
+	$home = rtrim($base,"\/");
+	$home = rtrim($home,"\\");
+
+	/* Create the filename that this file should have */
+	$album 	= sort_clean_name($song->f_album_full);
+	$artist = sort_clean_name($song->f_artist_full);
+	$genre 	= sort_clean_name($song->f_genre);
+	$track	= sort_clean_name($song->track);
+	$title	= sort_clean_name($song->title);
+	$year	= sort_clean_name($song->year);
+
+	/* Do the various check */
+	$album_object = new Album($song->album);
+	if ($album_object->artist_count != '1') { 
+		$artist = "Various";
+	}
+	
+	/* IF we want a,b,c,d we need to know the first element */
+	if ($GLOBALS['alphabet_prefix']) { 
+		$sort_pattern = preg_replace("/\/?%o\//","",$sort_pattern);
+		$first_element = substr($sort_pattern,0,2);
+		$element = sort_element_name($first_element);
+		if (!$element) { $alphabet = 'ZZ'; }
+		else { 	$alphabet = strtoupper(substr(${$element},0,1)); } 
+		$alphabet = preg_replace("/[^A-Za-z0-9]/","ZZ",$alphabet);
+
+		$home .= "/$alphabet";
+	}
+
+	/* Replace everything we can find */
+	$replace_array = array('%a','%A','%t','%T','%y','%g','%C');
+	$content_array = array($artist,$album,$title,$track,$year,$genre,'C');
+	$sort_pattern = str_replace($replace_array,$content_array,$sort_pattern);
+
+	/* Remove non A-Z0-9 chars */
+	$sort_pattern = preg_replace("[^\\\/A-Za-z0-9\-\_\ \'\,\(\)]","_",$sort_pattern);
+	
+	$home .= "/$sort_pattern";
+
+	return $home;
+
+} // sort_find_home
+
+/**
+ * sort_element_name
+ * gets the name of the %? in a yea.. too much beer 
+ */
+function sort_element_name($key) { 
+
+	switch ($key) { 
+		case '%t':
+			return 'title';
+		break;
+		case '%T':
+			return 'track';
+		break;
+		case '%a':
+			return 'artist';
+		break;
+		case '%A':
+			return 'album';
+		break;
+		case '%y':
+			return 'year';
+		break;
+		case '%g':
+			return 'genre';
+		break;
+		default: 
+		break;
+	} // switch on key
+
+	return false;
+
+} // sort_element_name
+
+/**
+ * sort_clean_name
+ * We have to have some special rules here
+ * This is run on every individual element of the search
+ * Before it is put togeather, this removes / and \ and also
+ * once I figure it out, it'll clean other stuff
+ */
+function sort_clean_name($string) { 
+
+	/* First remove any / or \ chars */
+	$string = preg_replace("/[\/\\\]/","-",$string);
+
+	$string = str_replace(":"," ",$string);
+
+	return $string;
+
+} // sort_clean_name
+
+/**
+ * sort_move_file
+ * All this function does is, move the friggin file and then update the database 
+ * We can't use the rename() function of PHP because it's functionality depends on the
+ * current phase of the moon, the alignment of the planets and my current BAL
+ * Instead we cheeseball it and walk through the new dir structure and make
+ * sure that the directories exist, once the dirs exist then we do a copy
+ * and unlink.. This is a little unsafe, and as such it verifys the copy
+ * worked by doing a filesize() before unlinking. 
+ */
+function sort_move_file($song,$fullname) { 
+
+	$old_dir	= dirname($song->file);
+
+	$info = pathinfo($fullname);
+
+	$directory 	= $info['dirname'];
+	$file		= $info['basename'];
+	$data = preg_split("/[\/\\\]/",$directory);
+	$path = '';
+
+	/* We not need the leading / */
+	unset($data[0]);
+
+	foreach ($data as $dir) { 
+
+		$path .= "/" . $dir;
+
+		/* We need to check for the existance of this directory */
+		if (!is_dir($path)) { 
+			if ($GLOBALS['test_mode']) { 
+				echo "\tMaking $path Directory\n";
+			}
+			else { 
+				if (conf('debug')) { log_event('commandline','mkdir',"Creating $path directory"); }
+				$results = mkdir($path);	
+				if (!$results) { 
+					echo "Error: Unable to create $path move failed\n";
+					return false;
+				}
+			} // else we aren't in test mode
+		} // if it's not a dir
+
+	} // foreach dir
+
+	/* Now that we've got the correct directory structure let's try to copy it */
+	if ($GLOBALS['test_mode']) { 
+		echo "\tCopying $file to $directory\n";
+		$sql = "UPDATE song SET file='" . sql_escape($fullname) . "' WHERE id='" . sql_escape($song->id) . "'";
+		echo "\tSQL: $sql\n";
+	}
+	else { 
+
+		/* Check for file existance */
+		if (file_exists($fullname)) { 
+			if (conf('debug')) { log_event('commandline','file exists','Error: $fullname already exists'); }
+			echo "Error: $fullname already exists\n"; 
+			return false;
+		}
+	
+		$results = copy($song->file,$fullname);
+		if (conf('debug')) { log_event('commandline','copy','Copied ' . $song->file . ' to ' . $fullname); }
+	
+		
+		/* Look for the folder art and copy that as well */
+		if (!conf('album_art_preferred_filename')) { 
+			$folder_art 	= $directory . '/folder.jpg';
+			$old_art 	= $old_dir . '/folder.jpg';
+		}
+		else { 
+			$folder_art 	= $directory . "/" . conf('album_art_preferred_filename'); 
+			$old_art 	= $old_dir . "/" . conf('album_art_preferred_filename');
+		}
+
+		if (conf('debug')) { log_event('commandline','copy_art','Copied ' . $old_art . ' to ' . $folder_art); }
+		@copy($old_art,$folder_art);
+		
+		if (!$results) { echo "Error: Unable to copy file to $fullname\n"; return false; }
+
+		/* Check the md5sums */
+		$new_sum = filesize($fullname);
+		$old_sum = filesize($song->file);
+
+		if ($new_sum != $old_sum OR !$new_sum) { 
+			echo "Error: Size Inconsistency, not deleting " . $song->file . "\n"; 
+			return false; 
+		} // end if sum's don't match
+		
+		/* If we've made it this far it should be safe */
+		$results = unlink($song->file);
+		if (!$results) { echo "Error: Unable to delete " . $song->file . "\n"; }
+
+		/* Update the catalog */
+		$sql = "UPDATE song SET file='" . sql_escape($fullname) . "' WHERE id='" . sql_escape($song->id) . "'";
+		$db_results = mysql_query($sql, dbh());
+
+	} // end else
+
+	return true;
+
+} // sort_move_file
+
+?>
diff -urN ampache-3.3.2-alpha4/browse.php ampache-3.3.2-beta1/browse.php
--- ampache-3.3.2-alpha4/browse.php	2005-12-27 01:33:03.000000000 -0800
+++ ampache-3.3.2-beta1/browse.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All Rights Reserved
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/config/ampache.cfg.php.dist ampache-3.3.2-beta1/config/ampache.cfg.php.dist
--- ampache-3.3.2-alpha4/config/ampache.cfg.php.dist	2005-12-27 01:33:03.000000000 -0800
+++ ampache-3.3.2-beta1/config/ampache.cfg.php.dist	2006-01-08 23:06:20.000000000 -0800
@@ -119,23 +119,6 @@
 # DEFAULT: false
 #allow_zip_download = "false"
 
-# This setting turns on/off public registration. It is
-# recommended you leave this off, as it will allow anyone to
-# sign up for an account on your server.
-# DEFAULT: false
-#allow_public_registration = "false"
-
-# This setting will allow all registrants to be auto-approved
-# as a user. By default, they will be added as a guest and
-# must be "promoted" by the admin.
-# DEFAULT: false
-#auto_user = "false"
-
-# This will display the user agreement when registering
-# For agreement text, edit templates/user_agreement.php
-# User will need to accept the agreement before they can register
-#user_agreement = "false"
-
 # This sets which ID3 tag takes precedence.
 # we've found for those of you who don't have
 # good v2 tags it's sometimes nice to keep the v1
@@ -250,6 +233,48 @@
 # DEFAULT: iso-8859-1
 site_charset = iso-8859-1
 
+
+##########################################################
+# Public Registration settings, defaults to disabled 
+##########################################################
+
+# This setting turns on/off public registration. It is
+# recommended you leave this off, as it will allow anyone to
+# sign up for an account on your server.
+# REMEMBER: don't forget to set the mail from address futher down in the config.
+# DEFAULT: false
+#allow_public_registration = "false"
+
+# Require Captcha Text on Image confirmation
+# Turning this on requires the user to correctly
+# type in the letters in the image created by Captcha
+# Default is off because its very hard to detect if it failed
+# to draw, or they failed to enter it.
+# DEFAULT: false
+#captcha_public_reg = "false"
+
+# This setting defines the mail domain your in.
+# It tries to deliver a test mail before the user can register and uses
+# the from address info@"domain.tld". No mail is send from this address it's
+# only used to test the existense of a mailbox before accepting user registration.
+# DEFAULT: domain.tld
+#mail_domain = "domain.tld"
+
+# This settting will be used as mail from address.
+# You need to change this when you activate public_registration.
+#mail_from = "info@domain.tld"
+
+# This setting will allow all registrants to be auto-approved
+# as a user. By default, they will be added as a guest and
+# must be "promoted" by the admin.
+# DEFAULT: false
+#auto_user = "false"
+
+# This will display the user agreement when registering
+# For agreement text, edit templates/user_agreement.php
+# User will need to accept the agreement before they can register
+#user_agreement = "false"
+
 ##########################################################
 # These Option Control which playback methods are allowed
 ##########################################################
@@ -359,7 +384,7 @@
 # %SAMPLE%	= sample rate
 # %EOF%		= end of file in min.sec
 # DEFAULT: mp3splt -qnf "%FILE%" %OFFSET% %EOF% -o - | lame --mp3input -q 3 -b %SAMPLE% -S - -
-downsample_cmd	= mp3splt -qnf "%FILE%" %OFFSET% %EOF% -o - | lame --mp3input -q 3 -b %SAMPLE% -S - -
+downsample_cmd	= mp3splt -qnf %FILE% %OFFSET% %EOF% -o - | lame --mp3input -q 3 -b %SAMPLE% -S - -
 
 #######################################################
 # These are commands used to transcode non-streaming
@@ -429,6 +454,11 @@
 # song is the information in the feed. can be multiple
 #      items.
 #
+# use_rss = false (values true | false)
+#
+#DEFAULT: use_rss = false 
+#use_rss = false
+#
 #
 # rss_main_title = the title for your feed.
 # DEFAULT: Ampache for the love of Music
@@ -453,7 +483,8 @@
 # $artist
 # $album
 # DEFAULT:  <![CDATA[$song->f_title @ $album played by  $user->fullname]]>
-rss_song_description = <![CDATA[$song->f_title @ $album played by  $user->fullname]]>
+# FIXME it's hardcoded in lib/rss.lib.php now
+#rss_song_description = <![CDATA[$song->f_title @ $album played by  $user->fullname]]>
 ######################################################
 
 #######################
diff -urN ampache-3.3.2-alpha4/config/registration_agreement.php.dist ampache-3.3.2-beta1/config/registration_agreement.php.dist
--- ampache-3.3.2-alpha4/config/registration_agreement.php.dist	1969-12-31 16:00:00.000000000 -0800
+++ ampache-3.3.2-beta1/config/registration_agreement.php.dist	2006-01-08 23:06:20.000000000 -0800
@@ -0,0 +1 @@
+**This is the plain TXT document that is put at the top of the User Registration page**
diff -urN ampache-3.3.2-alpha4/docs/CHANGELOG ampache-3.3.2-beta1/docs/CHANGELOG
--- ampache-3.3.2-alpha4/docs/CHANGELOG	2005-12-27 01:32:54.000000000 -0800
+++ ampache-3.3.2-beta1/docs/CHANGELOG	2006-01-08 23:06:12.000000000 -0800
@@ -3,6 +3,59 @@
 --------------------------------------------------------------------------
 
 --------------------------------------------------------------------------
+  v.3.3.2-Beta1 01/08/2006
+  	- Fixed lack of Access List check on download 
+  	- Fixed Access List so that you can edit existing records
+  	- Fixed counting error when using the /bin/catalog_update.php.inc
+		script
+  	- Fixed some minor theme issues with the built in themes
+  	- Fixed some RSS problems, and linked it on header (Thx pb1dft)
+  	- Fixed bug where you couldn't delete admin users because of an
+		overzelous permission check
+  	- Fixed Search Album art page so it correctly shows results
+		(Thx nhorlock)
+  	- Fixed stylesheet so all old Themes work again (Thx Sigger)
+  	- Added Normalize Tracks function to playlist which makes track
+		numbers contiguous
+	- Fixed ordering on Playlists under new code
+  	- Added the Import From File action for playlists back. The link
+		was just missing
+  	- Fixed SQL errors with Windows + Mysql5.x songs with empty 
+		genres, are now given a Unknown genre value (Thx WarrenG)
+  	- Rewrote entire Playlist class and document to use the new id
+		field in database, also added support for playlist tracks
+		that are based on search criteria.
+  	- Fixed Album Art Search so that it doesn't include the artist
+		if there is more then one artist on the album
+  	- Fixed Registration code so that it used existing functions and
+		added default to off config option for captcha because
+		its hard to detect compatibility
+  	- Fixed some logic errors in Downsampling code
+  	- Updated Registration code (Thx pb1dft)
+  	- Updated GetId3() Library to v.1.7.5
+  	- Updated SQL file
+	- Fixed Install script so it throws errors and is now able to
+		if specified create the database user for you
+  	- Added Popup Album Art (Thx Di-Fosfor)
+  	- Fixed Typo in Amazon Search debug statement
+  	- Added sort_files.php.inc to /bin 
+  	- Fixed Ratings designation mistake and added it to artist view
+  	- Fixed location detection for contextual titles and browse
+		on the simple menu's (Thx SoundOfEmotion)
+  	- Fixed a botched change to the database (No Data loss!) but I 
+		still feel stupid (Blame Vollmer)
+  	- Fixed a problem where .flac files wouldn't get recognized by
+		the regular expression that pulls in files from m3u's
+		(Thx nhorlock)
+  	- Fixed a logic problem with the rating system where it would
+		show a star for the 0 value when it should always show
+		the 0 or don't play symbol
+  	- Fixed drop-downs on sidebar not resizing with fontsize
+		(Thx SoundOfEmotion)
+  	- Fixed wrap-around text by removing float:left; on #content
+		(Thx Sigger)
+
+--------------------------------------------------------------------------
   v.3.3.2-Alpha4 12/27/2005 
   	- Fixed Registration system sort of. It still needs massive 
 		improvement, but it works.. kinda (Thx SoundOfEmotion)
diff -urN ampache-3.3.2-alpha4/download/index.php ampache-3.3.2-beta1/download/index.php
--- ampache-3.3.2-alpha4/download/index.php	2005-12-27 01:32:56.000000000 -0800
+++ ampache-3.3.2-beta1/download/index.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -36,8 +36,21 @@
 	access_denied();
 }
 
+/*
+   If they are using access lists let's make sure
+   that they have enough access to play this mojo
+*/
+if (conf('access_control')) {
 
+        $access = new Access(0);
+        if (!$access->check('50', $_SERVER['REMOTE_ADDR'])) {
+                if (conf('debug')) {
+                        log_event($user->username,' access_denied ', "Download Access Denied, " . $_SERVER['REMOTE_ADDR'] . " does not have download level
+                }
+                access_denied();
+        }
 
+} // access_control is enabled
 
 if ($user->prefs['download']) {
 	if ($_REQUEST['song_id']) {
diff -urN ampache-3.3.2-alpha4/flag.php ampache-3.3.2-beta1/flag.php
--- ampache-3.3.2-alpha4/flag.php	2005-12-27 01:33:03.000000000 -0800
+++ ampache-3.3.2-beta1/flag.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,6 +1,9 @@
 <?php
 /*
 
+ Copyright (c) 2001 - 2006 Ampache.org
+ All Rights Reserved
+
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
  as published by the Free Software Foundation; either version 2
@@ -29,27 +32,20 @@
 $song = scrub_in($_REQUEST['song']);
 
 if ( $action == 'flag_song') {
-    $flagged_type = scrub_in($_REQUEST['flagged_type']);
-    	$comment = scrub_in($_REQUEST['comment']);
+	$flagged_type = scrub_in($_REQUEST['flagged_type']);
+	$comment = scrub_in($_REQUEST['comment']);
 	insert_flagged_song($song, $flagged_type, $comment);
 	$flag_text = _("Flagging song completed.");
 	$action = 'flag';
 }
 
-?>
-<?php  show_template('header'); ?>
-<?php 
-	$highlight = "Home";
-	show_menu_items($highlight);
-
-	if ( $action == 'flag' ) {
-		$type = 'show_flagged_form';
-		$song_id = $song;
+show_template('header');
 
-		include(conf('prefix') . "/templates/flag.inc");
-	}
+if ( $action == 'flag' ) {
+	$type = 'show_flagged_form';
+	$song_id = $song;
+	include(conf('prefix') . "/templates/flag.inc");
+}
 
 show_footer();
 ?>
-</body>
-</html>
diff -urN ampache-3.3.2-alpha4/genre.php ampache-3.3.2-beta1/genre.php
--- ampache-3.3.2-alpha4/genre.php	2005-12-27 01:33:03.000000000 -0800
+++ ampache-3.3.2-beta1/genre.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,8 +1,7 @@
 <?php
-
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/index.php ampache-3.3.2-beta1/index.php
--- ampache-3.3.2-alpha4/index.php	2005-12-27 01:33:03.000000000 -0800
+++ ampache-3.3.2-beta1/index.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -110,24 +110,24 @@
 	</tr>
 	</table>
 	</td>
+		<?php 
+		    if($user->prefs['play_type'] == 'local_play') {
+	?>
 	<td valign="top">
 	<!-- Right table -->
 	<table border="0">
 	<tr>
 		<td valign="top" rowspan="7">
-		<?php 
-		    if($user->prefs['play_type'] == 'local_play') {
-		        show_local_control();
+		        <?php show_local_control(); ?>
 		        echo "<br />";
-		    } else {
-			echo "&nbsp;";
-		    }
-		?>
 		</td>
 	</tr>
-	</table>
+	</table>'
 	</td>
 	<!-- End Right Table -->
+        <?php
+		    } 
+	?>
 </tr>
 </table>
 
diff -urN ampache-3.3.2-alpha4/install.php ampache-3.3.2-beta1/install.php
--- ampache-3.3.2-alpha4/install.php	2005-12-27 01:33:03.000000000 -0800
+++ ampache-3.3.2-beta1/install.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 ampache.org
+ Copyright (c) 2001 - 2006 ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -30,6 +30,7 @@
 require_once('modules/lib.php');
 require_once('lib/debug.php');
 require_once('lib/class/user.class.php');
+require_once('lib/class/error.class.php');
 
 // Libglue Requires
 require_once('modules/libglue/auth.php');
@@ -63,6 +64,10 @@
 $password = scrub_in($_REQUEST['local_pass']);
 $hostname = scrub_in($_REQUEST['local_host']);
 $database = scrub_in($_REQUEST['local_db']);
+if ($_SERVER['HTTPS'] == 'on') { $http_type = "https://"; }
+else { $http_type = "http://"; }
+$php_self = $http_type . $_SERVER['HTTP_HOST'] . "/" . preg_replace("/^\/(.+\.php)\/?.*/","$1",$_SERVER['PHP_SELF']);
+$error	  = new Error();
 
 /* Catch the Current Action */
 switch ($action) { 
@@ -73,7 +78,7 @@
 			break;
 		}
 		
-		header ("Location: " . $_SERVER['PHP_SELF'] . "?action=show_create_config&local_db=$database&local_host=$hostname");
+		header ("Location: " . $php_self . "?action=show_create_config&local_db=$database&local_host=$hostname");
 		
 		break;
 	case 'create_config':
@@ -102,7 +107,8 @@
 		/* Setup Preferences */
 		$temp_user = new User($username);
 		$temp_user->fix_preferences();
-		$temp_user = new User(0);
+		$temp_user = new User(-1);
+		$temp_user->username = '-1';
 		$temp_user->fix_preferences();
 
 	
diff -urN ampache-3.3.2-alpha4/lib/artist.lib.php ampache-3.3.2-beta1/lib/artist.lib.php
--- ampache-3.3.2-alpha4/lib/artist.lib.php	2005-12-27 01:32:56.000000000 -0800
+++ ampache-3.3.2-beta1/lib/artist.lib.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,6 +1,9 @@
 <?php
 /*
 
+ Copyright (c) 2001 - 2006 Ampache.org
+ All Rights Reserved
+
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
  as published by the Free Software Foundation; either version 2
diff -urN ampache-3.3.2-alpha4/lib/batch.lib.php ampache-3.3.2-beta1/lib/batch.lib.php
--- ampache-3.3.2-alpha4/lib/batch.lib.php	2005-12-27 01:32:56.000000000 -0800
+++ ampache-3.3.2-beta1/lib/batch.lib.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,19 +1,22 @@
 <?php
 /*
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ Copyright (c) 2001 - 2006 Ampache.org
+ All Rights Reserved
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
diff -urN ampache-3.3.2-alpha4/lib/class/access.class.php ampache-3.3.2-beta1/lib/class/access.class.php
--- ampache-3.3.2-alpha4/lib/class/access.class.php	2005-12-27 01:32:55.000000000 -0800
+++ ampache-3.3.2-beta1/lib/class/access.class.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,6 +1,9 @@
 <?php
 /*
 
+ Copyright (c) 2001 - 2006 Ampache.org
+ All Rights Reserved
+
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
  as published by the Free Software Foundation; either version 2
@@ -16,9 +19,10 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA. 
 
 */
-
-/*!
-	@header Access Class
+/** 
+ * Access Class
+ * This class handles the access list mojo for Ampache, it is ment to restrict
+ * access based on IP and maybe something else in the future
 */
 
 class Access {
@@ -37,25 +41,21 @@
 	 */
 	function Access($access_id = 0) {
 
-		/* If we have passed an id then do something */
-		if ($access_id) { 
+		if (!$access_id) { return false; }
 
-			/* Assign id for use in get_info() */
-			$this->id = $access_id;
 
-			/* Get the information from the db */
-			if ($info = $this->get_info()) {
+		/* Assign id for use in get_info() */
+		$this->id = $access_id;
 
-				/* Assign Vars */
-				$this->name 	= $info->name;
-				$this->start 	= $info->start;
-				$this->end	= $info->end;
-				$this->level	= $info->level;
-			} // if info
+		$info = $this->get_info();
+		$this->name 	= $info->name;
+		$this->start 	= $info->start;
+		$this->end	= $info->end;
+		$this->level	= $info->level;
 
-		} // if access_id
+		return true;
 
-	} //constructor
+	} //Access
 
 	/*!
 		@function get_info
@@ -65,7 +65,7 @@
 	function get_info() {
 
 		/* Grab the basic information from the catalog and return it */
-		$sql = "SELECT * FROM access_list WHERE id='$this->id'";
+		$sql = "SELECT * FROM access_list WHERE id='" . sql_escape($this->id) . "'";
 		$db_results = mysql_query($sql, dbh());
 
 		$results = mysql_fetch_object($db_results);
@@ -74,6 +74,23 @@
 
 	} //get_info
 
+	/**
+	 * update
+	 * This function takes a named array as a datasource and updates the current access list entry
+	 */
+	function update($data) { 
+
+		$start 	= ip2int($data['start']);
+		$end	= ip2int($data['end']);
+		$level	= sql_escape($data['level']);
+		
+		$sql = "UPDATE access_list SET start='$start', end='$end', level='$level' WHERE id='" . sql_escape($this->id) . "'";
+		$db_results = mysql_query($sql, dbh());
+
+		return true;
+
+	} // update
+
 	/*!
 		@function create
 		@discussion creates a new entry
@@ -101,7 +118,7 @@
 			$access_id = $this->id;
 		}
 
-		$sql = "DELETE FROM access_list WHERE id='$access_id'";
+		$sql = "DELETE FROM access_list WHERE id='" . sql_escape($access_id) . "'";
 		$db_results = mysql_query($sql, dbh());
 
 	} // delete
diff -urN ampache-3.3.2-alpha4/lib/class/album.class.php ampache-3.3.2-beta1/lib/class/album.class.php
--- ampache-3.3.2-alpha4/lib/class/album.class.php	2005-12-27 01:32:55.000000000 -0800
+++ ampache-3.3.2-beta1/lib/class/album.class.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,8 @@
 <?php
 /*
- Copyright (c) 2004
- Ampache.org
+
+ Copyright (c) 2001 - 2006 Ampache.org
+ All Rights Reserved
 
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
@@ -104,6 +105,30 @@
 
 	} // get_songs
 
+	/**
+	 * get_song_ids
+	 * This returns an array of the song id's that are on this album. This is used by the
+	 * show_songs function and can be pased and artist if you so desire to limit it to that
+	 */
+	function get_song_ids($artist='') { 
+
+		/* If they pass an artist then constrain it based on the artist as well */
+		if ($artist) { 
+			$artist_sql = " AND artist='" . sql_escape($artist) . "'";
+		}
+		
+		$sql = "SELECT id FROM song WHERE album='" . sql_escape($this->id) . "' $artist_sql ORDER BY track";
+		$db_results = mysql_query($sql, dbh());
+
+		$results = array();
+
+		while ($r = mysql_fetch_assoc($db_results)) { 
+			$results[] = $r['id'];
+		}
+
+		return $results;
+
+	} // get_song_ids
 
 	/*!
 		@function format_album
@@ -395,9 +420,6 @@
 		$final_results 	= array();
 		$possible_keys = array("LargeImage","MediumImage","SmallImage");
 	
-		/* We're gonna need this object */	
-		$snoopy = new Snoopy();
-		
 		// Prevent the script from timing out
 		set_time_limit(0);
 
@@ -405,7 +427,10 @@
 	        if (empty($coverurl)) { 
 
 			if (empty($keywords)) { 
-				$keywords = $this->name . ' ' . $this->artist;
+				
+				$keywords = $this->name;
+				/* If this isn't a various album combine with artist name */
+				if ($this->artist_count == '1') { $keywords .= ' ' . $this->artist; }
 			}
 
 		    	// Create the Search Object
@@ -420,7 +445,7 @@
 		
 			/* Log this if we're doin debug */
 			if (conf('debug')) { 
-				log_event($GLOBALS['user']->username,'amazon-xml',"Searched using $search_term with " . conf('amazon_developer_key') . " as key " . count($final_results) . " results found");
+				log_event($GLOBALS['user']->username,'amazon-xml',"Searched using $keywords with " . conf('amazon_developer_key') . " as key " . count($final_results) . " results found");
 			}
 
 		} // if no cover
@@ -452,7 +477,6 @@
 				continue;
 			}
 
-//	                $snoopy->fetch($results[$key]);
 	                $data['url'] 	= $result[$key];
 			$data['mime']	= $mime;
 			
@@ -465,29 +489,6 @@
 
 	} // find_art 
 
-	/*!
-               @function       get_song_ids
-               @discussion     returns a list of song_ids on the album
-                               get_songs returns a list of song objects
-	*/
-	// it seems get_songs really should call this, 
-	// but I don't feel comfortable imposing that - RCR
-	function get_song_ids( $limit = 0 ) {
-		
-		$results = array();
-		$sql = "SELECT id FROM song WHERE album='$this->id' ORDER BY track, title";
-		
-                if ($limit) { $sql .= " LIMIT $limit"; }
-                
-		$db_results = mysql_query($sql, dbh());
-
-                while ($r = mysql_fetch_object($db_results)) {
- 			$results[] = $r->id;
- 		}
-		
-		return $results;
-       } // get_song_ids
-	
 } //end of album class
 
 ?>
diff -urN ampache-3.3.2-alpha4/lib/class/artist.class.php ampache-3.3.2-beta1/lib/class/artist.class.php
--- ampache-3.3.2-alpha4/lib/class/artist.class.php	2005-12-27 01:32:55.000000000 -0800
+++ ampache-3.3.2-beta1/lib/class/artist.class.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2004 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -67,7 +67,7 @@
 	function get_info() {
 
 		/* Grab the basic information from the catalog and return it */
-		$sql = "SELECT * FROM artist WHERE id='$this->id'";
+		$sql = "SELECT * FROM artist WHERE id='" . sql_escape($this->id) . "'";
 		$db_results = mysql_query($sql, dbh());
 
 		$results = mysql_fetch_object($db_results);
@@ -112,6 +112,24 @@
 
 	} // get_songs
 
+	/**
+	 * get_song_ids
+	 * This gets an array of song ids that are assoicated with this artist. This is great for using
+	 * with the show_songs function
+	 */
+	function get_song_ids() { 
+
+		$sql = "SELECT id FROM song WHERE artist='" . sql_escape($this->id) . "' ORDER BY album, track";
+		$db_results = mysql_query($sql, dbh());
+
+		while ($r = mysql_fetch_assoc($db_results)) { 
+			$results[] = $r['id'];
+		}
+
+		return $results;
+
+	} // get_song_ids
+
         /*!
                 @function get_random_songs
                 @discussion gets a random number, and
@@ -265,7 +283,6 @@
 	        /* Set Vars */
 	        $web_path = conf('web_path');
 
-
 	        $albums = $this->get_albums();
 	        $this->format_artist();
 		$artist = $this;
diff -urN ampache-3.3.2-alpha4/lib/class/catalog.class.php ampache-3.3.2-beta1/lib/class/catalog.class.php
--- ampache-3.3.2-alpha4/lib/class/catalog.class.php	2005-12-27 01:32:55.000000000 -0800
+++ ampache-3.3.2-beta1/lib/class/catalog.class.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,6 +1,9 @@
 <?php
 /*
 
+ Copyright (c) 2001 - 2006 Ampache.org
+ All Rights Reserved
+
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
  as published by the Free Software Foundation; either version 2
@@ -853,7 +856,7 @@
                 $new_song->artist       = $this->check_artist($artist);
                 $new_song->f_artist     = $artist;
                 $new_song->genre        = $this->check_genre($genre);
-                $new_song->f_genre      = $genre;
+                $new_song->f_genre      = $new_song->get_genre_name();
                 $new_song->album        = $this->check_album($album,$new_song->year);
                 $new_song->f_album      = $album . " - " . $new_song->year;
                 $new_song->title        = $this->check_title($new_song->title,$new_song->file);
@@ -1187,13 +1190,15 @@
 		$this->clean_stats();
 		$this->clean_playlists();
 		$this->clean_flagged();
-		$this->clean_genres();
-
+		;$this->clean_genres();
+		
 		/* Return dead files, so they can be listed */
 		echo "<b>" . _("Catalog Clean Done") . " [" . count($dead_files) . "] " . _("files removed") . "</b><br />\n";
 		flush();
 		return $dead_files;
 
+		$this->count = 0;
+
 	} //clean_catalog
 
 	/**
@@ -1568,6 +1573,10 @@
 
 		echo "Update Finished. Checked $this->count. $total_updated songs updated.<br /><br />";
 
+		$this->count = 0;
+
+		return true;
+
 	} //verify_catalog
 
 
@@ -1665,7 +1674,13 @@
 		/* If not found create */
 		else {
 
-			$sql = "INSERT INTO artist (name, prefix) VALUES ('$artist', '$prefix')";
+			$prefix_txt = 'NULL';
+
+			if ($prefix) {
+				$prefix_txt = "'$prefix'";
+			}
+		
+			$sql = "INSERT INTO artist (name, prefix) VALUES ('$artist', $prefix_txt)";
 			$db_results = mysql_query($sql, dbh());
 			$artist_id = mysql_insert_id(dbh());
 
@@ -1741,8 +1756,13 @@
 
 		/* If not found create */
 		else {
+                        $prefix_txt = 'NULL';
+
+                        if ($prefix) {
+                                $prefix_txt = "'$prefix'";
+                        }
 
-			$sql = "INSERT INTO album (name, prefix,year) VALUES ('$album', '$prefix','$album_year')";
+			$sql = "INSERT INTO album (name, prefix,year) VALUES ('$album',$prefix_txt,'$album_year')";
 			$db_results = mysql_query($sql, dbh());
 			$album_id = mysql_insert_id(dbh());
 
@@ -1777,9 +1797,10 @@
 		@param $genre The name of the genre
 	*/
 	function check_genre($genre) {
-
-		if (!$genre) {
-			return false;
+	
+		/* If a genre isn't specified force one */
+		if (strlen(trim($genre)) < 1) {
+			$genre = "Unknown (Orphaned)";
 		}
 
 		if ($this->genres[$genre]) {
@@ -1983,7 +2004,7 @@
 		foreach ($results as $value) {
 			// Remove extra whitespace
 			$value = trim($value);
-			if (preg_match("/\.[A-Za-z0-9]{3}$/",$value)) { 
+			if (preg_match("/\.[A-Za-z0-9]{3,4}$/",$value)) { 
 				$file[0] = str_replace("/","\\",$value);
 				$file[1] = str_replace("\\","/",$value);
 				/* Search for this filename, cause it's a audio file */
diff -urN ampache-3.3.2-alpha4/lib/class/error.class.php ampache-3.3.2-beta1/lib/class/error.class.php
--- ampache-3.3.2-alpha4/lib/class/error.class.php	2005-12-27 01:32:55.000000000 -0800
+++ ampache-3.3.2-beta1/lib/class/error.class.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/lib/class/genre.class.php ampache-3.3.2-beta1/lib/class/genre.class.php
--- ampache-3.3.2-alpha4/lib/class/genre.class.php	2005-12-27 01:32:55.000000000 -0800
+++ ampache-3.3.2-beta1/lib/class/genre.class.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright 2001 - 2005 Ampache.org
+ Copyright 2001 - 2006 Ampache.org
  All Rights Reserved
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/lib/class/playlist.class.php ampache-3.3.2-beta1/lib/class/playlist.class.php
--- ampache-3.3.2-alpha4/lib/class/playlist.class.php	2005-12-27 01:32:55.000000000 -0800
+++ ampache-3.3.2-beta1/lib/class/playlist.class.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -18,393 +18,443 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-
-*/
-/*!
-	@header Playlist Class
-	This class handles all actual work in regards to playlists.
 */
+/**
+ * Playlist Class
+ * This class handles playlists in ampache. it references the playlist* tables
+ */
+class Playlist { 
 
-class Playlist {
-
-	// Variables from DB
+	/* Variables from the Datbase */
 	var $id;
 	var $name;
 	var $user;
 	var $type;
-	var $time;
-	var $items;
-
-	/*!
-		@function Playlist
-		@discussion Playlist class
-		@param $playlist_id 	The ID of the playlist
-	 */
-	function Playlist($playlist_id = 0) {
-
-		/* If we have an id then do something */
-		if ($playlist_id) { 
-			// Assign id
-			$this->id = $playlist_id;
+	var $date;
 
-			// Get the information from the db
-			$this->refresh_object();
-		}
-		
-	}
+	/* Generated Elements */
+	var $items = array();
 
 
+	/**
+	 * Constructor 
+	 * This takes a playlist_id as an optional argument and gathers the information
+	 * if not playlist_id is passed returns false (or if it isn't found 
+	 */
+	function Playlist($playlist_id = 0) { 
 
-	/*!
-		@function refresh_object
-		@discussion Reads playlist information from the db and updates the Playlist object with it
-	*/
-	function refresh_object() {
-
-		$dbh = dbh();
-
-		if ($this->id) {
-			$sql = "SELECT name, user, type, date FROM playlist" .
-				" WHERE id = '$this->id'";
-			$db_results = mysql_query($sql, $dbh);
-
-			if ($r = mysql_fetch_object($db_results)) {
-				$this->name = $r->name;
-				$this->user = $r->user;
-				$this->type = $r->type;
-				$this->time = $r->date;
-				$this->items = array();
-
-				// Fetch playlist items
-				$sql = "SELECT song, track FROM playlist_data" .
-					" WHERE playlist = '$this->id'" .
-					" ORDER BY track";
-				$db_results = mysql_query($sql, $dbh);
-
-				while ($r = mysql_fetch_object($db_results)) {
-					$this->items[] = array("song_id" => $r->song, "track" => $r->track);
-				}
-			}
+		if (!$playlist_id) { return false; }
+		
+		$this->id 	= $playlist_id;
+		$info 		= $this->_get_info();
+		$this->name	= $info['name'];
+		$this->user	= $info['user'];
+		$this->type	= $info['type'];
+		$this->date	= $info['date'];
+	
+	} // Playlist
 
-			return TRUE;
-		}
+	/** 
+	 * _get_info
+	 * This is an internal (private) function that gathers the information for this object from the 
+	 * playlist_id that was passed in. 
+	 */
+	function _get_info() { 
 
-		return FALSE;
+		$sql = "SELECT * FROM playlist WHERE id='" . sql_escape($this->id) . "'";	
+		$db_results = mysql_query($sql, dbh());
 
-	}
+		$results = mysql_fetch_assoc($db_results);
 
+		return $results;
 
-	/*!
-		@function create_playlist
-		@discussion Creates an empty playlist, given a name, user_id, and type.
-	*/
-	function create_playlist($name, $user, $type) {
+	} // _get_info
 
-		$dbh = dbh();
+	/**
+	 * get_track
+	 * Takes a playlist_data.id and returns the current track value for said entry
+	 */
+	function get_track($id) { 
 
-		if (isset($name) && isset($user) && isset($type) && $this->check_type($type)) {
-			$name = sql_escape($name);
-			$user = sql_escape($user);
-			$type = sql_escape($type);
-			
-			$sql = "INSERT INTO playlist (name, user, type)" .
-				" VALUES ('$name', '$user', '$type')";
-			$db_results = mysql_query($sql, $dbh);
-			
-			if ($this->id = mysql_insert_id($dbh)) {
-				$this->refresh_object();
-				return true;
-			} // end if it created correctly
-			
-		} // end if this is a valid playlist entry
+		$sql = "SELECT track FROM playlist_data WHERE id='" . sql_escape($id) . "'";
+		$db_results = mysql_query($sql, dbh());
 
-		if (conf('debug')) { 
-			log_event($GLOBALS['user']->username,'playlist_create',"Failed to Create Playlist of $type Type named $name for $user"); 
-		}
+		$result = mysql_fetch_assoc($db_results);
 
-		return false;
+		return $result['track'];
 
-	} // create_playlist
+	} // get_track
 
+	/**
+	 * get_items
+	 * This returns an array of playlist songs that are in this playlist. Because the same
+	 * song can be on the same playlist twice they are key'd by the uid from playlist_data
+	 */
+	function get_items() { 
 
-	/*!
-		@function delete
-		@discussion Deletes the playlist.
-	*/
-	function delete() {
+		$sql = "SELECT * FROM playlist_data WHERE playlist='" . sql_escape($this->id) . "' ORDER BY track";
+		$db_results = mysql_query($sql, dbh());
 
-		$dbh = dbh();
+		while ($r = mysql_fetch_assoc($db_results)) { 
 
-		if ($this->id) {
-			$sql = "DELETE FROM playlist_data" .
-				" WHERE playlist = '$this->id'";
-			$db_results = mysql_query($sql, $dbh);
+			$key = $r['id'];
+			$results[$key] = $r;
 
-			$sql = "DELETE FROM playlist" .
-				" WHERE id = '$this->id'";
-			$db_results = mysql_query($sql, $dbh);
+		} // end while
 
-			$sql = "DELETE FROM playlist_permission" . 
-				" WHERE playlist = '$this->id'";
-			$db_results = mysql_query($sql, $dbh);
+		return $results;
 
-			return true;
-		} // if we've got a valid playlist
+	} // get_items
 
-		return false;
+	/**
+	 * get_songs
+	 * This returns an array of song_ids accounting for any dyn_song entries this playlist
+	 * may have. This is what should be called when trying to generate a m3u or other playlist
+	 */
+	function get_songs() { 
 
-	} // delete
+		$sql = "SELECT * FROM playlist_data WHERE playlist='" . sql_escape($this->id) . "'";
+		$db_results = mysql_query($sql, dbh());
 
+		$results = array();
 
-	/*!
-		@function update_track_numbers
-		@discussion Reads an array of song_ids and track numbers to update
-	*/
-	function update_track_numbers($changes) {
-
-		$dbh = dbh();
-
-		if ($this->id && isset($changes) && is_array($changes)) {
-			foreach ($changes as $change) {
-				// Check for valid song_id
-				$sql = "SELECT count(*) FROM song WHERE id = '" . $change['song_id'] . "'";
-				$db_results = mysql_query($sql, $dbh);
-				$r = mysql_fetch_row($db_results);
-				if ($r[0] == 1) {
-					$sql = "UPDATE playlist_data SET" .
-						" track = '" . $change['track'] . "'" .
-						" WHERE playlist = '$this->id'".
-						" AND song = '" . $change['song_id'] . "'";
-					$db_results = mysql_query($sql, $dbh);
-				}
+		while ($r = mysql_fetch_assoc($db_results)) { 
+			if ($r['dyn_song']) { 
+				$array = $this->get_dyn_songs($r['dyn_song']);
+				$results = array_merge($array,$results);
 			}
+			else { 
+				$results[] = $r['song'];
+			} 
 
-			// Refresh the playlist object
-			$this->refresh_object();
+		} // end while
 
-			return TRUE;
-		}
+		return $results;
+
+	} // get_songs
 
-		return FALSE;
+	/**
+	 * get_random_songs
+	 * This returns all of the songs in a random order, except those
+	 * pulled from dyn_songs
+	 */
+	function get_random_songs() { 
 
-	}
+		$sql = "SELECT * FROM playlist_data WHERE playlist='" . sql_escape($this->id) . "'" . 
+			" ORDER BY RAND()";
+		$db_results = mysql_query($sql, dbh());
 
+		$results = array();
 
-	/*!
-		@function add_songs
-		@discussion Reads an array of song_ids to add to the playlist
-		@param $song_ids the array of song_ids
-		@param $is_ordered boolean, if true insert in order submitted, not by track number
-	*/
-	function add_songs($song_ids, $is_ordered = false) {
-
-		$dbh = dbh();
-
-		if ($this->id && isset($song_ids) && is_array($song_ids)) {
-			$count = 0;
-			foreach ($song_ids as $song_id) {
-				if( $is_ordered ) {
-					$track_num = $count++;
-				} else {
-					$track_num = $song->track;
-				}
-				$song = new Song($song_id);
-				if (isset($song->id)) {
-					$sql = "INSERT INTO playlist_data" .
-						" (playlist, song, track)" .
-						" VALUES ('$this->id', '$song->id', '$track_num')";
-					$db_results = mysql_query($sql, $dbh);
-				}
+		while ($r = mysql_fetch_assoc($db_results)) { 
+			if ($r['dyn_song']) { 
+				$array = $this->get_dyn_songs($r['dyn_song']);
+				$results = array_merge($array,$results);
+			}
+			else { 
+				$results[] = $r['song'];
 			}
+		} // end while
 
-			// Refresh the playlist object
-			$this->refresh_object();
+		return $results;
 
-			return TRUE;
-		}
+	} // get_random_songs
 
-		return FALSE;
+	/**
+ 	 * get_dyn_songs
+	 * This returns an array of song_ids for a single dynamic playlist entry
+	 */
+	function get_dyn_songs($dyn_string) { 
 
-	} // add_songs
+		/* Ok honestly I know this is risky, so we have to be
+		 * 100% sure that the user never got to touch this. This
+		 * Query has to return id which must be a song.id
+		 */
+		$db_results = mysql_query($dyn_string, dbh());
+		$results = array();
 
+		while ($r = mysql_fetch_assoc($db_results)) { 
+			$results[] = $r['id'];
+		} // end while
 
-	/*!
-		@function remove_songs
-		@discussion Reads an array of song_ids to remove from the playlist
-	*/
-	function remove_songs($song_ids) {
-
-		$dbh = dbh();
-
-		if ($this->id && isset($song_ids) && is_array($song_ids)) {
-			foreach ($song_ids as $song_id) {
-				$sql = "DELETE FROM playlist_data" .
-					" WHERE song = '$song_id'" .
-					" AND playlist = '$this->id'";
-				$db_results = mysql_query($sql, $dbh);
-			}
+		return $results;
 
-			// Refresh the playlist object
-			$this->refresh_object();
+	} // get_dyn_songs
 
-			return TRUE;
-		}
+	/**
+	 * get_song_count
+	 * This simply returns a int of how many song elements exist in this playlist
+	 * For now let's consider a dyn_song a single entry
+	 */
+	function get_song_count() { 
 
-		return FALSE;
+		$sql = "SELECT COUNT(id) FROM playlist_data WHERE playlist='" . sql_escape($this->id) . "'";
+		$db_results = mysql_query($sql, dbh());
 
-	}
+		$results = mysql_fetch_row($db_results);
 
+		return $results['0'];
 
-	/*!
-		@function check_type
-		@discussion Checks for a valid playlist type
-	*/
-	function check_type($type) {
+	} // get_song_count
 
-		if (isset($type)) {
-			if ($type === 'public' || $type === 'private') {
-				return TRUE;
-			}
-		}
+	/**
+	 * has_access
+	 * This takes no arguments. It looks at the currently logged in user (_SESSION)
+	 * This accounts for admin powers and the access on a per list basis
+	 */
+	function has_access() { 
 
-		return FALSE;
+		if (!$GLOBALS['user']->has_access(25)) { return false; }  
 
-	}
+		/* If they are a full admin, then they always get rights */
+		if ($GLOBALS['user']->has_access(100)) { return true; } 
 
+		if ($this->user == $GLOBALS['user']->username) { return true; } 
 
-	/*!
-		@function update_type
-		@discussion Updates the playlist type
-	*/
-	function update_type($type) {
+		/* Check the Playlist_permission table */
+		$sql = "SELECT id FROM playlist_permission WHERE " . 
+			"playlist='" . sql_escape($this->id) . "' AND userid='" . sql_escape($GLOBALS['user']->username) . "'" . 
+			" AND level >= '25'";
+		$db_results = mysql_query($sql, dbh());
 
-		$dbh = dbh();
+		$results = mysql_fetch_row($db_results);
 
-		if ($this->id && isset($type) && $this->check_type($type)) {
-			$sql = "UPDATE playlist SET type = '$type'" .
-				" WHERE id = '$this->id'";
-			$db_results = mysql_query($sql, $dbh);
+		if ($results) { return true; }
 
-			// Refresh the playlist object
-			$this->refresh_object();
+		return false;
 
-			return TRUE;
-		}
+	} // has_access
 
-		return FALSE;
+	/**
+	 * update_type
+	 * This updates the playlist type, it calls the generic update_item function 
+	 */
+	function update_type($new_type) { 
 
-	}
+		if ($this->_update_item('type',$new_type,'100')) { 
+			$this->type = $new_type;
+		}
 
+	} // update_type
 
-	/*!
-		@function update_name
-		@discussion Updates the playlist name
-	*/
-	function update_name($name) {
+	/**
+	 * update_name
+	 * This updates the playlist name, it calls the generic update_item function
+	 */
+	function update_name($new_name) { 
 
-		$dbh = dbh();
+		if ($this->_update_item('name',$new_name,'100')) { 
+			$this->name = $new_name;
+		}
 
-		if ($this->id && isset($name)) {
-			$name = sql_escape($name);
-			$sql = "UPDATE playlist SET name = '$name'" .
-				" WHERE id = '$this->id'";
-			$db_results = mysql_query($sql, $dbh);
+	} // update_name
 
-			// Refresh the playlist object
-			$this->refresh_object();
+	/**
+	 * _update_item
+	 * This is the generic update function, it does the escaping and error checking
+	 */
+	function _update_item($field,$value,$level) { 
 
-			return TRUE;
+		if ($GLOBALS['user']->username != $this->user AND !$GLOBALS['user']->has_access($level)) { 
+			return false; 
 		}
 
-		return FALSE;
+		$value = sql_escape($value);
 
-	}
+		$sql = "UPDATE playlist SET $field='$value' WHERE id='" . sql_escape($this->id) . "'";
+		$db_results = mysql_query($sql, dbh());
 
-	/*!
-		@function normalize_tracks
-		@discussion this takes the crazy out of order tracks
-			and numbers them in a liner fashion, not allowing for
-			the same track # twice, this is an optional funcition
-	*/
-	function normalize_tracks() { 
+		return $db_results;
 
-		/* First get all of the songs in order of their tracks */
-		$sql = "SELECT id FROM playlist_data WHERE playlist='$this->id' ORDER BY track ASC";
-		$db_results = mysql_query($sql, dbh());
+	} // update_item
 
-		$i = 1;
+	/**
+	 * update_track_numbers
+	 
+	 * This function takes an array of $array['song_id'] $array['track'] where song_id is really the
+	 * playlist_data.id and updates them
+	 */
+	function update_track_numbers($data) { 
 
-		while ($r = mysql_fetch_assoc($db_results)) { 
-			$new_data = array();
-			$new_data['id']		= $r['id'];
-			$new_data['track']	= $i;
-			$results[] = $new_data;
-			$i++;
-		} // end while results
-
-		foreach($results as $data) { 
-			$sql = "UPDATE playlist_data SET track='" . $data['track'] . "' WHERE" . 
-					" id='" . $data['id'] . "'";
+		foreach ($data as $change) { 
+		
+			$track 	= sql_escape($change['track']);
+			$id	= sql_escape($change['song_id']);
+
+			$sql = "UPDATE playlist_data SET track='$track' WHERE id='$id'";
 			$db_results = mysql_query($sql, dbh());
-		} // foreach re-ordered results
 
-		return true;
+		} // end foreach
+
+	} // update_track_numbers
+
+	/**
+	 * add_songs
+	 * This takes an array of song_ids and then adds it to the playlist
+	 * if you want to add a dyn_song you need to use the one shot function
+	 * add_dyn_song
+	 */
+	function add_songs($song_ids=array()) { 
+
+		foreach ($song_ids as $song_id) { 
+			/* We need the songs track */
+			$song = new Song($song_id);
+
+			$track	= sql_escape($song->track);
+			$id	= sql_escape($song->id);
+			$pl_id	= sql_escape($this->id);
+
+			/* Don't insert dead songs */
+			if ($id) { 
+				$sql = "INSERT INTO playlist_data (`playlist`,`song`,`track`) " . 
+					" VALUES ('$pl_id','$id','$track')";
+				$db_results = mysql_query($sql, dbh());
+			} // if valid id
+
+		} // end foreach songs
 
-	} // normalize_tracks
+	} // add_songs
+
+	/**
+	 * add_dyn_song
+	 * This adds a dynamic song to a specified playlist this is just called as the
+	 * song its self is stored in the session to keep it away from evil users
+	 */
+	function add_dyn_song() { 
 	
+		$dyn_song = $_SESSION['userdata']['stored_search'];
 
-	/*!
-		@function get_songs
-		@discussion Returns an array of song_ids for the playlist
-	*/
-	function get_songs() {
-
-		$song_ids = array();
-
-		if ($this->id && is_array($this->items)) {
-			foreach ($this->items as $item) {
-				$song_ids[] = $item['song_id'];
-			}
-		}
+		if (strlen($dyn_song) < 1) { echo "FAILED1"; return false; }
 
-		return $song_ids;
+		if (substr($dyn_song,0,6) != 'SELECT') { echo "$dyn_song"; return false; }
 
-	} // get_songs
+		/* Test the query before we put it in */
+		$db_results = @mysql_query($dyn_song, dbh());
 
-	/*!
-		@function get_random_songs
-		@discussion gets a random set of the songs in this
-			playlist
-	*/
-	function get_random_songs() { 
+		if (!$db_results) { return false; }
 
-		$sql = "SELECT COUNT(song) FROM playlist_data WHERE playlist = '$this->id'";
+		/* Ok now let's add it */
+		$sql = "INSERT INTO playlist_data (`playlist`,`dyn_song`,`track`) " . 
+			" VALUES ('" . sql_escape($this->id) . "','" . sql_escape($dyn_song) . "','0')";
 		$db_results = mysql_query($sql, dbh());
 
-		$total_songs = mysql_fetch_row($db_results);
-		
-	        // Fetch playlist items
-                $sql = "SELECT song, track FROM playlist_data" .
-        	        " WHERE playlist = '$this->id'" .
-                        " ORDER BY RAND()";
+		return true;
+
+	} // add_dyn_song
+
+	/**
+	 * create
+	 * This function creates an empty playlist, gives it a name and type
+	 * Assumes $GLOBALS['user']->username as the user
+	 */
+	function create($name,$type) { 
+
+		$name = sql_escape($name);
+		$type = sql_escape($type);
+		$user = sql_escape($GLOBALS['user']->username);
+		$date = time();
+
+		$sql = "INSERT INTO playlist (`name`,`user`,`type`,`date`) " . 
+			" VALUES ('$name','$user','$type','$date')";
+		$db_results = mysql_query($sql, dbh());
+
+		$insert_id = mysql_insert_id(dbh());
+
+		return $insert_id;
+
+	} //create_paylist
+
+	/**
+	 * set_items
+	 * This calles the get_items function and sets it to $this->items which is an array in this object
+	 */
+	function set_items() { 
+
+		$this->items = $this->get_items();
+
+	} // set_items
+
+        /**
+         * normalize_tracks
+         * this takes the crazy out of order tracks
+         * and numbers them in a liner fashion, not allowing for
+	 * the same track # twice, this is an optional funcition
+	 */
+        function normalize_tracks() { 
+
+                /* First get all of the songs in order of their tracks */
+                $sql = "SELECT id FROM playlist_data WHERE playlist='" . sql_escape($this->id) . "' ORDER BY track ASC";
                 $db_results = mysql_query($sql, dbh());
-                while ($r = mysql_fetch_object($db_results)) {
-	                $song_ids[] = $r->song;
-                }
 
-		return $song_ids;
-	} // get_random_songs
+                $i = 1;
 
-	/*!
-		@function show_import
-		@discussion shows the import from file template
-	*/
-	function show_import() { 
+                while ($r = mysql_fetch_assoc($db_results)) { 
+                        $new_data = array();
+                        $new_data['id']         = $r['id'];
+                        $new_data['track']      = $i;
+                        $results[] = $new_data;
+                        $i++;
+                } // end while results
+
+                foreach($results as $data) { 
+                        $sql = "UPDATE playlist_data SET track='" . $data['track'] . "' WHERE" . 
+                                        " id='" . $data['id'] . "'";
+                        $db_results = mysql_query($sql, dbh());
+                } // foreach re-ordered results
 
-		require (conf('prefix') . "/templates/show_import_playlist.inc.php");
+                return true;
 
-	} // show_import
+        } // normalize_tracks
+	
+	/**
+	 * check_type
+	 * This validates a type to make sure it's legit
+	 */
+	function check_type($type) { 
+
+		if ($type == 'public' || $type == 'private') { return true; }
+		
+		return false; 
+
+	} // check_type
+
+	/**
+	 * remove_songs
+	 * This is the polar opposite of the add_songs function... with one little 
+	 * change. it works off of the playlist_data.id rather then song_id
+	 */
+	function remove_songs($data) { 
+
+		foreach ($data as $value) { 
+		
+			$id = sql_escape($value);
+			
+			$sql = "DELETE FROM playlist_data WHERE id='$id'";
+			$db_results = mysql_query($sql, dbh());
 
-} //end of playlist class
+		} // end foreach dead songs
+
+	} // remove_songs
+
+	/**
+	 * delete
+	 * This deletes the current playlist and all assoicated data
+	 */
+	function delete() { 
+
+		$id = sql_escape($this->id);
+
+		$sql = "DELETE FROM playlist_data WHERE playlist = '$id'";
+		$db_results = mysql_query($sql, dbh());
+
+		$sql = "DELETE FROM playlist WHERE id='$id'";
+		$db_results = mysql_query($sql, dbh());
+
+		$sql = "DELETE FROM playlist_permission WHERE playlist='$id'";
+		$db_results = mysql_query($sql, dbh());
+
+		return true;
+	
+	} // delete
 
-?>
+} // class Playlist
diff -urN ampache-3.3.2-alpha4/lib/class/rating.class.php ampache-3.3.2-beta1/lib/class/rating.class.php
--- ampache-3.3.2-alpha4/lib/class/rating.class.php	2005-12-27 01:32:55.000000000 -0800
+++ ampache-3.3.2-beta1/lib/class/rating.class.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -44,10 +44,12 @@
 		$this->id 	= $id;
 		$this->type 	= $type;
 
-
 		if (intval($id) > 1) { 
 			$this->get_average();
 		}
+		else {
+			$this->rating='0';
+		}
 
 	} // Rating
 
diff -urN ampache-3.3.2-alpha4/lib/class/song.class.php ampache-3.3.2-beta1/lib/class/song.class.php
--- ampache-3.3.2-alpha4/lib/class/song.class.php	2005-12-27 01:32:55.000000000 -0800
+++ ampache-3.3.2-beta1/lib/class/song.class.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2004 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -109,7 +109,7 @@
 			"title,bitrate,rate,mode,size,time,track,genre,played,song.enabled,update_time,".
 			"addition_time,flagged.id as flagid,flagged.user as flaguser,flagged.type ".
 			"as flagtype,flagged.date as flagdate,flagged.comment as flagcomment FROM ".
-			"song LEFT JOIN flagged ON song.id = flagged.song WHERE song.id = '$this->id'";
+			"song LEFT JOIN flagged ON song.id = flagged.song WHERE song.id = '" . sql_escape($this->id) . "'";
 		$db_results = mysql_query($sql, dbh());
 
 		$results = mysql_fetch_object($db_results);
diff -urN ampache-3.3.2-alpha4/lib/class/stream.class.php ampache-3.3.2-beta1/lib/class/stream.class.php
--- ampache-3.3.2-alpha4/lib/class/stream.class.php	2005-12-27 01:32:55.000000000 -0800
+++ ampache-3.3.2-beta1/lib/class/stream.class.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.  
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/lib/class/update.class.php ampache-3.3.2-beta1/lib/class/update.class.php
--- ampache-3.3.2-alpha4/lib/class/update.class.php	2005-12-27 01:32:55.000000000 -0800
+++ ampache-3.3.2-beta1/lib/class/update.class.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -248,6 +248,21 @@
 
 		$version[] = array('version' => '332004', 'description' => $update_string);
 
+		$update_string = "- Verify Previous Update, I dropped the ball and allowed a nightly to be built with an invalid Update function " . 
+				 "this update simply verifies that the previous database upgrade worked correctly and corrects it if it didn't. I appologize " . 
+				 "for the mistake and will do my best to make sure it never happens again. - Karl Vollmer<br />";
+
+		$version[] = array('version' => '332005','description' => $update_string);
+
+
+		$update_string = '- Adds Create Date to User table to track registration and user creation time.';
+
+		$version[] = array('version' => '332006','description' => $update_string);
+
+		$update_string = '- Alters the Dynamic Song field to be TEXT instead of Varchar (varchar was not long enough).';
+		
+		$version[] = array('version' => '332007','description' => $update_string);
+
 		return $version;
 
 	} // populate_version
@@ -1231,7 +1246,7 @@
 	*/
 	function update_332004() { 
 
-		$sql = "ALTER TABLE `playlist_data` ADD `id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT FIRST";
+		$sql = "ALTER TABLE `playlist_data` ADD `id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST";
 		$db_results = mysql_query($sql, dbh());
 
 		/* Create the ratings table */
@@ -1294,6 +1309,100 @@
 		$this->set_version('db_version','332004');
 
 	} // update_332004
+	
+	/**
+	 * update_332005
+	 * I tottaly messed up the 332004 update so I've gotta go back and verify what
+	 * happened and didn't happen and then fix that which didn't happen 
+	 * Doublecheck the playlist_data entry
+	 * Check the ratings table to make sure it's correct
+	 */
+	function update_332005() { 
+
+		/* Check Playlist_Data */
+		$sql = "DESCRIBE playlist_data";
+		$db_results = mysql_query($sql, dbh());
+
+		while ($r = mysql_fetch_assoc($db_results)) { 
+			$key = $r['Field'];
+			$results[$key] = $r['Key'];
+		}
+
+		/* If $results['id'] != PRI then we're screwed and we need to try again */
+		if ($results['id'] != 'PRI') { 
+			/* Try again!!!! */
+			$sql = "ALTER TABLE `playlist_data` ADD `id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST";
+			$db_results = mysql_query($sql, dbh());
+		}
+
+		/* Next verify the setup of the ratings table */
+		$sql = "DESCRIBE ratings";
+		$db_results = mysql_query($sql, dbh());
+
+		$results = array();
+
+		/* it fails horribly? */
+		if (!$db_results) { 
+			/* Try to create the table again */
+			$sql =  "CREATE TABLE `ratings` (`id` int(11) unsigned NOT NULL auto_increment," .
+	                        " `user` varchar(128) NOT NULL default ''," .
+	                        " `object_type` enum('artist','album','song') NOT NULL default 'artist'," .
+	                        " `object_id` int(11) unsigned NOT NULL default '0'," .
+	                        " `user_rating` enum('00','0','1','2','3','4','5') NOT NULL default '0'," .
+	                        " PRIMARY KEY (`id`))";
+			$db_results = mysql_query($sql, dbh());
+		} 
+		else { 
+			/* Go through the friggin results */
+			while ($r = mysql_fetch_assoc($db_results)) { 
+				$key = $r['Field'];
+				$results[$key] = $r['Type'];
+			}
+			if ($results['rating']) { 
+				$sql = "ALTER TABLE `ratings` CHANGE `rating` `user_rating` ENUM( '00', '0', '1', '2', '3', '4', '5' ) NOT NULL DEFAULT '0'";
+				$db_results = mysql_query($sql, dbh());
+			}
+
+		} // end else
+
+		/* One more thing I pooched */
+		$sql = "ALTER TABLE `playlist_data` CHANGE `song` `song` INT( 11 ) UNSIGNED NULL DEFAULT NULL";
+		$db_results = mysql_query($sql, dbh());
+
+		$this->set_version('db_version','332005');
+
+	} // update_332005
+
+	/**
+	 * update_332006
+	 * Hmm 2006 perfect for the new year.. anyway this just adds the create_date on the account
+	 * so that you know when they were registered/created 
+	 */
+	function update_332006() { 
+
+		$sql = "ALTER TABLE `user` ADD `create_date` INT ( 11 ) UNSIGNED NULL DEFAULT NULL";
+		$db_results = mysql_query($sql, dbh());
+		
+		$sql = "ALTER TABLE `user` ADD `validation` VARCHAR ( 128 )";
+		$db_results = mysql_query($sql, dbh());
+		
+		$this->set_version('db_version','332006');
+
+	} // update_332006
+
+	/**
+	 * update_332007
+	 * Arg... I'm tried of writting these updates
+	 * If I would only get it right the first time I wouldn't have to do this
+	 */
+	function update_332007() { 
+
+		$sql = "ALTER TABLE `playlist_data` CHANGE `dyn_song` `dyn_song` TEXT NULL DEFAULT NULL";
+		$db_results = mysql_query($sql, dbh());
+
+		$this->set_version('db_version','332007');
+
+	} // update_332007
 
 } // end update class
 ?>
diff -urN ampache-3.3.2-alpha4/lib/class/user.class.php ampache-3.3.2-beta1/lib/class/user.class.php
--- ampache-3.3.2-alpha4/lib/class/user.class.php	2005-12-27 01:32:55.000000000 -0800
+++ ampache-3.3.2-beta1/lib/class/user.class.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -36,6 +36,8 @@
 	var $offset_limit=25;
 	var $email;
 	var $last_seen;
+	var $create_date;
+	var $validation;
 	
 	function User($username=0) {
 
@@ -52,6 +54,8 @@
 		$this->offset_limit 	= $info->offset_limit;
 		$this->email		= $info->email;
 		$this->last_seen	= $info->last_seen;
+		$this->create_date	= $info->create_date;
+		$this->validation	= $info->validation;
 		$this->set_preferences();
 
 		// Make sure the Full name is always filled
@@ -304,6 +308,23 @@
 
 	} // update_username
 
+	/**
+	 * update_validation
+	 * This is used by the registration mumbojumbo
+	 * Use this function to update the validation key
+	 * NOTE: crap this doesn't have update_item the humanity of it all 
+	 */
+	function update_validation($new_validation) { 
+
+		$new_validation = sql_escape($new_validation);
+		$sql = "UPDATE user SET validation='$new_validation' WHERE username='$this->username'";
+		$this->validation = $new_validation;
+		$db_results = mysql_query($sql, dbh());
+
+		return $db_results;
+
+	} // update_validation
+
 	/*!
 		@function update_fullname
 		@discussion updates their fullname
@@ -368,12 +389,12 @@
 			
 		} 
 		elseif ($new_access == 'disabled') {
-			$new_access = sql_escape($new_access);
 			$sql = "UPDATE user SET disabled='1' WHERE username='$this->username'";
 			$db_results = mysql_query($sql, dbh());
 			$sql = "DELETE FROM session WHERE username='" . sql_escape($this->username) . "'";
 			$db_results = mysql_query($sql, dbh());
-		} else {
+		} 
+		else {
 			$new_access = sql_escape($new_access);
 			$sql = "UPDATE user SET access='$new_access' WHERE username='$this->username'";
 			$db_results = mysql_query($sql, dbh());
@@ -466,21 +487,22 @@
 
 	} // update_stats
 
-	/*!
-		@function create
-		@discussion inserts a new user into ampache
-	*/
+	/**
+	 * create
+	 * inserts a new user into ampache
+	 */
 	function create($username, $fullname, $email, $password, $access) { 
 
 		/* Lets clean up the fields... */
 		$username	= sql_escape($username);
 		$fullname	= sql_escape($fullname);
 		$email		= sql_escape($email);
-
+		
 		/* Now Insert this new user */
-		$sql = "INSERT INTO user (username, fullname, email, password, access) VALUES" .
-			" ('$username','$fullname','$email',PASSWORD('$password'),'$access')";
+		$sql = "INSERT INTO user (username, fullname, email, password, access, create_date) VALUES" .
+			" ('$username','$fullname','$email',PASSWORD('$password'),'$access','" . time() ."')";
 		$db_results = mysql_query($sql, dbh());
+		
 		if (!$db_results) { return false; }
 
 		/* Populates any missing preferences, in this case all of them */
@@ -488,7 +510,7 @@
 
 		return $username;
 
-	} // new
+	} // create
 	
 	/*!
 		@function update_password
@@ -568,7 +590,7 @@
 		*/
 		if ($user_id != '-1') { 
 			$sql = "SELECT user_preference.preference,user_preference.value FROM user_preference,preferences " . 
-				"WHERE user_preference.preference = preferences.id AND user_preference.user='-1' AND preferences.type='user'";
+				"WHERE user_preference.preference = preferences.id AND user_preference.user='-1' AND preferences.type !='system'";
 			$db_results = mysql_query($sql, dbh());
 			while ($r = mysql_fetch_object($db_results)) { 
 				$zero_results[$r->preference] = $r->value;
@@ -578,7 +600,7 @@
 
 		$sql = "SELECT * FROM preferences";
 		if ($user_id != '-1') { 
-			$sql .= " WHERE type='user'";
+			$sql .= " WHERE type !='system'";
 		}
 		$db_results = mysql_query($sql, dbh());
 
@@ -701,7 +723,7 @@
 		  admin
 		*/
 		if ($this->has_access(100)) { 
-			$sql = "SELECT * FROM user WHERE (level='admin' OR level='100') AND username!='" . $this->username . "'";
+			$sql = "SELECT username FROM user WHERE (access='admin' OR access='100') AND username !='" . sql_escape($this->username) . "'";
 			$db_results = mysql_query($sql, dbh());
 			if (!mysql_num_rows($db_results)) { 
 				return false;
@@ -737,9 +759,42 @@
 		@description  calcs difference between now and last_seen
 			if less than delay, we consider them still online
 	*/
+	
 	function is_online( $delay = 1200 ) {
 		return time() - $this->last_seen <= $delay;
 	}
 
+	/*!
+		@function get_user_validation
+		@check if user exists before activation can be done.
+	*/
+	function get_user_validation($username,$validation) {
+	
+		$usename = sql_escape($username);
+	
+		$sql = "SELECT validation FROM user where username='$username'";
+		$db_results = mysql_query($sql, dbh());
+		
+		$row = mysql_fetch_assoc($db_results);
+		$val = $row['validation'];
+
+		return $val;
+
+	} // get_user_validation
+
+	/*!
+		@function activate_user
+		@activates the user from public_registration
+	*/
+	function activate_user($username) {
+	
+		$username = sql_escape($username);
+	
+		$sql = "UPDATE user SET disabled='0' WHERE username='$username'";
+		$db_results = mysql_query($sql, dbh());
+		
+	} // activate_user
+	
 } //end class
+
 ?>
diff -urN ampache-3.3.2-alpha4/lib/class/view.class.php ampache-3.3.2-beta1/lib/class/view.class.php
--- ampache-3.3.2-alpha4/lib/class/view.class.php	2005-12-27 01:32:55.000000000 -0800
+++ ampache-3.3.2-beta1/lib/class/view.class.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2004 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/lib/debug.php ampache-3.3.2-beta1/lib/debug.php
--- ampache-3.3.2-alpha4/lib/debug.php	2005-12-27 01:32:56.000000000 -0800
+++ ampache-3.3.2-beta1/lib/debug.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2004 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/lib/duplicates.php ampache-3.3.2-beta1/lib/duplicates.php
--- ampache-3.3.2-alpha4/lib/duplicates.php	2005-12-27 01:32:56.000000000 -0800
+++ ampache-3.3.2-beta1/lib/duplicates.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,4 +1,26 @@
 <?php
+/*
+
+ Copyright (c) 2001 - 2006 Ampache.org
+ All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+
+
 /*!
 	@header Contains the functions for handling duplicate songs 
 */
diff -urN ampache-3.3.2-alpha4/lib/flag.php ampache-3.3.2-beta1/lib/flag.php
--- ampache-3.3.2-alpha4/lib/flag.php	2005-12-27 01:32:56.000000000 -0800
+++ ampache-3.3.2-beta1/lib/flag.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,10 +1,9 @@
 <?php
 /*
 
- Copyright (c) 2004 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
-
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
  as published by the Free Software Foundation; either version 2
diff -urN ampache-3.3.2-alpha4/lib/general.js ampache-3.3.2-beta1/lib/general.js
--- ampache-3.3.2-alpha4/lib/general.js	2005-12-27 01:32:56.000000000 -0800
+++ ampache-3.3.2-beta1/lib/general.js	2006-01-08 23:06:13.000000000 -0800
@@ -1,3 +1,93 @@
+/* The AJAX stuff */
+var xmlHttp;
+var requestType="";
+
+
+function createXMLHttpRequest() {
+   if (window.ActiveXObject) {
+      xmlHttp = new ActiveXObject("Microsoft.XMLHTTP");
+   }
+   else if (window.XMLHttpRequest) {
+      xmlHttp = new XMLHttpRequest();
+   }
+}
+
+function startRequest(params) {
+   createXMLHttpRequest();
+   xmlHttp.onreadystatechange = handleStateChange;
+   xmlHttp.open("GET", "server/ajax.server.php?"+params, true);
+/*   xmlHttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); */
+   xmlHttp.send(null);
+}
+
+function timestuff() {
+alert ("mpd_elapsed ="+fmt_time(mpd_elapsed)+"; nowtime - starttime ="+fmt_time(Math.floor ((nowtime - starttime)/1000))+"; secondssinceloaded ="+fmt_time(secondssinceloaded));
+}
+
+function handleStateChange() {
+   if (xmlHttp.readyState == 4) {
+      if (xmlHttp.status == 200) {
+/* alert ("responseText = " + xmlHttp.responseText);  */
+         var props = xmlHttp.responseXML.getElementsByTagName("properties")[0].childNodes;
+
+         for (var i=1; i< props.length; i++) {
+            el = props[i];
+/* alert ("i="+i+"; "+el.tagName); */
+
+            switch (el.tagName) {
+               case 'action' : break;
+               case 'volume' :
+                  var vol = el.firstChild.data;
+                  document.getElementById ('volume').firstChild.data = vol;
+                  break;
+               case 'mpd_cur_track_pos' :
+                  mpd_elapsed = Math.floor(el.firstChild.data);
+/* alert ('mpd_elapsed ='+mpd_elapsed); */
+               starttime = new Date();
+               starttime=starttime.getTime()
+                  break;
+
+               case 'state' :
+                  var new_state = el.firstChild.data;
+/* alert ('state = '+new_state+'; player_state = '+player_state); */
+                  if ((player == 'mpd') && (player_state != new_state)) {
+                     document.getElementById (player_state+'_button').className = "";
+                     document.getElementById (new_state+'_button').className = "selected_button";
+                     player_state = new_state;
+                     if (player_state == "stop" || player_state == "pause") { 
+                        if (player == 'mpd') document.getElementById ('mpd_np').className = "nodisplay";
+/*               turn off the now playing stuff */
+                     } else 
+                     {
+                        if (player == 'mpd') document.getElementById ('mpd_np').className = "";
+/*               turn on the now playing stuff */
+                     } // end if else
+                  } // end if 
+                  break;
+               case 'now_playing' :
+		  if (player == 'mpd') {
+	                  mpd_song_length = el.getElementsByTagName ('songlength')[0].firstChild.data;
+        	          mpd_songid = Math.round(el.getElementsByTagName ('songid')[0].firstChild.data);
+                	  document.getElementById ('mpd_npinfo').firstChild.data =
+	                      1+mpd_songid + ". " +
+	                      el.getElementsByTagName ('songartist')[0].firstChild.data + " - " +
+	                      el.getElementsByTagName ('songtitle')[0].firstChild.data + " - " +
+	                      el.getElementsByTagName ('songalbum')[0].firstChild.data + " - " +
+	                      fmt_time(mpd_song_length);
+		  }
+                  break;
+               default :
+                  alert ('Unknown XML reply :"'+el.tagName+'"');
+            } // end switch
+         } // end for
+      } 
+      else
+      { alert ('status = ' + xmlHttp.status); 
+      } // end if status else
+   } //end if ready status
+}
+
+
 function disableField(element) {
         var element_id = document.getElementById(element);
         element_id.disabled=true;
@@ -86,3 +176,27 @@
                 return "Select All";
         }
 }
+
+
+function popup_art(url) {
+        var newwindow;
+        newwindow=window.open(url, "ampache_art", "menubar=no,toolbar=no,location=no,directories=no");
+        if (window.focus) {newwindow.focus()}
+}
+
+// function needed for IE.  attaches mouseover/out events to give/remove css class .sfhover (fake hover)
+sfHover = function(navlist) {
+var sfEls = document.getElementById("navlist").getElementsByTagName("LI");
+for (var i=0; i <sfEls.length; i++) {
+    sfEls[i].onmouseover=function() {
+        this.className+=" sfhover";
+    }           
+    sfEls[i].onmouseout=function() {
+        this.className=this.className.replace(new RegExp("sfhover\\b"), "");
+    }           
+} // end for    
+} // end function for sfHover
+
+if (window.attachEvent) window.attachEvent("onload", sfHover);
+
+
diff -urN ampache-3.3.2-alpha4/lib/general.lib.php ampache-3.3.2-beta1/lib/general.lib.php
--- ampache-3.3.2-alpha4/lib/general.lib.php	2005-12-27 01:32:56.000000000 -0800
+++ ampache-3.3.2-beta1/lib/general.lib.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,5 +1,27 @@
 <?php
 /*
+
+ Copyright (c) 2001 - 2006 Ampache.org
+ All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+
+
+/*
 	@header General Library
 	This is the general library that contains misc functions
 	that doesn't have a home elsewhere
@@ -59,6 +81,7 @@
 	@param 	$template	Name of Template
 */
 function show_template($template) {
+global $myMpd, $user;
 
 	/* Check for a 'Theme' template */
 	if (is_readable(conf('prefix') . conf('theme_path') . "/templates/$template".".inc")) { 
@@ -364,9 +387,6 @@
 */
 function get_tag_type($results) {
 
-
-	
-
          // Check and see if we are dealing with an ogg
          // If so order will be a little different
          if ($results['ogg']) {
diff -urN ampache-3.3.2-alpha4/lib/gettext.php ampache-3.3.2-beta1/lib/gettext.php
--- ampache-3.3.2-alpha4/lib/gettext.php	2005-12-27 01:32:56.000000000 -0800
+++ ampache-3.3.2-beta1/lib/gettext.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,6 +1,9 @@
 <?php
 /*
 
+ Copyright (c) 2001 - 2006 Ampache.org
+ All Rights Reserved
+
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
  as published by the Free Software Foundation; either version 2
diff -urN ampache-3.3.2-alpha4/lib/install.php ampache-3.3.2-beta1/lib/install.php
--- ampache-3.3.2-alpha4/lib/install.php	2005-12-27 01:32:56.000000000 -0800
+++ ampache-3.3.2-beta1/lib/install.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -110,17 +110,28 @@
 	/* Attempt to make DB connection */
 	$dbh = @mysql_pconnect($hostname,$username,$password);
 	
-
 	/* Check/Create Database as needed */
 	$db_selected = @mysql_select_db($database, $dbh);
 	if (!$db_selected) { 
 		$sql = "CREATE DATABASE `" . $database . "`";
 		if (!$db_results = @mysql_query($sql, $dbh)) { 
+			$GLOBALS['error']->add_error('general',"Error: Unable to Create Database " . mysql_error());
 			return false;
 		}
 		@mysql_select_db($database, $dbh);
 	} // if db can't be selected
-		
+	/* Check and see if we should create a user here */
+	if ($_REQUEST['db_user'] == 'create_db_user') { 
+		$db_user = scrub_in($_REQUEST['db_username']);
+		$db_pass = scrub_in($_REQUEST['db_password']);
+		$sql = "GRANT ALL PRIVILEGES ON " . sql_escape($database,$dbh) . ".* TO " .
+			"'" . sql_escape($db_user,$dbh) . "'@'" . sql_escape($hostname,$dbh) . "' IDENTIFIED BY '" . sql_escape($db_pass,$dbh) . "' WITH GRANT OPTION";	
+
+		if (!$db_results = @mysql_query($sql, $dbh)) { 
+			$GLOBALS['error']->add_error('general',"Error: Unable to Insert $db_user with permissions to $database on $hostname " . mysql_error());
+			return false;
+		}
+	} // end if we are creating a user
 
 	/* Attempt to insert database */
          $query = fread(fopen("sql/ampache.sql", "r"), filesize("sql/ampache.sql"));
@@ -154,9 +165,11 @@
 	*/
 	// Connect to the DB
 	if(!$dbh = @mysql_pconnect($hostname,$username,$password)) { 
+		$GLOBALS['error']->add_error('general',"Database Connection Failed Check Hostname, Username and Password");
 		return false;
 	}
 	if (!$db_selected = @mysql_select_db($database, $dbh)) { 
+		$GLOBALS['error']->add_error('general',"Database Selection Failure Check Existance of $database");
 		return false;
 	}
 
@@ -197,12 +210,12 @@
 	if (!$config_handle = @fopen("config/ampache.cfg.php",'w')) { 
 		$browser = new Browser();
 		$browser->downloadHeaders("ampache.cfg.php","text/plain",false,filesize("config/ampache.cfg.php.dist"));
-
 		echo $config_data;
 		exit();
 		
 	}
 	if (!@fwrite($config_handle,$config_data)) {
+		$GLOBALS['error']->add_error('general',"Error: Unable to write Config File but file writeable?");
 		return false;
 	}
 
@@ -227,9 +240,10 @@
 	$sql = "INSERT INTO user (`username`,`password`,`offset_limit`,`access`) VALUES ('$username',PASSWORD('$password'),'50','admin')";
 	$db_results = mysql_query($sql, $dbh);
 	
-	$insert_id = mysql_insert_id($dbh);
-	
-	if (!$insert_id) { return false; }
+	if (!$db_results) { 
+		$GLOBALS['error']->add_error('general',"Insert of Base User Failed " . mysql_error());
+		return false; 
+	}
 
 	return true;
 		
diff -urN ampache-3.3.2-alpha4/lib/log.lib.php ampache-3.3.2-beta1/lib/log.lib.php
--- ampache-3.3.2-alpha4/lib/log.lib.php	2005-12-27 01:32:56.000000000 -0800
+++ ampache-3.3.2-beta1/lib/log.lib.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,6 +1,9 @@
 <?php
 /*
 
+ Copyright (c) 2001 - 2006 Ampache.org
+ All Rights Reserved
+
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
  as published by the Free Software Foundation; either version 2
diff -urN ampache-3.3.2-alpha4/lib/mpd.php ampache-3.3.2-beta1/lib/mpd.php
--- ampache-3.3.2-alpha4/lib/mpd.php	2005-12-27 01:32:56.000000000 -0800
+++ ampache-3.3.2-beta1/lib/mpd.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,6 +1,9 @@
 <?php
 /*
 
+ Copyright (c) 2001 - 2006 Ampache.org
+ All Rights Reserved
+
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
  as published by the Free Software Foundation; either version 2
diff -urN ampache-3.3.2-alpha4/lib/perl/Local/Ampache/Ampache.pm ampache-3.3.2-beta1/lib/perl/Local/Ampache/Ampache.pm
--- ampache-3.3.2-alpha4/lib/perl/Local/Ampache/Ampache.pm	2005-12-27 01:32:55.000000000 -0800
+++ ampache-3.3.2-beta1/lib/perl/Local/Ampache/Ampache.pm	1969-12-31 16:00:00.000000000 -0800
@@ -1,237 +0,0 @@
-#!/usr/bin/perl -w 
-
-# Find and file away MP3's.  Run multiple times and will
-#  ignore addition of duplicates in db (based on MD5 hash
-#  of full file path.
-
-package Local::Ampache;
-#use File::Find;
-use DBI;
-#use strict;
-use Data::Dumper;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %ampache);
-require Exporter;
-
-@ISA = qw(Exporter AutoLoader);
-@EXPORT = qw(
-
-);
-
-my $TRUE = 1;
-my $FALSE = 0;
-$VERSION = '';
-
-
-my %ampache = ();
-
-
-sub new {
-	my ($class, $path) = @_;
-
-
-	open(CONFIG, "< $path/config/ampache.cfg")
-        	or die "Could not find $path/config/ampache.cfg.  Is it readable by me?\n";
-
-        my %config = ();
-
-        while (<CONFIG>) {
-                next if ($_ =~ /^#.*/); 
-
-                if ( $_ =~ /(.*?)\s+=\s+(.*)/ ) {
-                        $config{$1} = $2;
-                }
-        }
-
-	my $name = $config{'local_db'};
-
-        my $self = 
-                {
-                        _name         => $config{'local_db'},
-                        _database     => $config{'local_db'},
-                        _sth_cache    => {},
-                        _connect      => {
-                                dbd      => 'mysql',
-                                host     => $config{'local_host'},
-                                port     => '3306',
-                                username => $config{'local_username'},
-                                password => $config{'local_pass'} 
-                        },
-                _dbh       => '',
-                _path   => $path,
-                _config => \%config,
-                _debug  => $FALSE
-        };
-
-        $VERSION = $config{'VERSION'};
-
-	$Local::Ampache::ampache{$name} = bless ($self, $class);
-	
-	$self->{_dbh} = $self->dbh( $name );
-	
-	return $self;
-
-} # End New Ampache Module
-
-sub DESTROY {
-	my ($self) = @_;
-   
-	foreach my $sth (values %{$self->{_sth_cache}}) {
-		if (defined($sth)) { $sth->finish(); } 
-	}
-	
-	if (defined($self->{_dbh}) and $self->{_dbh} ne "") {
-		$self->{_dbh}->disconnect();
-	}
-}
-
-sub get
-{
-    my ($class, $name) = @_;
-    
-    if (not $Local::Ampache::ampache{$name}) {
-        $Local::Ampache::ampache{$name} = Local::Ampache->new($name);
-    }
-    return bless $Local::Ampache::ampache{$name}, $class;
-}
-
-sub dbh
-{
-    my ($self, $database) = @_;
-    my $dbh = '';
-
-    if($self->{_dbh} ) 
-    {
-        return $self->{_dbh};
-    }
-    else
-    {
-        my $connect_string = [ sprintf("dbi:%s:database=%s;host=%s;port=%s",
-                                $self->{_connect}{dbd},
-                                $self->{_database},
-                                $self->{_connect}{host},
-                                $self->{_connect}{port}),
-                                $self->{_connect}{username},
-                                $self->{_connect}{password} ];
-        $dbh = DBI->connect( @{$connect_string}, 
-                              {PrintError => 0,
-                              RaiseError => 0,
-                              AutoCommit => 1});
-
-        if ( !$dbh ) 
-        {
-            die "Failed to connect to database.  Exiting.";
-        }
-    }
-
-    return $dbh;
-}
-
-sub prepare_sth_cache {
-        my ($self, $sql) = @_;
-
-        # the call to dbh() forces a connection if one has dropped
-        my $dbh = $self->dbh();
-        return $dbh->prepare($sql);
-}
-
-sub get_table_where
-{
-    my ($self, $name, $where,$select) = @_;
-    if (!$select) { $select = "*"; } 
-    my ($sql, $sth);
-    my $dbh = $self->dbh();
-    $sql = qq{SELECT $select FROM $name $where};
-    $sth = $dbh->prepare($sql);
-    $sth->execute();
-
-    my @table = ();
-    while ( my $ary = $sth->fetchrow_hashref() ) 
-    {
-        push(@table, $ary); 
-    }
-    return (@table);
-}
-
-sub get_catalog_option
-{
-    my ($self, $catalog, $field) = @_;
-    if(!$self->{_catalog}{$catalog}) {
-        print "Loading catalog settings\n";
-        my ($sql, $sth);
-        $sql = qq{SELECT * FROM catalog WHERE path = '$catalog'};
-        my $dbh = $self->dbh();
-        $sth = $dbh->prepare($sql);
-        $sth->execute();
-        $self->{_catalog}{$catalog} = $sth->fetchrow_hashref();
-    }
-    return $self->{_catalog}->{$catalog}->{$field};
-}
-
-sub change_flags
-{
-    my ($self, $song, $oldflag, $newflag) = @_;
-    my ($sql, $sth);
-    my $dbh = $self->dbh();
-    $sql = "UPDATE flagged SET type = '$newflag' WHERE song = '".$song->{'id'}."' AND type = '$oldflag'";
-    $sth = $dbh->prepare($sql);
-    $sth->execute();
-}
-
- sub update_song
-{
-    my ($self, $filename, $song) = @_;
-    my ($sql, $sth);
-    my $dbh = $self->dbh();
-    $filename =~ s/'/\\'/g;
-    $filename =~ s/"/\\"/g;
-    $filename =~ s/\Q%\E//g;
-    $sql = "UPDATE song SET file = '$filename' WHERE id = '".$song->{'id'}."'";
-    $sth = $dbh->prepare($sql);
-    $sth->execute();
-}   
-
-sub get_song_info
-{
-    my ($self, $song) = @_;
-    my ($sql, $sth);
-    my $dbh = $self->dbh();
-    if ( not $self->{_sth_cache}{get_song_info}) 
-    {
-        $self->{_sth_cache}{get_song_info} = $self->prepare_sth_cache(
-            qq{SELECT catalog.path AS catalog,song.file,song.id,song.title,song.track,song.year,song.comment,album.name AS album, artist.name AS artist,genre FROM song,album,artist,catalog WHERE song.id = ? AND album.id = song.album AND artist.id = song.artist AND song.catalog = catalog.id});
-
-    }
-    $sth = $self->{_sth_cache}{get_song_info};
-    $sth->execute($song);
-
-    my @table = ();
-    while ( my $ary = $sth->fetchrow_hashref() ) 
-    {
-        push(@table, $ary); 
-    }
-    return (@table);
-}
-
-#sub get_song_info
-#{
-#    my ($self, $song) = @_;
-#
-#    my ($sql, $sth);
-#    my $dbh = $self->dbh();
-#    if ( not $self->{_sth_cache}{song_info}{$song} ) 
-#    {
-#        $sql = qq{SELECT * FROM song WHERE id = $song};
-#        $sth = $dbh->prepare($sql);
-#        $self->{_sth_cache}{song_info}{$song} = $sth;
-#    }
-#
-#    $sth = $self->{_sth_cache}{song_info}{$song};
-#    $sth->execute();
-#
-#    my @song_info = $sth->fetchrow_hashref(); 
-#    return (@song_info);
-#}
-
-
-1;
-__END__
diff -urN ampache-3.3.2-alpha4/lib/perl/Local/Ampache/Makefile.PL ampache-3.3.2-beta1/lib/perl/Local/Ampache/Makefile.PL
--- ampache-3.3.2-alpha4/lib/perl/Local/Ampache/Makefile.PL	2005-12-27 01:32:55.000000000 -0800
+++ ampache-3.3.2-beta1/lib/perl/Local/Ampache/Makefile.PL	1969-12-31 16:00:00.000000000 -0800
@@ -1,7 +0,0 @@
-use ExtUtils::MakeMaker;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
-WriteMakefile(
-    'NAME'	=> 'Local::Ampache',
-    'VERSION_FROM' => 'Ampache.pm', # finds $VERSION
-);
diff -urN ampache-3.3.2-alpha4/lib/playlist.lib.php ampache-3.3.2-beta1/lib/playlist.lib.php
--- ampache-3.3.2-alpha4/lib/playlist.lib.php	1969-12-31 16:00:00.000000000 -0800
+++ ampache-3.3.2-beta1/lib/playlist.lib.php	2006-01-08 23:06:13.000000000 -0800
@@ -0,0 +1,124 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2006 Ampache.org
+ All Rights Reserved
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+/**
+ * Playlist Library
+ * This file should contain the functions that don't fit inside the object, but
+ * still are related to handling playlists
+ */
+
+/**
+ * show_playlists
+ * This shows all of the current playlists. Depending on your rights you may just
+ * get to see Public + Yours Private or if you're an admin then you get to see
+ * Public + Yours + Private 
+ */
+function show_playlists() { 
+
+	show_playlist_menu();
+	
+	/* Always show yours first */
+	$playlists = get_playlists('private');
+	$type = 'Private';
+	require (conf('prefix') . '/templates/show_playlists.inc.php');
+
+	/* Now for some Admin? */
+	if ($GLOBALS['user']->has_access(100)) { 
+		$playlists = get_playlists('adminprivate');
+		$type = 'Admin';
+		require (conf('prefix') . '/templates/show_playlists.inc.php');
+	}
+
+	/* Always Show Public */
+	$playlists = get_playlists('public');
+	$type = 'Public';
+	require (conf('prefix') . '/templates/show_playlists.inc.php');
+
+} // show_playlists
+
+/**
+ * show_playlist
+ * This function takes a playlist object and calls show_songs after
+ * runing get_items()
+ */
+function show_playlist($playlist) {
+
+        /* Create the Playlist */
+        $song_ids = $playlist->get_items();
+
+	show_playlist_menu();
+
+        if (count($song_ids) > 0) {
+                show_songs($song_ids, $playlist);
+        }
+        else {
+                echo "<div class=\"text-box\">" . _("No songs in this playlist.") . "</div>\n";
+        }
+
+} // show_playlist
+
+/**
+ * show_playlist_menu
+ * This shows a little pretty box that contains the playlist 'functions'
+ */
+function show_playlist_menu() {
+
+	require (conf('prefix') . '/templates/show_playlist_box.inc.php');
+
+} // show_playlist_menu
+
+/**
+ * get_playlists
+ * This function takes private,adminprivate or public and returns an array of playlist objects
+ * that match, it checks permission
+ */
+function get_playlists($type) { 
+
+	switch ($type) { 
+		case 'private':
+			$sql = "SELECT id FROM playlist WHERE user='" . sql_escape($GLOBALS['user']->username) . "'" . 
+				" AND type='private'";
+		break;
+		case 'adminprivate':
+			if (!$GLOBALS['user']->has_access(100)) { return false; }
+			$sql = "SELECT id FROM playlist WHERE user!='" . sql_escape($GLOBALS['user']->username) . "'" . 
+				" AND type='private'";
+		break;
+		default:
+		case 'public':
+			$sql = "SELECT id FROM playlist WHERE type='public'";
+		break;
+	} // end switch
+
+	$db_results = mysql_query($sql, dbh());
+
+	$results = array();
+
+	while ($r = mysql_fetch_assoc($db_results)) { 
+		$playlist = new Playlist($r['id']);
+		$results[] = $playlist;
+	}
+
+	return $results;
+
+} // get_playlists
+
+?>
diff -urN ampache-3.3.2-alpha4/lib/preferences.php ampache-3.3.2-beta1/lib/preferences.php
--- ampache-3.3.2-alpha4/lib/preferences.php	2005-12-27 01:32:56.000000000 -0800
+++ ampache-3.3.2-beta1/lib/preferences.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/lib/rss.php ampache-3.3.2-beta1/lib/rss.php
--- ampache-3.3.2-alpha4/lib/rss.php	2005-12-27 01:32:56.000000000 -0800
+++ ampache-3.3.2-beta1/lib/rss.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright 2001 - 2005 Ampache.org
+ Copyright 2001 - 2006 Ampache.org
  All Rights Reserved
 
  This program is free software; you can redistribute it and/or
@@ -26,20 +26,22 @@
 */
 function show_now_playingRSS () {
 
+header ("Content-Type: application/xml");
+
         $dbh = dbh();
         $web_path = conf('web_path');
         $rss_main_title = conf('rss_main_title');
         $rss_main_description = conf('rss_main_description');
         $rss_main_copyright = conf('rss_main_copyright');
         $rss_main_language = conf('rss_main_language');
-        $rss_song_description = conf('rss_song_description');
+        $rss_description = conf('rss_song_description');
 
         $sql = "SELECT * FROM now_playing ORDER BY start_time DESC";
 
         $db_result = mysql_query($sql, $dbh);
         $today = date("d-m-Y");
-
-        echo "<rss version=\"0.91\">";
+        $rss_song_description = $rss_description;
+        echo "<rss version=\"2.0\">";
         echo "<channel>\n<title>$rss_main_title</title>\n";
         echo "<link>$web_path</link>\n<description>$rss_main_description</description>\n";
         echo "<copyright>$rss_main_copyright</copyright>";
@@ -48,17 +50,17 @@
         while ($r = mysql_fetch_object($db_result)) {
                 $song = new Song($r->song_id);
                 $song->format_song();
-                $user = get_user_byid($r->user_id);
+
                 if (is_object($song)) {
                         $artist = $song->f_artist;
                         $album = $song->get_album_name();
-                        $text = "$artist - $song->f_title";
-                        echo "<item> ";
-                        echo " <title><![CDATA[$text]]></title> ";
-                        echo " <link>$web_path/albums.php?action=show&amp;album=$song->album</link>";
-                        echo " <description>$rss_song_description</description>";
-                        echo " <pubDate>$today</pubDate>";
-                        echo "</item>";
+                        $text = "$artist - $song->f_title played by $r->user";
+                        echo "<item> \n";
+                        echo " <title><![CDATA[$text]]></title> \n";
+                        echo " <link>$web_path/albums.php?action=show&amp;album=$song->album</link>\n";
+                        echo " <description><![CDATA[$song->f_title @ $album is played by $r->user]]></description>\n";
+                        echo " <pubDate>$today</pubDate>\n";
+                        echo "</item>\n";
                 }
         }
  
diff -urN ampache-3.3.2-alpha4/lib/search.php ampache-3.3.2-beta1/lib/search.php
--- ampache-3.3.2-alpha4/lib/search.php	2005-12-27 01:32:56.000000000 -0800
+++ ampache-3.3.2-beta1/lib/search.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2004 ampache.org
+ Copyright (c) 2001 - 2006 ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -178,7 +178,14 @@
 	$where_sql = rtrim($where_sql,$operator);
 
 	$sql = $base_sql . $table_sql . " WHERE " . $join_sql . "(" . $where_sql . ")" . $limit_sql;
-	
+
+	/**
+	 * Because we might need this for Dynamic Playlist Action 
+	 * but we don't trust users to provide this store it in the
+	 * session where they can't get to it!
+	 */
+	$_SESSION['userdata']['stored_search'] = $sql;
+
 	$db_results = mysql_query($sql, dbh());
 	
 	while ($r = mysql_fetch_assoc($db_results)) { 
diff -urN ampache-3.3.2-alpha4/lib/song.php ampache-3.3.2-beta1/lib/song.php
--- ampache-3.3.2-alpha4/lib/song.php	2005-12-27 01:32:56.000000000 -0800
+++ ampache-3.3.2-beta1/lib/song.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,6 +1,9 @@
 <?php
 /*
 
+ Copyright (c) 2001 - 2006 Ampache.org
+ All Rights Reserved
+
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
  as published by the Free Software Foundation; either version 2
@@ -16,12 +19,13 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-/*
-	@header Song Library
- 	@discussion This library handles song related functions.... woohoo!
-		This library is defunt, please try use the song class if possible
 
-*/
+/**
+ * Song Library
+ * This is for functions that don't make sense in the class because we aren't looking
+ * at a specific song... these should be general function that return arrays of songs
+ * and the like
+ */
 
 /*!
 	@function get_songs
@@ -32,9 +36,6 @@
 
 	$db_results = mysql_query($sql, dbh());
 	while ($r = mysql_fetch_array($db_results)) {
-//		$song_info = get_songinfo($r['id']);
-//		if ($action === 'format') { $song = format_song($song_info); }
-//		else { $song = $song_info; }
 		$results[] = $r['id'];
 	}
 
@@ -86,6 +87,4 @@
 
 } // get_popular_songs()
 
-
-
 ?>
diff -urN ampache-3.3.2-alpha4/lib/stream.lib.php ampache-3.3.2-beta1/lib/stream.lib.php
--- ampache-3.3.2-alpha4/lib/stream.lib.php	2005-12-27 01:32:56.000000000 -0800
+++ ampache-3.3.2-beta1/lib/stream.lib.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright 2001 - 2005 Ampache.org
+ Copyright 2001 - 2006 Ampache.org
  All Rights Reserved
 
  This program is free software; you can redistribute it and/or
@@ -207,18 +207,18 @@
 		$sample_rate = $user_sample_rate;
 	}
 
-	
+	/* Validate the bitrate */
+	$sample_rate = validate_bitrate($sample_rate);
+ 
 	/* Never Upsample a song */
 	if (($sample_rate*1000) > $song->bitrate) {
 		$sample_rate = $song->bitrate/1000;
 		$sample_ratio = '1';
 	}
-
-	/* Validate the bitrate */
-	$sample_rate = validate_bitrate($sample_rate);
- 
-	/* Set the Sample Ratio */
-	$sample_ratio = $sample_rate/($song->bitrate/1000);
+	else { 
+		/* Set the Sample Ratio */
+		$sample_ratio = $sample_rate/($song->bitrate/1000);
+	}
 
 	header("Content-Length: " . $sample_ratio*$song->size);
         $browser->downloadHeaders($song_name, $song->mime, false,$sample_ratio*$song->size);
@@ -234,10 +234,12 @@
         $eofss  = floor($song->time-$eofmm*60);
         $eof    = sprintf("%02d.%02d",$eofmm,$eofss);
 
+	$song_file = escapeshellarg($song->file);
+
 
         /* Replace Variables */
         $downsample_command = conf($song->stream_cmd());
-        $downsample_command = str_replace("%FILE%",$song->file,$downsample_command);
+        $downsample_command = str_replace("%FILE%",$song_file,$downsample_command);
         $downsample_command = str_replace("%OFFSET%",$offset,$downsample_command);
         $downsample_command = str_replace("%EOF%",$eof,$downsample_command);
         $downsample_command = str_replace("%SAMPLE%",$sample_rate,$downsample_command);
diff -urN ampache-3.3.2-alpha4/lib/themes.php ampache-3.3.2-beta1/lib/themes.php
--- ampache-3.3.2-alpha4/lib/themes.php	2005-12-27 01:32:56.000000000 -0800
+++ ampache-3.3.2-beta1/lib/themes.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All Rights Reserved
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/lib/ui.lib.php ampache-3.3.2-beta1/lib/ui.lib.php
--- ampache-3.3.2-alpha4/lib/ui.lib.php	2005-12-27 01:32:56.000000000 -0800
+++ ampache-3.3.2-beta1/lib/ui.lib.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
-   Copyright (c) 2001 - 2005 Ampache.org
+   Copyright (c) 2001 - 2006 Ampache.org
    All rights reserved.
 
    This program is free software; you can redistribute it and/or
@@ -204,19 +204,6 @@
 } // if _ isn't defined
 
 /**
- *  show_playlist_menu
- * playlist functions
- */
-function show_playlist_menu () {
-
-	echo "<br /><span class=\"header2\">" . _("Playlist Actions") . ": <a href=\"" . conf('web_path') . "/playlist.php?action=new\">" . _("New") ."</a> | ";
-	echo "<a href=\"" . conf('web_path') . "/playlist.php\"> " . _("View All") . "</a> | ";
-	echo "<a href=\"" . conf('web_path') . "/playlist.php?action=show_import_playlist\"> " . _("Import") . "</a>";
-	echo "</span><br /><br />";
-
-} // show_playlist_menu
-
-/**
  *  show_admin_menu
  * shows the admin menu
  */
@@ -442,25 +429,6 @@
 } // show_edit_profile
 
 /**
- *  show_playlist
- * this shows the current playlist
- */
-function show_playlist($playlist_id) {
-
-	/* Create the Playlist */
-	$playlist = new Playlist($playlist_id);
-	$song_ids = $playlist->get_songs();
-
-	if (count($song_ids) > 0) {
-		show_songs($song_ids, $playlist->id);
-	}
-	else {
-		echo "<p>" . _("No songs in this playlist.") . "</p>\n";
-	}
-
-} // show_playlist
-
-/**
  *  show_play_selected
  * this shows the playselected/add to playlist
  *	box, which includes a little javascript
@@ -986,7 +954,8 @@
 	}
 
 	/* Sanatize the $_SERVER['PHP_SELF'] variable */
-	$location['page'] = preg_replace("/^\/(.+\.php)\/?.*/","$1",$source);
+	$source			= str_replace(conf('raw_web_path'),"",$source);
+	$location['page'] 	= preg_replace("/^\/(.+\.php)\/?.*/","$1",$source);
 
 	switch ($location['page']) {
 		case 'index.php':
@@ -1103,59 +1072,6 @@
 
 } // show_genre_pulldown
 
-function username_exists($check_user){
-
-	$check_user = sql_escape($check_user);
-
-	$sql = "SELECT * FROM user WHERE username='$check_user'";
-	$db_results = mysql_query($sql, dbh());
- 
-	if ($r = mysql_fetch_assoc($db_results)) {
-		return true;
-	}
-	else {
-		return false;
-	}
-} // username_exists
-
-/**
- * new_user
- * FIXME: This needs to be done right... I don't know how right is
- * but my guess is this isn't it, so anyway this just creates a new user
- * this should really use the built in functions rather than creating
- * a new one
- */
-function new_user($username, $fullname, $email, $password) {
-
-	/* First lets clean up the fields... */
-	$username       = sql_escape($username);
-	$fullname       = sql_escape($fullname);
-	$email          = sql_escape($email);
-	$access         = '5';
-	if(conf('auto_user')){
-        	$access='25';
-	}
-
-	/* Check to see if the user exists... */
-	//FIXME: Use the error class 
-	if(username_exists($username)){
-	        return false;
-	}
-
-	/* Uhh let's not auto-pass through in this fashion FIXME */
-	else {
-		/* Apparently it's a new user, now insert the user into the database*/
-		$sql = "INSERT INTO user (username, fullname, email, password, access) VALUES" .
-			" ('$username','$fullname','$email',PASSWORD('$password'),'$access')";
-		$db_results = mysql_query($sql, dbh());
-		show_template('style');
-		show_confirmation('Registration Complete','You have registered succesfully','/login.php');
-	}
-
-	return true;
- 
-} // new_user
-
 /**
  * good_email
  * Don't get me started... I'm sure the indenting is still wrong on this
@@ -1191,6 +1107,89 @@
 	return true;
 } //good_email
 
+/**
+ * str_rand
+ *
+ *
+ */
+function str_rand($length = 8, $seeds = 'abcdefghijklmnopqrstuvwxyz0123456789'){
+    $str = '';
+    $seeds_count = strlen($seeds);
+
+    // Seed
+    list($usec, $sec) = explode(' ', microtime());
+    $seed = (float) $sec + ((float) $usec * 100000);
+    mt_srand($seed);
+
+    // Generate
+    for ($i = 0; $length > $i; $i++) {
+        $str .= $seeds{mt_rand(0, $seeds_count - 1)};
+    }
+
+    return $str;
+} //str_rand
+
+/**
+ * send_confirmation
+ *
+ *
+ */
+function send_confirmation($username, $fullname, $email, $password, $validation) {
+
+$title = conf('site_title');
+$from = "From: Ampache <".conf('mail_from').">";
+$body = "Welcome to $title
+
+Please keep this email for your records. Your account information is as follows: 
+
+----------------------------
+Username: $username
+Password: $password
+----------------------------
+
+Your account is currently inactive. You cannot use it until you visit the following link:
+"
+. conf('web_path'). "/activate.php?mode=activate&u=$username&act_key=$validation
+
+Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
+
+Thank you for registering.";
+
+
+mail($email, "Welcome to $title" , $body, $from);
+
+} //send_confirmation
+
+/**
+ * show_registration_agreement
+ * This function reads in /config/registration_agreement.php
+ * Plaintext Only
+ */
+function show_registration_agreement() { 
+
+	$filename = conf('prefix') . '/config/registration_agreement.php';
+
+	/* Check for existance */
+	$fp = fopen($filename,'r');
+
+	if (!$fp) { return false; }
+
+	$data = fread($fp,filesize($filename));
+
+	/* Scrub and show */
+	echo scrub_out($data);
+		
+} // show_registration_agreement
+
+
+/**
+ * show_playlist_import
+ * This shows the playlist import templates
+ */
+function show_playlist_import() { 
+
+	require (conf('prefix') . '/templates/show_import_playlist.inc.php');
 
+} // show_playlist_import
 
 ?>
diff -urN ampache-3.3.2-alpha4/lib/upload.php ampache-3.3.2-beta1/lib/upload.php
--- ampache-3.3.2-alpha4/lib/upload.php	2005-12-27 01:32:56.000000000 -0800
+++ ampache-3.3.2-beta1/lib/upload.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,5 +1,8 @@
 <?php
 /*
+ 
+ Copyright (c) 2001 - 2006 Ampache.org
+ All Rights Reserved
 
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
diff -urN ampache-3.3.2-alpha4/lib/xmlrpc.php ampache-3.3.2-beta1/lib/xmlrpc.php
--- ampache-3.3.2-alpha4/lib/xmlrpc.php	2005-12-27 01:32:56.000000000 -0800
+++ ampache-3.3.2-beta1/lib/xmlrpc.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/locale/base/messages.po ampache-3.3.2-beta1/locale/base/messages.po
--- ampache-3.3.2-alpha4/locale/base/messages.po	2005-12-27 01:32:55.000000000 -0800
+++ ampache-3.3.2-beta1/locale/base/messages.po	2006-01-08 23:06:12.000000000 -0800
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-29 10:27-0700\n"
+"POT-Creation-Date: 2006-01-07 22:47-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,127 +20,201 @@
 msgid "Session Expired: please log in again at"
 msgstr ""
 
-#: ../../lib/preferences.php:211 ../../templates/show_users.inc:97
-msgid "Enable"
+#: ../../lib/class/catalog.class.php:281 ../../lib/class/catalog.class.php:566
+#: ../../lib/class/album.class.php:263
+msgid "Error: Unable to open"
 msgstr ""
 
-#: ../../lib/preferences.php:212 ../../templates/show_users.inc:100
-msgid "Disable"
+#: ../../lib/class/catalog.class.php:304
+msgid "Error: Unable to change to directory"
 msgstr ""
 
-#: ../../lib/preferences.php:224 ../../templates/add_catalog.inc:60
-msgid "Local"
+#: ../../lib/class/catalog.class.php:330
+msgid "Error: Unable to get filesize for"
 msgstr ""
 
-#: ../../lib/preferences.php:227
-msgid "Stream"
+#: ../../lib/class/catalog.class.php:365
+msgid "Added"
 msgstr ""
 
-#: ../../lib/preferences.php:230
-msgid "IceCast"
+#: ../../lib/class/catalog.class.php:377
+msgid "is not readable by ampache"
 msgstr ""
 
-#: ../../lib/preferences.php:233
-msgid "Downsample"
+#: ../../lib/class/catalog.class.php:441
+msgid "Found in ID3"
 msgstr ""
 
-#: ../../lib/preferences.php:236
-msgid "Music Player Daemon"
+#: ../../lib/class/catalog.class.php:445
+msgid "Found on Amazon"
 msgstr ""
 
-#: ../../lib/preferences.php:239
-msgid "SlimServer"
+#: ../../lib/class/catalog.class.php:449
+msgid "Found in Folder"
 msgstr ""
 
-#: ../../lib/preferences.php:248
-msgid "M3U"
+#: ../../lib/class/catalog.class.php:453
+msgid "Found"
 msgstr ""
 
-#: ../../lib/preferences.php:249
-msgid "Simple M3U"
+#: ../../lib/class/catalog.class.php:456
+msgid "Not Found"
 msgstr ""
 
-#: ../../lib/preferences.php:250
-msgid "PLS"
+#: ../../lib/class/catalog.class.php:464
+msgid "Searched"
 msgstr ""
 
-#: ../../lib/preferences.php:251
-msgid "Asx"
+#: ../../lib/class/catalog.class.php:622
+msgid "Starting Dump Album Art"
 msgstr ""
 
-#: ../../lib/preferences.php:258
-msgid "English"
+#: ../../lib/class/catalog.class.php:642
+msgid "Written"
 msgstr ""
 
-#: ../../lib/preferences.php:259
-msgid "British English"
+#: ../../lib/class/catalog.class.php:651
+msgid "Error unable to open file for writting"
 msgstr ""
 
-#: ../../lib/preferences.php:260
-msgid "German"
+#: ../../lib/class/catalog.class.php:658
+msgid "Album Art Dump Complete"
 msgstr ""
 
-#: ../../lib/preferences.php:261
-msgid "French"
+#: ../../lib/class/catalog.class.php:659 ../../artists.php:64
+#: ../../albums.php:153
+msgid "Return"
 msgstr ""
 
-#: ../../lib/preferences.php:262
-msgid "Turkish"
+#: ../../lib/class/catalog.class.php:728
+msgid "Starting Catalog Build"
 msgstr ""
 
-#: ../../lib/preferences.php:263
-msgid "Spanish"
+#: ../../lib/class/catalog.class.php:733
+msgid "Running Remote Sync"
 msgstr ""
 
-#: ../../lib/preferences.php:264
-msgid "Dutch"
+#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:904
+msgid "Added Playlist From"
 msgstr ""
 
-#: ../../lib/preferences.php:265
-msgid "Simplified Chinese"
+#: ../../lib/class/catalog.class.php:752 ../../lib/class/catalog.class.php:913
+#: ../../admin/catalog.php:258
+msgid "Starting Album Art Search"
 msgstr ""
 
-#: ../../lib/duplicates.php:80
-msgid "Find Duplicates"
+#: ../../lib/class/catalog.class.php:762
+msgid "Catalog Finished"
 msgstr ""
 
-#: ../../lib/duplicates.php:83
-msgid "Search Type"
+#: ../../lib/class/catalog.class.php:762 ../../lib/class/catalog.class.php:932
+msgid "Total Time"
 msgstr ""
 
-#: ../../lib/duplicates.php:91 ../../lib/class/song.class.php:275
-#: ../../templates/show_search.inc:48
-msgid "Title"
+#: ../../lib/class/catalog.class.php:762 ../../lib/class/catalog.class.php:933
+msgid "Total Songs"
 msgstr ""
 
-#: ../../lib/duplicates.php:97
-msgid "Artist and Title"
+#: ../../lib/class/catalog.class.php:763 ../../lib/class/catalog.class.php:933
+msgid "Songs Per Seconds"
 msgstr ""
 
-#: ../../lib/duplicates.php:102
-msgid "Artist, Album and Title"
+#: ../../lib/class/catalog.class.php:797
+#: ../../lib/class/catalog.class.php:1512
+msgid "Updated"
 msgstr ""
 
-#: ../../lib/duplicates.php:110 ../../templates/menu.inc:39
-#: ../../templates/show_search.inc:153 ../../templates/show_search_bar.inc:50
-msgid "Search"
+#: ../../lib/class/catalog.class.php:804
+msgid "No Update Needed"
 msgstr ""
 
-#: ../../lib/general.lib.php:640
-msgid "Not Enough Data"
+#: ../../lib/class/catalog.class.php:885
+msgid "Starting New Song Search on"
 msgstr ""
 
-#: ../../lib/class/genre.class.php:278
-msgid "Show Genres starting with"
+#: ../../lib/class/catalog.class.php:885
+msgid "catalog"
 msgstr ""
 
-#: ../../lib/class/album.class.php:126
-msgid "Various"
+#: ../../lib/class/catalog.class.php:889
+msgid "Running Remote Update"
 msgstr ""
 
-#: ../../lib/class/album.class.php:241 ../../lib/class/catalog.class.php:275
-#: ../../lib/class/catalog.class.php:560
-msgid "Error: Unable to open"
+#: ../../lib/class/catalog.class.php:932
+msgid "Catalog Update Finished"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:952 ../../lib/mpd.php:43
+#: ../../lib/mpd.php:52 ../../albums.php:74
+msgid "Error"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:952
+msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
+msgid "Error connecting to"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
+msgid "Code"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
+msgid "Reason"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:1007
+msgid "Completed updating remote catalog(s)"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:1138
+msgid "Checking"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:1196
+msgid "Catalog Clean Done"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:1196
+msgid "files removed"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:1469
+msgid "Updating the"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:1469 ../../templates/sidebar.inc.php:31
+msgid "Catalog"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:1470
+msgid "songs found checking tag information."
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:1520
+msgid " FOUND"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:1521
+msgid "Searching for new Album Art"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:1525
+msgid "Album Art Already Found"
+msgstr ""
+
+#: ../../lib/class/artist.class.php:223
+msgid "Error: Name Identical"
+msgstr ""
+
+#: ../../lib/class/song.class.php:275 ../../lib/duplicates.php:113
+#: ../../templates/show_search.inc:66
+msgid "Title"
 msgstr ""
 
 #: ../../lib/class/song.class.php:275 ../../lib/class/song.class.php:279
@@ -152,8 +226,8 @@
 msgid "updated to"
 msgstr ""
 
-#: ../../lib/class/song.class.php:279 ../../templates/show_songs.inc:39
-#: ../../templates/show_uploads.inc:39
+#: ../../lib/class/song.class.php:279 ../../templates/show_uploads.inc:39
+#: ../../templates/show_songs.inc:47 ../../templates/list_duplicates.inc:36
 msgid "Bitrate"
 msgstr ""
 
@@ -165,13 +239,13 @@
 msgid "Mode"
 msgstr ""
 
-#: ../../lib/class/song.class.php:291 ../../templates/show_songs.inc:37
-#: ../../templates/show_mpdpl.inc:67 ../../templates/show_uploads.inc:38
+#: ../../lib/class/song.class.php:291 ../../templates/show_uploads.inc:38
+#: ../../templates/show_mpdpl.inc:66 ../../templates/show_songs.inc:45
 msgid "Time"
 msgstr ""
 
-#: ../../lib/class/song.class.php:295 ../../templates/show_songs.inc:32
-#: ../../templates/show_songs.inc:36 ../../templates/show_mpdpl.inc:66
+#: ../../lib/class/song.class.php:295 ../../templates/show_mpdpl.inc:65
+#: ../../templates/show_songs.inc:39 ../../templates/show_songs.inc:44
 msgid "Track"
 msgstr ""
 
@@ -179,35 +253,40 @@
 msgid "Filesize"
 msgstr ""
 
-#: ../../lib/class/song.class.php:304 ../../templates/show_artists.inc:39
-#: ../../templates/show_artists.inc:62 ../../templates/show_songs.inc:34
-#: ../../templates/show_albums.inc:40 ../../templates/show_albums.inc:70
-#: ../../templates/show_search.inc:53 ../../templates/show_mpdpl.inc:64
-#: ../../templates/show_uploads.inc:35 ../../templates/show_search_bar.inc:43
+#: ../../lib/class/song.class.php:304
+#: ../../templates/show_get_albumart.inc.php:33
+#: ../../templates/show_uploads.inc:35 ../../templates/show_mpdpl.inc:63
+#: ../../templates/show_songs.inc:42 ../../templates/show_artists.inc:39
+#: ../../templates/show_artists.inc:62 ../../templates/show_albums.inc:40
+#: ../../templates/show_albums.inc:70 ../../templates/list_duplicates.inc:33
+#: ../../templates/show_search.inc:71
 msgid "Artist"
 msgstr ""
 
-#: ../../lib/class/song.class.php:309 ../../templates/show_songs.inc:35
-#: ../../templates/show_albums.inc:38 ../../templates/show_albums.inc:68
-#: ../../templates/show_search.inc:60 ../../templates/show_mpdpl.inc:65
-#: ../../templates/show_uploads.inc:36 ../../templates/show_search_bar.inc:44
+#: ../../lib/class/song.class.php:309
+#: ../../templates/show_get_albumart.inc.php:41
+#: ../../templates/show_uploads.inc:36 ../../templates/show_mpdpl.inc:64
+#: ../../templates/show_songs.inc:43 ../../templates/show_albums.inc:38
+#: ../../templates/show_albums.inc:68 ../../templates/list_duplicates.inc:34
+#: ../../templates/show_search.inc:78
 msgid "Album"
 msgstr ""
 
 #: ../../lib/class/song.class.php:313 ../../templates/show_albums.inc:43
-#: ../../templates/show_albums.inc:73 ../../templates/show_search.inc:72
+#: ../../templates/show_albums.inc:73 ../../templates/show_search.inc:90
 msgid "Year"
 msgstr ""
 
-#: ../../lib/class/song.class.php:317 ../../templates/list_flagged.inc:46
-#: ../../templates/flag.inc:66
+#: ../../lib/class/song.class.php:317 ../../templates/flag.inc:66
+#: ../../templates/list_flagged.inc:46
 msgid "Comment"
 msgstr ""
 
-#: ../../lib/class/song.class.php:322 ../../templates/show_genres.inc.php:36
-#: ../../templates/show_genre.inc.php:32 ../../templates/show_songs.inc:40
-#: ../../templates/show_search.inc:65 ../../templates/show_browse_menu.inc:37
-#: ../../templates/show_mpdpl.inc:68 ../../templates/show_uploads.inc:37
+#: ../../lib/class/song.class.php:322 ../../templates/show_genre.inc.php:32
+#: ../../templates/show_genres.inc.php:36 ../../templates/sidebar.inc.php:37
+#: ../../templates/show_uploads.inc:37 ../../templates/show_mpdpl.inc:67
+#: ../../templates/show_songs.inc:48 ../../templates/show_browse_menu.inc:37
+#: ../../templates/show_search.inc:83
 msgid "Genre"
 msgstr ""
 
@@ -227,191 +306,187 @@
 msgid "Closed after write"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:298
-msgid "Error: Unable to change to directory"
-msgstr ""
-
-#: ../../lib/class/catalog.class.php:321
-msgid "Error: Unable to get filesize for"
+#: ../../lib/class/genre.class.php:278
+msgid "Show Genres starting with"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:340
-msgid "Added Playlist From"
+#: ../../lib/class/album.class.php:151
+msgid "Various"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:359
-msgid "Added"
+#: ../../lib/duplicates.php:102
+msgid "Find Duplicates"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:371
-msgid "is not readable by ampache"
+#: ../../lib/duplicates.php:105
+msgid "Search Type"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:435
-msgid "Found in ID3"
+#: ../../lib/duplicates.php:119
+msgid "Artist and Title"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:439
-msgid "Found on Amazon"
+#: ../../lib/duplicates.php:124
+msgid "Artist, Album and Title"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:443
-msgid "Found in Folder"
+#: ../../lib/duplicates.php:132 ../../templates/sidebar.inc.php:97
+#: ../../templates/sidebar.inc.php:103 ../../templates/show_search_bar.inc:41
+#: ../../templates/menu.inc:39 ../../templates/show_search.inc:171
+msgid "Search"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:447
-msgid "Found"
+#: ../../lib/preferences.php:252 ../../templates/show_users.inc:118
+msgid "Enable"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:450
-msgid "Not Found"
+#: ../../lib/preferences.php:253 ../../templates/show_users.inc:121
+#: ../../templates/list_duplicates.inc:31
+msgid "Disable"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:458
-msgid "Searched"
+#: ../../lib/preferences.php:265 ../../templates/add_catalog.inc:61
+msgid "Local"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:613
-msgid "Starting Dump Album Art"
+#: ../../lib/preferences.php:268
+msgid "Stream"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:633
-msgid "Written"
+#: ../../lib/preferences.php:271
+msgid "IceCast"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:642
-msgid "Error unable to open file for writting"
+#: ../../lib/preferences.php:274
+msgid "Downsample"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:649
-msgid "Album Art Dump Complete"
+#: ../../lib/preferences.php:277
+msgid "Music Player Daemon"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:650 ../../artists.php:63
-#: ../../albums.php:112
-msgid "Return"
+#: ../../lib/preferences.php:280
+msgid "SlimServer"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:719
-msgid "Starting Catalog Build"
+#: ../../lib/preferences.php:289
+msgid "M3U"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:724
-msgid "Running Remote Sync"
+#: ../../lib/preferences.php:290
+msgid "Simple M3U"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:734 ../../lib/class/catalog.class.php:880
-#: ../../admin/catalog.php:264
-msgid "Starting Album Art Search"
+#: ../../lib/preferences.php:291
+msgid "PLS"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:744
-msgid "Catalog Finished"
+#: ../../lib/preferences.php:292
+msgid "Asx"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:899
-msgid "Total Time"
+#: ../../lib/preferences.php:293
+msgid "RAM"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:900
-msgid "Total Songs"
+#: ../../lib/mpd.php:43 ../../lib/mpd.php:52
+msgid "Could not add"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:900
-msgid "Songs Per Seconds"
+#: ../../lib/general.lib.php:675
+msgid "Not Enough Data"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:779
-#: ../../lib/class/catalog.class.php:1476
-msgid "Updated"
+#: ../../lib/general.lib.php:897 ../../lib/general.lib.php:908
+msgid "English"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:786
-msgid "No Update Needed"
+#: ../../lib/general.lib.php:907
+msgid "German"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:860
-msgid "Starting New Song Search on"
+#: ../../lib/general.lib.php:909
+msgid "British English"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:860
-msgid "catalog"
+#: ../../lib/general.lib.php:910
+msgid "Spanish"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:864
-msgid "Running Remote Update"
+#: ../../lib/general.lib.php:911
+msgid "French"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:899
-msgid "Catalog Update Finished"
+#: ../../lib/general.lib.php:912
+msgid "Italian"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:919 ../../lib/mpd.php:40
-#: ../../lib/mpd.php:49
-msgid "Error"
+#: ../../lib/general.lib.php:913
+msgid "Dutch"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:919
-msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
+#: ../../lib/general.lib.php:914
+msgid "Turkish"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
-msgid "Error connecting to"
+#: ../../lib/general.lib.php:915
+msgid "Simplified Chinese"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
-msgid "Code"
+#: ../../lib/general.lib.php:916
+msgid "Unknown"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
-msgid "Reason"
+#: ../../lib/ui.lib.php:222
+msgid "Error Access Denied"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:974
-msgid "Completed updating remote catalog(s)"
+#: ../../lib/ui.lib.php:299 ../../templates/sidebar.inc.php:69
+#: ../../templates/header.inc:51 ../../templates/menu.inc:35
+msgid "Browse"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1105
-msgid "Checking"
+#: ../../lib/ui.lib.php:301
+msgid "Show w/o art"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1163
-msgid "Catalog Clean Done"
+#: ../../lib/ui.lib.php:304
+msgid "Show all"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1163
-msgid "files removed"
+#: ../../lib/ui.lib.php:721
+msgid "No Catalogs Found!"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1436
-msgid "Updating the"
+#: ../../lib/ui.lib.php:722 ../../templates/add_catalog.inc:29
+msgid "Add a Catalog"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1436 ../../templates/admin_menu.inc:35
-msgid "Catalog"
+#: ../../lib/ui.lib.php:723 ../../templates/show_local_catalog_info.inc.php:7
+msgid "Catalog Statistics"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1437
-msgid "songs found checking tag information."
+#: ../../lib/ui.lib.php:759
+msgid "day"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1484
-msgid " FOUND"
+#: ../../lib/ui.lib.php:759
+msgid "days"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1485
-msgid "Searching for new Album Art"
+#: ../../lib/ui.lib.php:761
+msgid "hour"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1489
-msgid "Album Art Already Found"
+#: ../../lib/ui.lib.php:761
+msgid "hours"
 msgstr ""
 
-#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
-msgid "Could not add"
+#: ../../lib/ui.lib.php:1053 ../../templates/sidebar.inc.php:128
+#: ../../templates/show_random_play_bar.inc.php:45
+#: ../../templates/show_artists.inc:55 ../../templates/show_random_play.inc:46
+#: ../../templates/show_albums.inc:58
+msgid "All"
 msgstr ""
 
 #: ../../lib/Browser.php:867
@@ -444,329 +519,222 @@
 "There was a problem with the file upload: The %s was only partially uploaded."
 msgstr ""
 
-#: ../../lib/ui.lib.php:199
-msgid "Playlist Actions"
+#: ../../lib/upload.php:228
+msgid "The file uploaded successfully"
 msgstr ""
 
-#: ../../lib/ui.lib.php:199
-msgid "New"
+#: ../../lib/upload.php:229
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ../../lib/ui.lib.php:200
-msgid "View All"
+#: ../../lib/upload.php:230
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
 msgstr ""
 
-#: ../../lib/ui.lib.php:201
-msgid "Import"
+#: ../../lib/upload.php:231
+msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ../../lib/ui.lib.php:301 ../../templates/menu.inc:35
-msgid "Browse"
+#: ../../lib/upload.php:232
+msgid "No file was uploaded"
 msgstr ""
 
-#: ../../lib/ui.lib.php:303
-msgid "Show w/o art"
+#: ../../lib/upload.php:233
+msgid "Missing a temporary folder"
 msgstr ""
 
-#: ../../lib/ui.lib.php:306
-msgid "Show all"
+#: ../../lib/rating.lib.php:55
+msgid "Don't Play"
 msgstr ""
 
-#: ../../lib/ui.lib.php:446
-msgid "No songs in this playlist."
+#: ../../lib/rating.lib.php:58
+msgid "It's Pretty Bad"
 msgstr ""
 
-#: ../../lib/ui.lib.php:592
-msgid "No Catalogs Found!"
+#: ../../lib/rating.lib.php:61
+msgid "It's Ok"
 msgstr ""
 
-#: ../../lib/ui.lib.php:593 ../../templates/add_catalog.inc:28
-msgid "Add a Catalog"
+#: ../../lib/rating.lib.php:64
+msgid "It's Pretty Good"
 msgstr ""
 
-#: ../../lib/ui.lib.php:594 ../../templates/show_local_catalog_info.inc.php:7
-msgid "Catalog Statistics"
+#: ../../lib/rating.lib.php:67
+msgid "I Love It!"
 msgstr ""
 
-#: ../../lib/ui.lib.php:630
-msgid "day"
+#: ../../lib/rating.lib.php:70
+msgid "It's Insane"
 msgstr ""
 
-#: ../../lib/ui.lib.php:630
-msgid "days"
+#: ../../lib/rating.lib.php:74
+msgid "Off the Charts!"
 msgstr ""
 
-#: ../../lib/ui.lib.php:632
-msgid "hour"
+#: ../../lib/playlist.lib.php:73
+msgid "No songs in this playlist."
 msgstr ""
 
-#: ../../lib/ui.lib.php:632
-msgid "hours"
+#: ../../modules/lib.php:537
+msgid "Create a new playlist"
 msgstr ""
 
-#: ../../lib/upload.php:225
-msgid "The file uploaded successfully"
+#: ../../modules/admin.php:46
+msgid "Manage Users"
 msgstr ""
 
-#: ../../lib/upload.php:226
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+#: ../../modules/admin.php:48 ../../templates/show_admin_index.inc:34
+msgid "Add a new user"
 msgstr ""
 
-#: ../../lib/upload.php:227
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form"
+#: ../../admin/catalog.php:49 ../../templates/catalog.inc:63
+msgid "Add to Catalog(s)"
 msgstr ""
 
-#: ../../lib/upload.php:228
-msgid "The uploaded file was only partially uploaded"
+#: ../../admin/catalog.php:60 ../../templates/catalog.inc:64
+msgid "Add to all Catalogs"
 msgstr ""
 
-#: ../../lib/upload.php:229
-msgid "No file was uploaded"
+#: ../../admin/catalog.php:69
+msgid "Error Connecting"
 msgstr ""
 
-#: ../../lib/upload.php:230
-msgid "Missing a temporary folder"
+#: ../../admin/catalog.php:83 ../../templates/catalog.inc:70
+msgid "Update Catalog(s)"
 msgstr ""
 
-#: ../../modules/lib.php:709
-msgid "Public"
+#: ../../admin/catalog.php:94 ../../templates/catalog.inc:71
+msgid "Update All Catalogs"
 msgstr ""
 
-#: ../../modules/lib.php:710
-msgid "Your Private"
+#: ../../admin/catalog.php:126 ../../templates/catalog.inc:77
+msgid "Clean Catalog(s)"
 msgstr ""
 
-#: ../../modules/lib.php:711
-msgid "Other Private"
+#: ../../admin/catalog.php:156 ../../templates/catalog.inc:78
+msgid "Clean All Catalogs"
 msgstr ""
 
-#: ../../modules/lib.php:792 ../../templates/show_play_selected.inc.php:72
-msgid "View"
+#: ../../admin/catalog.php:206
+msgid "Now Playing Cleared"
 msgstr ""
 
-#: ../../modules/lib.php:795 ../../templates/show_play_selected.inc.php:73
-#: ../../templates/show_users.inc:52 ../../templates/show_users.inc:86
-msgid "Edit"
+#: ../../admin/catalog.php:206
+msgid "All now playing data has been cleared"
 msgstr ""
 
-#: ../../modules/lib.php:796 ../../templates/catalog.inc:60
-#: ../../templates/show_users.inc:61 ../../templates/show_uploads.inc:50
-msgid "Delete"
+#: ../../admin/catalog.php:211
+msgid "Do you really want to clear your catalog?"
 msgstr ""
 
-#: ../../modules/lib.php:804 ../../templates/show_genres.inc.php:48
-#: ../../templates/show_localplay.inc:41 ../../templates/show_artists.inc:54
-#: ../../templates/show_albums.inc:57 ../../templates/show_artist.inc:80
-#: ../../templates/show_mpdplay.inc:50
-msgid "Play"
-msgstr ""
-
-#: ../../modules/lib.php:805 ../../templates/show_artists.inc:56
-#: ../../templates/show_albums.inc:59 ../../templates/show_mpdplay.inc:85
-msgid "Random"
-msgstr ""
-
-#: ../../modules/lib.php:811 ../../templates/show_songs.inc:116
-#: ../../templates/show_album.inc:61 ../../templates/show_albums.inc:61
-#: ../../templates/show_artist.inc:82
-msgid "Download"
-msgstr ""
-
-#: ../../modules/lib.php:822
-msgid "There are no playlists of this type"
-msgstr ""
-
-#: ../../modules/lib.php:857
-msgid "Create a new playlist"
-msgstr ""
-
-#: ../../modules/admin.php:46
-msgid "Manage Users"
-msgstr ""
-
-#: ../../modules/admin.php:48 ../../templates/show_admin_index.inc:34
-msgid "Add a new user"
-msgstr ""
-
-#: ../../admin/catalog.php:55 ../../templates/catalog.inc:66
-msgid "Add to Catalog(s)"
-msgstr ""
-
-#: ../../admin/catalog.php:66 ../../templates/catalog.inc:67
-msgid "Add to all Catalogs"
-msgstr ""
-
-#: ../../admin/catalog.php:75
-msgid "Error Connecting"
-msgstr ""
-
-#: ../../admin/catalog.php:89 ../../templates/catalog.inc:73
-msgid "Update Catalog(s)"
-msgstr ""
-
-#: ../../admin/catalog.php:100 ../../templates/catalog.inc:74
-msgid "Update All Catalogs"
-msgstr ""
-
-#: ../../admin/catalog.php:132 ../../templates/catalog.inc:80
-msgid "Clean Catalog(s)"
-msgstr ""
-
-#: ../../admin/catalog.php:162 ../../templates/catalog.inc:81
-msgid "Clean All Catalogs"
-msgstr ""
-
-#: ../../admin/catalog.php:212
-msgid "Now Playing Cleared"
-msgstr ""
-
-#: ../../admin/catalog.php:212
-msgid "All now playing data has been cleared"
-msgstr ""
-
-#: ../../admin/catalog.php:217
-msgid "Do you really want to clear your catalog?"
-msgstr ""
-
-#: ../../admin/catalog.php:224
+#: ../../admin/catalog.php:218
 msgid "Do you really want to clear the statistics for this catalog?"
 msgstr ""
 
-#: ../../admin/catalog.php:241
+#: ../../admin/catalog.php:235
 msgid "Do you really want to delete this catalog?"
 msgstr ""
 
-#: ../../admin/catalog.php:272
+#: ../../admin/catalog.php:266
 msgid "Album Art Search Finished"
 msgstr ""
 
-#: ../../admin/users.php:76 ../../admin/users.php:123
+#: ../../admin/users.php:72 ../../admin/users.php:119
 msgid "Error Username Required"
 msgstr ""
 
-#: ../../admin/users.php:79 ../../admin/users.php:119
+#: ../../admin/users.php:75 ../../admin/users.php:115
 msgid "Error Passwords don't match"
 msgstr ""
 
-#: ../../admin/users.php:128
+#: ../../admin/users.php:124 ../../register.php:136
 msgid "Error Username already exists"
 msgstr ""
 
-#: ../../admin/users.php:149
+#: ../../admin/users.php:145
 msgid "Are you sure you want to permanently delete"
 msgstr ""
 
-#: ../../admin/users.php:156 ../../templates/show_confirm_action.inc.php:29
-#: ../../templates/show_search.inc:89
+#: ../../admin/users.php:152 ../../templates/show_confirm_action.inc.php:29
+#: ../../templates/show_search.inc:107
 msgid "No"
 msgstr ""
 
-#: ../../admin/users.php:158
+#: ../../admin/users.php:154
 msgid "User Deleted"
 msgstr ""
 
-#: ../../admin/users.php:161
+#: ../../admin/users.php:157
 msgid "Delete Error"
 msgstr ""
 
-#: ../../admin/users.php:161
+#: ../../admin/users.php:157
 msgid "Unable to delete last Admin User"
 msgstr ""
 
-#: ../../admin/access.php:43
+#: ../../admin/access.php:40
 msgid "Do you really want to delete this Access Record?"
 msgstr ""
 
-#: ../../admin/access.php:51
+#: ../../admin/access.php:48
 msgid "Entry Deleted"
 msgstr ""
 
-#: ../../admin/access.php:51
+#: ../../admin/access.php:48
 msgid "Your Access List Entry has been removed"
 msgstr ""
 
-#: ../../admin/access.php:61
+#: ../../admin/access.php:58
 msgid "Entry Added"
 msgstr ""
 
-#: ../../admin/access.php:61
+#: ../../admin/access.php:58
 msgid "Your new Access List Entry has been created"
 msgstr ""
 
-#: ../../admin/mail.php:98
+#: ../../admin/mail.php:94
 msgid "Mail to"
 msgstr ""
 
-#: ../../admin/mail.php:109
+#: ../../admin/mail.php:105
 msgid "Subject"
 msgstr ""
 
-#: ../../admin/mail.php:116
+#: ../../admin/mail.php:112
 msgid "Message"
 msgstr ""
 
-#: ../../admin/mail.php:126
+#: ../../admin/mail.php:122
 msgid "Send Mail"
 msgstr ""
 
-#: ../../admin/song.php:68
+#: ../../admin/song.php:65
 msgid "Songs Disabled"
 msgstr ""
 
-#: ../../admin/song.php:68
+#: ../../admin/song.php:65
 msgid "The requested song(s) have been disabled"
 msgstr ""
 
-#: ../../admin/song.php:78
+#: ../../admin/song.php:75
 msgid "Songs Enabled"
 msgstr ""
 
-#: ../../admin/song.php:78
+#: ../../admin/song.php:75
 msgid "The requested song(s) have been enabled"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:28
-#: ../../templates/show_install_account.inc.php:59
-#: ../../templates/userform.inc:40 ../../templates/show_users.inc:40
-msgid "Username"
-msgstr ""
-
-#: ../../templates/show_user_registration.inc.php:36
-#: ../../templates/userform.inc:48
-msgid "Full Name"
-msgstr ""
-
-#: ../../templates/show_user_registration.inc.php:44
-#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:55
-msgid "E-mail"
-msgstr ""
-
-#: ../../templates/show_user_registration.inc.php:52
-#: ../../templates/show_install_account.inc.php:63
-#: ../../templates/userform.inc:63 ../../templates/show_login_form.inc:53
-msgid "Password"
-msgstr ""
-
-#: ../../templates/show_user_registration.inc.php:60
-#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
-msgid "Confirm Password"
-msgstr ""
-
-#: ../../templates/show_user_registration.inc.php:69
-msgid "Register User"
-msgstr ""
-
 #: ../../templates/show_install_account.inc.php:35
 #: ../../templates/show_install_config.inc:35
-#: ../../templates/show_install.inc:34
+#: ../../templates/show_install.inc:35
 msgid "Ampache Installation"
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:37
 #: ../../templates/show_install_config.inc:37
-#: ../../templates/show_install.inc:36
+#: ../../templates/show_install.inc:37
 msgid ""
 "This Page handles the installation of the Ampache database and the creation "
 "of the ampache.cfg.php file. Before you continue please make sure that you "
@@ -775,7 +743,7 @@
 
 #: ../../templates/show_install_account.inc.php:40
 #: ../../templates/show_install_config.inc:40
-#: ../../templates/show_install.inc:39
+#: ../../templates/show_install.inc:40
 msgid ""
 "A MySQL Server with a username and password that can create/modify databases"
 msgstr ""
@@ -788,7 +756,7 @@
 
 #: ../../templates/show_install_account.inc.php:43
 #: ../../templates/show_install_config.inc:43
-#: ../../templates/show_install.inc:42
+#: ../../templates/show_install.inc:43
 msgid ""
 "Once you have ensured that you have the above requirements please fill out "
 "the information below. You will only be asked for the required config "
@@ -798,7 +766,7 @@
 
 #: ../../templates/show_install_account.inc.php:48
 #: ../../templates/show_install_config.inc:48
-#: ../../templates/show_install.inc:46
+#: ../../templates/show_install.inc:47
 msgid "Step 1 - Creating and Inserting the Ampache Database"
 msgstr ""
 
@@ -808,7 +776,7 @@
 
 #: ../../templates/show_install_account.inc.php:50
 #: ../../templates/show_install_config.inc:53
-#: ../../templates/show_install.inc:51
+#: ../../templates/show_install.inc:52
 msgid "Step 3 - Setup Initial Account"
 msgstr ""
 
@@ -818,12 +786,67 @@
 "account has been created you will be directed to the login page"
 msgstr ""
 
-#: ../../templates/show_install_account.inc.php:68
+#: ../../templates/show_install_account.inc.php:55
+msgid "Create Admin Account"
+msgstr ""
+
+#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/show_user_registration.inc.php:109
+#: ../../templates/userform.inc:40 ../../templates/show_users.inc:43
+msgid "Username"
+msgstr ""
+
+#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/show_user_registration.inc.php:137
+#: ../../templates/userform.inc:63 ../../templates/show_login_form.inc:53
+msgid "Password"
+msgstr ""
+
+#: ../../templates/show_install_account.inc.php:69
 msgid "Create Account"
 msgstr ""
 
+#: ../../templates/show_user_registration.inc.php:59
+msgid "Ampache New User Registration"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:74
+msgid "User Agreement"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:84
+msgid "I Accept"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:101
+msgid "User Information"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:119
+#: ../../templates/userform.inc:48
+msgid "Full Name"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:128
+#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:55
+msgid "E-mail"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:146
+#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
+msgid "Confirm Password"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:166
+msgid "Clear Info"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:167
+msgid "Register User"
+msgstr ""
+
 #: ../../templates/show_confirm_action.inc.php:28
-#: ../../templates/show_search.inc:88
+#: ../../templates/show_search.inc:106
 msgid "Yes"
 msgstr ""
 
@@ -832,8 +855,8 @@
 msgstr ""
 
 #: ../../templates/show_import_playlist.inc.php:29
-#: ../../templates/show_search.inc:77 ../../templates/show_uploads.inc:41
-#: ../../templates/show_search_bar.inc:48
+#: ../../templates/show_uploads.inc:41 ../../templates/list_duplicates.inc:38
+#: ../../templates/show_search.inc:95
 msgid "Filename"
 msgstr ""
 
@@ -845,6 +868,35 @@
 msgid "Import Playlist"
 msgstr ""
 
+#: ../../templates/show_genre.inc.php:32
+msgid "Viewing"
+msgstr ""
+
+#: ../../templates/show_genre.inc.php:36 ../../templates/sidebar.inc.php:35
+#: ../../templates/sidebar.inc.php:136
+#: ../../templates/show_local_catalog_info.inc.php:18
+#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:65
+#: ../../templates/show_browse_menu.inc:36 ../../templates/show_search.inc:136
+msgid "Albums"
+msgstr ""
+
+#: ../../templates/show_genre.inc.php:41 ../../templates/sidebar.inc.php:36
+#: ../../templates/sidebar.inc.php:135
+#: ../../templates/show_local_catalog_info.inc.php:22
+#: ../../templates/show_browse_menu.inc:35 ../../templates/show_search.inc:137
+msgid "Artists"
+msgstr ""
+
+#: ../../templates/show_genre.inc.php:46
+#: ../../templates/show_genres.inc.php:37 ../../templates/sidebar.inc.php:133
+#: ../../templates/show_random_play_bar.inc.php:49
+#: ../../templates/show_local_catalog_info.inc.php:26
+#: ../../templates/show_artists.inc:41 ../../templates/show_artists.inc:64
+#: ../../templates/show_albums.inc:41 ../../templates/show_albums.inc:71
+#: ../../templates/show_search.inc:135
+msgid "Songs"
+msgstr ""
+
 #: ../../templates/show_user.inc.php:26
 msgid "Changing User Information for"
 msgstr ""
@@ -880,10 +932,138 @@
 msgid "Clear Stats"
 msgstr ""
 
+#: ../../templates/show_genres.inc.php:38 ../../templates/show_uploads.inc:32
+#: ../../templates/show_mpdpl.inc:68 ../../templates/show_songs.inc:50
+#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:67
+#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:75
+#: ../../templates/show_access_list.inc:51 ../../templates/show_artist.inc:42
+msgid "Action"
+msgstr ""
+
+#: ../../templates/show_genres.inc.php:48
+#: ../../templates/show_playlists.inc.php:63
+#: ../../templates/show_localplay.inc:41 ../../templates/show_artists.inc:54
+#: ../../templates/show_albums.inc:57 ../../templates/show_mpdplay.inc:64
+#: ../../templates/show_artist.inc:67
+msgid "Play"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:29
+msgid "Users"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:30
+msgid "Mail Users"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:32
+msgid "Site Preferences"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:33
+msgid "Access List"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:38
+msgid "Lists"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:45 ../../templates/menu.inc:29
+msgid "Home"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:49 ../../templates/menu.inc:63
+#: ../../templates/menu.inc:66
+msgid "Admin"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:66 ../../templates/menu.inc:40
+msgid "Preferences"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:85 ../../templates/menu.inc:43
+#: ../../templates/show_upload.inc:73
+msgid "Upload"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:89
+#: ../../templates/show_playlists.inc.php:28 ../../templates/menu.inc:38
+msgid "Playlists"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:93 ../../templates/menu.inc:32
+msgid "Local Play"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:112
+#: ../../templates/show_playlists.inc.php:66
+#: ../../templates/show_artists.inc:56 ../../templates/show_albums.inc:59
+#: ../../templates/show_mpdplay.inc:114
+msgid "Random"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:134
+#: ../../templates/show_random_play_bar.inc.php:50
+msgid "Minutes"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:137
+#: ../../templates/show_random_play_bar.inc.php:53
+msgid "Less Played"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:141
+#: ../../templates/show_random_play_bar.inc.php:58
+msgid "Enqueue"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:146 ../../templates/menu.inc:75
+#: ../../templates/menu.inc:81 ../../templates/menu.inc:85
+msgid "Logout"
+msgstr ""
+
 #: ../../templates/show_confirmation.inc.php:30
 msgid "Continue"
 msgstr ""
 
+#: ../../templates/show_random_play_bar.inc.php:31
+#: ../../templates/show_random_play.inc:28
+msgid "Play Random Selection"
+msgstr ""
+
+#: ../../templates/show_random_play_bar.inc.php:51
+msgid "Full Artists"
+msgstr ""
+
+#: ../../templates/show_random_play_bar.inc.php:52
+#: ../../templates/show_random_play.inc:60
+msgid "Full Albums"
+msgstr ""
+
+#: ../../templates/show_random_play_bar.inc.php:55
+msgid "from"
+msgstr ""
+
+#: ../../templates/show_random_play_bar.inc.php:59
+msgid "Advanced"
+msgstr ""
+
+#: ../../templates/show_local_catalog_info.inc.php:10
+msgid "Total Users"
+msgstr ""
+
+#: ../../templates/show_local_catalog_info.inc.php:14
+msgid "Connected Users"
+msgstr ""
+
+#: ../../templates/show_local_catalog_info.inc.php:30
+msgid "Catalog Size"
+msgstr ""
+
+#: ../../templates/show_local_catalog_info.inc.php:34
+msgid "Catalog Time"
+msgstr ""
+
 #: ../../templates/show_play_selected.inc.php:49
 msgid "Play Selected"
 msgstr ""
@@ -892,35 +1072,54 @@
 msgid "Download Selected"
 msgstr ""
 
-#: ../../templates/show_play_selected.inc.php:55 ../../playlist.php:77
+#: ../../templates/show_play_selected.inc.php:55
 msgid "Flag Selected"
 msgstr ""
 
-#: ../../templates/show_play_selected.inc.php:56 ../../playlist.php:83
+#: ../../templates/show_play_selected.inc.php:56
 msgid "Edit Selected"
 msgstr ""
 
-#: ../../templates/show_play_selected.inc.php:63
+#: ../../templates/show_play_selected.inc.php:64
 msgid "Set Track Numbers"
 msgstr ""
 
-#: ../../templates/show_play_selected.inc.php:64
+#: ../../templates/show_play_selected.inc.php:65
 msgid "Remove Selected Tracks"
 msgstr ""
 
-#: ../../templates/show_play_selected.inc.php:70
+#: ../../templates/show_play_selected.inc.php:71
 msgid "Playlist"
 msgstr ""
 
-#: ../../templates/show_play_selected.inc.php:70
+#: ../../templates/show_play_selected.inc.php:71
 msgid "Add to"
 msgstr ""
 
-#: ../../templates/show_all_popular.inc.php:27 ../../index.php:105
+#: ../../templates/show_play_selected.inc.php:73
+#: ../../templates/show_playlists.inc.php:51
+msgid "View"
+msgstr ""
+
+#: ../../templates/show_play_selected.inc.php:74
+#: ../../templates/show_playlists.inc.php:55 ../../templates/show_users.inc:58
+#: ../../templates/show_users.inc:102
+msgid "Edit"
+msgstr ""
+
+#: ../../templates/show_all_recent.inc.php:27 ../../index.php:99
+msgid "Newest Artist Additions"
+msgstr ""
+
+#: ../../templates/show_all_recent.inc.php:30 ../../index.php:106
+msgid "Newest Album Additions"
+msgstr ""
+
+#: ../../templates/show_all_popular.inc.php:27 ../../index.php:82
 msgid "Most Popular Artists"
 msgstr ""
 
-#: ../../templates/show_all_popular.inc.php:30 ../../index.php:72
+#: ../../templates/show_all_popular.inc.php:30 ../../index.php:61
 msgid "Most Popular Albums"
 msgstr ""
 
@@ -928,160 +1127,210 @@
 msgid "Most Popular Genres"
 msgstr ""
 
-#: ../../templates/show_all_popular.inc.php:40 ../../index.php:112
+#: ../../templates/show_all_popular.inc.php:40 ../../index.php:89
 msgid "Most Popular Songs"
 msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:10
-msgid "Total Users"
+#: ../../templates/show_get_albumart.inc.php:28
+msgid "Customize Search"
 msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:14
-msgid "Connected Users"
+#: ../../templates/show_get_albumart.inc.php:49
+msgid "Direct URL to Image"
 msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:18
-#: ../../templates/show_genre.inc.php:36 ../../templates/show_artists.inc:42
-#: ../../templates/show_artists.inc:65 ../../templates/show_search.inc:118
-#: ../../templates/show_browse_menu.inc:36
-msgid "Albums"
+#: ../../templates/show_get_albumart.inc.php:59
+msgid "Get Art"
 msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:22
-#: ../../templates/show_genre.inc.php:41 ../../templates/show_search.inc:119
-#: ../../templates/show_browse_menu.inc:35
-msgid "Artists"
+#: ../../templates/show_rename_artist.inc.php:33
+#: ../../templates/show_rename_artist.inc.php:51
+msgid "Rename"
 msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:26
-#: ../../templates/show_genres.inc.php:37
-#: ../../templates/show_genre.inc.php:46
-#: ../../templates/show_random_play_bar.inc.php:49
-#: ../../templates/show_artists.inc:41 ../../templates/show_artists.inc:64
-#: ../../templates/show_albums.inc:41 ../../templates/show_albums.inc:71
-#: ../../templates/show_search.inc:117
-msgid "Songs"
+#: ../../templates/show_rename_artist.inc.php:33
+msgid "to"
 msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:30
-msgid "Catalog Size"
+#: ../../templates/show_rename_artist.inc.php:40
+#: ../../templates/show_search.inc:144
+msgid "OR"
 msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:34
-msgid "Catalog Time"
+#: ../../templates/show_rename_artist.inc.php:42
+msgid "Insert current"
 msgstr ""
 
-#: ../../templates/show_genres.inc.php:38 ../../templates/show_artists.inc:43
-#: ../../templates/show_artists.inc:67 ../../templates/show_songs.inc:42
-#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:75
-#: ../../templates/show_access_list.inc:51 ../../templates/show_artist.inc:55
-#: ../../templates/show_mpdpl.inc:69 ../../templates/show_uploads.inc:32
-msgid "Action"
+#: ../../templates/show_rename_artist.inc.php:47
+msgid "Update id3 tags"
 msgstr ""
 
-#: ../../templates/show_genre.inc.php:32
-msgid "Viewing"
+#: ../../templates/show_artist_box.inc.php:26
+msgid "Albums by"
 msgstr ""
 
-#: ../../templates/show_all_recent.inc.php:27 ../../index.php:123
-msgid "Newest Artist Additions"
+#: ../../templates/show_artist_box.inc.php:34
+msgid "Show All Songs By"
 msgstr ""
 
-#: ../../templates/show_all_recent.inc.php:30 ../../index.php:130
-msgid "Newest Album Additions"
+#: ../../templates/show_artist_box.inc.php:35
+msgid "Play All Songs By"
 msgstr ""
 
-#: ../../templates/show_random_play_bar.inc.php:31
-#: ../../templates/show_random_play.inc:28
-msgid "Play Random Selection"
+#: ../../templates/show_artist_box.inc.php:36
+msgid "Play Random Songs By"
 msgstr ""
 
-#: ../../templates/show_random_play_bar.inc.php:45 ../../randomplay.php:70
-#: ../../templates/show_artists.inc:55 ../../templates/show_albums.inc:58
-#: ../../templates/show_random_play.inc:46
-msgid "All"
+#: ../../templates/show_artist_box.inc.php:38
+#: ../../templates/show_album.inc:72
+msgid "Update from tags"
 msgstr ""
 
-#: ../../templates/show_random_play_bar.inc.php:50
-msgid "Minutes"
+#: ../../templates/show_artist_box.inc.php:39
+msgid "Rename Artist"
 msgstr ""
 
-#: ../../templates/show_random_play_bar.inc.php:51
-msgid "Full Artists"
+#: ../../templates/show_playlists.inc.php:31
+msgid "Playlist Name"
 msgstr ""
 
-#: ../../templates/show_random_play_bar.inc.php:52
-#: ../../templates/show_random_play.inc:60
-msgid "Full Albums"
+#: ../../templates/show_playlists.inc.php:32
+msgid "# Songs"
 msgstr ""
 
-#: ../../templates/show_random_play_bar.inc.php:53
-msgid "Less Played"
+#: ../../templates/show_playlists.inc.php:33
+msgid "Owner"
 msgstr ""
 
-#: ../../templates/show_random_play_bar.inc.php:55
-msgid "from"
+#: ../../templates/show_playlists.inc.php:34
+msgid "Actions"
 msgstr ""
 
-#: ../../templates/show_random_play_bar.inc.php:58
-msgid "Enqueue"
+#: ../../templates/show_playlists.inc.php:58
+#: ../../templates/show_uploads.inc:50 ../../templates/catalog.inc:57
+#: ../../templates/show_users.inc:70
+msgid "Delete"
 msgstr ""
 
-#: ../../templates/show_random_play_bar.inc.php:59
-msgid "Advanced"
+#: ../../templates/show_playlists.inc.php:71
+#: ../../templates/show_songs.inc:140 ../../templates/show_album.inc:75
+#: ../../templates/show_albums.inc:61 ../../templates/show_artist.inc:69
+msgid "Download"
+msgstr ""
+
+#: ../../templates/show_playlist_box.inc.php:33
+msgid "Playlist Actions"
+msgstr ""
+
+#: ../../templates/show_playlist_box.inc.php:34
+msgid "Create New Playlist"
+msgstr ""
+
+#: ../../templates/show_playlist_box.inc.php:35
+msgid "View All Playlists"
+msgstr ""
+
+#: ../../templates/show_playlist_box.inc.php:36
+msgid "Import From File"
+msgstr ""
+
+#: ../../templates/show_playlist_box.inc.php:38
+msgid "Normalize Tracks"
+msgstr ""
+
+#: ../../templates/show_playlist_box.inc.php:39
+msgid "Play This Playlist"
+msgstr ""
+
+#: ../../templates/show_preference_box.inc.php:44
+msgid "Preference"
+msgstr ""
+
+#: ../../templates/show_preference_box.inc.php:45
+msgid "Value"
+msgstr ""
+
+#: ../../templates/show_preference_box.inc.php:47
+msgid "Apply to All"
 msgstr ""
 
-#: ../../localplay.php:79
+#: ../../templates/show_preference_box.inc.php:54
+msgid "description"
+msgstr ""
+
+#: ../../templates/show_object_rating.inc.php:25
+#: ../../templates/show_songs.inc:52
+msgid "Rating"
+msgstr ""
+
+#: ../../localplay.php:81
 msgid "Unknown action requested"
 msgstr ""
 
-#: ../../artists.php:48
-msgid "All songs by"
+#: ../../browse.php:48 ../../albums.php:168 ../../albums.php:174
+#: ../../albums.php:181 ../../albums.php:186 ../../albums.php:192
+msgid "Show Albums starting with"
+msgstr ""
+
+#: ../../browse.php:78 ../../artists.php:128 ../../artists.php:132
+#: ../../artists.php:138 ../../artists.php:151
+msgid "Show Artists starting with"
+msgstr ""
+
+#: ../../search.php:45
+msgid "Error: No Keyword Entered"
+msgstr ""
+
+#: ../../tv.php:76 ../../templates/show_now_playing.inc:31
+msgid "Now Playing"
 msgstr ""
 
-#: ../../artists.php:57 ../../albums.php:106
+#: ../../artists.php:58 ../../albums.php:147
 msgid "Starting Update from Tags"
 msgstr ""
 
-#: ../../artists.php:62 ../../albums.php:111
+#: ../../artists.php:63 ../../albums.php:152
 msgid "Update From Tags Complete"
 msgstr ""
 
-#: ../../artists.php:72 ../../artists.php:76 ../../artists.php:82
-#: ../../artists.php:95
-msgid "Show Artists starting with"
+#: ../../amp-mpd.php:171 ../../playlist.php:63
+msgid "New Playlist"
 msgstr ""
 
-#: ../../amp-mpd.php:176 ../../playlist.php:135
-msgid "New Playlist"
+#: ../../playlist.php:46
+msgid "Playlist Deleted"
 msgstr ""
 
-#: ../../playlist.php:115
-msgid "owned by"
+#: ../../playlist.php:46
+msgid "The Requested Playlist has been deleted"
 msgstr ""
 
-#: ../../playlist.php:118
-msgid "Edit Playlist"
+#: ../../playlist.php:56
+msgid "Are you sure you want to delete this playlist"
 msgstr ""
 
-#: ../../playlist.php:121
-msgid "Play Full Playlist"
+#: ../../playlist.php:112
+msgid "Playlist Created"
 msgstr ""
 
-#: ../../playlist.php:122
-msgid "Play Random"
+#: ../../playlist.php:112
+msgid " has been created"
+msgstr ""
+
+#: ../../playlist.php:121
+msgid "Remote Selected Tracks"
 msgstr ""
 
-#: ../../playlist.php:192
-msgid "Playlist updated."
+#: ../../playlist.php:139
+msgid "Playlist Updated"
 msgstr ""
 
-#: ../../index.php:42
-msgid "Welcome to"
+#: ../../playlist.php:139
+msgid " has been updated"
 msgstr ""
 
-#: ../../index.php:44
-msgid "you are currently logged in as"
+#: ../../flag.php:38
+msgid "Flagging song completed."
 msgstr ""
 
 #: ../../user.php:45
@@ -1092,10 +1341,6 @@
 msgid "Error: Insufficient Rights"
 msgstr ""
 
-#: ../../flag.php:35
-msgid "Flagging song completed."
-msgstr ""
-
 #: ../../albums.php:44
 msgid "Album Art Cleared"
 msgstr ""
@@ -1104,72 +1349,85 @@
 msgid "Album Art information has been removed form the database"
 msgstr ""
 
-#: ../../albums.php:78
-msgid "Album Art Located"
+#: ../../albums.php:74
+msgid "No Amazon Developer Key set, amazon album art searching will not work"
+msgstr ""
+
+#: ../../albums.php:104
+msgid "Album Art Not Located"
 msgstr ""
 
-#: ../../albums.php:78
+#: ../../albums.php:104
 msgid ""
-"Album Art information has been located in Amazon. If incorrect, click "
-"\"Reset Album Art\" below to remove the artwork."
+"Album Art could not be located at this time. This may be due to Amazon being "
+"busy, or the album not being present in their collection."
 msgstr ""
 
-#: ../../albums.php:86 ../../albums.php:96
-msgid "Get Art"
+#: ../../albums.php:137
+msgid "Album Art Inserted"
 msgstr ""
 
-#: ../../albums.php:90
-msgid "Album Art Not Located"
+#: ../../ratings.php:33
+msgid "Rating Updated"
 msgstr ""
 
-#: ../../albums.php:90
-msgid ""
-"Album Art could not be located at this time. This may be due to Amazon being "
-"busy, or the album not being present in their collection."
+#: ../../ratings.php:33
+msgid "Your rating for this object has been updated"
 msgstr ""
 
-#: ../../albums.php:127 ../../albums.php:133 ../../albums.php:140
-#: ../../albums.php:145 ../../albums.php:150
-msgid "Show Albums starting with"
+#: ../../register.php:79
+msgid "Error Captcha Required"
 msgstr ""
 
-#: ../../tv.php:76 ../../templates/show_now_playing.inc:31
-msgid "Now Playing"
+#: ../../register.php:86
+msgid "Error Captcha Failed"
 msgstr ""
 
-#: ../../randomplay.php:60
-msgid "Play Random Selection from Multiple Genres"
+#: ../../register.php:93
+msgid "You <U>must</U> accept the user agreement"
 msgstr ""
 
-#: ../../randomplay.php:67 ../../templates/show_random_play.inc:34
-msgid "Item count"
+#: ../../register.php:98
+msgid "You did not enter a username"
 msgstr ""
 
-#: ../../randomplay.php:81 ../../templates/show_random_play.inc:49
-msgid "From genre"
+#: ../../register.php:102
+msgid "Please fill in your full name (Firstname Lastname)"
 msgstr ""
 
-#: ../../randomplay.php:90 ../../templates/show_random_play.inc:59
-msgid "Favor Unplayed"
+#: ../../register.php:128
+msgid "You must enter a password"
 msgstr ""
 
-#: ../../randomplay.php:91
-msgid "Favor Full Albums"
+#: ../../register.php:132
+msgid "Your passwords do not match"
 msgstr ""
 
-#: ../../randomplay.php:92
-msgid "Favor Full Artist"
+#: ../../register.php:150
+msgid "Error: Insert Failed"
 msgstr ""
 
-#: ../../randomplay.php:101 ../../templates/show_random_play.inc:66
-msgid "from catalog"
+#: ../../register.php:165
+msgid "Registration Complete"
 msgstr ""
 
-#: ../../randomplay.php:112 ../../templates/show_random_play.inc:75
-msgid "Play Random Songs"
+#: ../../activate.php:42
+msgid "No user with this name registered"
 msgstr ""
 
-#: ../../bin/print_tags.php.inc:43
+#: ../../activate.php:46
+msgid "The validation key used isn't correct."
+msgstr ""
+
+#: ../../activate.php:51
+msgid "User activated"
+msgstr ""
+
+#: ../../activate.php:51
+msgid "This User ID is activated and can be used"
+msgstr ""
+
+#: ../../bin/print_tags.php.inc:42
 msgid ""
 "[print_tags.php.inc]\n"
 "This commandline script will display the tag information for the specified "
@@ -1178,7 +1436,7 @@
 "        \n"
 msgstr ""
 
-#: ../../bin/print_tags.php.inc:49
+#: ../../bin/print_tags.php.inc:48
 msgid "Filename:"
 msgstr ""
 
@@ -1226,31 +1484,143 @@
 "\t\n"
 msgstr ""
 
-#: ../../bin/quarantine_migration.php.inc:127
-msgid "Continue?  (Y/N):"
+#: ../../bin/quarantine_migration.php.inc:127
+msgid "Continue?  (Y/N):"
+msgstr ""
+
+#: ../../bin/quarantine_migration.php.inc:151
+msgid "Error:  "
+msgstr ""
+
+#: ../../bin/quarantine_migration.php.inc:152
+msgid "!\n"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:27
+msgid "User Management"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:28
+msgid "E-mail Management"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:29
+msgid "Catalog Managment"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:30
+msgid "Admin Preferences"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:31 ../../templates/catalog.inc:95
+msgid "Access Lists"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:94
+msgid "Add a catalog"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:35 ../../templates/catalog.inc:99
+msgid "Clear Now Playing"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:36
+msgid "Add Access List Entry"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:40
+msgid "Common Functions"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:43
+msgid "Admin Sections"
+msgstr ""
+
+#: ../../templates/show_uploads.inc:33
+msgid "Status"
+msgstr ""
+
+#: ../../templates/show_uploads.inc:34 ../../templates/flag.inc:58
+#: ../../templates/list_flagged.inc:41 ../../templates/list_duplicates.inc:32
+msgid "Song"
+msgstr ""
+
+#: ../../templates/show_uploads.inc:40 ../../templates/show_songs.inc:46
+#: ../../templates/list_duplicates.inc:37
+msgid "Size"
+msgstr ""
+
+#: ../../templates/show_uploads.inc:42
+msgid "User"
+msgstr ""
+
+#: ../../templates/show_uploads.inc:43
+msgid "Date"
+msgstr ""
+
+#: ../../templates/show_uploads.inc:49
+msgid "Add"
+msgstr ""
+
+#: ../../templates/show_mpdpl.inc:43
+msgid "MPD Server Playlist"
+msgstr ""
+
+#: ../../templates/show_mpdpl.inc:45 ../../templates/show_mpdpl.inc:175
+msgid "Refresh the Playlist Window"
+msgstr ""
+
+#: ../../templates/show_mpdpl.inc:47 ../../templates/show_mpdpl.inc:177
+msgid "Click to shuffle (randomize) the playlist"
+msgstr ""
+
+#: ../../templates/show_mpdpl.inc:47 ../../templates/show_mpdpl.inc:177
+msgid "shuffle"
+msgstr ""
+
+#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:178
+msgid "Click to the clear the playlist"
+msgstr ""
+
+#: ../../templates/show_mpdpl.inc:52 ../../templates/show_mpdpl.inc:182
+msgid "Click to the remove all except the Now Playing"
+msgstr ""
+
+#: ../../templates/show_mpdpl.inc:62 ../../templates/show_songs.inc:41
+msgid "Song title"
+msgstr ""
+
+#: ../../templates/flag.inc:43
+msgid "Flag song"
+msgstr ""
+
+#: ../../templates/flag.inc:45
+msgid ""
+"Flag the following song as having one of the problems listed below.  Site "
+"admins will then take the appropriate action for the flagged files."
 msgstr ""
 
-#: ../../bin/quarantine_migration.php.inc:151
-msgid "Error:  "
+#: ../../templates/flag.inc:62
+msgid "Reason to flag"
 msgstr ""
 
-#: ../../bin/quarantine_migration.php.inc:152
-msgid "!\n"
+#: ../../templates/flag.inc:73
+msgid "Flag Song"
 msgstr ""
 
 #: ../../templates/customize_catalog.inc:24
 msgid "Settings for catalog in"
 msgstr ""
 
-#: ../../templates/customize_catalog.inc:32 ../../templates/add_catalog.inc:39
+#: ../../templates/customize_catalog.inc:32 ../../templates/add_catalog.inc:40
 msgid "Auto-inserted Fields"
 msgstr ""
 
-#: ../../templates/customize_catalog.inc:33 ../../templates/add_catalog.inc:40
+#: ../../templates/customize_catalog.inc:33 ../../templates/add_catalog.inc:41
 msgid "album name"
 msgstr ""
 
-#: ../../templates/customize_catalog.inc:34 ../../templates/add_catalog.inc:41
+#: ../../templates/customize_catalog.inc:34 ../../templates/add_catalog.inc:42
 msgid "artist name"
 msgstr ""
 
@@ -1258,27 +1628,27 @@
 msgid "catalog path"
 msgstr ""
 
-#: ../../templates/customize_catalog.inc:36 ../../templates/add_catalog.inc:42
+#: ../../templates/customize_catalog.inc:36 ../../templates/add_catalog.inc:43
 msgid "id3 comment"
 msgstr ""
 
-#: ../../templates/customize_catalog.inc:37 ../../templates/add_catalog.inc:43
+#: ../../templates/customize_catalog.inc:37 ../../templates/add_catalog.inc:44
 msgid "genre"
 msgstr ""
 
-#: ../../templates/customize_catalog.inc:38 ../../templates/add_catalog.inc:44
+#: ../../templates/customize_catalog.inc:38 ../../templates/add_catalog.inc:45
 msgid "track number (padded with leading 0)"
 msgstr ""
 
-#: ../../templates/customize_catalog.inc:39 ../../templates/add_catalog.inc:45
+#: ../../templates/customize_catalog.inc:39 ../../templates/add_catalog.inc:46
 msgid "song title"
 msgstr ""
 
-#: ../../templates/customize_catalog.inc:40 ../../templates/add_catalog.inc:46
+#: ../../templates/customize_catalog.inc:40 ../../templates/add_catalog.inc:47
 msgid "year"
 msgstr ""
 
-#: ../../templates/customize_catalog.inc:41 ../../templates/add_catalog.inc:47
+#: ../../templates/customize_catalog.inc:41 ../../templates/add_catalog.inc:48
 msgid "other"
 msgstr ""
 
@@ -1290,11 +1660,11 @@
 msgid "Filename pattern"
 msgstr ""
 
-#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:75
 msgid "Folder Pattern"
 msgstr ""
 
-#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:75
 msgid "(no leading or ending '/')"
 msgstr ""
 
@@ -1302,47 +1672,6 @@
 msgid "Save Catalog Settings"
 msgstr ""
 
-#: ../../templates/show_admin_index.inc:27
-msgid "User Management"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:28
-msgid "E-mail Management"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:29
-msgid "Catalog Managment"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:30 ../../templates/admin_menu.inc:36
-msgid "Admin Preferences"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:31 ../../templates/catalog.inc:98
-#: ../../templates/admin_menu.inc:37
-msgid "Access Lists"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:97
-msgid "Add a catalog"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:35 ../../templates/catalog.inc:102
-msgid "Clear Now Playing"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:36
-msgid "Add Access List Entry"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:40
-msgid "Common Functions"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:43
-msgid "Admin Sections"
-msgstr ""
-
 #: ../../templates/show_test.inc:29
 msgid "Ampache Debug"
 msgstr ""
@@ -1406,7 +1735,7 @@
 msgstr ""
 
 #: ../../templates/show_test.inc:116
-#: ../../templates/show_install_config.inc:87
+#: ../../templates/show_install_config.inc:88
 msgid "Ampache.cfg.php Exists"
 msgstr ""
 
@@ -1418,7 +1747,7 @@
 msgstr ""
 
 #: ../../templates/show_test.inc:137
-#: ../../templates/show_install_config.inc:104
+#: ../../templates/show_install_config.inc:105
 msgid "Ampache.cfg.php Configured?"
 msgstr ""
 
@@ -1464,20 +1793,20 @@
 msgstr ""
 
 #: ../../templates/show_localplay.inc:39 ../../templates/list_header.inc:71
-#: ../../templates/show_mpdplay.inc:48
+#: ../../templates/show_mpdplay.inc:62
 msgid "Prev"
 msgstr ""
 
-#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:49
+#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:63
 msgid "Stop"
 msgstr ""
 
-#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:51
+#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:65
 msgid "Pause"
 msgstr ""
 
 #: ../../templates/show_localplay.inc:43 ../../templates/list_header.inc:94
-#: ../../templates/show_mpdplay.inc:52
+#: ../../templates/show_mpdplay.inc:66
 msgid "Next"
 msgstr ""
 
@@ -1497,66 +1826,61 @@
 msgid "Clear queue"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:30
+#: ../../templates/add_catalog.inc:31
 msgid ""
 "In the form below enter either a local path (i.e. /data/music) or the URL to "
 "a remote Ampache installation (i.e http://theotherampache.com)"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:36
+#: ../../templates/add_catalog.inc:37
 msgid "Catalog Name"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:53
+#: ../../templates/add_catalog.inc:54
 msgid "Path"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:57
+#: ../../templates/add_catalog.inc:58
 msgid "Catalog Type"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:61
+#: ../../templates/add_catalog.inc:62
 msgid "Remote"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:66
+#: ../../templates/add_catalog.inc:67
 msgid "ID3 Set Command"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:70
+#: ../../templates/add_catalog.inc:71
 msgid "Filename Pattern"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:78 ../../templates/catalog.inc:104
+#: ../../templates/add_catalog.inc:79 ../../templates/catalog.inc:101
 msgid "Gather Album Art"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:82
+#: ../../templates/add_catalog.inc:83
 msgid "ID3V2 Tags"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:85
+#: ../../templates/add_catalog.inc:86
 msgid "Amazon"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:88
+#: ../../templates/add_catalog.inc:89
 msgid "File Folder"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:95
+#: ../../templates/add_catalog.inc:96
 msgid "Build Playlists from m3u Files"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:102
+#: ../../templates/add_catalog.inc:103
 msgid "Add Catalog"
 msgstr ""
 
-#: ../../templates/list_flagged.inc:41 ../../templates/flag.inc:58
-#: ../../templates/show_uploads.inc:34
-msgid "Song"
-msgstr ""
-
-#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:41
+#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:49
 msgid "Flag"
 msgstr ""
 
@@ -1580,31 +1904,35 @@
 msgid "Reject"
 msgstr ""
 
-#: ../../templates/show_songs.inc:33 ../../templates/show_mpdpl.inc:63
-msgid "Song title"
+#: ../../templates/header.inc:49
+msgid "You are currently logged in as"
 msgstr ""
 
-#: ../../templates/show_songs.inc:38 ../../templates/show_uploads.inc:40
-msgid "Size"
+#: ../../templates/header.inc:58
+msgid "Go!"
 msgstr ""
 
-#: ../../templates/show_songs.inc:119
+#: ../../templates/show_songs.inc:143
 msgid "Direct Link"
 msgstr ""
 
-#: ../../templates/show_songs.inc:137
+#: ../../templates/show_songs.inc:166
 msgid "Total"
 msgstr ""
 
+#: ../../templates/show_search_bar.inc:36 ../../templates/show_search.inc:54
+msgid "Search Ampache"
+msgstr ""
+
 #: ../../templates/show_install_config.inc:41
-#: ../../templates/show_install.inc:40
+#: ../../templates/show_install.inc:41
 msgid ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
 "ampache.cfg.php.dist file"
 msgstr ""
 
 #: ../../templates/show_install_config.inc:49
-#: ../../templates/show_install.inc:50
+#: ../../templates/show_install.inc:51
 msgid "Step 2 - Creating the Ampache.cfg.php file"
 msgstr ""
 
@@ -1615,89 +1943,69 @@
 "download the config file. Please put the downloaded config file in /config"
 msgstr ""
 
-#: ../../templates/show_install_config.inc:59
+#: ../../templates/show_install_config.inc:60
 msgid "Web Path"
 msgstr ""
 
-#: ../../templates/show_install_config.inc:63
-#: ../../templates/show_install.inc:57
+#: ../../templates/show_install_config.inc:64
+#: ../../templates/show_install.inc:59
 msgid "Desired Database Name"
 msgstr ""
 
-#: ../../templates/show_install_config.inc:67
-#: ../../templates/show_install.inc:61
+#: ../../templates/show_install_config.inc:68
+#: ../../templates/show_install.inc:63
 msgid "MySQL Hostname"
 msgstr ""
 
-#: ../../templates/show_install_config.inc:71
+#: ../../templates/show_install_config.inc:72
 msgid "MySQL Username"
 msgstr ""
 
-#: ../../templates/show_install_config.inc:75
+#: ../../templates/show_install_config.inc:76
 msgid "MySQL Password"
 msgstr ""
 
-#: ../../templates/show_install_config.inc:80
+#: ../../templates/show_install_config.inc:81
 msgid "Write Config"
 msgstr ""
 
-#: ../../templates/show_install_config.inc:124
+#: ../../templates/show_install_config.inc:125
 msgid "Check for Config"
 msgstr ""
 
-#: ../../templates/show_album.inc:53
+#: ../../templates/show_album.inc:67
 msgid "Play Album"
 msgstr ""
 
-#: ../../templates/show_album.inc:54
+#: ../../templates/show_album.inc:68
 msgid "Play Random from Album"
 msgstr ""
 
-#: ../../templates/show_album.inc:55
+#: ../../templates/show_album.inc:69
 msgid "Reset Album Art"
 msgstr ""
 
-#: ../../templates/show_album.inc:56
+#: ../../templates/show_album.inc:70
 msgid "Find Album Art"
 msgstr ""
 
-#: ../../templates/show_album.inc:58 ../../templates/show_artist.inc:37
-msgid "Update from tags"
-msgstr ""
-
-#: ../../templates/show_preferences.inc:31
+#: ../../templates/show_preferences.inc:42
 msgid "Editing"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:31
+#: ../../templates/show_preferences.inc:42
 msgid "preferences"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:33
+#: ../../templates/show_preferences.inc:44
 msgid "Rebuild Preferences"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:39
-msgid "Preference"
-msgstr ""
-
-#: ../../templates/show_preferences.inc:40
-msgid "Value"
-msgstr ""
-
-#: ../../templates/show_preferences.inc:42
-msgid "Type"
-msgstr ""
-
-#: ../../templates/show_preferences.inc:43
-msgid "Apply to All"
-msgstr ""
-
-#: ../../templates/show_preferences.inc:83
+#: ../../templates/show_preferences.inc:73
 msgid "Update Preferences"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:87
+#: ../../templates/show_preferences.inc:77
 msgid "Cancel"
 msgstr ""
 
@@ -1721,41 +2029,63 @@
 msgid "Update User"
 msgstr ""
 
-#: ../../templates/show_install.inc:48
+#: ../../templates/show_random_play.inc:34
+msgid "Item count"
+msgstr ""
+
+#: ../../templates/show_random_play.inc:49
+msgid "From genre"
+msgstr ""
+
+#: ../../templates/show_random_play.inc:58
+msgid "Standard"
+msgstr ""
+
+#: ../../templates/show_random_play.inc:59
+msgid "Favor Unplayed"
+msgstr ""
+
+#: ../../templates/show_random_play.inc:61
+msgid "Full Artist"
+msgstr ""
+
+#: ../../templates/show_random_play.inc:66
+msgid "from catalog"
+msgstr ""
+
+#: ../../templates/show_random_play.inc:75
+msgid "Play Random Songs"
+msgstr ""
+
+#: ../../templates/show_install.inc:49
 msgid ""
 "This step creates and inserts the Ampache database, as such please provide a "
 "mysql account with database creation rights. This step may take a while "
 "depending upon the speed of your computer"
 msgstr ""
 
-#: ../../templates/show_install.inc:65
+#: ../../templates/show_install.inc:67
 msgid "MySQL Administrative Username"
 msgstr ""
 
-#: ../../templates/show_install.inc:69
+#: ../../templates/show_install.inc:71
 msgid "MySQL Administrative Password"
 msgstr ""
 
-#: ../../templates/show_install.inc:74
-msgid "Insert Database"
-msgstr ""
-
-#: ../../templates/flag.inc:43
-msgid "Flag song"
+#: ../../templates/show_install.inc:75
+msgid "Create Database User for New Database"
 msgstr ""
 
-#: ../../templates/flag.inc:45
-msgid ""
-"Flag the following song as having one of the problems listed below.  Site "
-"admins will then take the appropriate action for the flagged files."
+#: ../../templates/show_install.inc:80
+msgid "Ampache Database Username"
 msgstr ""
 
-#: ../../templates/flag.inc:62
-msgid "Reason to flag"
+#: ../../templates/show_install.inc:84
+msgid "Ampache Database User Password"
 msgstr ""
 
-#: ../../templates/flag.inc:73
-msgid "Flag Song"
+#: ../../templates/show_install.inc:89
+msgid "Insert Database"
 msgstr ""
 
 #: ../../templates/show_add_access.inc:31
@@ -1785,108 +2115,119 @@
 msgid "Add Host"
 msgstr ""
 
-#: ../../templates/catalog.inc:33
+#: ../../templates/catalog.inc:30
 msgid ""
 "Error: ICONV not found, ID3V2 Tags will not import correctly. See <a href="
 "\"http://php.oregonstate.edu/iconv\">Iconv</a> for information on getting "
 "ICONV"
 msgstr ""
 
-#: ../../templates/catalog.inc:42
+#: ../../templates/catalog.inc:39
 msgid "Update Catalogs"
 msgstr ""
 
-#: ../../templates/catalog.inc:68
+#: ../../templates/catalog.inc:65
 msgid "Fast Add"
 msgstr ""
 
-#: ../../templates/catalog.inc:75
+#: ../../templates/catalog.inc:72
 msgid "Fast Update"
 msgstr ""
 
-#: ../../templates/catalog.inc:88
+#: ../../templates/catalog.inc:85
 msgid "You don't have any catalogs."
 msgstr ""
 
-#: ../../templates/catalog.inc:99
+#: ../../templates/catalog.inc:96
 msgid "Show Duplicate Songs"
 msgstr ""
 
-#: ../../templates/catalog.inc:100
+#: ../../templates/catalog.inc:97
 msgid "Show Disabled Songs"
 msgstr ""
 
-#: ../../templates/catalog.inc:101
+#: ../../templates/catalog.inc:98
 msgid "Clear Catalog Stats"
 msgstr ""
 
-#: ../../templates/catalog.inc:103
+#: ../../templates/catalog.inc:100
 msgid "Dump Album Art"
 msgstr ""
 
-#: ../../templates/catalog.inc:105
+#: ../../templates/catalog.inc:102
 msgid "View flagged songs"
 msgstr ""
 
-#: ../../templates/catalog.inc:106
+#: ../../templates/catalog.inc:103
 msgid "Catalog Tools"
 msgstr ""
 
-#: ../../templates/admin_menu.inc:33
-msgid "Users"
+#: ../../templates/menu.inc:73 ../../templates/menu.inc:79
+msgid "Account"
 msgstr ""
 
-#: ../../templates/admin_menu.inc:34
-msgid "Mail Users"
+#: ../../templates/menu.inc:74 ../../templates/menu.inc:80
+#: ../../templates/show_users.inc:64 ../../templates/show_users.inc:112
+msgid "Stats"
 msgstr ""
 
-#: ../../templates/menu.inc:29
-msgid "Home"
+#: ../../templates/show_upload.inc:30
+msgid "Uploading Music to Ampache"
 msgstr ""
 
-#: ../../templates/menu.inc:32
-msgid "Local Play"
+#: ../../templates/show_upload.inc:32
+msgid "The following Audio file formats are supported"
 msgstr ""
 
-#: ../../templates/menu.inc:38
-msgid "Playlists"
+#: ../../templates/show_upload.inc:72
+msgid "max_upload_size"
 msgstr ""
 
-#: ../../templates/menu.inc:40
-msgid "Preferences"
+#: ../../templates/show_users.inc:40
+msgid "Fullname"
 msgstr ""
 
-#: ../../templates/menu.inc:43 ../../templates/show_upload.inc:73
-msgid "Upload"
+#: ../../templates/show_users.inc:48
+msgid "Last Seen"
 msgstr ""
 
-#: ../../templates/menu.inc:63 ../../templates/menu.inc:66
-msgid "Admin"
+#: ../../templates/show_users.inc:53
+msgid "Registration Date"
 msgstr ""
 
-#: ../../templates/menu.inc:73 ../../templates/menu.inc:79
-msgid "Account"
+#: ../../templates/show_users.inc:61 ../../templates/show_users.inc:107
+msgid "Prefs"
 msgstr ""
 
-#: ../../templates/menu.inc:74 ../../templates/menu.inc:80
-msgid "Stats"
+#: ../../templates/show_users.inc:67
+msgid "Access"
 msgstr ""
 
-#: ../../templates/menu.inc:75 ../../templates/menu.inc:81
-#: ../../templates/menu.inc:85
-msgid "Logout"
+#: ../../templates/show_users.inc:73
+msgid "On-line"
 msgstr ""
 
-#: ../../templates/show_upload.inc:30
-msgid "Uploading Music to Ampache"
+#: ../../templates/show_users.inc:126
+msgid "delete"
 msgstr ""
 
-#: ../../templates/show_upload.inc:32
-msgid "The following Audio file formats are supported"
+#: ../../templates/list_duplicates.inc:28
+msgid "Duplicate Songs"
 msgstr ""
 
-#: ../../templates/show_upload.inc:72
-msgid "max_upload_size"
+#: ../../templates/list_duplicates.inc:35
+msgid "Length"
+msgstr ""
+
+#: ../../templates/list_duplicates.inc:74
+msgid "You don"
+msgstr ""
+
+#: ../../templates/list_duplicates.inc:74
+msgid ""
+"); ?></p>\n"
+"<?php  } ?>\n"
+"</form>\n"
 msgstr ""
 
 #: ../../templates/show_login_form.inc:49
@@ -1898,6 +2239,10 @@
 msgid "Remember Me"
 msgstr ""
 
+#: ../../templates/show_login_form.inc:72
+msgid "Register"
+msgstr ""
+
 #: ../../templates/show_access_list.inc:34
 msgid "Host Access to Your Catalog"
 msgstr ""
@@ -1918,210 +2263,118 @@
 msgid "Revoke"
 msgstr ""
 
-#: ../../templates/show_users.inc:43
-msgid "Fullname"
-msgstr ""
-
-#: ../../templates/show_users.inc:48
-msgid "Last Seen"
-msgstr ""
-
-#: ../../templates/show_users.inc:55 ../../templates/show_users.inc:91
-msgid "Prefs"
-msgstr ""
-
-#: ../../templates/show_users.inc:58
-msgid "Access"
-msgstr ""
-
-#: ../../templates/show_users.inc:64
-msgid "On-line"
-msgstr ""
-
-#: ../../templates/show_users.inc:105
-msgid "delete"
-msgstr ""
-
-#: ../../templates/show_search.inc:45 ../../templates/show_search_bar.inc:36
-msgid "Search Ampache"
+#: ../../templates/show_search.inc:57
+msgid "Keywords"
 msgstr ""
 
-#: ../../templates/show_search.inc:84
+#: ../../templates/show_search.inc:102
 msgid "Played"
 msgstr ""
 
-#: ../../templates/show_search.inc:92
+#: ../../templates/show_search.inc:110
 msgid "Min Bitrate"
 msgstr ""
 
-#: ../../templates/show_search.inc:114
+#: ../../templates/show_search.inc:132
 msgid "Object Type"
 msgstr ""
 
-#: ../../templates/show_search.inc:120
+#: ../../templates/show_search.inc:138
 msgid "Genres"
 msgstr ""
 
-#: ../../templates/show_search.inc:123
+#: ../../templates/show_search.inc:141
 msgid "Operator"
 msgstr ""
 
-#: ../../templates/show_search.inc:126
-msgid "OR"
-msgstr ""
-
-#: ../../templates/show_search.inc:127
+#: ../../templates/show_search.inc:145
 msgid "AND"
 msgstr ""
 
-#: ../../templates/show_search.inc:132
+#: ../../templates/show_search.inc:150
 msgid "Method"
 msgstr ""
 
-#: ../../templates/show_search.inc:135
+#: ../../templates/show_search.inc:153
 msgid "Fuzzy"
 msgstr ""
 
-#: ../../templates/show_search.inc:136
+#: ../../templates/show_search.inc:154
 msgid "Exact"
 msgstr ""
 
-#: ../../templates/show_search.inc:139
+#: ../../templates/show_search.inc:157
 msgid "Maxium Results"
 msgstr ""
 
-#: ../../templates/show_search.inc:142
+#: ../../templates/show_search.inc:160
 msgid "Unlimited"
 msgstr ""
 
-#: ../../templates/show_search.inc:154
+#: ../../templates/show_search.inc:172
 msgid "Reset Form"
 msgstr ""
 
-#: ../../templates/show_artist.inc:31
-msgid "Albums by"
-msgstr ""
-
-#: ../../templates/show_artist.inc:33
-msgid "Show All Songs By"
-msgstr ""
-
-#: ../../templates/show_artist.inc:34
-msgid "Play All Songs By"
-msgstr ""
-
-#: ../../templates/show_artist.inc:35
-msgid "Play Random Songs By"
-msgstr ""
-
-#: ../../templates/show_artist.inc:49
-msgid "Select"
-msgstr ""
-
-#: ../../templates/show_artist.inc:51
-msgid "Cover"
+#: ../../templates/show_search.inc:184
+msgid "Save Search As Track on"
 msgstr ""
 
-#: ../../templates/show_artist.inc:52
-msgid "Album Name"
-msgstr ""
-
-#: ../../templates/show_artist.inc:53
-msgid "Album Year"
+#: ../../templates/show_search.inc:186
+msgid "Save"
 msgstr ""
 
-#: ../../templates/show_artist.inc:54
-msgid "Total Tracks"
-msgstr ""
-
-#: ../../templates/show_mpdplay.inc:38
+#: ../../templates/show_mpdplay.inc:39
 msgid "MPD Play Control"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:71
+#: ../../templates/show_mpdplay.inc:100
 msgid "Loop"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:78 ../../templates/show_mpdplay.inc:91
+#: ../../templates/show_mpdplay.inc:107 ../../templates/show_mpdplay.inc:120
 msgid "On"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:79 ../../templates/show_mpdplay.inc:92
+#: ../../templates/show_mpdplay.inc:108 ../../templates/show_mpdplay.inc:121
 msgid "Off"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:109
+#: ../../templates/show_mpdplay.inc:134
 msgid "Now Playing :"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:133
+#: ../../templates/show_mpdplay.inc:163
 msgid "On Deck "
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:133
+#: ../../templates/show_mpdplay.inc:163
 msgid "(in "
 msgstr ""
 
-#: ../../templates/show_mpdpl.inc:44
-msgid "MPD Server Playlist"
-msgstr ""
-
-#: ../../templates/show_mpdpl.inc:46 ../../templates/show_mpdpl.inc:184
-msgid "Refresh the Playlist Window"
-msgstr ""
-
-#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:186
-msgid "Click to shuffle (randomize) the playlist"
-msgstr ""
-
-#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:186
-msgid "shuffle"
-msgstr ""
-
-#: ../../templates/show_mpdpl.inc:49 ../../templates/show_mpdpl.inc:187
-msgid "Click to the clear the playlist"
-msgstr ""
-
-#: ../../templates/show_mpdpl.inc:53 ../../templates/show_mpdpl.inc:191
-msgid "Click to the remove all except the Now Playing"
-msgstr ""
-
-#: ../../templates/show_uploads.inc:33
-msgid "Status"
-msgstr ""
-
-#: ../../templates/show_uploads.inc:42
-msgid "User"
-msgstr ""
-
-#: ../../templates/show_uploads.inc:43
-msgid "Date"
-msgstr ""
-
-#: ../../templates/show_uploads.inc:49
-msgid "Add"
+#: ../../templates/show_artist.inc:36
+msgid "Select"
 msgstr ""
 
-#: ../../templates/show_search_bar.inc:42
-msgid "Song Title"
+#: ../../templates/show_artist.inc:38
+msgid "Cover"
 msgstr ""
 
-#: ../../templates/show_search_bar.inc:45
-msgid "Song Genre"
+#: ../../templates/show_artist.inc:39
+msgid "Album Name"
 msgstr ""
 
-#: ../../templates/show_search_bar.inc:46
-msgid "Song Year"
+#: ../../templates/show_artist.inc:40
+msgid "Album Year"
 msgstr ""
 
-#: ../../templates/show_search_bar.inc:47
-msgid "Minimum Bitrate"
+#: ../../templates/show_artist.inc:41
+msgid "Total Tracks"
 msgstr ""
 
-#: ../../templates/show_random_play.inc:58
-msgid "Standard"
+#: ../../templates/show_big_art.inc:31
+msgid "Album Art"
 msgstr ""
 
-#: ../../templates/show_random_play.inc:61
-msgid "Full Artist"
+#: ../../templates/show_big_art.inc:35
+msgid "Click to close window"
 msgstr ""
diff -urN ampache-3.3.2-alpha4/locale/de_DE/LC_MESSAGES/messages.po ampache-3.3.2-beta1/locale/de_DE/LC_MESSAGES/messages.po
--- ampache-3.3.2-alpha4/locale/de_DE/LC_MESSAGES/messages.po	2005-12-27 01:32:54.000000000 -0800
+++ ampache-3.3.2-beta1/locale/de_DE/LC_MESSAGES/messages.po	2006-01-08 23:06:12.000000000 -0800
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-14 16:23-0700\n"
+"POT-Creation-Date: 2006-01-07 22:47-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,139 +20,222 @@
 msgid "Session Expired: please log in again at"
 msgstr ""
 
-#: ../../lib/preferences.php:211 ../../templates/show_users.inc:97
-msgid "Enable"
+#: ../../lib/class/catalog.class.php:281 ../../lib/class/catalog.class.php:566
+#: ../../lib/class/album.class.php:263
+msgid "Error: Unable to open"
 msgstr ""
 
-#: ../../lib/preferences.php:212 ../../templates/show_users.inc:100
-msgid "Disable"
+#: ../../lib/class/catalog.class.php:304
+msgid "Error: Unable to change to directory"
 msgstr ""
 
-#: ../../lib/preferences.php:224 ../../templates/add_catalog.inc:60
-msgid "Local"
-msgstr "Lokal"
+#: ../../lib/class/catalog.class.php:330
+msgid "Error: Unable to get filesize for"
+msgstr ""
 
-#: ../../lib/preferences.php:227
-msgid "Stream"
+#: ../../lib/class/catalog.class.php:365
+msgid "Added"
 msgstr ""
 
-#: ../../lib/preferences.php:230
-msgid "IceCast"
+#: ../../lib/class/catalog.class.php:377
+msgid "is not readable by ampache"
 msgstr ""
 
-#: ../../lib/preferences.php:233
-msgid "Downsample"
+#: ../../lib/class/catalog.class.php:441
+msgid "Found in ID3"
 msgstr ""
 
-#: ../../lib/preferences.php:236
-msgid "Music Player Daemon"
+#: ../../lib/class/catalog.class.php:445
+msgid "Found on Amazon"
 msgstr ""
 
-#: ../../lib/preferences.php:239
-msgid "SlimServer"
+#: ../../lib/class/catalog.class.php:449
+msgid "Found in Folder"
 msgstr ""
 
-#: ../../lib/preferences.php:248
-msgid "M3U"
+#: ../../lib/class/catalog.class.php:453
+#, fuzzy
+msgid "Found"
+msgstr "Schrift"
+
+#: ../../lib/class/catalog.class.php:456
+msgid "Not Found"
 msgstr ""
 
-#: ../../lib/preferences.php:249
-msgid "Simple M3U"
+#: ../../lib/class/catalog.class.php:464
+#, fuzzy
+msgid "Searched"
+msgstr "Suchen"
+
+#: ../../lib/class/catalog.class.php:622
+#, fuzzy
+msgid "Starting Dump Album Art"
+msgstr "Cover finden"
+
+#: ../../lib/class/catalog.class.php:642
+msgid "Written"
 msgstr ""
 
-#: ../../lib/preferences.php:250
-msgid "PLS"
+#: ../../lib/class/catalog.class.php:651
+msgid "Error unable to open file for writting"
 msgstr ""
 
-#: ../../lib/preferences.php:251
-msgid "Asx"
+#: ../../lib/class/catalog.class.php:658
+#, fuzzy
+msgid "Album Art Dump Complete"
+msgstr "Album Jahr"
+
+#: ../../lib/class/catalog.class.php:659 ../../artists.php:64
+#: ../../albums.php:153
+msgid "Return"
 msgstr ""
 
-#: ../../lib/preferences.php:258
-msgid "English"
+#: ../../lib/class/catalog.class.php:728
+msgid "Starting Catalog Build"
 msgstr ""
 
-#: ../../lib/preferences.php:259
-msgid "British English"
+#: ../../lib/class/catalog.class.php:733
+msgid "Running Remote Sync"
 msgstr ""
 
-#: ../../lib/preferences.php:260
-msgid "German"
+#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:904
+#, fuzzy
+msgid "Added Playlist From"
+msgstr "Playlist"
+
+#: ../../lib/class/catalog.class.php:752 ../../lib/class/catalog.class.php:913
+#: ../../admin/catalog.php:258
+#, fuzzy
+msgid "Starting Album Art Search"
+msgstr "Album Jahr"
+
+#: ../../lib/class/catalog.class.php:762
+#, fuzzy
+msgid "Catalog Finished"
+msgstr "Kataloggröße"
+
+#: ../../lib/class/catalog.class.php:762 ../../lib/class/catalog.class.php:932
+#, fuzzy
+msgid "Total Time"
+msgstr "Katalog Spielzeit"
+
+#: ../../lib/class/catalog.class.php:762 ../../lib/class/catalog.class.php:933
+#, fuzzy
+msgid "Total Songs"
+msgstr "Alle Lieder"
+
+#: ../../lib/class/catalog.class.php:763 ../../lib/class/catalog.class.php:933
+msgid "Songs Per Seconds"
 msgstr ""
 
-#: ../../lib/preferences.php:261
-msgid "French"
+#: ../../lib/class/catalog.class.php:797
+#: ../../lib/class/catalog.class.php:1512
+#, fuzzy
+msgid "Updated"
+msgstr "Schnelles Aktualisieren"
+
+#: ../../lib/class/catalog.class.php:804
+msgid "No Update Needed"
 msgstr ""
 
-#: ../../lib/preferences.php:262
-msgid "Turkish"
+#: ../../lib/class/catalog.class.php:885
+msgid "Starting New Song Search on"
 msgstr ""
 
-#: ../../lib/preferences.php:263
-msgid "Spanish"
+#: ../../lib/class/catalog.class.php:885
+#, fuzzy
+msgid "catalog"
+msgstr "Katalog"
+
+#: ../../lib/class/catalog.class.php:889
+msgid "Running Remote Update"
 msgstr ""
 
-#: ../../lib/preferences.php:264
-msgid "Norwegian"
+#: ../../lib/class/catalog.class.php:932
+#, fuzzy
+msgid "Catalog Update Finished"
+msgstr "Katalogstatistik"
+
+#: ../../lib/class/catalog.class.php:952 ../../lib/mpd.php:43
+#: ../../lib/mpd.php:52 ../../albums.php:74
+#, fuzzy
+msgid "Error"
+msgstr "Fehler-Farbe"
+
+#: ../../lib/class/catalog.class.php:952
+msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
 msgstr ""
 
-#: ../../lib/preferences.php:265
-msgid "Simplified Chinese"
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
+msgid "Error connecting to"
 msgstr ""
 
-#: ../../lib/duplicates.php:80
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
 #, fuzzy
-msgid "Find Duplicates"
-msgstr "Doppelte Songs anzeigen"
-
-#: ../../lib/duplicates.php:83 ../../templates/show_search.inc:74
-msgid "Search Type"
-msgstr "Suchart"
+msgid "Code"
+msgstr "Demo Modus"
 
-#: ../../lib/duplicates.php:91 ../../lib/class/song.class.php:275
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
 #, fuzzy
-msgid "Title"
-msgstr "Seitentitel"
+msgid "Reason"
+msgstr "Lied"
+
+#: ../../lib/class/catalog.class.php:1007
+msgid "Completed updating remote catalog(s)"
+msgstr ""
 
-#: ../../lib/duplicates.php:97
+#: ../../lib/class/catalog.class.php:1138
+msgid "Checking"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:1196
 #, fuzzy
-msgid "Artist and Title"
-msgstr "Interpret Cache Begrenzung"
+msgid "Catalog Clean Done"
+msgstr "Katalogname"
 
-#: ../../lib/duplicates.php:102
-msgid "Artist, Album and Title"
+#: ../../lib/class/catalog.class.php:1196
+msgid "files removed"
 msgstr ""
 
-#: ../../lib/duplicates.php:110 ../../templates/menu.inc:39
-#: ../../templates/show_search.inc:37 ../../templates/show_search.inc:83
-#: ../../templates/show_search_bar.inc:71
-msgid "Search"
-msgstr "Suchen"
+#: ../../lib/class/catalog.class.php:1469
+msgid "Updating the"
+msgstr ""
 
-#: ../../lib/general.lib.php:640
-msgid "Not Enough Data"
+#: ../../lib/class/catalog.class.php:1469 ../../templates/sidebar.inc.php:31
+#, fuzzy
+msgid "Catalog"
+msgstr "Katalog"
+
+#: ../../lib/class/catalog.class.php:1470
+msgid "songs found checking tag information."
 msgstr ""
 
-#: ../../lib/search.php:52 ../../lib/search.php:68 ../../lib/search.php:84
-#: ../../lib/search.php:100 ../../lib/search.php:116 ../../lib/search.php:133
-#: ../../lib/search.php:145 ../../lib/search.php:161 ../../lib/search.php:177
+#: ../../lib/class/catalog.class.php:1520
+msgid " FOUND"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:1521
 #, fuzzy
-msgid "No Results Found"
-msgstr "Keine Dateileichen gefunden"
+msgid "Searching for new Album Art"
+msgstr "Cover finden"
 
-#: ../../lib/class/genre.class.php:278
+#: ../../lib/class/catalog.class.php:1525
 #, fuzzy
-msgid "Show Genres starting with"
-msgstr "(<u>S</u>) Zeige Interpreten mit folgendem Beginn"
+msgid "Album Art Already Found"
+msgstr "Album Jahr"
 
-#: ../../lib/class/album.class.php:126
-msgid "Various"
+#: ../../lib/class/artist.class.php:223
+msgid "Error: Name Identical"
 msgstr ""
 
-#: ../../lib/class/album.class.php:241 ../../lib/class/catalog.class.php:275
-#: ../../lib/class/catalog.class.php:560
-msgid "Error: Unable to open"
-msgstr ""
+#: ../../lib/class/song.class.php:275 ../../lib/duplicates.php:113
+#: ../../templates/show_search.inc:66
+#, fuzzy
+msgid "Title"
+msgstr "Seitentitel"
 
 #: ../../lib/class/song.class.php:275 ../../lib/class/song.class.php:279
 #: ../../lib/class/song.class.php:283 ../../lib/class/song.class.php:287
@@ -164,8 +247,8 @@
 msgid "updated to"
 msgstr "Katalog aktualisieren"
 
-#: ../../lib/class/song.class.php:279 ../../templates/show_songs.inc:39
-#: ../../templates/show_uploads.inc:39
+#: ../../lib/class/song.class.php:279 ../../templates/show_uploads.inc:39
+#: ../../templates/show_songs.inc:47 ../../templates/list_duplicates.inc:36
 msgid "Bitrate"
 msgstr "Bitrate"
 
@@ -179,13 +262,13 @@
 msgid "Mode"
 msgstr "Demo Modus"
 
-#: ../../lib/class/song.class.php:291 ../../templates/show_songs.inc:37
-#: ../../templates/show_mpdpl.inc:66 ../../templates/show_uploads.inc:38
+#: ../../lib/class/song.class.php:291 ../../templates/show_uploads.inc:38
+#: ../../templates/show_mpdpl.inc:66 ../../templates/show_songs.inc:45
 msgid "Time"
 msgstr "Dauer"
 
-#: ../../lib/class/song.class.php:295 ../../templates/show_songs.inc:32
-#: ../../templates/show_songs.inc:36 ../../templates/show_mpdpl.inc:65
+#: ../../lib/class/song.class.php:295 ../../templates/show_mpdpl.inc:65
+#: ../../templates/show_songs.inc:39 ../../templates/show_songs.inc:44
 msgid "Track"
 msgstr "Lied"
 
@@ -193,35 +276,42 @@
 msgid "Filesize"
 msgstr ""
 
-#: ../../lib/class/song.class.php:304 ../../templates/show_artists.inc:39
-#: ../../templates/show_artists.inc:62 ../../templates/show_songs.inc:34
-#: ../../templates/show_albums.inc:40 ../../templates/show_albums.inc:70
-#: ../../templates/show_mpdpl.inc:63 ../../templates/show_uploads.inc:35
+#: ../../lib/class/song.class.php:304
+#: ../../templates/show_get_albumart.inc.php:33
+#: ../../templates/show_uploads.inc:35 ../../templates/show_mpdpl.inc:63
+#: ../../templates/show_songs.inc:42 ../../templates/show_artists.inc:39
+#: ../../templates/show_artists.inc:62 ../../templates/show_albums.inc:40
+#: ../../templates/show_albums.inc:70 ../../templates/list_duplicates.inc:33
+#: ../../templates/show_search.inc:71
 msgid "Artist"
 msgstr "Interpret"
 
-#: ../../lib/class/song.class.php:309 ../../templates/show_songs.inc:35
-#: ../../templates/show_albums.inc:38 ../../templates/show_albums.inc:68
-#: ../../templates/show_mpdpl.inc:64 ../../templates/show_uploads.inc:36
+#: ../../lib/class/song.class.php:309
+#: ../../templates/show_get_albumart.inc.php:41
+#: ../../templates/show_uploads.inc:36 ../../templates/show_mpdpl.inc:64
+#: ../../templates/show_songs.inc:43 ../../templates/show_albums.inc:38
+#: ../../templates/show_albums.inc:68 ../../templates/list_duplicates.inc:34
+#: ../../templates/show_search.inc:78
 msgid "Album"
 msgstr "Album"
 
 #: ../../lib/class/song.class.php:313 ../../templates/show_albums.inc:43
-#: ../../templates/show_albums.inc:73
+#: ../../templates/show_albums.inc:73 ../../templates/show_search.inc:90
 #, fuzzy
 msgid "Year"
 msgstr "Jahr"
 
-#: ../../lib/class/song.class.php:317 ../../templates/list_flagged.inc:46
-#: ../../templates/flag.inc:66
+#: ../../lib/class/song.class.php:317 ../../templates/flag.inc:66
+#: ../../templates/list_flagged.inc:46
 #, fuzzy
 msgid "Comment"
 msgstr "id3-Kommentar"
 
-#: ../../lib/class/song.class.php:322 ../../templates/show_genres.inc.php:36
-#: ../../templates/show_genre.inc.php:32 ../../templates/show_songs.inc:40
-#: ../../templates/show_browse_menu.inc:37 ../../templates/show_mpdpl.inc:67
-#: ../../templates/show_uploads.inc:37
+#: ../../lib/class/song.class.php:322 ../../templates/show_genre.inc.php:32
+#: ../../templates/show_genres.inc.php:36 ../../templates/sidebar.inc.php:37
+#: ../../templates/show_uploads.inc:37 ../../templates/show_mpdpl.inc:67
+#: ../../templates/show_songs.inc:48 ../../templates/show_browse_menu.inc:37
+#: ../../templates/show_search.inc:83
 msgid "Genre"
 msgstr "Genre"
 
@@ -241,211 +331,194 @@
 msgid "Closed after write"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:298
-msgid "Error: Unable to change to directory"
-msgstr ""
+#: ../../lib/class/genre.class.php:278
+#, fuzzy
+msgid "Show Genres starting with"
+msgstr "(<u>S</u>) Zeige Interpreten mit folgendem Beginn"
 
-#: ../../lib/class/catalog.class.php:321
-msgid "Error: Unable to get filesize for"
+#: ../../lib/class/album.class.php:151
+msgid "Various"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:340
+#: ../../lib/duplicates.php:102
 #, fuzzy
-msgid "Added Playlist From"
-msgstr "Playlist"
+msgid "Find Duplicates"
+msgstr "Doppelte Songs anzeigen"
 
-#: ../../lib/class/catalog.class.php:359
-msgid "Added"
-msgstr ""
+#: ../../lib/duplicates.php:105
+msgid "Search Type"
+msgstr "Suchart"
 
-#: ../../lib/class/catalog.class.php:371
-msgid "is not readable by ampache"
-msgstr ""
+#: ../../lib/duplicates.php:119
+#, fuzzy
+msgid "Artist and Title"
+msgstr "Interpret Cache Begrenzung"
 
-#: ../../lib/class/catalog.class.php:435
-msgid "Found in ID3"
+#: ../../lib/duplicates.php:124
+msgid "Artist, Album and Title"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:439
-msgid "Found on Amazon"
+#: ../../lib/duplicates.php:132 ../../templates/sidebar.inc.php:97
+#: ../../templates/sidebar.inc.php:103 ../../templates/show_search_bar.inc:41
+#: ../../templates/menu.inc:39 ../../templates/show_search.inc:171
+msgid "Search"
+msgstr "Suchen"
+
+#: ../../lib/preferences.php:252 ../../templates/show_users.inc:118
+msgid "Enable"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:443
-msgid "Found in Folder"
+#: ../../lib/preferences.php:253 ../../templates/show_users.inc:121
+#: ../../templates/list_duplicates.inc:31
+msgid "Disable"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:447
-#, fuzzy
-msgid "Found"
-msgstr "Schrift"
+#: ../../lib/preferences.php:265 ../../templates/add_catalog.inc:61
+msgid "Local"
+msgstr "Lokal"
 
-#: ../../lib/class/catalog.class.php:450
-msgid "Not Found"
+#: ../../lib/preferences.php:268
+msgid "Stream"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:458
-#, fuzzy
-msgid "Searched"
-msgstr "Suchen"
+#: ../../lib/preferences.php:271
+msgid "IceCast"
+msgstr ""
 
-#: ../../lib/class/catalog.class.php:613
-#, fuzzy
-msgid "Starting Dump Album Art"
-msgstr "Cover finden"
+#: ../../lib/preferences.php:274
+msgid "Downsample"
+msgstr ""
 
-#: ../../lib/class/catalog.class.php:633
-msgid "Written"
+#: ../../lib/preferences.php:277
+msgid "Music Player Daemon"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:642
-msgid "Error unable to open file for writting"
+#: ../../lib/preferences.php:280
+msgid "SlimServer"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:649
-#, fuzzy
-msgid "Album Art Dump Complete"
-msgstr "Album Jahr"
+#: ../../lib/preferences.php:289
+msgid "M3U"
+msgstr ""
 
-#: ../../lib/class/catalog.class.php:650 ../../artists.php:63
-#: ../../albums.php:112
-msgid "Return"
+#: ../../lib/preferences.php:290
+msgid "Simple M3U"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:719
-msgid "Starting Catalog Build"
+#: ../../lib/preferences.php:291
+msgid "PLS"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:724
-msgid "Running Remote Sync"
+#: ../../lib/preferences.php:292
+msgid "Asx"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:734 ../../lib/class/catalog.class.php:880
-#: ../../admin/catalog.php:264
-#, fuzzy
-msgid "Starting Album Art Search"
-msgstr "Album Jahr"
+#: ../../lib/preferences.php:293
+msgid "RAM"
+msgstr ""
 
-#: ../../lib/class/catalog.class.php:744
-#, fuzzy
-msgid "Catalog Finished"
-msgstr "Kataloggröße"
+#: ../../lib/mpd.php:43 ../../lib/mpd.php:52
+msgid "Could not add"
+msgstr ""
 
-#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:899
-#, fuzzy
-msgid "Total Time"
-msgstr "Katalog Spielzeit"
+#: ../../lib/general.lib.php:675
+msgid "Not Enough Data"
+msgstr ""
 
-#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:900
-#, fuzzy
-msgid "Total Songs"
-msgstr "Alle Lieder"
+#: ../../lib/general.lib.php:897 ../../lib/general.lib.php:908
+msgid "English"
+msgstr ""
 
-#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:900
-msgid "Songs Per Seconds"
+#: ../../lib/general.lib.php:907
+msgid "German"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:779
-#: ../../lib/class/catalog.class.php:1476
-#, fuzzy
-msgid "Updated"
-msgstr "Schnelles Aktualisieren"
+#: ../../lib/general.lib.php:909
+msgid "British English"
+msgstr ""
 
-#: ../../lib/class/catalog.class.php:786
-msgid "No Update Needed"
+#: ../../lib/general.lib.php:910
+msgid "Spanish"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:860
-msgid "Starting New Song Search on"
+#: ../../lib/general.lib.php:911
+msgid "French"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:860
-#, fuzzy
-msgid "catalog"
-msgstr "Katalog"
+#: ../../lib/general.lib.php:912
+msgid "Italian"
+msgstr ""
 
-#: ../../lib/class/catalog.class.php:864
-msgid "Running Remote Update"
+#: ../../lib/general.lib.php:913
+msgid "Dutch"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:899
-#, fuzzy
-msgid "Catalog Update Finished"
-msgstr "Katalogstatistik"
+#: ../../lib/general.lib.php:914
+msgid "Turkish"
+msgstr ""
 
-#: ../../lib/class/catalog.class.php:919 ../../lib/mpd.php:40
-#: ../../lib/mpd.php:49
-#, fuzzy
-msgid "Error"
-msgstr "Fehler-Farbe"
+#: ../../lib/general.lib.php:915
+msgid "Simplified Chinese"
+msgstr ""
 
-#: ../../lib/class/catalog.class.php:919
-msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
+#: ../../lib/general.lib.php:916
+msgid "Unknown"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
-msgid "Error connecting to"
+#: ../../lib/ui.lib.php:222
+msgid "Error Access Denied"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
-#, fuzzy
-msgid "Code"
-msgstr "Demo Modus"
-
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
-#, fuzzy
-msgid "Reason"
-msgstr "Lied"
-
-#: ../../lib/class/catalog.class.php:974
-msgid "Completed updating remote catalog(s)"
-msgstr ""
-
-#: ../../lib/class/catalog.class.php:1105
-msgid "Checking"
+#: ../../lib/ui.lib.php:299 ../../templates/sidebar.inc.php:69
+#: ../../templates/header.inc:51 ../../templates/menu.inc:35
+msgid "Browse"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1163
+#: ../../lib/ui.lib.php:301
 #, fuzzy
-msgid "Catalog Clean Done"
-msgstr "Katalogname"
+msgid "Show w/o art"
+msgstr "Zeige Alle"
 
-#: ../../lib/class/catalog.class.php:1163
-msgid "files removed"
-msgstr ""
+#: ../../lib/ui.lib.php:304
+msgid "Show all"
+msgstr "Zeige Alle"
 
-#: ../../lib/class/catalog.class.php:1436
-msgid "Updating the"
-msgstr ""
+#: ../../lib/ui.lib.php:721
+#, fuzzy
+msgid "No Catalogs Found!"
+msgstr "Keine Dateileichen gefunden"
 
-#: ../../lib/class/catalog.class.php:1436 ../../templates/admin_menu.inc:35
+#: ../../lib/ui.lib.php:722 ../../templates/add_catalog.inc:29
 #, fuzzy
-msgid "Catalog"
-msgstr "Katalog"
+msgid "Add a Catalog"
+msgstr "Katalog hinzufügen"
 
-#: ../../lib/class/catalog.class.php:1437
-msgid "songs found checking tag information."
-msgstr ""
+#: ../../lib/ui.lib.php:723 ../../templates/show_local_catalog_info.inc.php:7
+msgid "Catalog Statistics"
+msgstr "Katalogstatistik"
 
-#: ../../lib/class/catalog.class.php:1484
-msgid " FOUND"
-msgstr ""
+#: ../../lib/ui.lib.php:759
+msgid "day"
+msgstr "Tag"
 
-#: ../../lib/class/catalog.class.php:1485
-#, fuzzy
-msgid "Searching for new Album Art"
-msgstr "Cover finden"
+#: ../../lib/ui.lib.php:759
+msgid "days"
+msgstr "Tage"
 
-#: ../../lib/class/catalog.class.php:1489
-#, fuzzy
-msgid "Album Art Already Found"
-msgstr "Album Jahr"
+#: ../../lib/ui.lib.php:761
+msgid "hour"
+msgstr "Stunde"
 
-#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
-msgid "Could not add"
-msgstr ""
+#: ../../lib/ui.lib.php:761
+msgid "hours"
+msgstr "Stunden"
+
+#: ../../lib/ui.lib.php:1053 ../../templates/sidebar.inc.php:128
+#: ../../templates/show_random_play_bar.inc.php:45
+#: ../../templates/show_artists.inc:55 ../../templates/show_random_play.inc:46
+#: ../../templates/show_albums.inc:58
+msgid "All"
+msgstr "Alle"
 
 #: ../../lib/Browser.php:867
 #, fuzzy
@@ -478,145 +551,66 @@
 "There was a problem with the file upload: The %s was only partially uploaded."
 msgstr ""
 
-#: ../../lib/ui.lib.php:199
-#, fuzzy
-msgid "Playlist Actions"
-msgstr "Playlists"
-
-#: ../../lib/ui.lib.php:199
-msgid "New"
-msgstr "Neu"
-
-#: ../../lib/ui.lib.php:200
-msgid "View All"
-msgstr "Alle ansehen"
-
-#: ../../lib/ui.lib.php:201
-msgid "Import"
-msgstr ""
-
-#: ../../lib/ui.lib.php:301 ../../templates/menu.inc:35
-msgid "Browse"
-msgstr ""
-
-#: ../../lib/ui.lib.php:303
-#, fuzzy
-msgid "Show w/o art"
-msgstr "Zeige Alle"
-
-#: ../../lib/ui.lib.php:306
-msgid "Show all"
-msgstr "Zeige Alle"
-
-#: ../../lib/ui.lib.php:446
-msgid "No songs in this playlist."
-msgstr ""
-
-#: ../../lib/ui.lib.php:592
-#, fuzzy
-msgid "No Catalogs Found!"
-msgstr "Keine Dateileichen gefunden"
-
-#: ../../lib/ui.lib.php:593 ../../templates/add_catalog.inc:28
-#, fuzzy
-msgid "Add a Catalog"
-msgstr "Katalog hinzufügen"
-
-#: ../../lib/ui.lib.php:594 ../../templates/show_local_catalog_info.inc.php:7
-msgid "Catalog Statistics"
-msgstr "Katalogstatistik"
-
-#: ../../lib/ui.lib.php:630
-msgid "day"
-msgstr "Tag"
-
-#: ../../lib/ui.lib.php:630
-msgid "days"
-msgstr "Tage"
-
-#: ../../lib/ui.lib.php:632
-msgid "hour"
-msgstr "Stunde"
-
-#: ../../lib/ui.lib.php:632
-msgid "hours"
-msgstr "Stunden"
-
-#: ../../lib/upload.php:225
+#: ../../lib/upload.php:228
 msgid "The file uploaded successfully"
 msgstr ""
 
-#: ../../lib/upload.php:226
+#: ../../lib/upload.php:229
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ../../lib/upload.php:227
+#: ../../lib/upload.php:230
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ../../lib/upload.php:228
+#: ../../lib/upload.php:231
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ../../lib/upload.php:229
+#: ../../lib/upload.php:232
 msgid "No file was uploaded"
 msgstr ""
 
-#: ../../lib/upload.php:230
+#: ../../lib/upload.php:233
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ../../modules/lib.php:708
-msgid "Public"
-msgstr "öffentliche"
-
-#: ../../modules/lib.php:709
-msgid "Your Private"
-msgstr "Deine private"
-
-#: ../../modules/lib.php:710
-msgid "Other Private"
-msgstr "Andere private"
+#: ../../lib/rating.lib.php:55
+#, fuzzy
+msgid "Don't Play"
+msgstr "Lokal"
 
-#: ../../modules/lib.php:791 ../../templates/show_play_selected.inc.php:72
-msgid "View"
-msgstr "Anschauen"
+#: ../../lib/rating.lib.php:58
+msgid "It's Pretty Bad"
+msgstr ""
 
-#: ../../modules/lib.php:794 ../../templates/show_play_selected.inc.php:73
-#: ../../templates/show_users.inc:52 ../../templates/show_users.inc:86
-msgid "Edit"
-msgstr "Editieren"
+#: ../../lib/rating.lib.php:61
+msgid "It's Ok"
+msgstr ""
 
-#: ../../modules/lib.php:795 ../../templates/catalog.inc:60
-#: ../../templates/show_users.inc:61 ../../templates/show_uploads.inc:50
-msgid "Delete"
-msgstr "Löschen"
+#: ../../lib/rating.lib.php:64
+msgid "It's Pretty Good"
+msgstr ""
 
-#: ../../modules/lib.php:803 ../../templates/show_genres.inc.php:48
-#: ../../templates/show_localplay.inc:41 ../../templates/show_artists.inc:54
-#: ../../templates/show_albums.inc:57 ../../templates/show_artist.inc:78
-#: ../../templates/show_mpdplay.inc:50
-msgid "Play"
-msgstr "Abspielen"
+#: ../../lib/rating.lib.php:67
+msgid "I Love It!"
+msgstr ""
 
-#: ../../modules/lib.php:804 ../../templates/show_artists.inc:56
-#: ../../templates/show_albums.inc:59 ../../templates/show_mpdplay.inc:85
-msgid "Random"
-msgstr "Zufällig"
+#: ../../lib/rating.lib.php:70
+msgid "It's Insane"
+msgstr ""
 
-#: ../../modules/lib.php:810 ../../templates/show_songs.inc:110
-#: ../../templates/show_album.inc:61 ../../templates/show_albums.inc:61
-#: ../../templates/show_artist.inc:80
-msgid "Download"
-msgstr "Download"
+#: ../../lib/rating.lib.php:74
+msgid "Off the Charts!"
+msgstr ""
 
-#: ../../modules/lib.php:821
-msgid "There are no playlists of this type"
-msgstr "Keine Playliste von diesem Typ verhanden"
+#: ../../lib/playlist.lib.php:73
+msgid "No songs in this playlist."
+msgstr ""
 
-#: ../../modules/lib.php:856
+#: ../../modules/lib.php:537
 msgid "Create a new playlist"
 msgstr "Neue Playlist erstellen"
 
@@ -630,189 +624,160 @@
 msgid "Add a new user"
 msgstr "Rechner hinzufügen"
 
-#: ../../admin/catalog.php:55 ../../templates/catalog.inc:66
+#: ../../admin/catalog.php:49 ../../templates/catalog.inc:63
 msgid "Add to Catalog(s)"
 msgstr "Zu Katalog hinzufügen"
 
-#: ../../admin/catalog.php:66 ../../templates/catalog.inc:67
+#: ../../admin/catalog.php:60 ../../templates/catalog.inc:64
 msgid "Add to all Catalogs"
 msgstr "Zu allen Katalogen hinzufügen"
 
-#: ../../admin/catalog.php:75
+#: ../../admin/catalog.php:69
 #, fuzzy
 msgid "Error Connecting"
 msgstr "Datenbank Verbindung"
 
-#: ../../admin/catalog.php:89 ../../templates/catalog.inc:73
+#: ../../admin/catalog.php:83 ../../templates/catalog.inc:70
 msgid "Update Catalog(s)"
 msgstr "Katalog(e) aktualisieren"
 
-#: ../../admin/catalog.php:100 ../../templates/catalog.inc:74
+#: ../../admin/catalog.php:94 ../../templates/catalog.inc:71
 msgid "Update All Catalogs"
 msgstr "Alle Kataloge aktualisieren"
 
-#: ../../admin/catalog.php:132 ../../templates/catalog.inc:80
+#: ../../admin/catalog.php:126 ../../templates/catalog.inc:77
 msgid "Clean Catalog(s)"
 msgstr "Katalog säubern"
 
-#: ../../admin/catalog.php:162 ../../templates/catalog.inc:81
+#: ../../admin/catalog.php:156 ../../templates/catalog.inc:78
 msgid "Clean All Catalogs"
 msgstr "Alle Kataloge säubern"
 
-#: ../../admin/catalog.php:211
+#: ../../admin/catalog.php:206
 msgid "Now Playing Cleared"
 msgstr "Zur Zeit gespielte Liederliste geleert"
 
-#: ../../admin/catalog.php:211
+#: ../../admin/catalog.php:206
 msgid "All now playing data has been cleared"
 msgstr "Übersicht der aktuell abspielenden Lieder geleert"
 
-#: ../../admin/catalog.php:216
+#: ../../admin/catalog.php:211
 msgid "Do you really want to clear your catalog?"
 msgstr "Wollen sie wirklich den Katalog leeren?"
 
-#: ../../admin/catalog.php:223
+#: ../../admin/catalog.php:218
 msgid "Do you really want to clear the statistics for this catalog?"
 msgstr "Wollen sie wirklich die Katalogstatistik leeren?"
 
-#: ../../admin/catalog.php:241
+#: ../../admin/catalog.php:235
 msgid "Do you really want to delete this catalog?"
 msgstr "Wollen sie wirklich den Katalog löschen?"
 
-#: ../../admin/catalog.php:272
+#: ../../admin/catalog.php:266
 #, fuzzy
 msgid "Album Art Search Finished"
 msgstr "Album Jahr"
 
-#: ../../admin/users.php:76 ../../admin/users.php:122
+#: ../../admin/users.php:72 ../../admin/users.php:119
 msgid "Error Username Required"
 msgstr ""
 
-#: ../../admin/users.php:79 ../../admin/users.php:119
+#: ../../admin/users.php:75 ../../admin/users.php:115
 msgid "Error Passwords don't match"
 msgstr ""
 
-#: ../../admin/users.php:136
+#: ../../admin/users.php:124 ../../register.php:136
+msgid "Error Username already exists"
+msgstr ""
+
+#: ../../admin/users.php:145
 msgid "Are you sure you want to permanently delete"
 msgstr ""
 
-#: ../../admin/users.php:143 ../../templates/show_confirm_action.inc.php:29
+#: ../../admin/users.php:152 ../../templates/show_confirm_action.inc.php:29
+#: ../../templates/show_search.inc:107
 msgid "No"
 msgstr ""
 
-#: ../../admin/users.php:145
+#: ../../admin/users.php:154
 #, fuzzy
 msgid "User Deleted"
 msgstr "Eintrag gelöscht"
 
-#: ../../admin/users.php:148
+#: ../../admin/users.php:157
 #, fuzzy
 msgid "Delete Error"
 msgstr "Löschen"
 
-#: ../../admin/users.php:148
+#: ../../admin/users.php:157
 msgid "Unable to delete last Admin User"
 msgstr ""
 
-#: ../../admin/access.php:43
+#: ../../admin/access.php:40
 msgid "Do you really want to delete this Access Record?"
 msgstr "Wollen sie wirklich diesen Zugangs-Eintrag löschen?"
 
-#: ../../admin/access.php:51
+#: ../../admin/access.php:48
 msgid "Entry Deleted"
 msgstr "Eintrag gelöscht"
 
-#: ../../admin/access.php:51
+#: ../../admin/access.php:48
 msgid "Your Access List Entry has been removed"
 msgstr "Ein Zugangs-Eintrag wurde gelöscht"
 
-#: ../../admin/access.php:61
+#: ../../admin/access.php:58
 #, fuzzy
 msgid "Entry Added"
 msgstr "Eintrag gelöscht"
 
-#: ../../admin/access.php:61
+#: ../../admin/access.php:58
 msgid "Your new Access List Entry has been created"
 msgstr "Ein neuer Zugangs-Eintrag wurde erstellt"
 
-#: ../../admin/mail.php:98
+#: ../../admin/mail.php:94
 msgid "Mail to"
 msgstr ""
 
-#: ../../admin/mail.php:109
+#: ../../admin/mail.php:105
 #, fuzzy
 msgid "Subject"
 msgstr "Auswahl"
 
-#: ../../admin/mail.php:116
+#: ../../admin/mail.php:112
 msgid "Message"
 msgstr ""
 
-#: ../../admin/mail.php:126
+#: ../../admin/mail.php:122
 msgid "Send Mail"
 msgstr ""
 
-#: ../../admin/song.php:68
+#: ../../admin/song.php:65
 #, fuzzy
 msgid "Songs Disabled"
 msgstr "Songname"
 
-#: ../../admin/song.php:68
+#: ../../admin/song.php:65
 msgid "The requested song(s) have been disabled"
 msgstr ""
 
-#: ../../admin/song.php:78
+#: ../../admin/song.php:75
 #, fuzzy
 msgid "Songs Enabled"
 msgstr "Lieder gelöscht"
 
-#: ../../admin/song.php:78
+#: ../../admin/song.php:75
 msgid "The requested song(s) have been enabled"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:28
-#: ../../templates/show_install_account.inc.php:59
-#: ../../templates/userform.inc:40 ../../templates/show_users.inc:40
-#, fuzzy
-msgid "Username"
-msgstr "Benutzer"
-
-#: ../../templates/show_user_registration.inc.php:36
-#: ../../templates/userform.inc:48
-#, fuzzy
-msgid "Full Name"
-msgstr "Playlistenname"
-
-#: ../../templates/show_user_registration.inc.php:44
-#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:55
-msgid "E-mail"
-msgstr ""
-
-#: ../../templates/show_user_registration.inc.php:52
-#: ../../templates/show_install_account.inc.php:63
-#: ../../templates/userform.inc:63 ../../templates/show_login_form.inc:53
-msgid "Password"
-msgstr "Passwort"
-
-#: ../../templates/show_user_registration.inc.php:60
-#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
-#, fuzzy
-msgid "Confirm Password"
-msgstr "Passwort"
-
-#: ../../templates/show_user_registration.inc.php:69
-msgid "Register User"
-msgstr ""
-
 #: ../../templates/show_install_account.inc.php:35
 #: ../../templates/show_install_config.inc:35
-#: ../../templates/show_install.inc:34
+#: ../../templates/show_install.inc:35
 msgid "Ampache Installation"
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:37
 #: ../../templates/show_install_config.inc:37
-#: ../../templates/show_install.inc:36
+#: ../../templates/show_install.inc:37
 msgid ""
 "This Page handles the installation of the Ampache database and the creation "
 "of the ampache.cfg.php file. Before you continue please make sure that you "
@@ -821,7 +786,7 @@
 
 #: ../../templates/show_install_account.inc.php:40
 #: ../../templates/show_install_config.inc:40
-#: ../../templates/show_install.inc:39
+#: ../../templates/show_install.inc:40
 msgid ""
 "A MySQL Server with a username and password that can create/modify databases"
 msgstr ""
@@ -834,7 +799,7 @@
 
 #: ../../templates/show_install_account.inc.php:43
 #: ../../templates/show_install_config.inc:43
-#: ../../templates/show_install.inc:42
+#: ../../templates/show_install.inc:43
 msgid ""
 "Once you have ensured that you have the above requirements please fill out "
 "the information below. You will only be asked for the required config "
@@ -844,7 +809,7 @@
 
 #: ../../templates/show_install_account.inc.php:48
 #: ../../templates/show_install_config.inc:48
-#: ../../templates/show_install.inc:46
+#: ../../templates/show_install.inc:47
 msgid "Step 1 - Creating and Inserting the Ampache Database"
 msgstr ""
 
@@ -854,7 +819,7 @@
 
 #: ../../templates/show_install_account.inc.php:50
 #: ../../templates/show_install_config.inc:53
-#: ../../templates/show_install.inc:51
+#: ../../templates/show_install.inc:52
 msgid "Step 3 - Setup Initial Account"
 msgstr ""
 
@@ -864,12 +829,74 @@
 "account has been created you will be directed to the login page"
 msgstr ""
 
-#: ../../templates/show_install_account.inc.php:68
+#: ../../templates/show_install_account.inc.php:55
+#, fuzzy
+msgid "Create Admin Account"
+msgstr "Account"
+
+#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/show_user_registration.inc.php:109
+#: ../../templates/userform.inc:40 ../../templates/show_users.inc:43
+#, fuzzy
+msgid "Username"
+msgstr "Benutzer"
+
+#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/show_user_registration.inc.php:137
+#: ../../templates/userform.inc:63 ../../templates/show_login_form.inc:53
+msgid "Password"
+msgstr "Passwort"
+
+#: ../../templates/show_install_account.inc.php:69
 #, fuzzy
 msgid "Create Account"
 msgstr "Account"
 
+#: ../../templates/show_user_registration.inc.php:59
+msgid "Ampache New User Registration"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:74
+#, fuzzy
+msgid "User Agreement"
+msgstr "Benutzer"
+
+#: ../../templates/show_user_registration.inc.php:84
+#, fuzzy
+msgid "I Accept"
+msgstr "Account"
+
+#: ../../templates/show_user_registration.inc.php:101
+msgid "User Information"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:119
+#: ../../templates/userform.inc:48
+#, fuzzy
+msgid "Full Name"
+msgstr "Playlistenname"
+
+#: ../../templates/show_user_registration.inc.php:128
+#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:55
+msgid "E-mail"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:146
+#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
+#, fuzzy
+msgid "Confirm Password"
+msgstr "Passwort"
+
+#: ../../templates/show_user_registration.inc.php:166
+msgid "Clear Info"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:167
+msgid "Register User"
+msgstr ""
+
 #: ../../templates/show_confirm_action.inc.php:28
+#: ../../templates/show_search.inc:106
 msgid "Yes"
 msgstr ""
 
@@ -878,7 +905,8 @@
 msgstr ""
 
 #: ../../templates/show_import_playlist.inc.php:29
-#: ../../templates/show_uploads.inc:41
+#: ../../templates/show_uploads.inc:41 ../../templates/list_duplicates.inc:38
+#: ../../templates/show_search.inc:95
 #, fuzzy
 msgid "Filename"
 msgstr "Dateinamenmuster"
@@ -893,6 +921,36 @@
 msgid "Import Playlist"
 msgstr "Playlist"
 
+#: ../../templates/show_genre.inc.php:32
+#, fuzzy
+msgid "Viewing"
+msgstr "Anschauen"
+
+#: ../../templates/show_genre.inc.php:36 ../../templates/sidebar.inc.php:35
+#: ../../templates/sidebar.inc.php:136
+#: ../../templates/show_local_catalog_info.inc.php:18
+#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:65
+#: ../../templates/show_browse_menu.inc:36 ../../templates/show_search.inc:136
+msgid "Albums"
+msgstr "Alben"
+
+#: ../../templates/show_genre.inc.php:41 ../../templates/sidebar.inc.php:36
+#: ../../templates/sidebar.inc.php:135
+#: ../../templates/show_local_catalog_info.inc.php:22
+#: ../../templates/show_browse_menu.inc:35 ../../templates/show_search.inc:137
+msgid "Artists"
+msgstr "Interpreten"
+
+#: ../../templates/show_genre.inc.php:46
+#: ../../templates/show_genres.inc.php:37 ../../templates/sidebar.inc.php:133
+#: ../../templates/show_random_play_bar.inc.php:49
+#: ../../templates/show_local_catalog_info.inc.php:26
+#: ../../templates/show_artists.inc:41 ../../templates/show_artists.inc:64
+#: ../../templates/show_albums.inc:41 ../../templates/show_albums.inc:71
+#: ../../templates/show_search.inc:135
+msgid "Songs"
+msgstr "Lieder"
+
 #: ../../templates/show_user.inc.php:26
 msgid "Changing User Information for"
 msgstr ""
@@ -932,10 +990,144 @@
 msgid "Clear Stats"
 msgstr "Katalogstatistiken löschen"
 
+#: ../../templates/show_genres.inc.php:38 ../../templates/show_uploads.inc:32
+#: ../../templates/show_mpdpl.inc:68 ../../templates/show_songs.inc:50
+#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:67
+#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:75
+#: ../../templates/show_access_list.inc:51 ../../templates/show_artist.inc:42
+msgid "Action"
+msgstr "Aktion"
+
+#: ../../templates/show_genres.inc.php:48
+#: ../../templates/show_playlists.inc.php:63
+#: ../../templates/show_localplay.inc:41 ../../templates/show_artists.inc:54
+#: ../../templates/show_albums.inc:57 ../../templates/show_mpdplay.inc:64
+#: ../../templates/show_artist.inc:67
+msgid "Play"
+msgstr "Abspielen"
+
+#: ../../templates/sidebar.inc.php:29
+msgid "Users"
+msgstr "Benutzer"
+
+#: ../../templates/sidebar.inc.php:30
+msgid "Mail Users"
+msgstr "Den Benutzern mailen"
+
+#: ../../templates/sidebar.inc.php:32
+#, fuzzy
+msgid "Site Preferences"
+msgstr "Einstellungen aktualisieren"
+
+#: ../../templates/sidebar.inc.php:33
+#, fuzzy
+msgid "Access List"
+msgstr "Zugriffsliste"
+
+#: ../../templates/sidebar.inc.php:38
+#, fuzzy
+msgid "Lists"
+msgstr "Interpreten"
+
+#: ../../templates/sidebar.inc.php:45 ../../templates/menu.inc:29
+msgid "Home"
+msgstr "Home"
+
+#: ../../templates/sidebar.inc.php:49 ../../templates/menu.inc:63
+#: ../../templates/menu.inc:66
+msgid "Admin"
+msgstr "Admin"
+
+#: ../../templates/sidebar.inc.php:66 ../../templates/menu.inc:40
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: ../../templates/sidebar.inc.php:85 ../../templates/menu.inc:43
+#: ../../templates/show_upload.inc:73
+msgid "Upload"
+msgstr "Upload"
+
+#: ../../templates/sidebar.inc.php:89
+#: ../../templates/show_playlists.inc.php:28 ../../templates/menu.inc:38
+msgid "Playlists"
+msgstr "Playlists"
+
+#: ../../templates/sidebar.inc.php:93 ../../templates/menu.inc:32
+#, fuzzy
+msgid "Local Play"
+msgstr "Lokal"
+
+#: ../../templates/sidebar.inc.php:112
+#: ../../templates/show_playlists.inc.php:66
+#: ../../templates/show_artists.inc:56 ../../templates/show_albums.inc:59
+#: ../../templates/show_mpdplay.inc:114
+msgid "Random"
+msgstr "Zufällig"
+
+#: ../../templates/sidebar.inc.php:134
+#: ../../templates/show_random_play_bar.inc.php:50
+msgid "Minutes"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:137
+#: ../../templates/show_random_play_bar.inc.php:53
+msgid "Less Played"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:141
+#: ../../templates/show_random_play_bar.inc.php:58
+msgid "Enqueue"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:146 ../../templates/menu.inc:75
+#: ../../templates/menu.inc:81 ../../templates/menu.inc:85
+msgid "Logout"
+msgstr "Ausloggen"
+
 #: ../../templates/show_confirmation.inc.php:30
 msgid "Continue"
 msgstr "Weiter"
 
+#: ../../templates/show_random_play_bar.inc.php:31
+#: ../../templates/show_random_play.inc:28
+msgid "Play Random Selection"
+msgstr "Spiele Zufallsauswahl"
+
+#: ../../templates/show_random_play_bar.inc.php:51
+#, fuzzy
+msgid "Full Artists"
+msgstr "Interpret"
+
+#: ../../templates/show_random_play_bar.inc.php:52
+#: ../../templates/show_random_play.inc:60
+#, fuzzy
+msgid "Full Albums"
+msgstr "Alle Alben"
+
+#: ../../templates/show_random_play_bar.inc.php:55
+msgid "from"
+msgstr ""
+
+#: ../../templates/show_random_play_bar.inc.php:59
+msgid "Advanced"
+msgstr ""
+
+#: ../../templates/show_local_catalog_info.inc.php:10
+msgid "Total Users"
+msgstr "Gesamtzahl Benutzer"
+
+#: ../../templates/show_local_catalog_info.inc.php:14
+msgid "Connected Users"
+msgstr "Verbundene Benutzer"
+
+#: ../../templates/show_local_catalog_info.inc.php:30
+msgid "Catalog Size"
+msgstr "Kataloggröße"
+
+#: ../../templates/show_local_catalog_info.inc.php:34
+msgid "Catalog Time"
+msgstr "Katalog Spielzeit"
+
 #: ../../templates/show_play_selected.inc.php:49
 msgid "Play Selected"
 msgstr "Ausgewählte abspielen"
@@ -945,36 +1137,55 @@
 msgid "Download Selected"
 msgstr "Ausgewählte markieren"
 
-#: ../../templates/show_play_selected.inc.php:55 ../../playlist.php:77
+#: ../../templates/show_play_selected.inc.php:55
 msgid "Flag Selected"
 msgstr "Ausgewählte markieren"
 
-#: ../../templates/show_play_selected.inc.php:56 ../../playlist.php:83
+#: ../../templates/show_play_selected.inc.php:56
 msgid "Edit Selected"
 msgstr "Ausgwählte editieren"
 
-#: ../../templates/show_play_selected.inc.php:63
+#: ../../templates/show_play_selected.inc.php:64
 msgid "Set Track Numbers"
 msgstr "Tracknummern setzen"
 
-#: ../../templates/show_play_selected.inc.php:64
+#: ../../templates/show_play_selected.inc.php:65
 msgid "Remove Selected Tracks"
 msgstr "Ausgwählte Lieder entfernen"
 
-#: ../../templates/show_play_selected.inc.php:70
+#: ../../templates/show_play_selected.inc.php:71
 msgid "Playlist"
 msgstr "Playlist"
 
-#: ../../templates/show_play_selected.inc.php:70
+#: ../../templates/show_play_selected.inc.php:71
 #, fuzzy
 msgid "Add to"
 msgstr "Katalog hinzufügen"
 
-#: ../../templates/show_all_popular.inc.php:27 ../../index.php:98
+#: ../../templates/show_play_selected.inc.php:73
+#: ../../templates/show_playlists.inc.php:51
+msgid "View"
+msgstr "Anschauen"
+
+#: ../../templates/show_play_selected.inc.php:74
+#: ../../templates/show_playlists.inc.php:55 ../../templates/show_users.inc:58
+#: ../../templates/show_users.inc:102
+msgid "Edit"
+msgstr "Editieren"
+
+#: ../../templates/show_all_recent.inc.php:27 ../../index.php:99
+msgid "Newest Artist Additions"
+msgstr "Neuste Interpretenzugänge"
+
+#: ../../templates/show_all_recent.inc.php:30 ../../index.php:106
+msgid "Newest Album Additions"
+msgstr "Neuste Albenzugänge"
+
+#: ../../templates/show_all_popular.inc.php:27 ../../index.php:82
 msgid "Most Popular Artists"
 msgstr "Meistgespielte Interpreten"
 
-#: ../../templates/show_all_popular.inc.php:30 ../../index.php:71
+#: ../../templates/show_all_popular.inc.php:30 ../../index.php:61
 #, fuzzy
 msgid "Most Popular Albums"
 msgstr "Meistgespielte Interpreten"
@@ -984,126 +1195,230 @@
 msgid "Most Popular Genres"
 msgstr "Meistgespielte Lieder"
 
-#: ../../templates/show_all_popular.inc.php:40 ../../index.php:105
+#: ../../templates/show_all_popular.inc.php:40 ../../index.php:89
 msgid "Most Popular Songs"
 msgstr "Meistgespielte Lieder"
 
-#: ../../templates/show_local_catalog_info.inc.php:10
-msgid "Total Users"
-msgstr "Gesamtzahl Benutzer"
+#: ../../templates/show_get_albumart.inc.php:28
+msgid "Customize Search"
+msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:14
-msgid "Connected Users"
-msgstr "Verbundene Benutzer"
+#: ../../templates/show_get_albumart.inc.php:49
+msgid "Direct URL to Image"
+msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:18
-#: ../../templates/show_genre.inc.php:36 ../../templates/show_artists.inc:42
-#: ../../templates/show_artists.inc:65 ../../templates/show_browse_menu.inc:36
-msgid "Albums"
-msgstr "Alben"
+#: ../../templates/show_get_albumart.inc.php:59
+msgid "Get Art"
+msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:22
-#: ../../templates/show_genre.inc.php:41
-#: ../../templates/show_browse_menu.inc:35
-msgid "Artists"
-msgstr "Interpreten"
+#: ../../templates/show_rename_artist.inc.php:33
+#: ../../templates/show_rename_artist.inc.php:51
+#, fuzzy
+msgid "Rename"
+msgstr "Benutzer"
 
-#: ../../templates/show_local_catalog_info.inc.php:26
-#: ../../templates/show_genres.inc.php:37
-#: ../../templates/show_genre.inc.php:46 ../../templates/show_artists.inc:41
-#: ../../templates/show_artists.inc:64 ../../templates/show_albums.inc:41
-#: ../../templates/show_albums.inc:71
-msgid "Songs"
+#: ../../templates/show_rename_artist.inc.php:33
+msgid "to"
+msgstr ""
+
+#: ../../templates/show_rename_artist.inc.php:40
+#: ../../templates/show_search.inc:144
+msgid "OR"
+msgstr ""
+
+#: ../../templates/show_rename_artist.inc.php:42
+msgid "Insert current"
+msgstr ""
+
+#: ../../templates/show_rename_artist.inc.php:47
+#, fuzzy
+msgid "Update id3 tags"
+msgstr "Aktuallisieren vom TAG"
+
+#: ../../templates/show_artist_box.inc.php:26
+msgid "Albums by"
+msgstr "Alben von"
+
+#: ../../templates/show_artist_box.inc.php:34
+msgid "Show All Songs By"
+msgstr "Zeige alle Lieder von"
+
+#: ../../templates/show_artist_box.inc.php:35
+msgid "Play All Songs By"
+msgstr "Spiele alle Lieder von"
+
+#: ../../templates/show_artist_box.inc.php:36
+msgid "Play Random Songs By"
+msgstr "Spiele Zufallsauswahl von"
+
+#: ../../templates/show_artist_box.inc.php:38
+#: ../../templates/show_album.inc:72
+msgid "Update from tags"
+msgstr "Aktuallisieren vom TAG"
+
+#: ../../templates/show_artist_box.inc.php:39
+#, fuzzy
+msgid "Rename Artist"
+msgstr "Interpret"
+
+#: ../../templates/show_playlists.inc.php:31
+#, fuzzy
+msgid "Playlist Name"
+msgstr "Abspielart"
+
+#: ../../templates/show_playlists.inc.php:32
+#, fuzzy
+msgid "# Songs"
 msgstr "Lieder"
 
-#: ../../templates/show_local_catalog_info.inc.php:30
-msgid "Catalog Size"
-msgstr "Kataloggröße"
+#: ../../templates/show_playlists.inc.php:33
+msgid "Owner"
+msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:34
-msgid "Catalog Time"
-msgstr "Katalog Spielzeit"
+#: ../../templates/show_playlists.inc.php:34
+msgid "Actions"
+msgstr "Aktionen"
 
-#: ../../templates/show_genres.inc.php:38 ../../templates/show_artists.inc:43
-#: ../../templates/show_artists.inc:67 ../../templates/show_songs.inc:42
-#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:75
-#: ../../templates/show_access_list.inc:51 ../../templates/show_artist.inc:55
-#: ../../templates/show_mpdpl.inc:68 ../../templates/show_uploads.inc:32
-msgid "Action"
-msgstr "Aktion"
+#: ../../templates/show_playlists.inc.php:58
+#: ../../templates/show_uploads.inc:50 ../../templates/catalog.inc:57
+#: ../../templates/show_users.inc:70
+msgid "Delete"
+msgstr "Löschen"
 
-#: ../../templates/show_genre.inc.php:32
+#: ../../templates/show_playlists.inc.php:71
+#: ../../templates/show_songs.inc:140 ../../templates/show_album.inc:75
+#: ../../templates/show_albums.inc:61 ../../templates/show_artist.inc:69
+msgid "Download"
+msgstr "Download"
+
+#: ../../templates/show_playlist_box.inc.php:33
 #, fuzzy
-msgid "Viewing"
-msgstr "Anschauen"
+msgid "Playlist Actions"
+msgstr "Playlists"
 
-#: ../../templates/show_all_recent.inc.php:27 ../../index.php:115
-msgid "Newest Artist Additions"
-msgstr "Neuste Interpretenzugänge"
+#: ../../templates/show_playlist_box.inc.php:34
+#, fuzzy
+msgid "Create New Playlist"
+msgstr "Neue Playlist erstellen"
 
-#: ../../templates/show_all_recent.inc.php:30 ../../index.php:122
-msgid "Newest Album Additions"
-msgstr "Neuste Albenzugänge"
+#: ../../templates/show_playlist_box.inc.php:35
+#, fuzzy
+msgid "View All Playlists"
+msgstr "Playlist"
+
+#: ../../templates/show_playlist_box.inc.php:36
+msgid "Import From File"
+msgstr ""
+
+#: ../../templates/show_playlist_box.inc.php:38
+#, fuzzy
+msgid "Normalize Tracks"
+msgstr "Anzahl Stücke"
+
+#: ../../templates/show_playlist_box.inc.php:39
+#, fuzzy
+msgid "Play This Playlist"
+msgstr "Playlist"
+
+#: ../../templates/show_preference_box.inc.php:44
+msgid "Preference"
+msgstr "Einstellung"
+
+#: ../../templates/show_preference_box.inc.php:45
+msgid "Value"
+msgstr "Wert"
+
+#: ../../templates/show_preference_box.inc.php:47
+msgid "Apply to All"
+msgstr ""
+
+#: ../../templates/show_preference_box.inc.php:54
+msgid "description"
+msgstr ""
 
-#: ../../localplay.php:79
+#: ../../templates/show_object_rating.inc.php:25
+#: ../../templates/show_songs.inc:52
+#, fuzzy
+msgid "Rating"
+msgstr "Editieren"
+
+#: ../../localplay.php:81
 msgid "Unknown action requested"
 msgstr ""
 
-#: ../../artists.php:48
+#: ../../browse.php:48 ../../albums.php:168 ../../albums.php:174
+#: ../../albums.php:181 ../../albums.php:186 ../../albums.php:192
 #, fuzzy
-msgid "All songs by"
-msgstr "Alle Lieder"
+msgid "Show Albums starting with"
+msgstr "Alle Alben, beginnend mit"
+
+#: ../../browse.php:78 ../../artists.php:128 ../../artists.php:132
+#: ../../artists.php:138 ../../artists.php:151
+#, fuzzy
+msgid "Show Artists starting with"
+msgstr "(<u>S</u>) Zeige Interpreten mit folgendem Beginn"
+
+#: ../../search.php:45
+msgid "Error: No Keyword Entered"
+msgstr ""
 
-#: ../../artists.php:57 ../../albums.php:106
+#: ../../tv.php:76 ../../templates/show_now_playing.inc:31
+msgid "Now Playing"
+msgstr "Aktuell wird gespielt"
+
+#: ../../artists.php:58 ../../albums.php:147
 msgid "Starting Update from Tags"
 msgstr "Starte Aktuallisierung vom TAG"
 
-#: ../../artists.php:62 ../../albums.php:111
+#: ../../artists.php:63 ../../albums.php:152
 #, fuzzy
 msgid "Update From Tags Complete"
 msgstr "Aktuallisierung vom Tag vollständig"
 
-#: ../../artists.php:72 ../../artists.php:76 ../../artists.php:82
-#: ../../artists.php:95
-#, fuzzy
-msgid "Show Artists starting with"
-msgstr "(<u>S</u>) Zeige Interpreten mit folgendem Beginn"
-
-#: ../../amp-mpd.php:176 ../../playlist.php:135
+#: ../../amp-mpd.php:171 ../../playlist.php:63
 #, fuzzy
 msgid "New Playlist"
 msgstr "Playlist"
 
-#: ../../playlist.php:115
-msgid "owned by"
+#: ../../playlist.php:46
+#, fuzzy
+msgid "Playlist Deleted"
+msgstr "Ausgewählte abspielen"
+
+#: ../../playlist.php:46
+msgid "The Requested Playlist has been deleted"
 msgstr ""
 
-#: ../../playlist.php:118
+#: ../../playlist.php:56
 #, fuzzy
-msgid "Edit Playlist"
-msgstr "Playlist"
+msgid "Are you sure you want to delete this playlist"
+msgstr "Wollen sie wirklich den Katalog löschen?"
 
-#: ../../playlist.php:121
+#: ../../playlist.php:112
 #, fuzzy
-msgid "Play Full Playlist"
-msgstr "Playlist"
+msgid "Playlist Created"
+msgstr "Playlistenname"
+
+#: ../../playlist.php:112
+msgid " has been created"
+msgstr ""
 
-#: ../../playlist.php:122
+#: ../../playlist.php:121
 #, fuzzy
-msgid "Play Random"
-msgstr "Spiele zufällige Lieder"
+msgid "Remote Selected Tracks"
+msgstr "Ausgwählte Lieder entfernen"
 
-#: ../../playlist.php:192
+#: ../../playlist.php:139
 #, fuzzy
-msgid "Playlist updated."
+msgid "Playlist Updated"
 msgstr "Playlistenname"
 
-#: ../../index.php:41
-msgid "Welcome to"
-msgstr "Willkommen bei"
+#: ../../playlist.php:139
+msgid " has been updated"
+msgstr ""
 
-#: ../../index.php:43
-msgid "you are currently logged in as"
+#: ../../flag.php:38
+msgid "Flagging song completed."
 msgstr ""
 
 #: ../../user.php:45
@@ -1114,10 +1429,6 @@
 msgid "Error: Insufficient Rights"
 msgstr ""
 
-#: ../../flag.php:35
-msgid "Flagging song completed."
-msgstr ""
-
 #: ../../albums.php:44
 #, fuzzy
 msgid "Album Art Cleared"
@@ -1127,35 +1438,101 @@
 msgid "Album Art information has been removed form the database"
 msgstr ""
 
-#: ../../albums.php:78
-msgid "Album Art Located"
+#: ../../albums.php:74
+msgid "No Amazon Developer Key set, amazon album art searching will not work"
+msgstr ""
+
+#: ../../albums.php:104
+msgid "Album Art Not Located"
 msgstr ""
 
-#: ../../albums.php:78
+#: ../../albums.php:104
 msgid ""
-"Album Art information has been located in Amazon. If incorrect, click "
-"\"Reset Album Art\" below to remove the artwork."
+"Album Art could not be located at this time. This may be due to Amazon being "
+"busy, or the album not being present in their collection."
 msgstr ""
 
-#: ../../albums.php:86 ../../albums.php:96
-msgid "Get Art"
+#: ../../albums.php:137
+#, fuzzy
+msgid "Album Art Inserted"
+msgstr "Album Jahr"
+
+#: ../../ratings.php:33
+#, fuzzy
+msgid "Rating Updated"
+msgstr "Schnelles Aktualisieren"
+
+#: ../../ratings.php:33
+msgid "Your rating for this object has been updated"
 msgstr ""
 
-#: ../../albums.php:90
-msgid "Album Art Not Located"
+#: ../../register.php:79
+msgid "Error Captcha Required"
+msgstr ""
+
+#: ../../register.php:86
+msgid "Error Captcha Failed"
+msgstr ""
+
+#: ../../register.php:93
+msgid "You <U>must</U> accept the user agreement"
+msgstr ""
+
+#: ../../register.php:98
+msgid "You did not enter a username"
+msgstr ""
+
+#: ../../register.php:102
+msgid "Please fill in your full name (Firstname Lastname)"
+msgstr ""
+
+#: ../../register.php:128
+#, fuzzy
+msgid "You must enter a password"
+msgstr "Passwort"
+
+#: ../../register.php:132
+msgid "Your passwords do not match"
+msgstr ""
+
+#: ../../register.php:150
+msgid "Error: Insert Failed"
+msgstr ""
+
+#: ../../register.php:165
+msgid "Registration Complete"
+msgstr ""
+
+#: ../../activate.php:42
+msgid "No user with this name registered"
+msgstr ""
+
+#: ../../activate.php:46
+msgid "The validation key used isn't correct."
+msgstr ""
+
+#: ../../activate.php:51
+#, fuzzy
+msgid "User activated"
+msgstr "Eintrag gelöscht"
+
+#: ../../activate.php:51
+msgid "This User ID is activated and can be used"
 msgstr ""
 
-#: ../../albums.php:90
+#: ../../bin/print_tags.php.inc:42
 msgid ""
-"Album Art could not be located at this time. This may be due to Amazon being "
-"busy, or the album not being present in their collection."
+"[print_tags.php.inc]\n"
+"This commandline script will display the tag information for the specified "
+"filename as it will \n"
+"appear to Ampache. \n"
+"        \n"
 msgstr ""
 
-#: ../../albums.php:127 ../../albums.php:133 ../../albums.php:140
-#: ../../albums.php:145 ../../albums.php:150
+#: ../../bin/print_tags.php.inc:48
 #, fuzzy
-msgid "Show Albums starting with"
-msgstr "Alle Alben, beginnend mit"
+msgid "Filename:"
+msgstr "Dateinamenmuster"
 
 #: ../../bin/quarantine_migration.php.inc:49
 msgid "Error: Unable to write to"
@@ -1218,19 +1595,145 @@
 msgid "!\n"
 msgstr ""
 
+#: ../../templates/show_admin_index.inc:27
+#, fuzzy
+msgid "User Management"
+msgstr "Benutzer"
+
+#: ../../templates/show_admin_index.inc:28
+msgid "E-mail Management"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:29
+#, fuzzy
+msgid "Catalog Managment"
+msgstr "Katalogname"
+
+#: ../../templates/show_admin_index.inc:30
+msgid "Admin Preferences"
+msgstr "Admineinstellungen"
+
+#: ../../templates/show_admin_index.inc:31 ../../templates/catalog.inc:95
+msgid "Access Lists"
+msgstr "Zugriffsliste"
+
+#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:94
+msgid "Add a catalog"
+msgstr "Katalog hinzufügen"
+
+#: ../../templates/show_admin_index.inc:35 ../../templates/catalog.inc:99
+msgid "Clear Now Playing"
+msgstr "Die aktuelle Songanzeige löschen"
+
+#: ../../templates/show_admin_index.inc:36
+#, fuzzy
+msgid "Add Access List Entry"
+msgstr "Zugriffsliste"
+
+#: ../../templates/show_admin_index.inc:40
+#, fuzzy
+msgid "Common Functions"
+msgstr "Datenbank Verbindung"
+
+#: ../../templates/show_admin_index.inc:43
+#, fuzzy
+msgid "Admin Sections"
+msgstr "Administrator Bereich"
+
+#: ../../templates/show_uploads.inc:33
+#, fuzzy
+msgid "Status"
+msgstr "Statistiken"
+
+#: ../../templates/show_uploads.inc:34 ../../templates/flag.inc:58
+#: ../../templates/list_flagged.inc:41 ../../templates/list_duplicates.inc:32
+#, fuzzy
+msgid "Song"
+msgstr "Lieder"
+
+#: ../../templates/show_uploads.inc:40 ../../templates/show_songs.inc:46
+#: ../../templates/list_duplicates.inc:37
+msgid "Size"
+msgstr "Größe"
+
+#: ../../templates/show_uploads.inc:42
+#, fuzzy
+msgid "User"
+msgstr "Benutzer"
+
+#: ../../templates/show_uploads.inc:43
+#, fuzzy
+msgid "Date"
+msgstr "Entfernt"
+
+#: ../../templates/show_uploads.inc:49
+#, fuzzy
+msgid "Add"
+msgstr "Katalog hinzufügen"
+
+#: ../../templates/show_mpdpl.inc:43
+#, fuzzy
+msgid "MPD Server Playlist"
+msgstr "Playlist"
+
+#: ../../templates/show_mpdpl.inc:45 ../../templates/show_mpdpl.inc:175
+msgid "Refresh the Playlist Window"
+msgstr ""
+
+#: ../../templates/show_mpdpl.inc:47 ../../templates/show_mpdpl.inc:177
+msgid "Click to shuffle (randomize) the playlist"
+msgstr ""
+
+#: ../../templates/show_mpdpl.inc:47 ../../templates/show_mpdpl.inc:177
+msgid "shuffle"
+msgstr ""
+
+#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:178
+#, fuzzy
+msgid "Click to the clear the playlist"
+msgstr "Neue Playlist erstellen"
+
+#: ../../templates/show_mpdpl.inc:52 ../../templates/show_mpdpl.inc:182
+msgid "Click to the remove all except the Now Playing"
+msgstr ""
+
+#: ../../templates/show_mpdpl.inc:62 ../../templates/show_songs.inc:41
+msgid "Song title"
+msgstr "Songname"
+
+#: ../../templates/flag.inc:43
+#, fuzzy
+msgid "Flag song"
+msgstr "Markieren"
+
+#: ../../templates/flag.inc:45
+msgid ""
+"Flag the following song as having one of the problems listed below.  Site "
+"admins will then take the appropriate action for the flagged files."
+msgstr ""
+
+#: ../../templates/flag.inc:62
+msgid "Reason to flag"
+msgstr ""
+
+#: ../../templates/flag.inc:73
+#, fuzzy
+msgid "Flag Song"
+msgstr "Alle Lieder"
+
 #: ../../templates/customize_catalog.inc:24
 msgid "Settings for catalog in"
 msgstr ""
 
-#: ../../templates/customize_catalog.inc:32 ../../templates/add_catalog.inc:39
+#: ../../templates/customize_catalog.inc:32 ../../templates/add_catalog.inc:40
 msgid "Auto-inserted Fields"
 msgstr "Automatisch ausgefüllte Felder"
 
-#: ../../templates/customize_catalog.inc:33 ../../templates/add_catalog.inc:40
+#: ../../templates/customize_catalog.inc:33 ../../templates/add_catalog.inc:41
 msgid "album name"
 msgstr "Albumname"
 
-#: ../../templates/customize_catalog.inc:34 ../../templates/add_catalog.inc:41
+#: ../../templates/customize_catalog.inc:34 ../../templates/add_catalog.inc:42
 msgid "artist name"
 msgstr "Interpretenname"
 
@@ -1238,27 +1741,27 @@
 msgid "catalog path"
 msgstr "Katalogpfad"
 
-#: ../../templates/customize_catalog.inc:36 ../../templates/add_catalog.inc:42
+#: ../../templates/customize_catalog.inc:36 ../../templates/add_catalog.inc:43
 msgid "id3 comment"
 msgstr "id3-Kommentar"
 
-#: ../../templates/customize_catalog.inc:37 ../../templates/add_catalog.inc:43
+#: ../../templates/customize_catalog.inc:37 ../../templates/add_catalog.inc:44
 msgid "genre"
 msgstr "Genre"
 
-#: ../../templates/customize_catalog.inc:38 ../../templates/add_catalog.inc:44
+#: ../../templates/customize_catalog.inc:38 ../../templates/add_catalog.inc:45
 msgid "track number (padded with leading 0)"
 msgstr "Titelummer (Mit einer 0 am Anfang)"
 
-#: ../../templates/customize_catalog.inc:39 ../../templates/add_catalog.inc:45
+#: ../../templates/customize_catalog.inc:39 ../../templates/add_catalog.inc:46
 msgid "song title"
 msgstr "Titel"
 
-#: ../../templates/customize_catalog.inc:40 ../../templates/add_catalog.inc:46
+#: ../../templates/customize_catalog.inc:40 ../../templates/add_catalog.inc:47
 msgid "year"
 msgstr "Jahr"
 
-#: ../../templates/customize_catalog.inc:41 ../../templates/add_catalog.inc:47
+#: ../../templates/customize_catalog.inc:41 ../../templates/add_catalog.inc:48
 #, fuzzy
 msgid "other"
 msgstr "Cover"
@@ -1273,12 +1776,12 @@
 msgid "Filename pattern"
 msgstr "Dateinamenmuster"
 
-#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:75
 #, fuzzy
 msgid "Folder Pattern"
 msgstr "Dateinamenmuster"
 
-#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:75
 #, fuzzy
 msgid "(no leading or ending '/')"
 msgstr "Sortiermuster: (Ohne '/' an Anfang oder Ende"
@@ -1288,52 +1791,6 @@
 msgid "Save Catalog Settings"
 msgstr "Katalogstatistiken löschen"
 
-#: ../../templates/show_admin_index.inc:27
-#, fuzzy
-msgid "User Management"
-msgstr "Benutzer"
-
-#: ../../templates/show_admin_index.inc:28
-msgid "E-mail Management"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:29
-#, fuzzy
-msgid "Catalog Managment"
-msgstr "Katalogname"
-
-#: ../../templates/show_admin_index.inc:30 ../../templates/admin_menu.inc:36
-msgid "Admin Preferences"
-msgstr "Admineinstellungen"
-
-#: ../../templates/show_admin_index.inc:31 ../../templates/catalog.inc:98
-#: ../../templates/admin_menu.inc:37
-msgid "Access Lists"
-msgstr "Zugriffsliste"
-
-#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:97
-msgid "Add a catalog"
-msgstr "Katalog hinzufügen"
-
-#: ../../templates/show_admin_index.inc:35 ../../templates/catalog.inc:102
-msgid "Clear Now Playing"
-msgstr "Die aktuelle Songanzeige löschen"
-
-#: ../../templates/show_admin_index.inc:36
-#, fuzzy
-msgid "Add Access List Entry"
-msgstr "Zugriffsliste"
-
-#: ../../templates/show_admin_index.inc:40
-#, fuzzy
-msgid "Common Functions"
-msgstr "Datenbank Verbindung"
-
-#: ../../templates/show_admin_index.inc:43
-#, fuzzy
-msgid "Admin Sections"
-msgstr "Administrator Bereich"
-
 #: ../../templates/show_test.inc:29
 msgid "Ampache Debug"
 msgstr "Ampache Debug"
@@ -1403,7 +1860,7 @@
 msgstr ""
 
 #: ../../templates/show_test.inc:116
-#: ../../templates/show_install_config.inc:87
+#: ../../templates/show_install_config.inc:88
 #, fuzzy
 msgid "Ampache.cfg.php Exists"
 msgstr "Ampache.cfg vorhanden"
@@ -1420,7 +1877,7 @@
 "(Dateirechte?)"
 
 #: ../../templates/show_test.inc:137
-#: ../../templates/show_install_config.inc:104
+#: ../../templates/show_install_config.inc:105
 #, fuzzy
 msgid "Ampache.cfg.php Configured?"
 msgstr "Ampache.cfg konfiguriert?"
@@ -1475,21 +1932,21 @@
 msgstr "Abspielen"
 
 #: ../../templates/show_localplay.inc:39 ../../templates/list_header.inc:71
-#: ../../templates/show_mpdplay.inc:48
+#: ../../templates/show_mpdplay.inc:62
 msgid "Prev"
 msgstr "Vorherige"
 
-#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:49
+#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:63
 msgid "Stop"
 msgstr ""
 
-#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:51
+#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:65
 #, fuzzy
 msgid "Pause"
 msgstr "Wert"
 
 #: ../../templates/show_localplay.inc:43 ../../templates/list_header.inc:94
-#: ../../templates/show_mpdplay.inc:52
+#: ../../templates/show_mpdplay.inc:66
 msgid "Next"
 msgstr "Nächste"
 
@@ -1510,71 +1967,65 @@
 msgid "Clear queue"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:30
+#: ../../templates/add_catalog.inc:31
 msgid ""
 "In the form below enter either a local path (i.e. /data/music) or the URL to "
 "a remote Ampache installation (i.e http://theotherampache.com)"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:36
+#: ../../templates/add_catalog.inc:37
 #, fuzzy
 msgid "Catalog Name"
 msgstr "Katalogname"
 
-#: ../../templates/add_catalog.inc:53
+#: ../../templates/add_catalog.inc:54
 msgid "Path"
 msgstr "Pfad"
 
-#: ../../templates/add_catalog.inc:57
+#: ../../templates/add_catalog.inc:58
 #, fuzzy
 msgid "Catalog Type"
 msgstr "Katalogtyp"
 
-#: ../../templates/add_catalog.inc:61
+#: ../../templates/add_catalog.inc:62
 msgid "Remote"
 msgstr "Entfernt"
 
-#: ../../templates/add_catalog.inc:66
+#: ../../templates/add_catalog.inc:67
 msgid "ID3 Set Command"
 msgstr "Kommando zum Setzen der ID3-Tags"
 
-#: ../../templates/add_catalog.inc:70
+#: ../../templates/add_catalog.inc:71
 msgid "Filename Pattern"
 msgstr "Dateinamenmuster"
 
-#: ../../templates/add_catalog.inc:78 ../../templates/catalog.inc:104
+#: ../../templates/add_catalog.inc:79 ../../templates/catalog.inc:101
 msgid "Gather Album Art"
 msgstr "Nach Covern suchen"
 
-#: ../../templates/add_catalog.inc:82
+#: ../../templates/add_catalog.inc:83
 msgid "ID3V2 Tags"
 msgstr "ID3V2 Tags"
 
-#: ../../templates/add_catalog.inc:85
+#: ../../templates/add_catalog.inc:86
 msgid "Amazon"
 msgstr "Amazon"
 
-#: ../../templates/add_catalog.inc:88
+#: ../../templates/add_catalog.inc:89
 #, fuzzy
 msgid "File Folder"
 msgstr "MP3 Verzeichnis"
 
-#: ../../templates/add_catalog.inc:95
+#: ../../templates/add_catalog.inc:96
 msgid "Build Playlists from m3u Files"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:102
+#: ../../templates/add_catalog.inc:103
 #, fuzzy
 msgid "Add Catalog"
 msgstr "Katalog hinzufügen"
 
-#: ../../templates/list_flagged.inc:41 ../../templates/flag.inc:58
-#: ../../templates/show_uploads.inc:34
-#, fuzzy
-msgid "Song"
-msgstr "Lieder"
-
-#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:41
+#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:49
 msgid "Flag"
 msgstr "Markieren"
 
@@ -1602,36 +2053,35 @@
 msgid "Reject"
 msgstr "Auswahl"
 
-#: ../../templates/show_artists.inc:55 ../../templates/show_albums.inc:58
-#: ../../templates/show_random_play.inc:46
-msgid "All"
-msgstr "Alle"
-
-#: ../../templates/show_songs.inc:33 ../../templates/show_mpdpl.inc:62
-msgid "Song title"
-msgstr "Songname"
+#: ../../templates/header.inc:49
+msgid "You are currently logged in as"
+msgstr ""
 
-#: ../../templates/show_songs.inc:38 ../../templates/show_uploads.inc:40
-msgid "Size"
-msgstr "Größe"
+#: ../../templates/header.inc:58
+msgid "Go!"
+msgstr ""
 
-#: ../../templates/show_songs.inc:113
+#: ../../templates/show_songs.inc:143
 msgid "Direct Link"
 msgstr ""
 
-#: ../../templates/show_songs.inc:131
+#: ../../templates/show_songs.inc:166
 msgid "Total"
 msgstr "Insgesamt"
 
+#: ../../templates/show_search_bar.inc:36 ../../templates/show_search.inc:54
+msgid "Search Ampache"
+msgstr "In Ampache suchen"
+
 #: ../../templates/show_install_config.inc:41
-#: ../../templates/show_install.inc:40
+#: ../../templates/show_install.inc:41
 msgid ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
 "ampache.cfg.php.dist file"
 msgstr ""
 
 #: ../../templates/show_install_config.inc:49
-#: ../../templates/show_install.inc:50
+#: ../../templates/show_install.inc:51
 msgid "Step 2 - Creating the Ampache.cfg.php file"
 msgstr ""
 
@@ -1642,93 +2092,73 @@
 "download the config file. Please put the downloaded config file in /config"
 msgstr ""
 
-#: ../../templates/show_install_config.inc:59
+#: ../../templates/show_install_config.inc:60
 #, fuzzy
 msgid "Web Path"
 msgstr "Pfad"
 
-#: ../../templates/show_install_config.inc:63
-#: ../../templates/show_install.inc:57
+#: ../../templates/show_install_config.inc:64
+#: ../../templates/show_install.inc:59
 msgid "Desired Database Name"
 msgstr ""
 
-#: ../../templates/show_install_config.inc:67
-#: ../../templates/show_install.inc:61
+#: ../../templates/show_install_config.inc:68
+#: ../../templates/show_install.inc:63
 msgid "MySQL Hostname"
 msgstr ""
 
-#: ../../templates/show_install_config.inc:71
+#: ../../templates/show_install_config.inc:72
 #, fuzzy
 msgid "MySQL Username"
 msgstr "Benutzer"
 
-#: ../../templates/show_install_config.inc:75
+#: ../../templates/show_install_config.inc:76
 #, fuzzy
 msgid "MySQL Password"
 msgstr "Passwort"
 
-#: ../../templates/show_install_config.inc:80
+#: ../../templates/show_install_config.inc:81
 msgid "Write Config"
 msgstr ""
 
-#: ../../templates/show_install_config.inc:124
+#: ../../templates/show_install_config.inc:125
 msgid "Check for Config"
 msgstr ""
 
-#: ../../templates/show_album.inc:53
+#: ../../templates/show_album.inc:67
 msgid "Play Album"
 msgstr "Album abspielen"
 
-#: ../../templates/show_album.inc:54
+#: ../../templates/show_album.inc:68
 msgid "Play Random from Album"
 msgstr "Zufällig vom Album"
 
-#: ../../templates/show_album.inc:55
+#: ../../templates/show_album.inc:69
 msgid "Reset Album Art"
 msgstr "Cover zurücksetzen"
 
-#: ../../templates/show_album.inc:56
+#: ../../templates/show_album.inc:70
 msgid "Find Album Art"
 msgstr "Cover finden"
 
-#: ../../templates/show_album.inc:58 ../../templates/show_artist.inc:37
-msgid "Update from tags"
-msgstr "Aktuallisieren vom TAG"
-
-#: ../../templates/show_preferences.inc:31
+#: ../../templates/show_preferences.inc:42
 msgid "Editing"
 msgstr "Editieren"
 
-#: ../../templates/show_preferences.inc:31
+#: ../../templates/show_preferences.inc:42
 msgid "preferences"
 msgstr "Einstellungen"
 
-#: ../../templates/show_preferences.inc:33
+#: ../../templates/show_preferences.inc:44
 #, fuzzy
 msgid "Rebuild Preferences"
 msgstr "Einstellungen"
 
-#: ../../templates/show_preferences.inc:39
-msgid "Preference"
-msgstr "Einstellung"
-
-#: ../../templates/show_preferences.inc:40
-msgid "Value"
-msgstr "Wert"
-
-#: ../../templates/show_preferences.inc:42
-msgid "Type"
-msgstr "Typ"
-
-#: ../../templates/show_preferences.inc:43
-msgid "Apply to All"
-msgstr ""
-
-#: ../../templates/show_preferences.inc:83
+#: ../../templates/show_preferences.inc:73
 msgid "Update Preferences"
 msgstr "Einstellungen aktualisieren"
 
-#: ../../templates/show_preferences.inc:87
+#: ../../templates/show_preferences.inc:77
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -1755,44 +2185,68 @@
 msgid "Update User"
 msgstr "Einstellungen aktualisieren"
 
-#: ../../templates/show_install.inc:48
+#: ../../templates/show_random_play.inc:34
+#, fuzzy
+msgid "Item count"
+msgstr "Liederanzahl"
+
+#: ../../templates/show_random_play.inc:49
+#, fuzzy
+msgid "From genre"
+msgstr "vom Genre"
+
+#: ../../templates/show_random_play.inc:58
+msgid "Standard"
+msgstr ""
+
+#: ../../templates/show_random_play.inc:59
+#, fuzzy
+msgid "Favor Unplayed"
+msgstr "nicht gespielte vorziehen"
+
+#: ../../templates/show_random_play.inc:61
+#, fuzzy
+msgid "Full Artist"
+msgstr "Interpret"
+
+#: ../../templates/show_random_play.inc:66
+msgid "from catalog"
+msgstr "vom Katalog"
+
+#: ../../templates/show_random_play.inc:75
+msgid "Play Random Songs"
+msgstr "Spiele zufällige Lieder"
+
+#: ../../templates/show_install.inc:49
 msgid ""
 "This step creates and inserts the Ampache database, as such please provide a "
 "mysql account with database creation rights. This step may take a while "
 "depending upon the speed of your computer"
 msgstr ""
 
-#: ../../templates/show_install.inc:65
+#: ../../templates/show_install.inc:67
 msgid "MySQL Administrative Username"
 msgstr ""
 
-#: ../../templates/show_install.inc:69
+#: ../../templates/show_install.inc:71
 msgid "MySQL Administrative Password"
 msgstr ""
 
-#: ../../templates/show_install.inc:74
-msgid "Insert Database"
+#: ../../templates/show_install.inc:75
+msgid "Create Database User for New Database"
 msgstr ""
 
-#: ../../templates/flag.inc:43
-#, fuzzy
-msgid "Flag song"
-msgstr "Markieren"
-
-#: ../../templates/flag.inc:45
-msgid ""
-"Flag the following song as having one of the problems listed below.  Site "
-"admins will then take the appropriate action for the flagged files."
+#: ../../templates/show_install.inc:80
+msgid "Ampache Database Username"
 msgstr ""
 
-#: ../../templates/flag.inc:62
-msgid "Reason to flag"
+#: ../../templates/show_install.inc:84
+msgid "Ampache Database User Password"
 msgstr ""
 
-#: ../../templates/flag.inc:73
-#, fuzzy
-msgid "Flag Song"
-msgstr "Alle Lieder"
+#: ../../templates/show_install.inc:89
+msgid "Insert Database"
+msgstr ""
 
 #: ../../templates/show_add_access.inc:31
 msgid "Add Access for a Host"
@@ -1823,7 +2277,7 @@
 msgid "Add Host"
 msgstr "Rechner hinzufügen"
 
-#: ../../templates/catalog.inc:33
+#: ../../templates/catalog.inc:30
 msgid ""
 "Error: ICONV not found, ID3V2 Tags will not import correctly. See <a href="
 "\"http://php.oregonstate.edu/iconv\">Iconv</a> for information on getting "
@@ -1833,93 +2287,56 @@
 "werden. Besuchen sie die <a href=\"http://php.oregonstate.edu/iconv\">Iconv-"
 "Seite</a> um an Informationen zu ICONV zu gelangen."
 
-#: ../../templates/catalog.inc:42
+#: ../../templates/catalog.inc:39
 msgid "Update Catalogs"
 msgstr "Katalog aktualisieren"
 
-#: ../../templates/catalog.inc:68
+#: ../../templates/catalog.inc:65
 msgid "Fast Add"
 msgstr "Schnelles Hinzufügen"
 
-#: ../../templates/catalog.inc:75
+#: ../../templates/catalog.inc:72
 msgid "Fast Update"
 msgstr "Schnelles Aktualisieren"
 
-#: ../../templates/catalog.inc:88
+#: ../../templates/catalog.inc:85
 msgid "You don't have any catalogs."
 msgstr "Sie haben keine Kataloge"
 
-#: ../../templates/catalog.inc:99
+#: ../../templates/catalog.inc:96
 msgid "Show Duplicate Songs"
 msgstr "Doppelte Songs anzeigen"
 
-#: ../../templates/catalog.inc:100
+#: ../../templates/catalog.inc:97
 msgid "Show Disabled Songs"
 msgstr "Gesperrte Songs anzeigen"
 
-#: ../../templates/catalog.inc:101
+#: ../../templates/catalog.inc:98
 msgid "Clear Catalog Stats"
 msgstr "Katalogstatistiken löschen"
 
-#: ../../templates/catalog.inc:103
+#: ../../templates/catalog.inc:100
 #, fuzzy
 msgid "Dump Album Art"
 msgstr "Cover finden"
 
-#: ../../templates/catalog.inc:105
+#: ../../templates/catalog.inc:102
 msgid "View flagged songs"
 msgstr "Markierte Songs betrachten"
 
-#: ../../templates/catalog.inc:106
+#: ../../templates/catalog.inc:103
 msgid "Catalog Tools"
 msgstr "Katalogwerkzeuge"
 
-#: ../../templates/admin_menu.inc:33
-msgid "Users"
-msgstr "Benutzer"
-
-#: ../../templates/admin_menu.inc:34
-msgid "Mail Users"
-msgstr "Den Benutzern mailen"
-
-#: ../../templates/menu.inc:29
-msgid "Home"
-msgstr "Home"
-
-#: ../../templates/menu.inc:32
-#, fuzzy
-msgid "Local Play"
-msgstr "Lokal"
-
-#: ../../templates/menu.inc:38
-msgid "Playlists"
-msgstr "Playlists"
-
-#: ../../templates/menu.inc:40
-msgid "Preferences"
-msgstr "Einstellungen"
-
-#: ../../templates/menu.inc:43 ../../templates/show_upload.inc:73
-msgid "Upload"
-msgstr "Upload"
-
-#: ../../templates/menu.inc:63 ../../templates/menu.inc:66
-msgid "Admin"
-msgstr "Admin"
-
 #: ../../templates/menu.inc:73 ../../templates/menu.inc:79
 msgid "Account"
 msgstr "Account"
 
 #: ../../templates/menu.inc:74 ../../templates/menu.inc:80
+#: ../../templates/show_users.inc:64 ../../templates/show_users.inc:112
 msgid "Stats"
 msgstr "Statistiken"
 
-#: ../../templates/menu.inc:75 ../../templates/menu.inc:81
-#: ../../templates/menu.inc:85
-msgid "Logout"
-msgstr "Ausloggen"
-
 #: ../../templates/show_upload.inc:30
 msgid "Uploading Music to Ampache"
 msgstr ""
@@ -1932,9 +2349,58 @@
 msgid "max_upload_size"
 msgstr ""
 
-#: ../../templates/show_now_playing.inc:31
-msgid "Now Playing"
-msgstr "Aktuell wird gespielt"
+#: ../../templates/show_users.inc:40
+#, fuzzy
+msgid "Fullname"
+msgstr "Playlistenname"
+
+#: ../../templates/show_users.inc:48
+msgid "Last Seen"
+msgstr ""
+
+#: ../../templates/show_users.inc:53
+msgid "Registration Date"
+msgstr ""
+
+#: ../../templates/show_users.inc:61 ../../templates/show_users.inc:107
+#, fuzzy
+msgid "Prefs"
+msgstr "Vorherige"
+
+#: ../../templates/show_users.inc:67
+#, fuzzy
+msgid "Access"
+msgstr "Start Adresse"
+
+#: ../../templates/show_users.inc:73
+msgid "On-line"
+msgstr ""
+
+#: ../../templates/show_users.inc:126
+#, fuzzy
+msgid "delete"
+msgstr "Löschen"
+
+#: ../../templates/list_duplicates.inc:28
+#, fuzzy
+msgid "Duplicate Songs"
+msgstr "Doppelte Songs anzeigen"
+
+#: ../../templates/list_duplicates.inc:35
+#, fuzzy
+msgid "Length"
+msgstr "Local Length"
+
+#: ../../templates/list_duplicates.inc:74
+msgid "You don"
+msgstr ""
+
+#: ../../templates/list_duplicates.inc:74
+msgid ""
+"); ?></p>\n"
+"<?php  } ?>\n"
+"</form>\n"
+msgstr ""
 
 #: ../../templates/show_login_form.inc:49
 #: ../../templates/show_login_form.inc:63
@@ -1945,6 +2411,10 @@
 msgid "Remember Me"
 msgstr ""
 
+#: ../../templates/show_login_form.inc:72
+msgid "Register"
+msgstr ""
+
 #: ../../templates/show_access_list.inc:34
 msgid "Host Access to Your Catalog"
 msgstr "Zugangsliste zum Katalog"
@@ -1965,194 +2435,168 @@
 msgid "Revoke"
 msgstr "Zurückziehen"
 
-#: ../../templates/show_users.inc:43
-#, fuzzy
-msgid "Fullname"
-msgstr "Playlistenname"
-
-#: ../../templates/show_users.inc:48
-msgid "Last Seen"
+#: ../../templates/show_search.inc:57
+msgid "Keywords"
 msgstr ""
 
-#: ../../templates/show_users.inc:55 ../../templates/show_users.inc:91
+#: ../../templates/show_search.inc:102
 #, fuzzy
-msgid "Prefs"
-msgstr "Vorherige"
+msgid "Played"
+msgstr "Abspielen"
 
-#: ../../templates/show_users.inc:58
+#: ../../templates/show_search.inc:110
 #, fuzzy
-msgid "Access"
-msgstr "Start Adresse"
+msgid "Min Bitrate"
+msgstr "Bitrate"
 
-#: ../../templates/show_users.inc:64
-msgid "On-line"
-msgstr ""
+#: ../../templates/show_search.inc:132
+msgid "Object Type"
+msgstr "Objektart"
 
-#: ../../templates/show_users.inc:105
+#: ../../templates/show_search.inc:138
 #, fuzzy
-msgid "delete"
-msgstr "Löschen"
-
-#: ../../templates/show_search.inc:34 ../../templates/show_search_bar.inc:36
-msgid "Search Ampache"
-msgstr "In Ampache suchen"
+msgid "Genres"
+msgstr "Genre"
 
-#: ../../templates/show_search.inc:41
-msgid "Object Type"
-msgstr "Objektart"
+#: ../../templates/show_search.inc:141
+msgid "Operator"
+msgstr ""
 
-#: ../../templates/show_artist.inc:31
-msgid "Albums by"
-msgstr "Alben von"
+#: ../../templates/show_search.inc:145
+msgid "AND"
+msgstr ""
 
-#: ../../templates/show_artist.inc:33
-msgid "Show All Songs By"
-msgstr "Zeige alle Lieder von"
+#: ../../templates/show_search.inc:150
+#, fuzzy
+msgid "Method"
+msgstr "Demo Modus"
 
-#: ../../templates/show_artist.inc:34
-msgid "Play All Songs By"
-msgstr "Spiele alle Lieder von"
+#: ../../templates/show_search.inc:153
+msgid "Fuzzy"
+msgstr ""
 
-#: ../../templates/show_artist.inc:35
-msgid "Play Random Songs By"
-msgstr "Spiele Zufallsauswahl von"
+#: ../../templates/show_search.inc:154
+msgid "Exact"
+msgstr ""
 
-#: ../../templates/show_artist.inc:49
-msgid "Select"
-msgstr "Auswahl"
+#: ../../templates/show_search.inc:157
+msgid "Maxium Results"
+msgstr ""
 
-#: ../../templates/show_artist.inc:51
-msgid "Cover"
-msgstr "Cover"
+#: ../../templates/show_search.inc:160
+msgid "Unlimited"
+msgstr ""
 
-#: ../../templates/show_artist.inc:52
-msgid "Album Name"
-msgstr "Album Name"
+#: ../../templates/show_search.inc:172
+msgid "Reset Form"
+msgstr ""
 
-#: ../../templates/show_artist.inc:53
-msgid "Album Year"
-msgstr "Album Jahr"
+#: ../../templates/show_search.inc:184
+msgid "Save Search As Track on"
+msgstr ""
 
-#: ../../templates/show_artist.inc:54
-msgid "Total Tracks"
-msgstr "Anzahl Stücke"
+#: ../../templates/show_search.inc:186
+msgid "Save"
+msgstr ""
 
-#: ../../templates/show_mpdplay.inc:38
+#: ../../templates/show_mpdplay.inc:39
 msgid "MPD Play Control"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:71
+#: ../../templates/show_mpdplay.inc:100
 #, fuzzy
 msgid "Loop"
 msgstr "Ausloggen"
 
-#: ../../templates/show_mpdplay.inc:78 ../../templates/show_mpdplay.inc:91
+#: ../../templates/show_mpdplay.inc:107 ../../templates/show_mpdplay.inc:120
 msgid "On"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:79 ../../templates/show_mpdplay.inc:92
+#: ../../templates/show_mpdplay.inc:108 ../../templates/show_mpdplay.inc:121
 msgid "Off"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:114
+#: ../../templates/show_mpdplay.inc:134
 #, fuzzy
 msgid "Now Playing :"
 msgstr "Aktuell wird gespielt"
 
-#: ../../templates/show_mpdplay.inc:138
+#: ../../templates/show_mpdplay.inc:163
 msgid "On Deck "
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:138
+#: ../../templates/show_mpdplay.inc:163
 msgid "(in "
 msgstr ""
 
-#: ../../templates/show_mpdpl.inc:45
-#, fuzzy
-msgid "MPD Server Playlist"
-msgstr "Playlist"
+#: ../../templates/show_artist.inc:36
+msgid "Select"
+msgstr "Auswahl"
 
-#: ../../templates/show_mpdpl.inc:46 ../../templates/show_mpdpl.inc:184
-msgid "Refresh the Playlist Window"
-msgstr ""
+#: ../../templates/show_artist.inc:38
+msgid "Cover"
+msgstr "Cover"
 
-#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:189
-msgid "Click to shuffle (randomize) the playlist"
-msgstr ""
+#: ../../templates/show_artist.inc:39
+msgid "Album Name"
+msgstr "Album Name"
 
-#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:189
-msgid "shuffle"
-msgstr ""
+#: ../../templates/show_artist.inc:40
+msgid "Album Year"
+msgstr "Album Jahr"
+
+#: ../../templates/show_artist.inc:41
+msgid "Total Tracks"
+msgstr "Anzahl Stücke"
 
-#: ../../templates/show_mpdpl.inc:49 ../../templates/show_mpdpl.inc:190
+#: ../../templates/show_big_art.inc:31
 #, fuzzy
-msgid "Click to the clear the playlist"
-msgstr "Neue Playlist erstellen"
+msgid "Album Art"
+msgstr "Cover finden"
 
-#: ../../templates/show_mpdpl.inc:53 ../../templates/show_mpdpl.inc:194
-msgid "Click to the remove all except the Now Playing"
+#: ../../templates/show_big_art.inc:35
+msgid "Click to close window"
 msgstr ""
 
-#: ../../templates/show_uploads.inc:33
-#, fuzzy
-msgid "Status"
-msgstr "Statistiken"
-
-#: ../../templates/show_uploads.inc:42
 #, fuzzy
-msgid "User"
-msgstr "Benutzer"
+#~ msgid "No Results Found"
+#~ msgstr "Keine Dateileichen gefunden"
 
-#: ../../templates/show_uploads.inc:43
-#, fuzzy
-msgid "Date"
-msgstr "Entfernt"
+#~ msgid "New"
+#~ msgstr "Neu"
 
-#: ../../templates/show_uploads.inc:49
-#, fuzzy
-msgid "Add"
-msgstr "Katalog hinzufügen"
+#~ msgid "View All"
+#~ msgstr "Alle ansehen"
 
-#: ../../templates/show_random_play.inc:28
-msgid "Play Random Selection"
-msgstr "Spiele Zufallsauswahl"
+#~ msgid "Public"
+#~ msgstr "öffentliche"
 
-#: ../../templates/show_random_play.inc:34
-#, fuzzy
-msgid "Item count"
-msgstr "Liederanzahl"
+#~ msgid "Your Private"
+#~ msgstr "Deine private"
 
-#: ../../templates/show_random_play.inc:49
-#, fuzzy
-msgid "From genre"
-msgstr "vom Genre"
+#~ msgid "Other Private"
+#~ msgstr "Andere private"
 
-#: ../../templates/show_random_play.inc:58
-msgid "Standard"
-msgstr ""
+#~ msgid "There are no playlists of this type"
+#~ msgstr "Keine Playliste von diesem Typ verhanden"
 
-#: ../../templates/show_random_play.inc:59
 #, fuzzy
-msgid "Favor Unplayed"
-msgstr "nicht gespielte vorziehen"
+#~ msgid "All songs by"
+#~ msgstr "Alle Lieder"
 
-#: ../../templates/show_random_play.inc:60
 #, fuzzy
-msgid "Full Albums"
-msgstr "Alle Alben"
+#~ msgid "Edit Playlist"
+#~ msgstr "Playlist"
 
-#: ../../templates/show_random_play.inc:61
 #, fuzzy
-msgid "Full Artist"
-msgstr "Interpret"
+#~ msgid "Play Random"
+#~ msgstr "Spiele zufällige Lieder"
 
-#: ../../templates/show_random_play.inc:66
-msgid "from catalog"
-msgstr "vom Katalog"
+#~ msgid "Welcome to"
+#~ msgstr "Willkommen bei"
 
-#: ../../templates/show_random_play.inc:75
-msgid "Play Random Songs"
-msgstr "Spiele zufällige Lieder"
+#~ msgid "Type"
+#~ msgstr "Typ"
 
 #~ msgid "All Albums"
 #~ msgstr "Alle Alben"
@@ -2218,9 +2662,6 @@
 #~ msgstr ""
 #~ "Entschuldigung, sie haben keinen Zugriff auf diesen Teil des Servers."
 
-#~ msgid "Actions"
-#~ msgstr "Aktionen"
-
 #~ msgid "No Songs Removed"
 #~ msgstr "Keine Lieder gelöscht"
 
@@ -2287,9 +2728,6 @@
 #~ msgid "Http Port"
 #~ msgstr "HTTP Port"
 
-#~ msgid "Local Length"
-#~ msgstr "Local Length"
-
 #~ msgid "Lock Songs"
 #~ msgstr "Lied sperren"
 
diff -urN ampache-3.3.2-alpha4/locale/es_ES/LC_MESSAGES/messages.po ampache-3.3.2-beta1/locale/es_ES/LC_MESSAGES/messages.po
--- ampache-3.3.2-alpha4/locale/es_ES/LC_MESSAGES/messages.po	2005-12-27 01:32:55.000000000 -0800
+++ ampache-3.3.2-beta1/locale/es_ES/LC_MESSAGES/messages.po	2006-01-08 23:06:12.000000000 -0800
@@ -2,1917 +2,2610 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-21 19:58-0700\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../../play/index.php:46
-msgid "Session Expired: please log in again at"
-msgstr "Expiró su sesión: por favor ingrese de nuevo en"
-
-#: ../../lib/preferences.php:210 ../../templates/show_users.inc:97
-msgid "Enable"
-msgstr "Encendido"
-
-#: ../../lib/preferences.php:211 ../../templates/show_users.inc:100
-msgid "Disable"
-msgstr "Apagado"
-
-#: ../../lib/preferences.php:223 ../../templates/add_catalog.inc:60
-msgid "Local"
-msgstr "Local"
-
-#: ../../lib/preferences.php:226
-msgid "Stream"
-msgstr "Stream"
-
-#: ../../lib/preferences.php:229
-msgid "IceCast"
-msgstr "IceCaste"
-
-#: ../../lib/preferences.php:232
-msgid "Downsample"
-msgstr "Degradar"
-
-#: ../../lib/preferences.php:235
-msgid "Music Player Daemon"
-msgstr "Music Player Daemon"
-
-#: ../../lib/preferences.php:238
-msgid "SlimServer"
-msgstr "SlimServer"
-
-#: ../../lib/preferences.php:247
-msgid "M3U"
-msgstr "M3U"
-
-#: ../../lib/preferences.php:248
-msgid "Simple M3U"
-msgstr "M3U Sencillo"
-
-#: ../../lib/preferences.php:249
-msgid "PLS"
-msgstr "PLS"
-
-#: ../../lib/preferences.php:250
-msgid "Asx"
-msgstr "Asx"
-
-#: ../../lib/preferences.php:257
-msgid "English"
-msgstr "Inglés"
-
-#: ../../lib/preferences.php:258
-msgid "German"
-msgstr "Alemán"
-
-#: ../../lib/preferences.php:259
-msgid "French"
-msgstr "Francés"
-
-#: ../../lib/preferences.php:260
-msgid "Turkish"
-msgstr "Turco"
-
-#: ../../lib/duplicates.php:80
-msgid "Find Duplicates"
-msgstr "Buscar archivos duplicados"
-
-#: ../../lib/duplicates.php:83 ../../templates/show_search.inc:74
-msgid "Search Type"
-msgstr "Tipo de búsqueda"
-
-#: ../../lib/duplicates.php:91 ../../modules/class/song.php:253
-msgid "Title"
-msgstr "Título"
-
-#: ../../lib/duplicates.php:97
-msgid "Artist and Title"
-msgstr "Artista y Título"
-
-#: ../../lib/duplicates.php:102
-msgid "Artist, Album and Title"
-msgstr "Artista, Album y Título"
-
-#: ../../lib/duplicates.php:110 ../../templates/menu.inc:38
-#: ../../templates/show_search.inc:37 ../../templates/show_search.inc:83
-msgid "Search"
-msgstr "Búsqueda"
-
-#: ../../lib/search.php:52 ../../lib/search.php:68 ../../lib/search.php:84
-#: ../../lib/search.php:100 ../../lib/search.php:116 ../../lib/search.php:133
-#: ../../lib/search.php:145 ../../lib/search.php:161 ../../lib/search.php:177
-msgid "No Results Found"
-msgstr "No se encontraron resultados"
-
-#: ../../lib/ui.php:180
-msgid "Playlist Actions"
-msgstr "Actiones de las listas de reproducción"
-
-#: ../../lib/ui.php:180
-msgid "New"
-msgstr "Nuevo"
-
-#: ../../lib/ui.php:181
-msgid "View All"
-msgstr "Ver todos"
-
-#: ../../lib/ui.php:182
-msgid "Import"
-msgstr "Importar"
-
-#: ../../lib/ui.php:282
-msgid "Browse"
-msgstr "Navegar"
-
-#: ../../lib/ui.php:284
-msgid "Show w/o art"
-msgstr "Mostrar con/sin arte"
-
-#: ../../lib/ui.php:287
-msgid "Show all"
-msgstr "Mostrar todos"
-
-#: ../../lib/ui.php:393
-msgid "No songs in this playlist."
-msgstr "No hay canciones en la lista de reproducción."
-
-#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
-#: ../../modules/class/catalog.php:902
-msgid "Error"
-msgstr "Error"
-
-#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
-msgid "Could not add"
-msgstr "No se agregó"
-
-#: ../../lib/Browser.php:867
-msgid "file"
-msgstr "archivo"
-
-#: ../../lib/Browser.php:871
-msgid "File uploads not supported."
-msgstr "No se permite agregar archivos."
-
-#: ../../lib/Browser.php:889
-msgid "No file uploaded"
-msgstr "No se agrego ningún archivo"
-
-#: ../../lib/Browser.php:896
-#, php-format
-msgid "There was a problem with the file upload: No %s was uploaded."
-msgstr "Hubo un problema con el archivo: Ningún $s"
-
-#: ../../lib/Browser.php:901
-#, php-format
-msgid ""
-"There was a problem with the file upload: The %s was larger than the maximum "
-"allowed size (%d bytes)."
-msgstr "Hubo un problema con el archivo: El $s es mayor al tamaño máximo de %d bytes."
-
-#: ../../lib/Browser.php:903
-#, php-format
-msgid ""
-"There was a problem with the file upload: The %s was only partially uploaded."
-msgstr ""
-
-#: ../../modules/class/catalog.php:267 ../../modules/class/catalog.php:552
-#: ../../modules/class/album.php:241
-msgid "Error: Unable to open"
-msgstr "Error: Imposible abrir"
-
-#: ../../modules/class/catalog.php:290
-msgid "Error: Unable to change to directory"
-msgstr "Error: Imposible cambiar al directorio"
-
-#: ../../modules/class/catalog.php:313
-msgid "Error: Unable to get filesize for"
-msgstr "Error: Imposible obtener el tamaño para"
-
-#: ../../modules/class/catalog.php:332
-msgid "Added Playlist From"
-msgstr "Agregando lista de reproducción de"
-
-#: ../../modules/class/catalog.php:351
-msgid "Added"
-msgstr "Agregado"
-
-#: ../../modules/class/catalog.php:363
-msgid "is not readable by ampache"
-msgstr "no se puede leer por ampache"
-
-#: ../../modules/class/catalog.php:427
-msgid "Found in ID3"
-msgstr "Encontrado en los ID3"
-
-#: ../../modules/class/catalog.php:431
-msgid "Found on Amazon"
-msgstr "Encontrado en Amazon"
-
-#: ../../modules/class/catalog.php:435
-msgid "Found in Folder"
-msgstr "Encontrado en Folder"
-
-#: ../../modules/class/catalog.php:439
-msgid "Found"
-msgstr "Encontrado"
-
-#: ../../modules/class/catalog.php:442
-msgid "Not Found"
-msgstr "No encontrado"
-
-#: ../../modules/class/catalog.php:450
-msgid "Searched"
-msgstr "Buscado"
-
-#: ../../modules/class/catalog.php:605
-msgid "Starting Dump Album Art"
-msgstr "Comenzando la búsqueda del arte"
-
-#: ../../modules/class/catalog.php:625
-msgid "Written"
-msgstr "Grabado"
-
-#: ../../modules/class/catalog.php:634
-msgid "Error unable to open file for writting"
-msgstr "Error: imposible abrir archivo para escritura"
-
-#: ../../modules/class/catalog.php:641
-msgid "Album Art Dump Complete"
-msgstr "Se completó la actualización del arte"
-
-#: ../../modules/class/catalog.php:642 ../../artists.php:62
-#: ../../albums.php:111
-msgid "Return"
-msgstr "Regresar"
-
-#: ../../modules/class/catalog.php:708
-msgid "Starting Catalog Build"
-msgstr "Construyendo el catálogo"
-
-#: ../../modules/class/catalog.php:713
-msgid "Running Remote Sync"
-msgstr "Sincronización remota en proceso"
-
-#: ../../modules/class/catalog.php:723 ../../modules/class/catalog.php:869
-#: ../../admin/catalog.php:251
-msgid "Starting Album Art Search"
-msgstr "Comenzando la búsqueda del arte"
-
-#: ../../modules/class/catalog.php:733
-msgid "Catalog Finished"
-msgstr "Catálogo completo"
-
-#: ../../modules/class/catalog.php:733 ../../modules/class/catalog.php:888
-msgid "Total Time"
-msgstr "Tiempo total"
-
-#: ../../modules/class/catalog.php:733 ../../modules/class/catalog.php:889
-msgid "Total Songs"
-msgstr "Total de canciones"
-
-#: ../../modules/class/catalog.php:734 ../../modules/class/catalog.php:889
-msgid "Songs Per Seconds"
-msgstr "Canciones por segundo"
-
-#: ../../modules/class/catalog.php:768 ../../modules/class/catalog.php:1379
-msgid "Updated"
-msgstr "Actualizado"
-
-#: ../../modules/class/catalog.php:775
-msgid "No Update Needed"
-msgstr "No se necesitó actualización"
-
-#: ../../modules/class/catalog.php:849
-msgid "Starting New Song Search on"
-msgstr "Comenzando búsqueda de nueva música en"
-
-#: ../../modules/class/catalog.php:849
-msgid "catalog"
-msgstr "catálogo"
-
-#: ../../modules/class/catalog.php:853
-msgid "Running Remote Update"
-msgstr "Corriendo actualización remota"
-
-#: ../../modules/class/catalog.php:888
-msgid "Catalog Update Finished"
-msgstr "Actualización del catálogo concluída"
-
-#: ../../modules/class/catalog.php:902
-msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
-msgstr "Imposible cargar la librería XMLRPC, asegúres que XML-RPC esta habilitada"
-
-#: ../../modules/class/catalog.php:934 ../../modules/class/catalog.php:949
-msgid "Error connecting to"
-msgstr "Error conectando a"
-
-#: ../../modules/class/catalog.php:934 ../../modules/class/catalog.php:949
-msgid "Code"
-msgstr "Código"
-
-#: ../../modules/class/catalog.php:934 ../../modules/class/catalog.php:949
-msgid "Reason"
-msgstr "Razón"
-
-#: ../../modules/class/catalog.php:954
-msgid "Completed updating remote catalog(s)"
-msgstr "Actualización de los catálogos remotos concluida"
-
-#: ../../modules/class/catalog.php:1042
-msgid "Checking"
-msgstr "Revisando"
-
-#: ../../modules/class/catalog.php:1099
-msgid "Catalog Clean Done"
-msgstr "Limpieza del catálogo concluida"
-
-#: ../../modules/class/catalog.php:1099
-msgid "files removed"
-msgstr "archivos eliminados"
-
-#: ../../modules/class/catalog.php:1339
-msgid "Updating the"
-msgstr "Actualizando el"
-
-#: ../../modules/class/catalog.php:1339
-#: ../../templates/show_admin_index.inc:31 ../../templates/admin_menu.inc:35
-msgid "Catalog"
-msgstr "Catálogo"
-
-#: ../../modules/class/catalog.php:1340
-msgid "songs found checking tag information."
-msgstr "canciones encontradas, revisando la información en los TAGs"
-
-#: ../../modules/class/catalog.php:1387
-msgid " FOUND"
-msgstr "SE ENCONTRARON"
-
-#: ../../modules/class/catalog.php:1388
-msgid "Searching for new Album Art"
-msgstr "Buscando arte nuevo"
-
-#: ../../modules/class/catalog.php:1392
-msgid "Album Art Already Found"
-msgstr "Arte del album cargada"
-
-#: ../../modules/class/stream.php:198
-msgid "Opened for writting"
-msgstr "Se abrió para escritura"
-
-#: ../../modules/class/stream.php:203
-msgid "Error, cannot write"
-msgstr "Error: no se puede escribir"
-
-#: ../../modules/class/stream.php:214
-msgid "Error, cannot write song in file"
-msgstr "Error: no se puede escribir la canción en el archivo"
-
-#: ../../modules/class/stream.php:220
-msgid "Closed after write"
-msgstr "Cerrado despues de la escritura"
-
-#: ../../modules/class/album.php:126
-msgid "Various"
-msgstr "Varios"
-
-#: ../../modules/class/song.php:253 ../../modules/class/song.php:257
-#: ../../modules/class/song.php:261 ../../modules/class/song.php:265
-#: ../../modules/class/song.php:269 ../../modules/class/song.php:273
-#: ../../modules/class/song.php:277 ../../modules/class/song.php:282
-#: ../../modules/class/song.php:287 ../../modules/class/song.php:291
-#: ../../modules/class/song.php:295 ../../modules/class/song.php:300
-msgid "updated to"
-msgstr "actualizado a"
-
-#: ../../modules/class/song.php:257 ../../upload.php:235
-#: ../../templates/show_songs.inc:39
-msgid "Bitrate"
-msgstr "Bitrate"
-
-#: ../../modules/class/song.php:261
-msgid "Rate"
-msgstr "Rate"
-
-#: ../../modules/class/song.php:265
-msgid "Mode"
-msgstr "Modo"
-
-#: ../../modules/class/song.php:269 ../../upload.php:234
-#: ../../templates/show_songs.inc:37
-msgid "Time"
-msgstr "Tiempo"
-
-#: ../../modules/class/song.php:273 ../../templates/show_songs.inc:32
-#: ../../templates/show_songs.inc:36
-msgid "Track"
-msgstr "Track"
-
-#: ../../modules/class/song.php:277
-msgid "Filesize"
-msgstr "Tamaño"
-
-#: ../../modules/class/song.php:282 ../../upload.php:231
-#: ../../templates/show_artists.inc:39 ../../templates/show_artists.inc:62
-#: ../../templates/show_songs.inc:34 ../../templates/show_albums.inc:40
-#: ../../templates/show_albums.inc:70
-msgid "Artist"
-msgstr "Artista"
-
-#: ../../modules/class/song.php:287 ../../upload.php:232
-#: ../../templates/show_songs.inc:35 ../../templates/show_albums.inc:38
-#: ../../templates/show_albums.inc:68
-msgid "Album"
-msgstr "Album"
-
-#: ../../modules/class/song.php:291 ../../templates/show_albums.inc:43
-#: ../../templates/show_albums.inc:73
-msgid "Year"
-msgstr "Año"
-
-#: ../../modules/class/song.php:295 ../../templates/list_flagged.inc:46
-#: ../../templates/flag.inc:66
-msgid "Comment"
-msgstr "Comentario"
-
-#: ../../modules/class/song.php:300 ../../upload.php:233
-#: ../../templates/show_songs.inc:40
-msgid "Genre"
-msgstr "Género"
-
-#: ../../modules/lib.php:53
-msgid "day"
-msgstr "día"
-
-#: ../../modules/lib.php:53
-msgid "days"
-msgstr "días"
-
-#: ../../modules/lib.php:55
-msgid "hour"
-msgstr "hora"
-
-#: ../../modules/lib.php:55
-msgid "hours"
-msgstr "horas"
-
-#: ../../modules/lib.php:70
-msgid "Catalog Statistics"
-msgstr "Estadísticas del catálogo"
-
-#: ../../modules/lib.php:73
-msgid "Total Users"
-msgstr "Usuarios totales"
-
-#: ../../modules/lib.php:77
-msgid "Connected Users"
-msgstr "Usuarios conectados"
-
-#: ../../modules/lib.php:81 ../../templates/show_artists.inc:42
-#: ../../templates/show_artists.inc:65 ../../templates/menu.inc:35
-msgid "Albums"
-msgstr "Albums"
-
-#: ../../modules/lib.php:85 ../../templates/menu.inc:36
-msgid "Artists"
-msgstr "Artistas"
-
-#: ../../modules/lib.php:89 ../../templates/show_artists.inc:41
-#: ../../templates/show_artists.inc:64 ../../templates/show_albums.inc:41
-#: ../../templates/show_albums.inc:71
-msgid "Songs"
-msgstr "Canciones"
-
-#: ../../modules/lib.php:93
-msgid "Catalog Size"
-msgstr "Tamaño del catálogo"
-
-#: ../../modules/lib.php:97
-msgid "Catalog Time"
-msgstr "Tiempo del catálogo"
-
-#: ../../modules/lib.php:151
-msgid "Play Random Selection"
-msgstr "Reproducción aleatoria"
-
-#: ../../modules/lib.php:158
-msgid "Item count"
-msgstr "Conteo"
-
-#: ../../modules/lib.php:170 ../../templates/show_artists.inc:55
-#: ../../templates/show_albums.inc:58
-msgid "All"
-msgstr "Todos"
-
-#: ../../modules/lib.php:172
-msgid "From genre"
-msgstr "De género"
-
-#: ../../modules/lib.php:182
-msgid "Favor Unplayed"
-msgstr "No reproducidas"
-
-#: ../../modules/lib.php:183
-msgid "Full Albums"
-msgstr "Álbums completos"
-
-#: ../../modules/lib.php:184
-msgid "Artistas completos"
-msgstr ""
-
-#: ../../modules/lib.php:193
-msgid "from catalog"
-msgstr "del catálogo"
-
-#: ../../modules/lib.php:204
-msgid "Play Random Songs"
-msgstr "Reproducción aleatoria"
-
-#: ../../modules/lib.php:912
-msgid "Public"
-msgstr "Público"
-
-#: ../../modules/lib.php:913
-msgid "Your Private"
-msgstr "Tu privado"
-
-#: ../../modules/lib.php:914
-msgid "Other Private"
-msgstr "Otro privado"
-
-#: ../../modules/lib.php:995 ../../templates/show_play_selected.inc.php:61
-msgid "View"
-msgstr "Ver"
-
-#: ../../modules/lib.php:998 ../../templates/show_play_selected.inc.php:62
-#: ../../templates/show_users.inc:52 ../../templates/show_users.inc:86
-msgid "Edit"
-msgstr "Editar"
-
-#: ../../modules/lib.php:999 ../../upload.php:290
-#: ../../templates/catalog.inc:60 ../../templates/show_users.inc:61
-msgid "Delete"
-msgstr "Borrar"
-
-#: ../../modules/lib.php:1007 ../../templates/show_localplay.inc:41
-#: ../../templates/show_artists.inc:54 ../../templates/show_albums.inc:57
-#: ../../templates/show_artist.inc:79 ../../templates/show_mpdplay.inc:45
-msgid "Play"
-msgstr "Reproducir"
-
-#: ../../modules/lib.php:1008 ../../templates/show_artists.inc:56
-#: ../../templates/show_albums.inc:59 ../../templates/show_mpdplay.inc:67
-msgid "Random"
-msgstr "Aleatorio"
-
-#: ../../modules/lib.php:1014 ../../templates/show_songs.inc:110
-#: ../../templates/show_album.inc:61 ../../templates/show_albums.inc:61
-#: ../../templates/show_artist.inc:81
-msgid "Download"
-msgstr "Descargar"
-
-#: ../../modules/lib.php:1025
-msgid "There are no playlists of this type"
-msgstr "No hay listas de reproducción de este tipo"
-
-#: ../../modules/lib.php:1060
-msgid "Create a new playlist"
-msgstr "Crear una nueva lista de reproducción"
-
-#: ../../modules/admin.php:46
-msgid "Manage Users"
-msgstr "Administrar usuarios"
-
-#: ../../modules/admin.php:48
-msgid "Add a new user"
-msgstr "Agregar usuario"
-
-#: ../../admin/catalog.php:55 ../../templates/catalog.inc:66
-msgid "Add to Catalog(s)"
-msgstr "Agregar al Catálogo(s)"
-
-#: ../../admin/catalog.php:66 ../../templates/catalog.inc:67
-msgid "Add to all Catalogs"
-msgstr "Agregar a todos los catálogos"
-
-#: ../../admin/catalog.php:76 ../../templates/catalog.inc:73
-msgid "Update Catalog(s)"
-msgstr "Actualizar catálogo(s)"
-
-#: ../../admin/catalog.php:87 ../../templates/catalog.inc:74
-msgid "Update All Catalogs"
-msgstr "Actualizar todos los catálogos"
-
-#: ../../admin/catalog.php:119 ../../templates/catalog.inc:80
-msgid "Clean Catalog(s)"
-msgstr "Limpiar catálogo(s)"
-
-#: ../../admin/catalog.php:149 ../../templates/catalog.inc:81
-msgid "Clean All Catalogs"
-msgstr "Limpiar todos los catálogos"
-
-#: ../../admin/catalog.php:198
-msgid "Now Playing Cleared"
-msgstr "Limpiar: Reproducción actual"
-
-#: ../../admin/catalog.php:198
-msgid "All now playing data has been cleared"
-msgstr "La lista de Reproducción actual ha sido eliminada"
-
-#: ../../admin/catalog.php:203
-msgid "Do you really want to clear your catalog?"
-msgstr "¿Confirmas limpiar el catálogo?"
-
-#: ../../admin/catalog.php:210
-msgid "Do you really want to clear the statistics for this catalog?"
-msgstr "¿Confirmas limpiar estadísticas de este catálogo?"
-
-#: ../../admin/catalog.php:228
-msgid "Do you really want to delete this catalog?"
-msgstr "¿Confirmas eliminar este catálogo?"
-
-#: ../../admin/catalog.php:259
-msgid "Album Art Search Finished"
-msgstr "Búsqueda de arte de álbums terminada"
-
-#: ../../admin/users.php:77 ../../admin/users.php:124
-msgid "Error Username Required"
-msgstr "Nombre de usuario obligatorio"
-
-#: ../../admin/users.php:80 ../../admin/users.php:121
-msgid "Error Passwords don't match"
-msgstr "Las contraseñas no coinciden"
-
-#: ../../admin/users.php:138
-msgid "Are you sure you want to permanently delete"
-msgstr "¿Confirmas borrar permanentemente"
-
-#: ../../admin/users.php:145 ../../templates/show_confirm_action.inc.php:29
-msgid "No"
-msgstr "No"
-
-#: ../../admin/users.php:147
-msgid "User Deleted"
-msgstr "Usuario eliminado"
-
-#: ../../admin/users.php:150
-msgid "Delete Error"
-msgstr "Error"
-
-#: ../../admin/users.php:150
-msgid "Unable to delete last Admin User"
-msgstr "Imposible borrar el último Admin"
-
-#: ../../admin/access.php:43
-msgid "Do you really want to delete this Access Record?"
-msgstr "¿Confirmas borrar este registro?"
-
-#: ../../admin/access.php:51
-msgid "Entry Deleted"
-msgstr "Registro eliminado"
-
-#: ../../admin/access.php:51
-msgid "Your Access List Entry has been removed"
-msgstr "Tu lista de acceso ha sido eliminada"
-
-#: ../../admin/access.php:61
-msgid "Entry Added"
-msgstr "Registro guardado"
-
-#: ../../admin/access.php:61
-msgid "Your new Access List Entry has been created"
-msgstr "Se ha creado tu nueva lista de acceso"
-
-#: ../../admin/mail.php:98
-msgid "Mail to"
-msgstr "Enviar a "
-
-#: ../../admin/mail.php:109
-msgid "Subject"
-msgstr "Asunto"
-
-#: ../../admin/mail.php:116
-msgid "Message"
-msgstr "Mensaje"
-
-#: ../../admin/mail.php:126
-msgid "Send Mail"
-msgstr "Enviar correo"
-
-#: ../../admin/song.php:70
-msgid "Songs Disabled"
-msgstr "Canciones deshabilitadas"
-
-#: ../../admin/song.php:70
-msgid "The requested song(s) have been disabled"
-msgstr "La canción seleccionada ha sido deshabilitada"
-
-#: ../../admin/song.php:80
-msgid "Songs Enabled"
-msgstr "Canciones habilitadas"
-
-#: ../../admin/song.php:80
-msgid "The requested song(s) have been enabled"
-msgstr "Cancion(es) habilitada(as)"
-
-#: ../../templates/show_user_registration.inc.php:28
-#: ../../templates/show_install_account.inc.php:59
-#: ../../templates/userform.inc:41 ../../templates/show_users.inc:40
-msgid "Username"
-msgstr "Nombre de usuario"
-
-#: ../../templates/show_user_registration.inc.php:36
-#: ../../templates/userform.inc:49
-msgid "Full Name"
-msgstr "Nombre completo"
-
-#: ../../templates/show_user_registration.inc.php:44
-#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:56
-msgid "E-mail"
-msgstr "Correo electrónico"
-
-#: ../../templates/show_user_registration.inc.php:52
-#: ../../templates/show_install_account.inc.php:63
-#: ../../templates/userform.inc:64 ../../templates/show_login_form.inc:53
-msgid "Password"
-msgstr "Contraseña"
-
-#: ../../templates/show_user_registration.inc.php:60
-#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:73
-msgid "Confirm Password"
-msgstr "Confirmar contraseña"
-
-#: ../../templates/show_user_registration.inc.php:69
-msgid "Register User"
-msgstr "Registar usuario"
-
-#: ../../templates/show_install_account.inc.php:35
-#: ../../templates/show_install_config.inc:35
-#: ../../templates/show_install.inc:34
-msgid "Ampache Installation"
-msgstr "Instalación del Ampache"
-
-#: ../../templates/show_install_account.inc.php:37
-#: ../../templates/show_install_config.inc:37
-#: ../../templates/show_install.inc:36
-msgid ""
-"This Page handles the installation of the ampache database and the creation "
-"of the ampache.cfg.php file. Before you continue please make sure that you "
-"have the following pre-requisits"
-msgstr "Esta página se encarga de la instalación de la base de datos del Ampache "
-"y la creación del archivo ampache.cfg.php.  Antes de continuar, asegúrese que "
-"estos requisitos se cumplen"
-
-#: ../../templates/show_install_account.inc.php:40
-#: ../../templates/show_install_config.inc:40
-#: ../../templates/show_install.inc:39
-msgid ""
-"A MySQL Server with a username and password that can create/modify databases"
-msgstr " Un servidor con MySQL instalado y una contraseña con privilegios para crear y modificar la base de datos"
-
-#: ../../templates/show_install_account.inc.php:41
-msgid ""
-"Your webserver has read access to the /sql/ampache.sql file and the /config/"
-"ampache.cfg.dist.php file"
-msgstr "El servidor tiene acceso de lectura a los archivos /sql/ampache.sql y /config/ampache.cfg.dist.php"
-
-#: ../../templates/show_install_account.inc.php:43
-#: ../../templates/show_install_config.inc:43
-#: ../../templates/show_install.inc:42
-msgid ""
-"Once you have ensured that you have the above requirements please fill out "
-"the information below. You will only be asked for the required config "
-"values. If you would like to make changes to your ampache install at a later "
-"date simply edit /config/ampache.cfg.php"
-msgstr "Una vez que compruebe los requierimientos anteriores, "
-"por favor complete la siguiente información.  Solo se le preguntarán los valores "
-"necesarios para la configuración inicial.  Si desea hacer cambios en la instalación "
-"del Ampache, use el archivo ubicado en /config/ampache.cfg.php"
-
-#: ../../templates/show_install_account.inc.php:48
-#: ../../templates/show_install_config.inc:48
-#: ../../templates/show_install.inc:46
-msgid "Step 1 - Creating and Inserting the Ampache Database"
-msgstr "Paso 1 - Crear e Insertar la Base de Datos del Ampache"
-
-#: ../../templates/show_install_account.inc.php:49
-msgid "Step 2 - Creating the ampache.cfg.php file"
-msgstr "Paso 2 - Crear el archivo ampache.cfg.php"
-
-#: ../../templates/show_install_account.inc.php:50
-#: ../../templates/show_install_config.inc:53
-#: ../../templates/show_install.inc:51
-msgid "Step 3 - Setup Initial Account"
-msgstr "Paso 3 - Configurar la cuenta inicial"
-
-#: ../../templates/show_install_account.inc.php:52
-msgid ""
-"This step creates your initial Ampache admin account. Once your admin "
-"account has been created you will be directed to the login page"
-msgstr "En este paso se crea la cuenta de administración del Ampache. "
-"Una vez que la cuenta este lista, se redireccionará a la página de inicio"
-
-#: ../../templates/show_install_account.inc.php:68
-msgid "Create Account"
-msgstr "Crear cuenta"
-
-#: ../../templates/show_confirm_action.inc.php:28
-msgid "Yes"
-msgstr "Si"
-
-#: ../../templates/show_import_playlist.inc.php:26
-msgid "Importing a Playlist from a File"
-msgstr "Importar listas de reproducción desde archivos"
-
-#: ../../templates/show_import_playlist.inc.php:29 ../../upload.php:237
-msgid "Filename"
-msgstr "Nombre de archivo"
-
-#: ../../templates/show_import_playlist.inc.php:36
-msgid "Playlist Type"
-msgstr "Tipo de listas de reproducción"
-
-#: ../../templates/show_import_playlist.inc.php:49
-msgid "Import Playlist"
-msgstr ""
-
-#: ../../templates/show_user.inc.php:31
-#: ../../templates/customize_catalog.inc:29
-#: ../../templates/show_add_access.inc:40
-#: ../../templates/show_access_list.inc:47
-msgid "Name"
-msgstr "Nombre"
-
-#: ../../templates/show_user.inc.php:48
-msgid "View Limit"
-msgstr "Límite"
-
-#: ../../templates/show_user.inc.php:56
-msgid "Update Profile"
-msgstr "Actualizar perfil"
-
-#: ../../templates/show_user.inc.php:67
-msgid "Enter password"
-msgstr "Contraseña"
-
-#: ../../templates/show_user.inc.php:83
-msgid "Change Password"
-msgstr "Cambiar la contraseña"
-
-#: ../../templates/show_user.inc.php:91
-msgid "Clear Stats"
-msgstr "Limpiar estadísticas"
-
-#: ../../templates/show_confirmation.inc.php:30
-msgid "Continue"
-msgstr "Continuar"
-
-#: ../../templates/show_play_selected.inc.php:43
-msgid "Play Selected"
-msgstr "Reproducir selección"
-
-#: ../../templates/show_play_selected.inc.php:44 ../../playlist.php:77
-msgid "Flag Selected"
-msgstr "Marcar la selección"
-
-#: ../../templates/show_play_selected.inc.php:45 ../../playlist.php:83
-msgid "Edit Selected"
-msgstr "Editar selección"
-
-#: ../../templates/show_play_selected.inc.php:52
-msgid "Set Track Numbers"
-msgstr "Tracks"
-
-#: ../../templates/show_play_selected.inc.php:53
-msgid "Remove Selected Tracks"
-msgstr "Eliminar tracks seleccionados"
-
-#: ../../templates/show_play_selected.inc.php:59
-msgid "Playlist"
-msgstr "Lista de reproducción"
-
-#: ../../templates/show_play_selected.inc.php:59
-msgid "Add to"
-msgstr "Añadir a"
-
-#: ../../localplay.php:79
-msgid "Unknown action requested"
-msgstr "Acción desconocida"
-
-#: ../../artists.php:47
-msgid "All songs by"
-msgstr "Todas las canciones de"
-
-#: ../../artists.php:56 ../../albums.php:105
-msgid "Starting Update from Tags"
-msgstr "Comenzar actualización de etiquetas"
-
-#: ../../artists.php:61 ../../albums.php:110
-msgid "Update From Tags Complete"
-msgstr "Actualización de etiquetas completo"
-
-#: ../../artists.php:73 ../../artists.php:82 ../../artists.php:94
-#: ../../artists.php:111
-msgid "<u>S</u>how artists starting with"
-msgstr "<u>M</u>ostrar artis que comienzan con"
-
-#: ../../amp-mpd.php:41
-msgid "Error Connecting"
-msgstr "Error de conexión"
-
-#: ../../playlist.php:115
-msgid "owned by"
-msgstr "pertenece a"
-
-#: ../../playlist.php:118
-msgid "Edit Playlist"
-msgstr "Editar lista de reproducción"
-
-#: ../../playlist.php:121
-msgid "Play Full Playlist"
-msgstr "Reproducir toda la lista"
-
-#: ../../playlist.php:122
-msgid "Play Random"
-msgstr "Reproducir aleatoreo"
-
-#: ../../playlist.php:135
-msgid "New Playlist"
-msgstr "Nueva lista"
-
-#: ../../playlist.php:192
-msgid "Playlist updated."
-msgstr "Lista actualizada"
-
-#: ../../index.php:38
-msgid "Welcome to"
-msgstr "Bienvenido a"
-
-#: ../../index.php:40
-msgid "you are currently logged in as"
-msgstr "esta en línea como"
-
-#: ../../index.php:65
-msgid "Most Popular Albums"
-msgstr "Albums más populares"
-
-#: ../../index.php:75
-msgid "Most Popular Artists"
-msgstr "Artistas más populares"
-
-#: ../../index.php:82
-msgid "Most Popular Songs"
-msgstr "Canciones más populares"
-
-#: ../../index.php:92
-msgid "Newest Artist Additions"
-msgstr "Nuevos artistas"
-
-#: ../../index.php:99
-msgid "Newest Album Additions"
-msgstr "Nuevos álbumes"
-
-#: ../../user.php:45
-msgid "Error: Password Does Not Match or Empty"
-msgstr "Error: Las contraseñas no coinciden"
-
-#: ../../user.php:51 ../../user.php:62
-msgid "Error: Insufficient Rights"
-msgstr "Error: Privilegios insuficientes"
-
-#: ../../flag.php:35
-msgid "Flagging song completed."
-msgstr "Información de cancion completa"
-
-#: ../../albums.php:43
-msgid "Album Art Cleared"
-msgstr "Arte de álbumes eliminado"
-
-#: ../../albums.php:43
-msgid "Album Art information has been removed form the database"
-msgstr "Se eliminó el arte de álbumes de la base de datos"
-
-#: ../../albums.php:77
-msgid "Album Art Located"
-msgstr "Se localizó el arte del álbum"
-
-#: ../../albums.php:77
-msgid ""
-"Album Art information has been located in Amazon. If incorrect, click "
-"\"Reset Album Art\" below to remove the artwork."
-msgstr "Se localizó el arte en Amazon.  Si esta incorrecta, haga click en "
-"\"Eliminar arte\""
-
-#: ../../albums.php:85 ../../albums.php:95
-msgid "Get Art"
-msgstr "Bajar arte"
-
-#: ../../albums.php:89
-msgid "Album Art Not Located"
-msgstr "Arte no localizado"
-
-#: ../../albums.php:89
-msgid ""
-"Album Art could not be located at this time. This may be due to Amazon being "
-"busy, or the album not being present in their collection."
-msgstr "El arte del album no pudo ser localizada en este momento.  Puede ser que Amazon "
-"este ocupado, o que el album no se encuentre en su colección."
-
-#: ../../albums.php:126 ../../albums.php:132
-msgid "<u>S</u>how all albums"
-msgstr "<u>M</u>ostrar todos los álbumes"
-
-#: ../../albums.php:139 ../../albums.php:146 ../../albums.php:151
-msgid "<u>S</u>how only albums starting with"
-msgstr "<u>M</u>ostrar álbums que comiencen con"
-
-#: ../../albums.php:145
-msgid "Select a starting letter or Show all"
-msgstr "Seleccione una letra o Mostrar todo"
-
-#: ../../upload.php:124
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr "El tamaño del archivo sobrepasa el tamaño permitido por upload_max_filesize en el php.ini"
-
-#: ../../upload.php:127
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr "El archivo excede el MAX_FILE_SIZE especificado en la forma HTML."
-
-#: ../../upload.php:130
-msgid "The uploaded file was only partially uploaded."
-msgstr "El archivo se copio parcialmente"
-
-#: ../../upload.php:133
-msgid "No file was uploaded."
-msgstr "No se copió ningún archivo"
-
-#: ../../upload.php:136
-msgid "An Unknown Error has occured."
-msgstr "Error desconocido"
-
-#: ../../upload.php:157
-msgid "Successfully-Quarantined"
-msgstr "En Cuarentena"
-
-#: ../../upload.php:167
-msgid "Successfully-Cataloged"
-msgstr "Catalogada satisfactoriamente"
-
-#: ../../upload.php:229 ../../templates/show_artists.inc:43
-#: ../../templates/show_artists.inc:67 ../../templates/show_songs.inc:42
-#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:75
-#: ../../templates/show_access_list.inc:51 ../../templates/show_artist.inc:56
-msgid "Action"
-msgstr "Acción"
-
-#: ../../upload.php:230 ../../templates/list_flagged.inc:41
-#: ../../templates/flag.inc:58
-msgid "Song"
-msgstr "Canción"
-
-#: ../../upload.php:236 ../../templates/show_songs.inc:38
-msgid "Size"
-msgstr "Tamaño"
-
-#: ../../upload.php:238
-msgid "User"
-msgstr "Usuario"
-
-#: ../../upload.php:239
-msgid "Date"
-msgstr "Fecha"
-
-#: ../../upload.php:267
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: ../../upload.php:289
-msgid "Add"
-msgstr "Agregar"
-
-#: ../../upload.php:294
-msgid "Quarantined"
-msgstr "En cuarentena"
-
-#: ../../templates/customize_catalog.inc:24
-msgid "Settings for catalog in"
-msgstr "Ajustes para el catálogo en"
-
-#: ../../templates/customize_catalog.inc:32 ../../templates/add_catalog.inc:39
-msgid "Auto-inserted Fields"
-msgstr "Campos automáticos"
-
-#: ../../templates/customize_catalog.inc:33 ../../templates/add_catalog.inc:40
-msgid "album name"
-msgstr "nombre del album"
-
-#: ../../templates/customize_catalog.inc:34 ../../templates/add_catalog.inc:41
-msgid "artist name"
-msgstr "nombre del artista"
-
-#: ../../templates/customize_catalog.inc:35
-msgid "catalog path"
-msgstr "ruta del catálogo"
-
-#: ../../templates/customize_catalog.inc:36 ../../templates/add_catalog.inc:42
-msgid "id3 comment"
-msgstr "comentario id3"
-
-#: ../../templates/customize_catalog.inc:37 ../../templates/add_catalog.inc:43
-msgid "genre"
-msgstr "género"
-
-#: ../../templates/customize_catalog.inc:38 ../../templates/add_catalog.inc:44
-msgid "track number (padded with leading 0)"
-msgstr "número de la canción (con 0 antes del número)"
-
-#: ../../templates/customize_catalog.inc:39 ../../templates/add_catalog.inc:45
-msgid "song title"
-msgstr "título de la canción"
-
-#: ../../templates/customize_catalog.inc:40 ../../templates/add_catalog.inc:46
-msgid "year"
-msgstr "año"
-
-#: ../../templates/customize_catalog.inc:41 ../../templates/add_catalog.inc:47
-msgid "other"
-msgstr "otro"
-
-#: ../../templates/customize_catalog.inc:45
-msgid "ID3 set command"
-msgstr "ID3 set command"
-
-#: ../../templates/customize_catalog.inc:51
-msgid "Filename pattern"
-msgstr "Nombre de archivo"
-
-#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
-msgid "Folder Pattern"
-msgstr "Folder"
-
-#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
-msgid "(no leading or ending '/')"
-msgstr "(sin '/' antes o despues)"
-
-#: ../../templates/customize_catalog.inc:69
-msgid "Save Catalog Settings"
-msgstr "Guardar cambios"
-
-#: ../../templates/show_admin_index.inc:27
-msgid "Admin Section"
-msgstr "Sección de administración"
-
-#: ../../templates/show_admin_index.inc:29 ../../templates/admin_menu.inc:33
-msgid "Users"
-msgstr "Usuarios"
-
-#: ../../templates/show_admin_index.inc:29
-msgid "Create/Modify User Accounts for Ampache"
-msgstr "Crear/Modificar cuentas de usuario para Ampache"
-
-#: ../../templates/show_admin_index.inc:30
-msgid "Mail"
-msgstr "Correo"
-
-#: ../../templates/show_admin_index.inc:30
-msgid "Mail your users to notfiy them of changes"
-msgstr "Enviar un mensaje a los usuarios"
-
-#: ../../templates/show_admin_index.inc:31
-msgid "Create/Update/Clean your catalog here"
-msgstr "Creación/Actualización/Mantenimiento del catálogo"
-
-#: ../../templates/show_admin_index.inc:32 ../../templates/admin_menu.inc:36
-msgid "Admin Preferences"
-msgstr "Preferencias del Admin"
-
-#: ../../templates/show_admin_index.inc:32
-msgid "Modify Site-wide preferences"
-msgstr "Preferencias de todo el sitio"
-
-#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:98
-#: ../../templates/admin_menu.inc:37
-msgid "Access Lists"
-msgstr "Listas de acceso"
-
-#: ../../templates/show_admin_index.inc:33
-msgid "Modify Access List Permissions"
-msgstr "Modificar los permisos en las listas de acceso"
-
-#: ../../templates/show_admin_index.inc:33
-msgid "Must have access_control=true in ampache.cfg"
-msgstr "Se requiere que el access_contro=true en ampache.cfg.php"
-
-#: ../../templates/show_test.inc:29
-msgid "Ampache Debug"
-msgstr "Ampache Debug"
-
-#: ../../templates/show_test.inc:30
-msgid ""
-"You've reached this page because a configuration error has occured. Debug "
-"Information below"
-msgstr "Un error inesperado se ha presentado.  Información para debuggear a continuación:"
-
-#: ../../templates/show_test.inc:34
-msgid "CHECK"
-msgstr "CHECK"
-
-#: ../../templates/show_test.inc:36
-msgid "STATUS"
-msgstr "STATUS"
-
-#: ../../templates/show_test.inc:38
-msgid "DESCRIPTION"
-msgstr "DESCRIPCION"
-
-#: ../../templates/show_test.inc:41
-msgid "PHP Version"
-msgstr "PHP Version"
-
-#: ../../templates/show_test.inc:56
-msgid ""
-"This tests to make sure that you are running a version of PHP that is known "
-"to work with Ampache."
-msgstr "Esta prueba es para asegurarnos que su version de PHP funciona con Ampache."
-
-#: ../../templates/show_test.inc:60
-msgid "Mysql for PHP"
-msgstr "MySQL para PHP"
-
-#: ../../templates/show_test.inc:75
-msgid ""
-"This test checks to see if you have the mysql extensions loaded for PHP. "
-"These are required for Ampache to work."
-msgstr "Esta prueba revisa las extensiones de PHP."
-
-#: ../../templates/show_test.inc:79
-msgid "PHP Session Support"
-msgstr "Soporte de Sesiones de PHP"
-
-#: ../../templates/show_test.inc:94
-msgid ""
-"This test checks to make sure that you have PHP session support enabled. "
-"Sessions are required for Ampache to work."
-msgstr "Estas pruebas se aseguran que las sesiones de PHP estén funcionando"
-"Las Sesiones son necesarias para que Ampache funcione."
-
-#: ../../templates/show_test.inc:98
-msgid "PHP ICONV Support"
-msgstr "Soporte PHP ICONV"
-
-#: ../../templates/show_test.inc:112
-msgid ""
-"This test checks to make sure you have Iconv support installed. Iconv "
-"support is not required for Ampache, but it is highly recommended"
-msgstr "Esta prueba es para revisar que Iconv esta instalado.  Iconv "
-"no es necesario para Ampache, pero es recomendado."
-
-#: ../../templates/show_test.inc:116
-#: ../../templates/show_install_config.inc:87
-msgid "Ampache.cfg.php Exists"
-msgstr "Existe ampache.cfg.php"
-
-#: ../../templates/show_test.inc:131
-msgid ""
-"This attempts to read /config/ampache.cfg.php If this fails either the "
-"ampache.cfg.php is not in the correct locations or\n"
-"\tit is not currently readable by your webserver."
-msgstr "Intentando leer /config/ampache.cfg.php Si esto falla, el ampache.cfg.php "
-"no esta en la ruta correcta o no existe."
-
-#: ../../templates/show_test.inc:137
-#: ../../templates/show_install_config.inc:104
-msgid "Ampache.cfg.php Configured?"
-msgstr "¿Está configurado el ampache.cfg.php?"
-
-#: ../../templates/show_test.inc:154
-msgid ""
-"This test makes sure that you have set all of the required config variables "
-"and that we are able to \n"
-"\tcompleatly parse your config file"
-msgstr "Esta prueba se asegura que todas las variables esten configuradas "
-" y que podemos leer el archivo de configuración."
-
-#: ../../templates/show_test.inc:160
-msgid "Ampache.cfg.php Up to Date?"
-msgstr "¿Está actualizado el ampache.cfg.php?"
-
-#: ../../templates/show_test.inc:180
-msgid "Ampache.cfg.php is missing the following:"
-msgstr "Al ampache.cfg.php le falta:"
-
-#: ../../templates/show_test.inc:181
-msgid "Under CONF"
-msgstr "Bajo CONF"
-
-#: ../../templates/show_test.inc:185
-msgid "Under LIBGLUE"
-msgstr "Bajo LIBGLUE"
-
-#: ../../templates/show_test.inc:196
-msgid "DB Connection"
-msgstr "Conexión DB"
-
-#: ../../templates/show_test.inc:212
-msgid ""
-"This attempts to connect to your database using the values from your ampache."
-"cfg.php"
-msgstr "Esto intenta conectarse a su base de datos usando el ampache.cfg.php"
-
-#: ../../templates/show_localplay.inc:30
-msgid "Local Play Control"
-msgstr "Control local de reproducción"
-
-#: ../../templates/show_localplay.inc:35
-msgid "Playback"
-msgstr "Reproducción"
-
-#: ../../templates/show_localplay.inc:39 ../../templates/list_header.inc:71
-#: ../../templates/show_mpdplay.inc:43
-msgid "Prev"
-msgstr "Anterior"
-
-#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:44
-msgid "Stop"
-msgstr "Detener"
-
-#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:46
-msgid "Pause"
-msgstr "Pausa"
-
-#: ../../templates/show_localplay.inc:43 ../../templates/list_header.inc:94
-#: ../../templates/show_mpdplay.inc:47
-msgid "Next"
-msgstr "Siguiente"
-
-#: ../../templates/show_localplay.inc:49
-msgid "Volume"
-msgstr "Volumen"
-
-#: ../../templates/show_localplay.inc:53 ../../templates/show_localplay.inc:54
-msgid "Increase Volume"
-msgstr "Aumentar volumen"
-
-#: ../../templates/show_localplay.inc:55 ../../templates/show_localplay.inc:56
-msgid "Decrease Volume"
-msgstr "Disnimuir volumen"
-
-#: ../../templates/show_localplay.inc:62
-msgid "Clear queue"
-msgstr "Limpiar queue"
-
-#: ../../templates/add_catalog.inc:28
-msgid "Add a Catalog"
-msgstr "Agregar un catálogo"
-
-#: ../../templates/add_catalog.inc:30
-msgid ""
-"In the form below enter either a local path (i.e. /data/music) or the URL to "
-"a remote Ampache installation (i.e http://theotherampache.com)"
-msgstr "En la siguiente forma, inserte una ruta local (ej. /data/music) o un URL a"
-" una instalación remota de Ampache (ej. http://miotroampache.com)."
-
-#: ../../templates/add_catalog.inc:36
-msgid "Catalog Name"
-msgstr "Nombre del catálogo"
-
-#: ../../templates/add_catalog.inc:53
-msgid "Path"
-msgstr "Ruta"
-
-#: ../../templates/add_catalog.inc:57
-msgid "Catalog Type"
-msgstr "Tipo de catálogo"
-
-#: ../../templates/add_catalog.inc:61
-msgid "Remote"
-msgstr "Remoto"
-
-#: ../../templates/add_catalog.inc:66
-msgid "ID3 Set Command"
-msgstr "Comando ID3"
-
-#: ../../templates/add_catalog.inc:70
-msgid "Filename Pattern"
-msgstr "Nombre de archivo"
-
-#: ../../templates/add_catalog.inc:78 ../../templates/catalog.inc:104
-msgid "Gather Album Art"
-msgstr "Recopilar arte de los albums"
-
-#: ../../templates/add_catalog.inc:82
-msgid "ID3V2 Tags"
-msgstr "Etiquetas ID3V2"
-
-#: ../../templates/add_catalog.inc:85
-msgid "Amazon"
-msgstr "Amazon"
-
-#: ../../templates/add_catalog.inc:88
-msgid "File Folder"
-msgstr "Folder del archivo"
-
-#: ../../templates/add_catalog.inc:95
-msgid "Build Playlists from m3u Files"
-msgstr "Generar listas de reproducción con los archivos m3u"
-
-#: ../../templates/add_catalog.inc:102
-msgid "Add Catalog"
-msgstr "Agregar catálogo"
-
-#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:41
-msgid "Flag"
-msgstr "Bandera"
-
-#: ../../templates/list_flagged.inc:43
-msgid "New Flag"
-msgstr "Nueva bandera"
-
-#: ../../templates/list_flagged.inc:44
-msgid "Flagged by"
-msgstr "Comentado por"
-
-#: ../../templates/list_flagged.inc:45
-msgid "ID3 Update"
-msgstr "Actualizar ID3"
-
-#: ../../templates/list_flagged.inc:69
-msgid "Accept"
-msgstr "Aceptar"
-
-#: ../../templates/list_flagged.inc:70
-msgid "Reject"
-msgstr "Rechazar"
-
-#: ../../templates/show_songs.inc:33
-msgid "Song title"
-msgstr "Título de la canción"
-
-#: ../../templates/show_songs.inc:113
-msgid "Direct Link"
-msgstr "Liga directa"
-
-#: ../../templates/show_songs.inc:131
-msgid "Total"
-msgstr "Total"
-
-#: ../../templates/show_install_config.inc:41
-#: ../../templates/show_install.inc:40
-msgid ""
-"Your webserver has read access to the /sql/ampache.sql file and the /config/"
-"ampache.cfg.php.dist file"
-msgstr "El servidor si tiene permiso de lectura de los archivos /sql/ampache.sql y /config/ampache.cfg.php.dist"
-""
-
-#: ../../templates/show_install_config.inc:49
-#: ../../templates/show_install.inc:50
-msgid "Step 2 - Creating the Ampache.cfg.php file"
-msgstr "Paso 2 - Creando el archivo ampache.cfg.php"
-
-#: ../../templates/show_install_config.inc:51
-msgid ""
-"This steps takes the basic config values, and first attempts to write them "
-"out directly to your webserver. If access is denied it will prompt you to "
-"download the config file. Please put the downloaded config file in /config"
-msgstr "En este paso se utilizan los valores de configuración,  para hacer una "
-"prueba de escritura en su sistema.  Si se niega el permiso, se le enviará el archivo "
-"a usted.  Cuando termine de descargarse, cópielo en /config"
-
-#: ../../templates/show_install_config.inc:59
-msgid "Web Path"
-msgstr "Ruta Web"
-
-#: ../../templates/show_install_config.inc:63
-#: ../../templates/show_install.inc:57
-msgid "Desired Database Name"
-msgstr "Nombre de datos de base sugerida"
-
-#: ../../templates/show_install_config.inc:67
-#: ../../templates/show_install.inc:61
-msgid "MySQL Hostname"
-msgstr "Mysql Hostname"
-
-#: ../../templates/show_install_config.inc:71
-msgid "MySQL Username"
-msgstr "MySQL nombre de usuario"
-
-#: ../../templates/show_install_config.inc:75
-msgid "MySQL Password"
-msgstr "MySQL Contraseña"
-
-#: ../../templates/show_install_config.inc:80
-msgid "Write Config"
-msgstr "Escribir configuración"
-
-#: ../../templates/show_install_config.inc:124
-msgid "Check for Config"
-msgstr "Revisar si existe Config"
-
-#: ../../templates/show_album.inc:53
-msgid "Play Album"
-msgstr "Reproducir album"
-
-#: ../../templates/show_album.inc:54
-msgid "Play Random from Album"
-msgstr "Reproducir Album aleatorio"
-
-#: ../../templates/show_album.inc:55
-msgid "Reset Album Art"
-msgstr "Reestablacer el Arte del album"
-
-#: ../../templates/show_album.inc:56
-msgid "Find Album Art"
-msgstr "Buscar arte del album"
-
-#: ../../templates/show_album.inc:58 ../../templates/show_artist.inc:37
-msgid "Update from tags"
-msgstr "Actualizar desde etiquetas"
-
-#: ../../templates/show_preferences.inc:31
-msgid "Editing"
-msgstr "Editando"
-
-#: ../../templates/show_preferences.inc:31
-msgid "preferences"
-msgstr "preferencias"
-
-#: ../../templates/show_preferences.inc:33
-msgid "Rebuild Preferences"
-msgstr "Recargar preferencias"
-
-#: ../../templates/show_preferences.inc:39
-msgid "Preference"
-msgstr "Preferencia"
-
-#: ../../templates/show_preferences.inc:40
-msgid "Value"
-msgstr "Valor"
-
-#: ../../templates/show_preferences.inc:42
-msgid "Type"
-msgstr "Tipo"
-
-#: ../../templates/show_preferences.inc:43
-msgid "Apply to All"
-msgstr "Aplicar a todos"
-
-#: ../../templates/show_preferences.inc:83
-msgid "Update Preferences"
-msgstr "Actualizar preferencias"
-
-#: ../../templates/show_preferences.inc:87
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../../templates/userform.inc:25
-msgid "Adding a New User"
-msgstr "Agregando usuario nuevo"
-
-#: ../../templates/userform.inc:29
-msgid "Editing existing User"
-msgstr "Editar usuario"
-
-#: ../../templates/userform.inc:81
-msgid "User Access Level"
-msgstr "Usar el nivel de acceso"
-
-#: ../../templates/userform.inc:97
-msgid "Add User"
-msgstr "Agregar usuario"
-
-#: ../../templates/userform.inc:102
-msgid "Update User"
-msgstr "Actualizar usuarios"
-
-#: ../../templates/show_install.inc:48
-msgid ""
-"This step creates and inserts the Ampache database, as such please provide a "
-"mysql account with database creation rights. This step may take a while "
-"depending upon the speed of your computer"
-msgstr "Este paso crea e inserta las bases de datos de tu ampache."
-
-#: ../../templates/show_install.inc:65
-msgid "MySQL Administrative Username"
-msgstr "Nombre de usuario de MySQL"
-
-#: ../../templates/show_install.inc:69
-msgid "MySQL Administrative Password"
-msgstr "Contraseña del MySQL administrativo."
-
-#: ../../templates/show_install.inc:74
-msgid "Insert Database"
-msgstr "Insertar base de datos."
-
-#: ../../templates/flag.inc:43
-msgid "Flag song"
-msgstr "Marcar canción"
-
-#: ../../templates/flag.inc:45
-msgid ""
-"Flag the following song as having one of the problems listed below.  Site "
-"admins will then take the appropriate action for the flagged files."
-msgstr "Marcar la siguiente canción"
-
-#: ../../templates/flag.inc:62
-msgid "Reason to flag"
-msgstr "Razón de la marca"
-
-#: ../../templates/flag.inc:73
-msgid "Flag Song"
-msgstr "Marcar canción."
-
-#: ../../templates/show_add_access.inc:31
-msgid "Add Access for a Host"
-msgstr "Añadir acceso a un Host"
-
-#: ../../templates/show_add_access.inc:33
-msgid ""
-"Use the form below to add a host that you want to have access to your "
-"Ampache catalog."
-msgstr "Use las formas abajo para agregar un host que pueda entrar "
-" al catálogo de Ampache."
-
-#: ../../templates/show_add_access.inc:46
-msgid "Start IP Address"
-msgstr "Iniciar dirección IP."
-
-#: ../../templates/show_add_access.inc:52
-msgid "End IP Address"
-msgstr "Termina la dirección IP?"
-
-#: ../../templates/show_add_access.inc:58
-#: ../../templates/show_access_list.inc:50
-msgid "Level"
-msgstr "Nivel"
-
-#: ../../templates/show_add_access.inc:72
-msgid "Add Host"
-msgstr "Agregar Host"
-
-#: ../../templates/catalog.inc:33
-msgid ""
-"Error: ICONV not found, ID3V2 Tags will not import correctly. See <a href="
-"\"http://php.oregonstate.edu/iconv\">Iconv</a> for information on getting "
-"ICONV"
-msgstr "Error: ICONV no encontrado, etiquetas ID3V2 no se importaran correctamente"
-
-#: ../../templates/catalog.inc:42
-msgid "Update Catalogs"
-msgstr "Actualizar catálogos"
-
-#: ../../templates/catalog.inc:68
-msgid "Fast Add"
-msgstr "Añadir"
-
-#: ../../templates/catalog.inc:75
-msgid "Fast Update"
-msgstr "Actualización rápida"
-
-#: ../../templates/catalog.inc:88
-msgid "You don't have any catalogs."
-msgstr "No tiene ningún catálogo"
-
-#: ../../templates/catalog.inc:97
-msgid "Add a catalog"
-msgstr "Añadir a catálogo"
-
-#: ../../templates/catalog.inc:99
-msgid "Show Duplicate Songs"
-msgstr "Mostrar canciones duplicadas"
-
-#: ../../templates/catalog.inc:100
-msgid "Show Disabled Songs"
-msgstr "Mostrar canciones no habilitadas"
-
-#: ../../templates/catalog.inc:101
-msgid "Clear Catalog Stats"
-msgstr "Eliminar estadísticas del catálogo"
-
-#: ../../templates/catalog.inc:102
-msgid "Clear Now Playing"
-msgstr "Eliminar listado de reproducción actual"
-
-#: ../../templates/catalog.inc:103
-msgid "Dump Album Art"
-msgstr "Eliminar arte de álbum"
-
-#: ../../templates/catalog.inc:105
-msgid "View flagged songs"
-msgstr "Ver canciones marcadas"
-
-#: ../../templates/catalog.inc:106
-msgid "Catalog Tools"
-msgstr "Herramientas de Catálogo"
-
-#: ../../templates/admin_menu.inc:34
-msgid "Mail Users"
-msgstr "Usuarios de correo"
-
-#: ../../templates/menu.inc:29
-msgid "Home"
-msgstr "Inicio"
-
-#: ../../templates/menu.inc:32
-msgid "Local Play"
-msgstr "Reproducción local"
-
-#: ../../templates/menu.inc:37
-msgid "Playlists"
-msgstr "Listas de reproducción"
-
-#: ../../templates/menu.inc:39
-msgid "Preferences"
-msgstr "Preferencias"
-
-#: ../../templates/menu.inc:42 ../../templates/show_upload.inc:59
-msgid "Upload"
-msgstr "Subir"
-
-#: ../../templates/menu.inc:62 ../../templates/menu.inc:65
-msgid "Admin"
-msgstr "Admin"
-
-#: ../../templates/menu.inc:72 ../../templates/menu.inc:78
-msgid "Account"
-msgstr "Cuenta"
-
-#: ../../templates/menu.inc:73 ../../templates/menu.inc:79
-msgid "Stats"
-msgstr "Estadísticas"
-
-#: ../../templates/menu.inc:74 ../../templates/menu.inc:80
-#: ../../templates/menu.inc:84
-msgid "Logout"
-msgstr "Salir"
-
-#: ../../templates/show_upload.inc:27
-msgid "Please Ensure All Files Are Tagged Correctly"
-msgstr "Asegúrese que todos los archivos estan correctamente etiquetados"
-
-#: ../../templates/show_upload.inc:30
-msgid ""
-"Ampache relies on id3 tags to sort data.  If your file is not tagged it may "
-"be deleted."
-msgstr "Ampache se basa en la información de las etiquetas ID3.  Si tu archivo "
-"no esta debidamente etiquetado, se borrará"
-
-#: ../../templates/show_upload.inc:34
-msgid "max_upload_size"
-msgstr "max_upload_size"
-
-#: ../../templates/show_now_playing.inc:31 ../../templates/show_mpdplay.inc:90
-msgid "Now Playing"
-msgstr "Ahora reproduciento"
-
-#: ../../templates/show_login_form.inc:49
-#: ../../templates/show_login_form.inc:63
-msgid "Login"
-msgstr "Login"
-
-#: ../../templates/show_login_form.inc:59
-msgid "Remember Me"
-msgstr "Recuerda mi info"
-
-#: ../../templates/show_access_list.inc:34
-msgid "Host Access to Your Catalog"
-msgstr "Acceso a tu catálogo"
-
-#: ../../templates/show_access_list.inc:43
-msgid "Add Entry"
-msgstr "Agregar registro"
-
-#: ../../templates/show_access_list.inc:48
-msgid "Start Address"
-msgstr "Dirección de inicio"
-
-#: ../../templates/show_access_list.inc:49
-msgid "End Address"
-msgstr "Dirección final"
-
-#: ../../templates/show_access_list.inc:65
-msgid "Revoke"
-msgstr "Revocar"
-
-#: ../../templates/show_users.inc:43
-msgid "Fullname"
-msgstr "Nombre completo"
-
-#: ../../templates/show_users.inc:48
-msgid "Last Seen"
-msgstr "Última visita"
-
-#: ../../templates/show_users.inc:55 ../../templates/show_users.inc:91
-msgid "Prefs"
-msgstr "Preferencias"
-
-#: ../../templates/show_users.inc:58
-msgid "Access"
-msgstr "Acceso"
-
-#: ../../templates/show_users.inc:64
-msgid "On-line"
-msgstr "En línea"
-
-#: ../../templates/show_users.inc:105
-msgid "delete"
-msgstr "borrar"
-
-#: ../../templates/show_search.inc:34
-msgid "Search Ampache"
-msgstr "Busqueda"
-
-#: ../../templates/show_search.inc:41
-msgid "Object Type"
-msgstr "Tipo de objeto"
-
-#: ../../templates/show_artist.inc:31
-msgid "Albums by"
-msgstr "Albums de"
-
-#: ../../templates/show_artist.inc:33
-msgid "Show All Songs By"
-msgstr "Mostrar todas las canciones de"
-
-#: ../../templates/show_artist.inc:34
-msgid "Play All Songs By"
-msgstr "Reproducir todas las canciones de"
-
-#: ../../templates/show_artist.inc:35
-msgid "Play Random Songs By"
-msgstr "Reproducir canciones aleatorias de"
-
-#: ../../templates/show_artist.inc:50
-msgid "Select"
-msgstr "Seleccionar"
-
-#: ../../templates/show_artist.inc:52
-msgid "Cover"
-msgstr "Portada"
-
-#: ../../templates/show_artist.inc:53
-msgid "Album Name"
-msgstr "Nombre del álbum"
-
-#: ../../templates/show_artist.inc:54
-msgid "Album Year"
-msgstr "Año del álbum"
-
-#: ../../templates/show_artist.inc:55
-msgid "Total Tracks"
-msgstr "Pistas totales"
-
-#: ../../templates/show_mpdplay.inc:33
-msgid "MPD Play Control"
-msgstr "Control MPD"
-
-#: ../../templates/show_mpdplay.inc:53
-msgid "Loop"
-msgstr "Ciclo"
-
-#: ../../templates/show_mpdplay.inc:60 ../../templates/show_mpdplay.inc:73
-msgid "On"
-msgstr "Encendido"
-
-#: ../../templates/show_mpdplay.inc:61 ../../templates/show_mpdplay.inc:74
-msgid "Off"
-msgstr "Apagado"
-
-#: ../../templates/show_mpdplay.inc:103
-msgid "Refresh the Playlist Window"
-msgstr "Actualizar la ventana de la lista de reproducción."
-
-#: ../../templates/show_mpdplay.inc:103
-msgid "refresh now"
-msgstr "actualizar ahora"
-
-#: ../../templates/show_mpdplay.inc:111
-msgid "Server Playlist"
-msgstr "Lista de reproducción del Servidor"
-
-#: ../../templates/show_mpdplay.inc:146
-msgid "Click to shuffle (randomize) the playlist"
-msgstr "Click para orden aleatorio"
-
-#: ../../templates/show_mpdplay.inc:146
-msgid "shuffle"
-msgstr "aleatorio"
-
-#: ../../templates/show_mpdplay.inc:147
-msgid "Click the clear the playlist"
-msgstr ""
-
-#: ../../templates/show_mpdplay.inc:147
-msgid "clear"
-msgstr "limpiear"
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-01-07 22:47-0800\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../play/index.php:50
+msgid "Session Expired: please log in again at"
+msgstr "Expir su sesin: por favor ingrese de nuevo en"
+
+#: ../../lib/class/catalog.class.php:281 ../../lib/class/catalog.class.php:566
+#: ../../lib/class/album.class.php:263
+msgid "Error: Unable to open"
+msgstr "Error: Imposible abrir"
+
+#: ../../lib/class/catalog.class.php:304
+msgid "Error: Unable to change to directory"
+msgstr "Error: Imposible cambiar al directorio"
+
+#: ../../lib/class/catalog.class.php:330
+msgid "Error: Unable to get filesize for"
+msgstr "Error: Imposible obtener el tamao para"
+
+#: ../../lib/class/catalog.class.php:365
+msgid "Added"
+msgstr "Agregado"
+
+#: ../../lib/class/catalog.class.php:377
+msgid "is not readable by ampache"
+msgstr "no se puede leer por ampache"
+
+#: ../../lib/class/catalog.class.php:441
+msgid "Found in ID3"
+msgstr "Encontrado en los ID3"
+
+#: ../../lib/class/catalog.class.php:445
+msgid "Found on Amazon"
+msgstr "Encontrado en Amazon"
+
+#: ../../lib/class/catalog.class.php:449
+msgid "Found in Folder"
+msgstr "Encontrado en Folder"
+
+#: ../../lib/class/catalog.class.php:453
+msgid "Found"
+msgstr "Encontrado"
+
+#: ../../lib/class/catalog.class.php:456
+msgid "Not Found"
+msgstr "No encontrado"
+
+#: ../../lib/class/catalog.class.php:464
+msgid "Searched"
+msgstr "Buscado"
+
+#: ../../lib/class/catalog.class.php:622
+msgid "Starting Dump Album Art"
+msgstr "Comenzando la bsqueda del arte"
+
+#: ../../lib/class/catalog.class.php:642
+msgid "Written"
+msgstr "Grabado"
+
+#: ../../lib/class/catalog.class.php:651
+msgid "Error unable to open file for writting"
+msgstr "Error: imposible abrir archivo para escritura"
+
+#: ../../lib/class/catalog.class.php:658
+msgid "Album Art Dump Complete"
+msgstr "Se complet la actualizacin del arte"
+
+#: ../../lib/class/catalog.class.php:659 ../../artists.php:64
+#: ../../albums.php:153
+msgid "Return"
+msgstr "Regresar"
+
+#: ../../lib/class/catalog.class.php:728
+msgid "Starting Catalog Build"
+msgstr "Construyendo el catlogo"
+
+#: ../../lib/class/catalog.class.php:733
+msgid "Running Remote Sync"
+msgstr "Sincronizacin remota en proceso"
+
+#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:904
+msgid "Added Playlist From"
+msgstr "Agregando lista de reproduccin de"
+
+#: ../../lib/class/catalog.class.php:752 ../../lib/class/catalog.class.php:913
+#: ../../admin/catalog.php:258
+msgid "Starting Album Art Search"
+msgstr "Comenzando la bsqueda del arte"
+
+#: ../../lib/class/catalog.class.php:762
+msgid "Catalog Finished"
+msgstr "Catlogo completo"
+
+#: ../../lib/class/catalog.class.php:762 ../../lib/class/catalog.class.php:932
+msgid "Total Time"
+msgstr "Tiempo total"
+
+#: ../../lib/class/catalog.class.php:762 ../../lib/class/catalog.class.php:933
+msgid "Total Songs"
+msgstr "Total de canciones"
+
+#: ../../lib/class/catalog.class.php:763 ../../lib/class/catalog.class.php:933
+msgid "Songs Per Seconds"
+msgstr "Canciones por segundo"
+
+#: ../../lib/class/catalog.class.php:797
+#: ../../lib/class/catalog.class.php:1512
+msgid "Updated"
+msgstr "Actualizado"
+
+#: ../../lib/class/catalog.class.php:804
+msgid "No Update Needed"
+msgstr "No se necesit actualizacin"
+
+#: ../../lib/class/catalog.class.php:885
+msgid "Starting New Song Search on"
+msgstr "Comenzando bsqueda de nueva msica en"
+
+#: ../../lib/class/catalog.class.php:885
+msgid "catalog"
+msgstr "catlogo"
+
+#: ../../lib/class/catalog.class.php:889
+msgid "Running Remote Update"
+msgstr "Corriendo actualizacin remota"
+
+#: ../../lib/class/catalog.class.php:932
+msgid "Catalog Update Finished"
+msgstr "Actualizacin del catlogo concluda"
+
+#: ../../lib/class/catalog.class.php:952 ../../lib/mpd.php:43
+#: ../../lib/mpd.php:52 ../../albums.php:74
+msgid "Error"
+msgstr "Error"
+
+#: ../../lib/class/catalog.class.php:952
+msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
+msgstr ""
+"Imposible cargar la librera XMLRPC, asegres que XML-RPC esta habilitada"
+
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
+msgid "Error connecting to"
+msgstr "Error conectando a"
+
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
+msgid "Code"
+msgstr "Cdigo"
+
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
+msgid "Reason"
+msgstr "Razn"
+
+#: ../../lib/class/catalog.class.php:1007
+msgid "Completed updating remote catalog(s)"
+msgstr "Actualizacin de los catlogos remotos concluida"
+
+#: ../../lib/class/catalog.class.php:1138
+msgid "Checking"
+msgstr "Revisando"
+
+#: ../../lib/class/catalog.class.php:1196
+msgid "Catalog Clean Done"
+msgstr "Limpieza del catlogo concluida"
+
+#: ../../lib/class/catalog.class.php:1196
+msgid "files removed"
+msgstr "archivos eliminados"
+
+#: ../../lib/class/catalog.class.php:1469
+msgid "Updating the"
+msgstr "Actualizando el"
+
+#: ../../lib/class/catalog.class.php:1469 ../../templates/sidebar.inc.php:31
+msgid "Catalog"
+msgstr "Catlogo"
+
+#: ../../lib/class/catalog.class.php:1470
+msgid "songs found checking tag information."
+msgstr "canciones encontradas, revisando la informacin en los TAGs"
+
+#: ../../lib/class/catalog.class.php:1520
+msgid " FOUND"
+msgstr "SE ENCONTRARON"
+
+#: ../../lib/class/catalog.class.php:1521
+msgid "Searching for new Album Art"
+msgstr "Buscando arte nuevo"
+
+#: ../../lib/class/catalog.class.php:1525
+msgid "Album Art Already Found"
+msgstr "Arte del album cargada"
+
+#: ../../lib/class/artist.class.php:223
+msgid "Error: Name Identical"
+msgstr ""
+
+#: ../../lib/class/song.class.php:275 ../../lib/duplicates.php:113
+#: ../../templates/show_search.inc:66
+msgid "Title"
+msgstr "Ttulo"
+
+#: ../../lib/class/song.class.php:275 ../../lib/class/song.class.php:279
+#: ../../lib/class/song.class.php:283 ../../lib/class/song.class.php:287
+#: ../../lib/class/song.class.php:291 ../../lib/class/song.class.php:295
+#: ../../lib/class/song.class.php:299 ../../lib/class/song.class.php:304
+#: ../../lib/class/song.class.php:309 ../../lib/class/song.class.php:313
+#: ../../lib/class/song.class.php:317 ../../lib/class/song.class.php:322
+msgid "updated to"
+msgstr "actualizado a"
+
+#: ../../lib/class/song.class.php:279 ../../templates/show_uploads.inc:39
+#: ../../templates/show_songs.inc:47 ../../templates/list_duplicates.inc:36
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: ../../lib/class/song.class.php:283
+msgid "Rate"
+msgstr "Rate"
+
+#: ../../lib/class/song.class.php:287
+msgid "Mode"
+msgstr "Modo"
+
+#: ../../lib/class/song.class.php:291 ../../templates/show_uploads.inc:38
+#: ../../templates/show_mpdpl.inc:66 ../../templates/show_songs.inc:45
+msgid "Time"
+msgstr "Tiempo"
+
+#: ../../lib/class/song.class.php:295 ../../templates/show_mpdpl.inc:65
+#: ../../templates/show_songs.inc:39 ../../templates/show_songs.inc:44
+msgid "Track"
+msgstr "Track"
+
+#: ../../lib/class/song.class.php:299
+msgid "Filesize"
+msgstr "Tamao"
+
+#: ../../lib/class/song.class.php:304
+#: ../../templates/show_get_albumart.inc.php:33
+#: ../../templates/show_uploads.inc:35 ../../templates/show_mpdpl.inc:63
+#: ../../templates/show_songs.inc:42 ../../templates/show_artists.inc:39
+#: ../../templates/show_artists.inc:62 ../../templates/show_albums.inc:40
+#: ../../templates/show_albums.inc:70 ../../templates/list_duplicates.inc:33
+#: ../../templates/show_search.inc:71
+msgid "Artist"
+msgstr "Artista"
+
+#: ../../lib/class/song.class.php:309
+#: ../../templates/show_get_albumart.inc.php:41
+#: ../../templates/show_uploads.inc:36 ../../templates/show_mpdpl.inc:64
+#: ../../templates/show_songs.inc:43 ../../templates/show_albums.inc:38
+#: ../../templates/show_albums.inc:68 ../../templates/list_duplicates.inc:34
+#: ../../templates/show_search.inc:78
+msgid "Album"
+msgstr "Album"
+
+#: ../../lib/class/song.class.php:313 ../../templates/show_albums.inc:43
+#: ../../templates/show_albums.inc:73 ../../templates/show_search.inc:90
+msgid "Year"
+msgstr "Ao"
+
+#: ../../lib/class/song.class.php:317 ../../templates/flag.inc:66
+#: ../../templates/list_flagged.inc:46
+msgid "Comment"
+msgstr "Comentario"
+
+#: ../../lib/class/song.class.php:322 ../../templates/show_genre.inc.php:32
+#: ../../templates/show_genres.inc.php:36 ../../templates/sidebar.inc.php:37
+#: ../../templates/show_uploads.inc:37 ../../templates/show_mpdpl.inc:67
+#: ../../templates/show_songs.inc:48 ../../templates/show_browse_menu.inc:37
+#: ../../templates/show_search.inc:83
+msgid "Genre"
+msgstr "Gnero"
+
+#: ../../lib/class/stream.class.php:198
+#, fuzzy
+msgid "Opened for writing"
+msgstr "Se abri para escritura"
+
+#: ../../lib/class/stream.class.php:203
+msgid "Error, cannot write"
+msgstr "Error: no se puede escribir"
+
+#: ../../lib/class/stream.class.php:214
+msgid "Error, cannot write song in file"
+msgstr "Error: no se puede escribir la cancin en el archivo"
+
+#: ../../lib/class/stream.class.php:220
+msgid "Closed after write"
+msgstr "Cerrado despues de la escritura"
+
+#: ../../lib/class/genre.class.php:278
+#, fuzzy
+msgid "Show Genres starting with"
+msgstr "<u>M</u>ostrar artis que comienzan con"
+
+#: ../../lib/class/album.class.php:151
+msgid "Various"
+msgstr "Varios"
+
+#: ../../lib/duplicates.php:102
+msgid "Find Duplicates"
+msgstr "Buscar archivos duplicados"
+
+#: ../../lib/duplicates.php:105
+msgid "Search Type"
+msgstr "Tipo de bsqueda"
+
+#: ../../lib/duplicates.php:119
+msgid "Artist and Title"
+msgstr "Artista y Ttulo"
+
+#: ../../lib/duplicates.php:124
+msgid "Artist, Album and Title"
+msgstr "Artista, Album y Ttulo"
+
+#: ../../lib/duplicates.php:132 ../../templates/sidebar.inc.php:97
+#: ../../templates/sidebar.inc.php:103 ../../templates/show_search_bar.inc:41
+#: ../../templates/menu.inc:39 ../../templates/show_search.inc:171
+msgid "Search"
+msgstr "Bsqueda"
+
+#: ../../lib/preferences.php:252 ../../templates/show_users.inc:118
+msgid "Enable"
+msgstr "Encendido"
+
+#: ../../lib/preferences.php:253 ../../templates/show_users.inc:121
+#: ../../templates/list_duplicates.inc:31
+msgid "Disable"
+msgstr "Apagado"
+
+#: ../../lib/preferences.php:265 ../../templates/add_catalog.inc:61
+msgid "Local"
+msgstr "Local"
+
+#: ../../lib/preferences.php:268
+msgid "Stream"
+msgstr "Stream"
+
+#: ../../lib/preferences.php:271
+msgid "IceCast"
+msgstr "IceCaste"
+
+#: ../../lib/preferences.php:274
+msgid "Downsample"
+msgstr "Degradar"
+
+#: ../../lib/preferences.php:277
+msgid "Music Player Daemon"
+msgstr "Music Player Daemon"
+
+#: ../../lib/preferences.php:280
+msgid "SlimServer"
+msgstr "SlimServer"
+
+#: ../../lib/preferences.php:289
+msgid "M3U"
+msgstr "M3U"
+
+#: ../../lib/preferences.php:290
+msgid "Simple M3U"
+msgstr "M3U Sencillo"
+
+#: ../../lib/preferences.php:291
+msgid "PLS"
+msgstr "PLS"
+
+#: ../../lib/preferences.php:292
+msgid "Asx"
+msgstr "Asx"
+
+#: ../../lib/preferences.php:293
+msgid "RAM"
+msgstr ""
+
+#: ../../lib/mpd.php:43 ../../lib/mpd.php:52
+msgid "Could not add"
+msgstr "No se agreg"
+
+#: ../../lib/general.lib.php:675
+msgid "Not Enough Data"
+msgstr ""
+
+#: ../../lib/general.lib.php:897 ../../lib/general.lib.php:908
+msgid "English"
+msgstr "Ingls"
+
+#: ../../lib/general.lib.php:907
+msgid "German"
+msgstr "Alemn"
+
+#: ../../lib/general.lib.php:909
+#, fuzzy
+msgid "British English"
+msgstr "Ingls"
+
+#: ../../lib/general.lib.php:910
+msgid "Spanish"
+msgstr ""
+
+#: ../../lib/general.lib.php:911
+msgid "French"
+msgstr "Francs"
+
+#: ../../lib/general.lib.php:912
+msgid "Italian"
+msgstr ""
+
+#: ../../lib/general.lib.php:913
+msgid "Dutch"
+msgstr ""
+
+#: ../../lib/general.lib.php:914
+msgid "Turkish"
+msgstr "Turco"
+
+#: ../../lib/general.lib.php:915
+msgid "Simplified Chinese"
+msgstr ""
+
+#: ../../lib/general.lib.php:916
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: ../../lib/ui.lib.php:222
+#, fuzzy
+msgid "Error Access Denied"
+msgstr "Usar el nivel de acceso"
+
+#: ../../lib/ui.lib.php:299 ../../templates/sidebar.inc.php:69
+#: ../../templates/header.inc:51 ../../templates/menu.inc:35
+msgid "Browse"
+msgstr "Navegar"
+
+#: ../../lib/ui.lib.php:301
+msgid "Show w/o art"
+msgstr "Mostrar con/sin arte"
+
+#: ../../lib/ui.lib.php:304
+msgid "Show all"
+msgstr "Mostrar todos"
+
+#: ../../lib/ui.lib.php:721
+#, fuzzy
+msgid "No Catalogs Found!"
+msgstr "No encontrado"
+
+#: ../../lib/ui.lib.php:722 ../../templates/add_catalog.inc:29
+msgid "Add a Catalog"
+msgstr "Agregar un catlogo"
+
+#: ../../lib/ui.lib.php:723 ../../templates/show_local_catalog_info.inc.php:7
+msgid "Catalog Statistics"
+msgstr "Estadsticas del catlogo"
+
+#: ../../lib/ui.lib.php:759
+msgid "day"
+msgstr "da"
+
+#: ../../lib/ui.lib.php:759
+msgid "days"
+msgstr "das"
+
+#: ../../lib/ui.lib.php:761
+msgid "hour"
+msgstr "hora"
+
+#: ../../lib/ui.lib.php:761
+msgid "hours"
+msgstr "horas"
+
+#: ../../lib/ui.lib.php:1053 ../../templates/sidebar.inc.php:128
+#: ../../templates/show_random_play_bar.inc.php:45
+#: ../../templates/show_artists.inc:55 ../../templates/show_random_play.inc:46
+#: ../../templates/show_albums.inc:58
+msgid "All"
+msgstr "Todos"
+
+#: ../../lib/Browser.php:867
+msgid "file"
+msgstr "archivo"
+
+#: ../../lib/Browser.php:871
+msgid "File uploads not supported."
+msgstr "No se permite agregar archivos."
+
+#: ../../lib/Browser.php:889
+msgid "No file uploaded"
+msgstr "No se agrego ningn archivo"
+
+#: ../../lib/Browser.php:896
+#, php-format
+msgid "There was a problem with the file upload: No %s was uploaded."
+msgstr "Hubo un problema con el archivo: Ningn $s"
+
+#: ../../lib/Browser.php:901
+#, php-format
+msgid ""
+"There was a problem with the file upload: The %s was larger than the maximum "
+"allowed size (%d bytes)."
+msgstr ""
+"Hubo un problema con el archivo: El $s es mayor al tamao mximo de %d bytes."
+
+#: ../../lib/Browser.php:903
+#, php-format
+msgid ""
+"There was a problem with the file upload: The %s was only partially uploaded."
+msgstr ""
+
+#: ../../lib/upload.php:228
+#, fuzzy
+msgid "The file uploaded successfully"
+msgstr "No se agrego ningn archivo"
+
+#: ../../lib/upload.php:229
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+"El tamao del archivo sobrepasa el tamao permitido por upload_max_filesize en "
+"el php.ini"
+
+#: ../../lib/upload.php:230
+#, fuzzy
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr "El archivo excede el MAX_FILE_SIZE especificado en la forma HTML."
+
+#: ../../lib/upload.php:231
+#, fuzzy
+msgid "The uploaded file was only partially uploaded"
+msgstr "El archivo se copio parcialmente"
+
+#: ../../lib/upload.php:232
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "No se copi ningn archivo"
+
+#: ../../lib/upload.php:233
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ../../lib/rating.lib.php:55
+#, fuzzy
+msgid "Don't Play"
+msgstr "Reproduccin local"
+
+#: ../../lib/rating.lib.php:58
+msgid "It's Pretty Bad"
+msgstr ""
+
+#: ../../lib/rating.lib.php:61
+msgid "It's Ok"
+msgstr ""
+
+#: ../../lib/rating.lib.php:64
+msgid "It's Pretty Good"
+msgstr ""
+
+#: ../../lib/rating.lib.php:67
+msgid "I Love It!"
+msgstr ""
+
+#: ../../lib/rating.lib.php:70
+msgid "It's Insane"
+msgstr ""
+
+#: ../../lib/rating.lib.php:74
+msgid "Off the Charts!"
+msgstr ""
+
+#: ../../lib/playlist.lib.php:73
+msgid "No songs in this playlist."
+msgstr "No hay canciones en la lista de reproduccin."
+
+#: ../../modules/lib.php:537
+msgid "Create a new playlist"
+msgstr "Crear una nueva lista de reproduccin"
+
+#: ../../modules/admin.php:46
+msgid "Manage Users"
+msgstr "Administrar usuarios"
+
+#: ../../modules/admin.php:48 ../../templates/show_admin_index.inc:34
+msgid "Add a new user"
+msgstr "Agregar usuario"
+
+#: ../../admin/catalog.php:49 ../../templates/catalog.inc:63
+msgid "Add to Catalog(s)"
+msgstr "Agregar al Catlogo(s)"
+
+#: ../../admin/catalog.php:60 ../../templates/catalog.inc:64
+msgid "Add to all Catalogs"
+msgstr "Agregar a todos los catlogos"
+
+#: ../../admin/catalog.php:69
+msgid "Error Connecting"
+msgstr "Error de conexin"
+
+#: ../../admin/catalog.php:83 ../../templates/catalog.inc:70
+msgid "Update Catalog(s)"
+msgstr "Actualizar catlogo(s)"
+
+#: ../../admin/catalog.php:94 ../../templates/catalog.inc:71
+msgid "Update All Catalogs"
+msgstr "Actualizar todos los catlogos"
+
+#: ../../admin/catalog.php:126 ../../templates/catalog.inc:77
+msgid "Clean Catalog(s)"
+msgstr "Limpiar catlogo(s)"
+
+#: ../../admin/catalog.php:156 ../../templates/catalog.inc:78
+msgid "Clean All Catalogs"
+msgstr "Limpiar todos los catlogos"
+
+#: ../../admin/catalog.php:206
+msgid "Now Playing Cleared"
+msgstr "Limpiar: Reproduccin actual"
+
+#: ../../admin/catalog.php:206
+msgid "All now playing data has been cleared"
+msgstr "La lista de Reproduccin actual ha sido eliminada"
+
+#: ../../admin/catalog.php:211
+msgid "Do you really want to clear your catalog?"
+msgstr "Confirmas limpiar el catlogo?"
+
+#: ../../admin/catalog.php:218
+msgid "Do you really want to clear the statistics for this catalog?"
+msgstr "Confirmas limpiar estadsticas de este catlogo?"
+
+#: ../../admin/catalog.php:235
+msgid "Do you really want to delete this catalog?"
+msgstr "Confirmas eliminar este catlogo?"
+
+#: ../../admin/catalog.php:266
+msgid "Album Art Search Finished"
+msgstr "Bsqueda de arte de lbums terminada"
+
+#: ../../admin/users.php:72 ../../admin/users.php:119
+msgid "Error Username Required"
+msgstr "Nombre de usuario obligatorio"
+
+#: ../../admin/users.php:75 ../../admin/users.php:115
+msgid "Error Passwords don't match"
+msgstr "Las contraseas no coinciden"
+
+#: ../../admin/users.php:124 ../../register.php:136
+#, fuzzy
+msgid "Error Username already exists"
+msgstr "Nombre de usuario obligatorio"
+
+#: ../../admin/users.php:145
+msgid "Are you sure you want to permanently delete"
+msgstr "Confirmas borrar permanentemente"
+
+#: ../../admin/users.php:152 ../../templates/show_confirm_action.inc.php:29
+#: ../../templates/show_search.inc:107
+msgid "No"
+msgstr "No"
+
+#: ../../admin/users.php:154
+msgid "User Deleted"
+msgstr "Usuario eliminado"
+
+#: ../../admin/users.php:157
+msgid "Delete Error"
+msgstr "Error"
+
+#: ../../admin/users.php:157
+msgid "Unable to delete last Admin User"
+msgstr "Imposible borrar el ltimo Admin"
+
+#: ../../admin/access.php:40
+msgid "Do you really want to delete this Access Record?"
+msgstr "Confirmas borrar este registro?"
+
+#: ../../admin/access.php:48
+msgid "Entry Deleted"
+msgstr "Registro eliminado"
+
+#: ../../admin/access.php:48
+msgid "Your Access List Entry has been removed"
+msgstr "Tu lista de acceso ha sido eliminada"
+
+#: ../../admin/access.php:58
+msgid "Entry Added"
+msgstr "Registro guardado"
+
+#: ../../admin/access.php:58
+msgid "Your new Access List Entry has been created"
+msgstr "Se ha creado tu nueva lista de acceso"
+
+#: ../../admin/mail.php:94
+msgid "Mail to"
+msgstr "Enviar a "
+
+#: ../../admin/mail.php:105
+msgid "Subject"
+msgstr "Asunto"
+
+#: ../../admin/mail.php:112
+msgid "Message"
+msgstr "Mensaje"
+
+#: ../../admin/mail.php:122
+msgid "Send Mail"
+msgstr "Enviar correo"
+
+#: ../../admin/song.php:65
+msgid "Songs Disabled"
+msgstr "Canciones deshabilitadas"
+
+#: ../../admin/song.php:65
+msgid "The requested song(s) have been disabled"
+msgstr "La cancin seleccionada ha sido deshabilitada"
+
+#: ../../admin/song.php:75
+msgid "Songs Enabled"
+msgstr "Canciones habilitadas"
+
+#: ../../admin/song.php:75
+msgid "The requested song(s) have been enabled"
+msgstr "Cancion(es) habilitada(as)"
+
+#: ../../templates/show_install_account.inc.php:35
+#: ../../templates/show_install_config.inc:35
+#: ../../templates/show_install.inc:35
+msgid "Ampache Installation"
+msgstr "Instalacin del Ampache"
+
+#: ../../templates/show_install_account.inc.php:37
+#: ../../templates/show_install_config.inc:37
+#: ../../templates/show_install.inc:37
+#, fuzzy
+msgid ""
+"This Page handles the installation of the Ampache database and the creation "
+"of the ampache.cfg.php file. Before you continue please make sure that you "
+"have the following pre-requisites"
+msgstr ""
+"Esta pgina se encarga de la instalacin de la base de datos del Ampache y la "
+"creacin del archivo ampache.cfg.php.  Antes de continuar, asegrese que estos "
+"requisitos se cumplen"
+
+#: ../../templates/show_install_account.inc.php:40
+#: ../../templates/show_install_config.inc:40
+#: ../../templates/show_install.inc:40
+msgid ""
+"A MySQL Server with a username and password that can create/modify databases"
+msgstr ""
+" Un servidor con MySQL instalado y una contrasea con privilegios para crear "
+"y modificar la base de datos"
+
+#: ../../templates/show_install_account.inc.php:41
+msgid ""
+"Your webserver has read access to the /sql/ampache.sql file and the /config/"
+"ampache.cfg.dist.php file"
+msgstr ""
+"El servidor tiene acceso de lectura a los archivos /sql/ampache.sql y /"
+"config/ampache.cfg.dist.php"
+
+#: ../../templates/show_install_account.inc.php:43
+#: ../../templates/show_install_config.inc:43
+#: ../../templates/show_install.inc:43
+msgid ""
+"Once you have ensured that you have the above requirements please fill out "
+"the information below. You will only be asked for the required config "
+"values. If you would like to make changes to your ampache install at a later "
+"date simply edit /config/ampache.cfg.php"
+msgstr ""
+"Una vez que compruebe los requierimientos anteriores, por favor complete la "
+"siguiente informacin.  Solo se le preguntarn los valores necesarios para la "
+"configuracin inicial.  Si desea hacer cambios en la instalacin del Ampache, "
+"use el archivo ubicado en /config/ampache.cfg.php"
+
+#: ../../templates/show_install_account.inc.php:48
+#: ../../templates/show_install_config.inc:48
+#: ../../templates/show_install.inc:47
+msgid "Step 1 - Creating and Inserting the Ampache Database"
+msgstr "Paso 1 - Crear e Insertar la Base de Datos del Ampache"
+
+#: ../../templates/show_install_account.inc.php:49
+msgid "Step 2 - Creating the ampache.cfg.php file"
+msgstr "Paso 2 - Crear el archivo ampache.cfg.php"
+
+#: ../../templates/show_install_account.inc.php:50
+#: ../../templates/show_install_config.inc:53
+#: ../../templates/show_install.inc:52
+msgid "Step 3 - Setup Initial Account"
+msgstr "Paso 3 - Configurar la cuenta inicial"
+
+#: ../../templates/show_install_account.inc.php:52
+msgid ""
+"This step creates your initial Ampache admin account. Once your admin "
+"account has been created you will be directed to the login page"
+msgstr ""
+"En este paso se crea la cuenta de administracin del Ampache. Una vez que la "
+"cuenta este lista, se redireccionar a la pgina de inicio"
+
+#: ../../templates/show_install_account.inc.php:55
+#, fuzzy
+msgid "Create Admin Account"
+msgstr "Crear cuenta"
+
+#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/show_user_registration.inc.php:109
+#: ../../templates/userform.inc:40 ../../templates/show_users.inc:43
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/show_user_registration.inc.php:137
+#: ../../templates/userform.inc:63 ../../templates/show_login_form.inc:53
+msgid "Password"
+msgstr "Contrasea"
+
+#: ../../templates/show_install_account.inc.php:69
+msgid "Create Account"
+msgstr "Crear cuenta"
+
+#: ../../templates/show_user_registration.inc.php:59
+#, fuzzy
+msgid "Ampache New User Registration"
+msgstr "Instalacin del Ampache"
+
+#: ../../templates/show_user_registration.inc.php:74
+#, fuzzy
+msgid "User Agreement"
+msgstr "Usuario eliminado"
+
+#: ../../templates/show_user_registration.inc.php:84
+#, fuzzy
+msgid "I Accept"
+msgstr "Aceptar"
+
+#: ../../templates/show_user_registration.inc.php:101
+msgid "User Information"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:119
+#: ../../templates/userform.inc:48
+msgid "Full Name"
+msgstr "Nombre completo"
+
+#: ../../templates/show_user_registration.inc.php:128
+#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:55
+msgid "E-mail"
+msgstr "Correo electrnico"
+
+#: ../../templates/show_user_registration.inc.php:146
+#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
+msgid "Confirm Password"
+msgstr "Confirmar contrasea"
+
+#: ../../templates/show_user_registration.inc.php:166
+msgid "Clear Info"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:167
+msgid "Register User"
+msgstr "Registar usuario"
+
+#: ../../templates/show_confirm_action.inc.php:28
+#: ../../templates/show_search.inc:106
+msgid "Yes"
+msgstr "Si"
+
+#: ../../templates/show_import_playlist.inc.php:26
+msgid "Importing a Playlist from a File"
+msgstr "Importar listas de reproduccin desde archivos"
+
+#: ../../templates/show_import_playlist.inc.php:29
+#: ../../templates/show_uploads.inc:41 ../../templates/list_duplicates.inc:38
+#: ../../templates/show_search.inc:95
+msgid "Filename"
+msgstr "Nombre de archivo"
+
+#: ../../templates/show_import_playlist.inc.php:36
+msgid "Playlist Type"
+msgstr "Tipo de listas de reproduccin"
+
+#: ../../templates/show_import_playlist.inc.php:49
+msgid "Import Playlist"
+msgstr ""
+
+#: ../../templates/show_genre.inc.php:32
+#, fuzzy
+msgid "Viewing"
+msgstr "Ver"
+
+#: ../../templates/show_genre.inc.php:36 ../../templates/sidebar.inc.php:35
+#: ../../templates/sidebar.inc.php:136
+#: ../../templates/show_local_catalog_info.inc.php:18
+#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:65
+#: ../../templates/show_browse_menu.inc:36 ../../templates/show_search.inc:136
+msgid "Albums"
+msgstr "Albums"
+
+#: ../../templates/show_genre.inc.php:41 ../../templates/sidebar.inc.php:36
+#: ../../templates/sidebar.inc.php:135
+#: ../../templates/show_local_catalog_info.inc.php:22
+#: ../../templates/show_browse_menu.inc:35 ../../templates/show_search.inc:137
+msgid "Artists"
+msgstr "Artistas"
+
+#: ../../templates/show_genre.inc.php:46
+#: ../../templates/show_genres.inc.php:37 ../../templates/sidebar.inc.php:133
+#: ../../templates/show_random_play_bar.inc.php:49
+#: ../../templates/show_local_catalog_info.inc.php:26
+#: ../../templates/show_artists.inc:41 ../../templates/show_artists.inc:64
+#: ../../templates/show_albums.inc:41 ../../templates/show_albums.inc:71
+#: ../../templates/show_search.inc:135
+msgid "Songs"
+msgstr "Canciones"
+
+#: ../../templates/show_user.inc.php:26
+msgid "Changing User Information for"
+msgstr ""
+
+#: ../../templates/show_user.inc.php:31
+#: ../../templates/customize_catalog.inc:29
+#: ../../templates/show_add_access.inc:40
+#: ../../templates/show_access_list.inc:47
+msgid "Name"
+msgstr "Nombre"
+
+#: ../../templates/show_user.inc.php:48
+msgid "Results Per Page"
+msgstr ""
+
+#: ../../templates/show_user.inc.php:56
+msgid "Update Profile"
+msgstr "Actualizar perfil"
+
+#: ../../templates/show_user.inc.php:67
+msgid "Enter password"
+msgstr "Contrasea"
+
+#: ../../templates/show_user.inc.php:83
+msgid "Change Password"
+msgstr "Cambiar la contrasea"
+
+#: ../../templates/show_user.inc.php:89
+msgid "Delete Your Personal Statistics"
+msgstr ""
+
+#: ../../templates/show_user.inc.php:91
+msgid "Clear Stats"
+msgstr "Limpiar estadsticas"
+
+#: ../../templates/show_genres.inc.php:38 ../../templates/show_uploads.inc:32
+#: ../../templates/show_mpdpl.inc:68 ../../templates/show_songs.inc:50
+#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:67
+#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:75
+#: ../../templates/show_access_list.inc:51 ../../templates/show_artist.inc:42
+msgid "Action"
+msgstr "Accin"
+
+#: ../../templates/show_genres.inc.php:48
+#: ../../templates/show_playlists.inc.php:63
+#: ../../templates/show_localplay.inc:41 ../../templates/show_artists.inc:54
+#: ../../templates/show_albums.inc:57 ../../templates/show_mpdplay.inc:64
+#: ../../templates/show_artist.inc:67
+msgid "Play"
+msgstr "Reproducir"
+
+#: ../../templates/sidebar.inc.php:29
+msgid "Users"
+msgstr "Usuarios"
+
+#: ../../templates/sidebar.inc.php:30
+msgid "Mail Users"
+msgstr "Usuarios de correo"
+
+#: ../../templates/sidebar.inc.php:32
+#, fuzzy
+msgid "Site Preferences"
+msgstr "Actualizar preferencias"
+
+#: ../../templates/sidebar.inc.php:33
+#, fuzzy
+msgid "Access List"
+msgstr "Listas de acceso"
+
+#: ../../templates/sidebar.inc.php:38
+#, fuzzy
+msgid "Lists"
+msgstr "Artistas"
+
+#: ../../templates/sidebar.inc.php:45 ../../templates/menu.inc:29
+msgid "Home"
+msgstr "Inicio"
+
+#: ../../templates/sidebar.inc.php:49 ../../templates/menu.inc:63
+#: ../../templates/menu.inc:66
+msgid "Admin"
+msgstr "Admin"
+
+#: ../../templates/sidebar.inc.php:66 ../../templates/menu.inc:40
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: ../../templates/sidebar.inc.php:85 ../../templates/menu.inc:43
+#: ../../templates/show_upload.inc:73
+msgid "Upload"
+msgstr "Subir"
+
+#: ../../templates/sidebar.inc.php:89
+#: ../../templates/show_playlists.inc.php:28 ../../templates/menu.inc:38
+msgid "Playlists"
+msgstr "Listas de reproduccin"
+
+#: ../../templates/sidebar.inc.php:93 ../../templates/menu.inc:32
+msgid "Local Play"
+msgstr "Reproduccin local"
+
+#: ../../templates/sidebar.inc.php:112
+#: ../../templates/show_playlists.inc.php:66
+#: ../../templates/show_artists.inc:56 ../../templates/show_albums.inc:59
+#: ../../templates/show_mpdplay.inc:114
+msgid "Random"
+msgstr "Aleatorio"
+
+#: ../../templates/sidebar.inc.php:134
+#: ../../templates/show_random_play_bar.inc.php:50
+msgid "Minutes"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:137
+#: ../../templates/show_random_play_bar.inc.php:53
+msgid "Less Played"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:141
+#: ../../templates/show_random_play_bar.inc.php:58
+msgid "Enqueue"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:146 ../../templates/menu.inc:75
+#: ../../templates/menu.inc:81 ../../templates/menu.inc:85
+msgid "Logout"
+msgstr "Salir"
+
+#: ../../templates/show_confirmation.inc.php:30
+msgid "Continue"
+msgstr "Continuar"
+
+#: ../../templates/show_random_play_bar.inc.php:31
+#: ../../templates/show_random_play.inc:28
+msgid "Play Random Selection"
+msgstr "Reproduccin aleatoria"
+
+#: ../../templates/show_random_play_bar.inc.php:51
+#, fuzzy
+msgid "Full Artists"
+msgstr "Artistas"
+
+#: ../../templates/show_random_play_bar.inc.php:52
+#: ../../templates/show_random_play.inc:60
+msgid "Full Albums"
+msgstr "lbums completos"
+
+#: ../../templates/show_random_play_bar.inc.php:55
+msgid "from"
+msgstr ""
+
+#: ../../templates/show_random_play_bar.inc.php:59
+#, fuzzy
+msgid "Advanced"
+msgstr "Agregado"
+
+#: ../../templates/show_local_catalog_info.inc.php:10
+msgid "Total Users"
+msgstr "Usuarios totales"
+
+#: ../../templates/show_local_catalog_info.inc.php:14
+msgid "Connected Users"
+msgstr "Usuarios conectados"
+
+#: ../../templates/show_local_catalog_info.inc.php:30
+msgid "Catalog Size"
+msgstr "Tamao del catlogo"
+
+#: ../../templates/show_local_catalog_info.inc.php:34
+msgid "Catalog Time"
+msgstr "Tiempo del catlogo"
+
+#: ../../templates/show_play_selected.inc.php:49
+msgid "Play Selected"
+msgstr "Reproducir seleccin"
+
+#: ../../templates/show_play_selected.inc.php:52
+#, fuzzy
+msgid "Download Selected"
+msgstr "Marcar la seleccin"
+
+#: ../../templates/show_play_selected.inc.php:55
+msgid "Flag Selected"
+msgstr "Marcar la seleccin"
+
+#: ../../templates/show_play_selected.inc.php:56
+msgid "Edit Selected"
+msgstr "Editar seleccin"
+
+#: ../../templates/show_play_selected.inc.php:64
+msgid "Set Track Numbers"
+msgstr "Tracks"
+
+#: ../../templates/show_play_selected.inc.php:65
+msgid "Remove Selected Tracks"
+msgstr "Eliminar tracks seleccionados"
+
+#: ../../templates/show_play_selected.inc.php:71
+msgid "Playlist"
+msgstr "Lista de reproduccin"
+
+#: ../../templates/show_play_selected.inc.php:71
+msgid "Add to"
+msgstr "Aadir a"
+
+#: ../../templates/show_play_selected.inc.php:73
+#: ../../templates/show_playlists.inc.php:51
+msgid "View"
+msgstr "Ver"
+
+#: ../../templates/show_play_selected.inc.php:74
+#: ../../templates/show_playlists.inc.php:55 ../../templates/show_users.inc:58
+#: ../../templates/show_users.inc:102
+msgid "Edit"
+msgstr "Editar"
+
+#: ../../templates/show_all_recent.inc.php:27 ../../index.php:99
+msgid "Newest Artist Additions"
+msgstr "Nuevos artistas"
+
+#: ../../templates/show_all_recent.inc.php:30 ../../index.php:106
+msgid "Newest Album Additions"
+msgstr "Nuevos lbumes"
+
+#: ../../templates/show_all_popular.inc.php:27 ../../index.php:82
+msgid "Most Popular Artists"
+msgstr "Artistas ms populares"
+
+#: ../../templates/show_all_popular.inc.php:30 ../../index.php:61
+msgid "Most Popular Albums"
+msgstr "Albums ms populares"
+
+#: ../../templates/show_all_popular.inc.php:37
+#, fuzzy
+msgid "Most Popular Genres"
+msgstr "Canciones ms populares"
+
+#: ../../templates/show_all_popular.inc.php:40 ../../index.php:89
+msgid "Most Popular Songs"
+msgstr "Canciones ms populares"
+
+#: ../../templates/show_get_albumart.inc.php:28
+msgid "Customize Search"
+msgstr ""
+
+#: ../../templates/show_get_albumart.inc.php:49
+msgid "Direct URL to Image"
+msgstr ""
+
+#: ../../templates/show_get_albumart.inc.php:59
+msgid "Get Art"
+msgstr "Bajar arte"
+
+#: ../../templates/show_rename_artist.inc.php:33
+#: ../../templates/show_rename_artist.inc.php:51
+#, fuzzy
+msgid "Rename"
+msgstr "Nombre de usuario"
+
+#: ../../templates/show_rename_artist.inc.php:33
+#, fuzzy
+msgid "to"
+msgstr "Detener"
+
+#: ../../templates/show_rename_artist.inc.php:40
+#: ../../templates/show_search.inc:144
+msgid "OR"
+msgstr ""
+
+#: ../../templates/show_rename_artist.inc.php:42
+msgid "Insert current"
+msgstr ""
+
+#: ../../templates/show_rename_artist.inc.php:47
+#, fuzzy
+msgid "Update id3 tags"
+msgstr "Actualizar desde etiquetas"
+
+#: ../../templates/show_artist_box.inc.php:26
+msgid "Albums by"
+msgstr "Albums de"
+
+#: ../../templates/show_artist_box.inc.php:34
+msgid "Show All Songs By"
+msgstr "Mostrar todas las canciones de"
+
+#: ../../templates/show_artist_box.inc.php:35
+msgid "Play All Songs By"
+msgstr "Reproducir todas las canciones de"
+
+#: ../../templates/show_artist_box.inc.php:36
+msgid "Play Random Songs By"
+msgstr "Reproducir canciones aleatorias de"
+
+#: ../../templates/show_artist_box.inc.php:38
+#: ../../templates/show_album.inc:72
+msgid "Update from tags"
+msgstr "Actualizar desde etiquetas"
+
+#: ../../templates/show_artist_box.inc.php:39
+#, fuzzy
+msgid "Rename Artist"
+msgstr "Artista"
+
+#: ../../templates/show_playlists.inc.php:31
+#, fuzzy
+msgid "Playlist Name"
+msgstr "Tipo de listas de reproduccin"
+
+#: ../../templates/show_playlists.inc.php:32
+#, fuzzy
+msgid "# Songs"
+msgstr "Canciones"
+
+#: ../../templates/show_playlists.inc.php:33
+msgid "Owner"
+msgstr ""
+
+#: ../../templates/show_playlists.inc.php:34
+#, fuzzy
+msgid "Actions"
+msgstr "Accin"
+
+#: ../../templates/show_playlists.inc.php:58
+#: ../../templates/show_uploads.inc:50 ../../templates/catalog.inc:57
+#: ../../templates/show_users.inc:70
+msgid "Delete"
+msgstr "Borrar"
+
+#: ../../templates/show_playlists.inc.php:71
+#: ../../templates/show_songs.inc:140 ../../templates/show_album.inc:75
+#: ../../templates/show_albums.inc:61 ../../templates/show_artist.inc:69
+msgid "Download"
+msgstr "Descargar"
+
+#: ../../templates/show_playlist_box.inc.php:33
+msgid "Playlist Actions"
+msgstr "Actiones de las listas de reproduccin"
+
+#: ../../templates/show_playlist_box.inc.php:34
+#, fuzzy
+msgid "Create New Playlist"
+msgstr "Crear una nueva lista de reproduccin"
+
+#: ../../templates/show_playlist_box.inc.php:35
+#, fuzzy
+msgid "View All Playlists"
+msgstr "Nueva lista"
+
+#: ../../templates/show_playlist_box.inc.php:36
+#, fuzzy
+msgid "Import From File"
+msgstr "Importar listas de reproduccin desde archivos"
+
+#: ../../templates/show_playlist_box.inc.php:38
+#, fuzzy
+msgid "Normalize Tracks"
+msgstr "Pistas totales"
+
+#: ../../templates/show_playlist_box.inc.php:39
+#, fuzzy
+msgid "Play This Playlist"
+msgstr "Reproducir toda la lista"
+
+#: ../../templates/show_preference_box.inc.php:44
+msgid "Preference"
+msgstr "Preferencia"
+
+#: ../../templates/show_preference_box.inc.php:45
+msgid "Value"
+msgstr "Valor"
+
+#: ../../templates/show_preference_box.inc.php:47
+msgid "Apply to All"
+msgstr "Aplicar a todos"
+
+#: ../../templates/show_preference_box.inc.php:54
+msgid "description"
+msgstr ""
+
+#: ../../templates/show_object_rating.inc.php:25
+#: ../../templates/show_songs.inc:52
+#, fuzzy
+msgid "Rating"
+msgstr "Editando"
+
+#: ../../localplay.php:81
+msgid "Unknown action requested"
+msgstr "Accin desconocida"
+
+#: ../../browse.php:48 ../../albums.php:168 ../../albums.php:174
+#: ../../albums.php:181 ../../albums.php:186 ../../albums.php:192
+#, fuzzy
+msgid "Show Albums starting with"
+msgstr "<u>M</u>ostrar lbums que comiencen con"
+
+#: ../../browse.php:78 ../../artists.php:128 ../../artists.php:132
+#: ../../artists.php:138 ../../artists.php:151
+#, fuzzy
+msgid "Show Artists starting with"
+msgstr "<u>M</u>ostrar artis que comienzan con"
+
+#: ../../search.php:45
+msgid "Error: No Keyword Entered"
+msgstr ""
+
+#: ../../tv.php:76 ../../templates/show_now_playing.inc:31
+msgid "Now Playing"
+msgstr "Ahora reproduciento"
+
+#: ../../artists.php:58 ../../albums.php:147
+msgid "Starting Update from Tags"
+msgstr "Comenzar actualizacin de etiquetas"
+
+#: ../../artists.php:63 ../../albums.php:152
+msgid "Update From Tags Complete"
+msgstr "Actualizacin de etiquetas completo"
+
+#: ../../amp-mpd.php:171 ../../playlist.php:63
+msgid "New Playlist"
+msgstr "Nueva lista"
+
+#: ../../playlist.php:46
+#, fuzzy
+msgid "Playlist Deleted"
+msgstr "Reproducir seleccin"
+
+#: ../../playlist.php:46
+#, fuzzy
+msgid "The Requested Playlist has been deleted"
+msgstr "Cancion(es) habilitada(as)"
+
+#: ../../playlist.php:56
+#, fuzzy
+msgid "Are you sure you want to delete this playlist"
+msgstr "Confirmas borrar permanentemente"
+
+#: ../../playlist.php:112
+#, fuzzy
+msgid "Playlist Created"
+msgstr "Lista actualizada"
+
+#: ../../playlist.php:112
+msgid " has been created"
+msgstr ""
+
+#: ../../playlist.php:121
+#, fuzzy
+msgid "Remote Selected Tracks"
+msgstr "Eliminar tracks seleccionados"
+
+#: ../../playlist.php:139
+#, fuzzy
+msgid "Playlist Updated"
+msgstr "Lista actualizada"
+
+#: ../../playlist.php:139
+msgid " has been updated"
+msgstr ""
+
+#: ../../flag.php:38
+msgid "Flagging song completed."
+msgstr "Informacin de cancion completa"
+
+#: ../../user.php:45
+msgid "Error: Password Does Not Match or Empty"
+msgstr "Error: Las contraseas no coinciden"
+
+#: ../../user.php:51 ../../user.php:62
+msgid "Error: Insufficient Rights"
+msgstr "Error: Privilegios insuficientes"
+
+#: ../../albums.php:44
+msgid "Album Art Cleared"
+msgstr "Arte de lbumes eliminado"
+
+#: ../../albums.php:44
+msgid "Album Art information has been removed form the database"
+msgstr "Se elimin el arte de lbumes de la base de datos"
+
+#: ../../albums.php:74
+msgid "No Amazon Developer Key set, amazon album art searching will not work"
+msgstr ""
+
+#: ../../albums.php:104
+msgid "Album Art Not Located"
+msgstr "Arte no localizado"
+
+#: ../../albums.php:104
+msgid ""
+"Album Art could not be located at this time. This may be due to Amazon being "
+"busy, or the album not being present in their collection."
+msgstr ""
+"El arte del album no pudo ser localizada en este momento.  Puede ser que "
+"Amazon este ocupado, o que el album no se encuentre en su coleccin."
+
+#: ../../albums.php:137
+#, fuzzy
+msgid "Album Art Inserted"
+msgstr "Arte de lbumes eliminado"
+
+#: ../../ratings.php:33
+#, fuzzy
+msgid "Rating Updated"
+msgstr "Actualizacin rpida"
+
+#: ../../ratings.php:33
+msgid "Your rating for this object has been updated"
+msgstr ""
+
+#: ../../register.php:79
+#, fuzzy
+msgid "Error Captcha Required"
+msgstr "Nombre de usuario obligatorio"
+
+#: ../../register.php:86
+msgid "Error Captcha Failed"
+msgstr ""
+
+#: ../../register.php:93
+msgid "You <U>must</U> accept the user agreement"
+msgstr ""
+
+#: ../../register.php:98
+msgid "You did not enter a username"
+msgstr ""
+
+#: ../../register.php:102
+msgid "Please fill in your full name (Firstname Lastname)"
+msgstr ""
+
+#: ../../register.php:128
+#, fuzzy
+msgid "You must enter a password"
+msgstr "Contrasea"
+
+#: ../../register.php:132
+#, fuzzy
+msgid "Your passwords do not match"
+msgstr "Las contraseas no coinciden"
+
+#: ../../register.php:150
+#, fuzzy
+msgid "Error: Insert Failed"
+msgstr "Error: Privilegios insuficientes"
+
+#: ../../register.php:165
+msgid "Registration Complete"
+msgstr ""
+
+#: ../../activate.php:42
+msgid "No user with this name registered"
+msgstr ""
+
+#: ../../activate.php:46
+msgid "The validation key used isn't correct."
+msgstr ""
+
+#: ../../activate.php:51
+#, fuzzy
+msgid "User activated"
+msgstr "Usuario eliminado"
+
+#: ../../activate.php:51
+msgid "This User ID is activated and can be used"
+msgstr ""
+
+#: ../../bin/print_tags.php.inc:42
+msgid ""
+"[print_tags.php.inc]\n"
+"This commandline script will display the tag information for the specified "
+"filename as it will \n"
+"appear to Ampache. \n"
+"        \n"
+msgstr ""
+
+#: ../../bin/print_tags.php.inc:48
+#, fuzzy
+msgid "Filename:"
+msgstr "Nombre de archivo"
+
+#: ../../bin/quarantine_migration.php.inc:49
+#, fuzzy
+msgid "Error: Unable to write to"
+msgstr "Error: Imposible abrir"
+
+#: ../../bin/quarantine_migration.php.inc:56
+msgid "Error: Upload directory not inside a catalog"
+msgstr ""
+
+#: ../../bin/quarantine_migration.php.inc:74
+#, fuzzy
+msgid "Moved"
+msgstr "Modo"
+
+#: ../../bin/quarantine_migration.php.inc:78
+#, fuzzy
+msgid "Adding"
+msgstr "Admin"
+
+#: ../../bin/quarantine_migration.php.inc:78
+#, fuzzy
+msgid "to database"
+msgstr "Insertar base de datos."
+
+#: ../../bin/quarantine_migration.php.inc:86
+msgid "Move Failed"
+msgstr ""
+
+#: ../../bin/quarantine_migration.php.inc:97
+#, fuzzy
+msgid "Deleted"
+msgstr "Borrar"
+
+#: ../../bin/quarantine_migration.php.inc:113
+msgid ""
+"\n"
+"\t\n"
+"************* WARNING *************\n"
+"This script will move, and \n"
+"potentially delete uploaded files.\n"
+"************* WARNING *************\n"
+"\n"
+"All files marked for add will be moved to the upload directory. All files \n"
+"marked for deletion will be deleted. This script must be run as a user with\n"
+"sufficient rights to perform the above two functions. \n"
+"\n"
+"\t\n"
+msgstr ""
+
+#: ../../bin/quarantine_migration.php.inc:127
+#, fuzzy
+msgid "Continue?  (Y/N):"
+msgstr "Continuar"
+
+#: ../../bin/quarantine_migration.php.inc:151
+#, fuzzy
+msgid "Error:  "
+msgstr "Error"
+
+#: ../../bin/quarantine_migration.php.inc:152
+msgid "!\n"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:27
+#, fuzzy
+msgid "User Management"
+msgstr "Nombre de usuario"
+
+#: ../../templates/show_admin_index.inc:28
+msgid "E-mail Management"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:29
+#, fuzzy
+msgid "Catalog Managment"
+msgstr "Nombre del catlogo"
+
+#: ../../templates/show_admin_index.inc:30
+msgid "Admin Preferences"
+msgstr "Preferencias del Admin"
+
+#: ../../templates/show_admin_index.inc:31 ../../templates/catalog.inc:95
+msgid "Access Lists"
+msgstr "Listas de acceso"
+
+#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:94
+msgid "Add a catalog"
+msgstr "Aadir a catlogo"
+
+#: ../../templates/show_admin_index.inc:35 ../../templates/catalog.inc:99
+msgid "Clear Now Playing"
+msgstr "Eliminar listado de reproduccin actual"
+
+#: ../../templates/show_admin_index.inc:36
+#, fuzzy
+msgid "Add Access List Entry"
+msgstr "Listas de acceso"
+
+#: ../../templates/show_admin_index.inc:40
+#, fuzzy
+msgid "Common Functions"
+msgstr "Conexin DB"
+
+#: ../../templates/show_admin_index.inc:43
+#, fuzzy
+msgid "Admin Sections"
+msgstr "Seccin de administracin"
+
+#: ../../templates/show_uploads.inc:33
+#, fuzzy
+msgid "Status"
+msgstr "Estadsticas"
+
+#: ../../templates/show_uploads.inc:34 ../../templates/flag.inc:58
+#: ../../templates/list_flagged.inc:41 ../../templates/list_duplicates.inc:32
+msgid "Song"
+msgstr "Cancin"
+
+#: ../../templates/show_uploads.inc:40 ../../templates/show_songs.inc:46
+#: ../../templates/list_duplicates.inc:37
+msgid "Size"
+msgstr "Tamao"
+
+#: ../../templates/show_uploads.inc:42
+msgid "User"
+msgstr "Usuario"
+
+#: ../../templates/show_uploads.inc:43
+msgid "Date"
+msgstr "Fecha"
+
+#: ../../templates/show_uploads.inc:49
+msgid "Add"
+msgstr "Agregar"
+
+#: ../../templates/show_mpdpl.inc:43
+#, fuzzy
+msgid "MPD Server Playlist"
+msgstr "Lista de reproduccin del Servidor"
+
+#: ../../templates/show_mpdpl.inc:45 ../../templates/show_mpdpl.inc:175
+msgid "Refresh the Playlist Window"
+msgstr "Actualizar la ventana de la lista de reproduccin."
+
+#: ../../templates/show_mpdpl.inc:47 ../../templates/show_mpdpl.inc:177
+msgid "Click to shuffle (randomize) the playlist"
+msgstr "Click para orden aleatorio"
+
+#: ../../templates/show_mpdpl.inc:47 ../../templates/show_mpdpl.inc:177
+msgid "shuffle"
+msgstr "aleatorio"
+
+#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:178
+#, fuzzy
+msgid "Click to the clear the playlist"
+msgstr "Click para orden aleatorio"
+
+#: ../../templates/show_mpdpl.inc:52 ../../templates/show_mpdpl.inc:182
+msgid "Click to the remove all except the Now Playing"
+msgstr ""
+
+#: ../../templates/show_mpdpl.inc:62 ../../templates/show_songs.inc:41
+msgid "Song title"
+msgstr "Ttulo de la cancin"
+
+#: ../../templates/flag.inc:43
+msgid "Flag song"
+msgstr "Marcar cancin"
+
+#: ../../templates/flag.inc:45
+msgid ""
+"Flag the following song as having one of the problems listed below.  Site "
+"admins will then take the appropriate action for the flagged files."
+msgstr "Marcar la siguiente cancin"
+
+#: ../../templates/flag.inc:62
+msgid "Reason to flag"
+msgstr "Razn de la marca"
+
+#: ../../templates/flag.inc:73
+msgid "Flag Song"
+msgstr "Marcar cancin."
+
+#: ../../templates/customize_catalog.inc:24
+msgid "Settings for catalog in"
+msgstr "Ajustes para el catlogo en"
+
+#: ../../templates/customize_catalog.inc:32 ../../templates/add_catalog.inc:40
+msgid "Auto-inserted Fields"
+msgstr "Campos automticos"
+
+#: ../../templates/customize_catalog.inc:33 ../../templates/add_catalog.inc:41
+msgid "album name"
+msgstr "nombre del album"
+
+#: ../../templates/customize_catalog.inc:34 ../../templates/add_catalog.inc:42
+msgid "artist name"
+msgstr "nombre del artista"
+
+#: ../../templates/customize_catalog.inc:35
+msgid "catalog path"
+msgstr "ruta del catlogo"
+
+#: ../../templates/customize_catalog.inc:36 ../../templates/add_catalog.inc:43
+msgid "id3 comment"
+msgstr "comentario id3"
+
+#: ../../templates/customize_catalog.inc:37 ../../templates/add_catalog.inc:44
+msgid "genre"
+msgstr "gnero"
+
+#: ../../templates/customize_catalog.inc:38 ../../templates/add_catalog.inc:45
+msgid "track number (padded with leading 0)"
+msgstr "nmero de la cancin (con 0 antes del nmero)"
+
+#: ../../templates/customize_catalog.inc:39 ../../templates/add_catalog.inc:46
+msgid "song title"
+msgstr "ttulo de la cancin"
+
+#: ../../templates/customize_catalog.inc:40 ../../templates/add_catalog.inc:47
+msgid "year"
+msgstr "ao"
+
+#: ../../templates/customize_catalog.inc:41 ../../templates/add_catalog.inc:48
+msgid "other"
+msgstr "otro"
+
+#: ../../templates/customize_catalog.inc:45
+msgid "ID3 set command"
+msgstr "ID3 set command"
+
+#: ../../templates/customize_catalog.inc:51
+msgid "Filename pattern"
+msgstr "Nombre de archivo"
+
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:75
+msgid "Folder Pattern"
+msgstr "Folder"
+
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:75
+msgid "(no leading or ending '/')"
+msgstr "(sin '/' antes o despues)"
+
+#: ../../templates/customize_catalog.inc:69
+msgid "Save Catalog Settings"
+msgstr "Guardar cambios"
+
+#: ../../templates/show_test.inc:29
+msgid "Ampache Debug"
+msgstr "Ampache Debug"
+
+#: ../../templates/show_test.inc:30
+msgid ""
+"You've reached this page because a configuration error has occured. Debug "
+"Information below"
+msgstr ""
+"Un error inesperado se ha presentado.  Informacin para debuggear a "
+"continuacin:"
+
+#: ../../templates/show_test.inc:34
+msgid "CHECK"
+msgstr "CHECK"
+
+#: ../../templates/show_test.inc:36
+msgid "STATUS"
+msgstr "STATUS"
+
+#: ../../templates/show_test.inc:38
+msgid "DESCRIPTION"
+msgstr "DESCRIPCION"
+
+#: ../../templates/show_test.inc:41
+msgid "PHP Version"
+msgstr "PHP Version"
+
+#: ../../templates/show_test.inc:56
+msgid ""
+"This tests to make sure that you are running a version of PHP that is known "
+"to work with Ampache."
+msgstr ""
+"Esta prueba es para asegurarnos que su version de PHP funciona con Ampache."
+
+#: ../../templates/show_test.inc:60
+msgid "Mysql for PHP"
+msgstr "MySQL para PHP"
+
+#: ../../templates/show_test.inc:75
+msgid ""
+"This test checks to see if you have the mysql extensions loaded for PHP. "
+"These are required for Ampache to work."
+msgstr "Esta prueba revisa las extensiones de PHP."
+
+#: ../../templates/show_test.inc:79
+msgid "PHP Session Support"
+msgstr "Soporte de Sesiones de PHP"
+
+#: ../../templates/show_test.inc:94
+msgid ""
+"This test checks to make sure that you have PHP session support enabled. "
+"Sessions are required for Ampache to work."
+msgstr ""
+"Estas pruebas se aseguran que las sesiones de PHP estn funcionandoLas "
+"Sesiones son necesarias para que Ampache funcione."
+
+#: ../../templates/show_test.inc:98
+msgid "PHP ICONV Support"
+msgstr "Soporte PHP ICONV"
+
+#: ../../templates/show_test.inc:112
+msgid ""
+"This test checks to make sure you have Iconv support installed. Iconv "
+"support is not required for Ampache, but it is highly recommended"
+msgstr ""
+"Esta prueba es para revisar que Iconv esta instalado.  Iconv no es necesario "
+"para Ampache, pero es recomendado."
+
+#: ../../templates/show_test.inc:116
+#: ../../templates/show_install_config.inc:88
+msgid "Ampache.cfg.php Exists"
+msgstr "Existe ampache.cfg.php"
+
+#: ../../templates/show_test.inc:131
+msgid ""
+"This attempts to read /config/ampache.cfg.php If this fails either the "
+"ampache.cfg.php is not in the correct locations or\n"
+"\tit is not currently readable by your webserver."
+msgstr ""
+"Intentando leer /config/ampache.cfg.php Si esto falla, el ampache.cfg.php no "
+"esta en la ruta correcta o no existe."
+
+#: ../../templates/show_test.inc:137
+#: ../../templates/show_install_config.inc:105
+msgid "Ampache.cfg.php Configured?"
+msgstr "Est configurado el ampache.cfg.php?"
+
+#: ../../templates/show_test.inc:154
+#, fuzzy
+msgid ""
+"This test makes sure that you have set all of the required configuration "
+"variables and that we are able to \n"
+"\tcompletely parse your config file"
+msgstr ""
+"Esta prueba se asegura que todas las variables esten configuradas  y que "
+"podemos leer el archivo de configuracin."
+
+#: ../../templates/show_test.inc:160
+msgid "Ampache.cfg.php Up to Date?"
+msgstr "Est actualizado el ampache.cfg.php?"
+
+#: ../../templates/show_test.inc:180
+msgid "Ampache.cfg.php is missing the following:"
+msgstr "Al ampache.cfg.php le falta:"
+
+#: ../../templates/show_test.inc:181
+msgid "Under CONF"
+msgstr "Bajo CONF"
+
+#: ../../templates/show_test.inc:185
+msgid "Under LIBGLUE"
+msgstr "Bajo LIBGLUE"
+
+#: ../../templates/show_test.inc:196
+msgid "DB Connection"
+msgstr "Conexin DB"
+
+#: ../../templates/show_test.inc:212
+msgid ""
+"This attempts to connect to your database using the values from your ampache."
+"cfg.php"
+msgstr "Esto intenta conectarse a su base de datos usando el ampache.cfg.php"
+
+#: ../../templates/show_localplay.inc:30
+msgid "Local Play Control"
+msgstr "Control local de reproduccin"
+
+#: ../../templates/show_localplay.inc:35
+msgid "Playback"
+msgstr "Reproduccin"
+
+#: ../../templates/show_localplay.inc:39 ../../templates/list_header.inc:71
+#: ../../templates/show_mpdplay.inc:62
+msgid "Prev"
+msgstr "Anterior"
+
+#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:63
+msgid "Stop"
+msgstr "Detener"
+
+#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:65
+msgid "Pause"
+msgstr "Pausa"
+
+#: ../../templates/show_localplay.inc:43 ../../templates/list_header.inc:94
+#: ../../templates/show_mpdplay.inc:66
+msgid "Next"
+msgstr "Siguiente"
+
+#: ../../templates/show_localplay.inc:49
+msgid "Volume"
+msgstr "Volumen"
+
+#: ../../templates/show_localplay.inc:53 ../../templates/show_localplay.inc:54
+msgid "Increase Volume"
+msgstr "Aumentar volumen"
+
+#: ../../templates/show_localplay.inc:55 ../../templates/show_localplay.inc:56
+msgid "Decrease Volume"
+msgstr "Disnimuir volumen"
+
+#: ../../templates/show_localplay.inc:62
+msgid "Clear queue"
+msgstr "Limpiar queue"
+
+#: ../../templates/add_catalog.inc:31
+msgid ""
+"In the form below enter either a local path (i.e. /data/music) or the URL to "
+"a remote Ampache installation (i.e http://theotherampache.com)"
+msgstr ""
+"En la siguiente forma, inserte una ruta local (ej. /data/music) o un URL a "
+"una instalacin remota de Ampache (ej. http://miotroampache.com)."
+
+#: ../../templates/add_catalog.inc:37
+msgid "Catalog Name"
+msgstr "Nombre del catlogo"
+
+#: ../../templates/add_catalog.inc:54
+msgid "Path"
+msgstr "Ruta"
+
+#: ../../templates/add_catalog.inc:58
+msgid "Catalog Type"
+msgstr "Tipo de catlogo"
+
+#: ../../templates/add_catalog.inc:62
+msgid "Remote"
+msgstr "Remoto"
+
+#: ../../templates/add_catalog.inc:67
+msgid "ID3 Set Command"
+msgstr "Comando ID3"
+
+#: ../../templates/add_catalog.inc:71
+msgid "Filename Pattern"
+msgstr "Nombre de archivo"
+
+#: ../../templates/add_catalog.inc:79 ../../templates/catalog.inc:101
+msgid "Gather Album Art"
+msgstr "Recopilar arte de los albums"
+
+#: ../../templates/add_catalog.inc:83
+msgid "ID3V2 Tags"
+msgstr "Etiquetas ID3V2"
+
+#: ../../templates/add_catalog.inc:86
+msgid "Amazon"
+msgstr "Amazon"
+
+#: ../../templates/add_catalog.inc:89
+msgid "File Folder"
+msgstr "Folder del archivo"
+
+#: ../../templates/add_catalog.inc:96
+msgid "Build Playlists from m3u Files"
+msgstr "Generar listas de reproduccin con los archivos m3u"
+
+#: ../../templates/add_catalog.inc:103
+msgid "Add Catalog"
+msgstr "Agregar catlogo"
+
+#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:49
+msgid "Flag"
+msgstr "Bandera"
+
+#: ../../templates/list_flagged.inc:43
+msgid "New Flag"
+msgstr "Nueva bandera"
+
+#: ../../templates/list_flagged.inc:44
+msgid "Flagged by"
+msgstr "Comentado por"
+
+#: ../../templates/list_flagged.inc:45
+msgid "ID3 Update"
+msgstr "Actualizar ID3"
+
+#: ../../templates/list_flagged.inc:69
+msgid "Accept"
+msgstr "Aceptar"
+
+#: ../../templates/list_flagged.inc:70
+msgid "Reject"
+msgstr "Rechazar"
+
+#: ../../templates/header.inc:49
+#, fuzzy
+msgid "You are currently logged in as"
+msgstr "esta en lnea como"
+
+#: ../../templates/header.inc:58
+msgid "Go!"
+msgstr ""
+
+#: ../../templates/show_songs.inc:143
+msgid "Direct Link"
+msgstr "Liga directa"
+
+#: ../../templates/show_songs.inc:166
+msgid "Total"
+msgstr "Total"
+
+#: ../../templates/show_search_bar.inc:36 ../../templates/show_search.inc:54
+msgid "Search Ampache"
+msgstr "Busqueda"
+
+#: ../../templates/show_install_config.inc:41
+#: ../../templates/show_install.inc:41
+msgid ""
+"Your webserver has read access to the /sql/ampache.sql file and the /config/"
+"ampache.cfg.php.dist file"
+msgstr ""
+"El servidor si tiene permiso de lectura de los archivos /sql/ampache.sql y /"
+"config/ampache.cfg.php.dist"
+
+#: ../../templates/show_install_config.inc:49
+#: ../../templates/show_install.inc:51
+msgid "Step 2 - Creating the Ampache.cfg.php file"
+msgstr "Paso 2 - Creando el archivo ampache.cfg.php"
+
+#: ../../templates/show_install_config.inc:51
+msgid ""
+"This steps takes the basic config values, and first attempts to write them "
+"out directly to your webserver. If access is denied it will prompt you to "
+"download the config file. Please put the downloaded config file in /config"
+msgstr ""
+"En este paso se utilizan los valores de configuracin,  para hacer una prueba "
+"de escritura en su sistema.  Si se niega el permiso, se le enviar el archivo "
+"a usted.  Cuando termine de descargarse, cpielo en /config"
+
+#: ../../templates/show_install_config.inc:60
+msgid "Web Path"
+msgstr "Ruta Web"
+
+#: ../../templates/show_install_config.inc:64
+#: ../../templates/show_install.inc:59
+msgid "Desired Database Name"
+msgstr "Nombre de datos de base sugerida"
+
+#: ../../templates/show_install_config.inc:68
+#: ../../templates/show_install.inc:63
+msgid "MySQL Hostname"
+msgstr "Mysql Hostname"
+
+#: ../../templates/show_install_config.inc:72
+msgid "MySQL Username"
+msgstr "MySQL nombre de usuario"
+
+#: ../../templates/show_install_config.inc:76
+msgid "MySQL Password"
+msgstr "MySQL Contrasea"
+
+#: ../../templates/show_install_config.inc:81
+msgid "Write Config"
+msgstr "Escribir configuracin"
+
+#: ../../templates/show_install_config.inc:125
+msgid "Check for Config"
+msgstr "Revisar si existe Config"
+
+#: ../../templates/show_album.inc:67
+msgid "Play Album"
+msgstr "Reproducir album"
+
+#: ../../templates/show_album.inc:68
+msgid "Play Random from Album"
+msgstr "Reproducir Album aleatorio"
+
+#: ../../templates/show_album.inc:69
+msgid "Reset Album Art"
+msgstr "Reestablacer el Arte del album"
+
+#: ../../templates/show_album.inc:70
+msgid "Find Album Art"
+msgstr "Buscar arte del album"
+
+#: ../../templates/show_preferences.inc:42
+msgid "Editing"
+msgstr "Editando"
+
+#: ../../templates/show_preferences.inc:42
+msgid "preferences"
+msgstr "preferencias"
+
+#: ../../templates/show_preferences.inc:44
+msgid "Rebuild Preferences"
+msgstr "Recargar preferencias"
+
+#: ../../templates/show_preferences.inc:73
+msgid "Update Preferences"
+msgstr "Actualizar preferencias"
+
+#: ../../templates/show_preferences.inc:77
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ../../templates/userform.inc:25
+msgid "Adding a New User"
+msgstr "Agregando usuario nuevo"
+
+#: ../../templates/userform.inc:29
+msgid "Editing existing User"
+msgstr "Editar usuario"
+
+#: ../../templates/userform.inc:80
+msgid "User Access Level"
+msgstr "Usar el nivel de acceso"
+
+#: ../../templates/userform.inc:96
+msgid "Add User"
+msgstr "Agregar usuario"
+
+#: ../../templates/userform.inc:101
+msgid "Update User"
+msgstr "Actualizar usuarios"
+
+#: ../../templates/show_random_play.inc:34
+msgid "Item count"
+msgstr "Conteo"
+
+#: ../../templates/show_random_play.inc:49
+msgid "From genre"
+msgstr "De gnero"
+
+#: ../../templates/show_random_play.inc:58
+msgid "Standard"
+msgstr ""
+
+#: ../../templates/show_random_play.inc:59
+msgid "Favor Unplayed"
+msgstr "No reproducidas"
+
+#: ../../templates/show_random_play.inc:61
+#, fuzzy
+msgid "Full Artist"
+msgstr "Artista"
+
+#: ../../templates/show_random_play.inc:66
+msgid "from catalog"
+msgstr "del catlogo"
+
+#: ../../templates/show_random_play.inc:75
+msgid "Play Random Songs"
+msgstr "Reproduccin aleatoria"
+
+#: ../../templates/show_install.inc:49
+msgid ""
+"This step creates and inserts the Ampache database, as such please provide a "
+"mysql account with database creation rights. This step may take a while "
+"depending upon the speed of your computer"
+msgstr "Este paso crea e inserta las bases de datos de tu ampache."
+
+#: ../../templates/show_install.inc:67
+msgid "MySQL Administrative Username"
+msgstr "Nombre de usuario de MySQL"
+
+#: ../../templates/show_install.inc:71
+msgid "MySQL Administrative Password"
+msgstr "Contrasea del MySQL administrativo."
+
+#: ../../templates/show_install.inc:75
+msgid "Create Database User for New Database"
+msgstr ""
+
+#: ../../templates/show_install.inc:80
+#, fuzzy
+msgid "Ampache Database Username"
+msgstr "Nombre de datos de base sugerida"
+
+#: ../../templates/show_install.inc:84
+msgid "Ampache Database User Password"
+msgstr ""
+
+#: ../../templates/show_install.inc:89
+msgid "Insert Database"
+msgstr "Insertar base de datos."
+
+#: ../../templates/show_add_access.inc:31
+msgid "Add Access for a Host"
+msgstr "Aadir acceso a un Host"
+
+#: ../../templates/show_add_access.inc:33
+msgid ""
+"Use the form below to add a host that you want to have access to your "
+"Ampache catalog."
+msgstr ""
+"Use las formas abajo para agregar un host que pueda entrar  al catlogo de "
+"Ampache."
+
+#: ../../templates/show_add_access.inc:46
+msgid "Start IP Address"
+msgstr "Iniciar direccin IP."
+
+#: ../../templates/show_add_access.inc:52
+msgid "End IP Address"
+msgstr "Termina la direccin IP?"
+
+#: ../../templates/show_add_access.inc:58
+#: ../../templates/show_access_list.inc:50
+msgid "Level"
+msgstr "Nivel"
+
+#: ../../templates/show_add_access.inc:72
+msgid "Add Host"
+msgstr "Agregar Host"
+
+#: ../../templates/catalog.inc:30
+msgid ""
+"Error: ICONV not found, ID3V2 Tags will not import correctly. See <a href="
+"\"http://php.oregonstate.edu/iconv\">Iconv</a> for information on getting "
+"ICONV"
+msgstr ""
+"Error: ICONV no encontrado, etiquetas ID3V2 no se importaran correctamente"
+
+#: ../../templates/catalog.inc:39
+msgid "Update Catalogs"
+msgstr "Actualizar catlogos"
+
+#: ../../templates/catalog.inc:65
+msgid "Fast Add"
+msgstr "Aadir"
+
+#: ../../templates/catalog.inc:72
+msgid "Fast Update"
+msgstr "Actualizacin rpida"
+
+#: ../../templates/catalog.inc:85
+msgid "You don't have any catalogs."
+msgstr "No tiene ningn catlogo"
+
+#: ../../templates/catalog.inc:96
+msgid "Show Duplicate Songs"
+msgstr "Mostrar canciones duplicadas"
+
+#: ../../templates/catalog.inc:97
+msgid "Show Disabled Songs"
+msgstr "Mostrar canciones no habilitadas"
+
+#: ../../templates/catalog.inc:98
+msgid "Clear Catalog Stats"
+msgstr "Eliminar estadsticas del catlogo"
+
+#: ../../templates/catalog.inc:100
+msgid "Dump Album Art"
+msgstr "Eliminar arte de lbum"
+
+#: ../../templates/catalog.inc:102
+msgid "View flagged songs"
+msgstr "Ver canciones marcadas"
+
+#: ../../templates/catalog.inc:103
+msgid "Catalog Tools"
+msgstr "Herramientas de Catlogo"
+
+#: ../../templates/menu.inc:73 ../../templates/menu.inc:79
+msgid "Account"
+msgstr "Cuenta"
+
+#: ../../templates/menu.inc:74 ../../templates/menu.inc:80
+#: ../../templates/show_users.inc:64 ../../templates/show_users.inc:112
+msgid "Stats"
+msgstr "Estadsticas"
+
+#: ../../templates/show_upload.inc:30
+msgid "Uploading Music to Ampache"
+msgstr ""
+
+#: ../../templates/show_upload.inc:32
+msgid "The following Audio file formats are supported"
+msgstr ""
+
+#: ../../templates/show_upload.inc:72
+msgid "max_upload_size"
+msgstr "max_upload_size"
+
+#: ../../templates/show_users.inc:40
+msgid "Fullname"
+msgstr "Nombre completo"
+
+#: ../../templates/show_users.inc:48
+msgid "Last Seen"
+msgstr "ltima visita"
+
+#: ../../templates/show_users.inc:53
+#, fuzzy
+msgid "Registration Date"
+msgstr "Registar usuario"
+
+#: ../../templates/show_users.inc:61 ../../templates/show_users.inc:107
+msgid "Prefs"
+msgstr "Preferencias"
+
+#: ../../templates/show_users.inc:67
+msgid "Access"
+msgstr "Acceso"
+
+#: ../../templates/show_users.inc:73
+msgid "On-line"
+msgstr "En lnea"
+
+#: ../../templates/show_users.inc:126
+msgid "delete"
+msgstr "borrar"
+
+#: ../../templates/list_duplicates.inc:28
+#, fuzzy
+msgid "Duplicate Songs"
+msgstr "Mostrar canciones duplicadas"
+
+#: ../../templates/list_duplicates.inc:35
+msgid "Length"
+msgstr ""
+
+#: ../../templates/list_duplicates.inc:74
+msgid "You don"
+msgstr ""
+
+#: ../../templates/list_duplicates.inc:74
+msgid ""
+"); ?></p>\n"
+"<?php  } ?>\n"
+"</form>\n"
+msgstr ""
+
+#: ../../templates/show_login_form.inc:49
+#: ../../templates/show_login_form.inc:63
+msgid "Login"
+msgstr "Login"
+
+#: ../../templates/show_login_form.inc:59
+msgid "Remember Me"
+msgstr "Recuerda mi info"
+
+#: ../../templates/show_login_form.inc:72
+#, fuzzy
+msgid "Register"
+msgstr "Registar usuario"
+
+#: ../../templates/show_access_list.inc:34
+msgid "Host Access to Your Catalog"
+msgstr "Acceso a tu catlogo"
+
+#: ../../templates/show_access_list.inc:43
+msgid "Add Entry"
+msgstr "Agregar registro"
+
+#: ../../templates/show_access_list.inc:48
+msgid "Start Address"
+msgstr "Direccin de inicio"
+
+#: ../../templates/show_access_list.inc:49
+msgid "End Address"
+msgstr "Direccin final"
+
+#: ../../templates/show_access_list.inc:65
+msgid "Revoke"
+msgstr "Revocar"
+
+#: ../../templates/show_search.inc:57
+msgid "Keywords"
+msgstr ""
+
+#: ../../templates/show_search.inc:102
+#, fuzzy
+msgid "Played"
+msgstr "Reproducir"
+
+#: ../../templates/show_search.inc:110
+#, fuzzy
+msgid "Min Bitrate"
+msgstr "Bitrate"
+
+#: ../../templates/show_search.inc:132
+msgid "Object Type"
+msgstr "Tipo de objeto"
+
+#: ../../templates/show_search.inc:138
+#, fuzzy
+msgid "Genres"
+msgstr "Gnero"
+
+#: ../../templates/show_search.inc:141
+msgid "Operator"
+msgstr ""
+
+#: ../../templates/show_search.inc:145
+msgid "AND"
+msgstr ""
+
+#: ../../templates/show_search.inc:150
+#, fuzzy
+msgid "Method"
+msgstr "Modo"
+
+#: ../../templates/show_search.inc:153
+msgid "Fuzzy"
+msgstr ""
+
+#: ../../templates/show_search.inc:154
+msgid "Exact"
+msgstr ""
+
+#: ../../templates/show_search.inc:157
+msgid "Maxium Results"
+msgstr ""
+
+#: ../../templates/show_search.inc:160
+msgid "Unlimited"
+msgstr ""
+
+#: ../../templates/show_search.inc:172
+msgid "Reset Form"
+msgstr ""
+
+#: ../../templates/show_search.inc:184
+msgid "Save Search As Track on"
+msgstr ""
+
+#: ../../templates/show_search.inc:186
+msgid "Save"
+msgstr ""
+
+#: ../../templates/show_mpdplay.inc:39
+msgid "MPD Play Control"
+msgstr "Control MPD"
+
+#: ../../templates/show_mpdplay.inc:100
+msgid "Loop"
+msgstr "Ciclo"
+
+#: ../../templates/show_mpdplay.inc:107 ../../templates/show_mpdplay.inc:120
+msgid "On"
+msgstr "Encendido"
+
+#: ../../templates/show_mpdplay.inc:108 ../../templates/show_mpdplay.inc:121
+msgid "Off"
+msgstr "Apagado"
+
+#: ../../templates/show_mpdplay.inc:134
+#, fuzzy
+msgid "Now Playing :"
+msgstr "Ahora reproduciento"
+
+#: ../../templates/show_mpdplay.inc:163
+msgid "On Deck "
+msgstr ""
+
+#: ../../templates/show_mpdplay.inc:163
+msgid "(in "
+msgstr ""
+
+#: ../../templates/show_artist.inc:36
+msgid "Select"
+msgstr "Seleccionar"
+
+#: ../../templates/show_artist.inc:38
+msgid "Cover"
+msgstr "Portada"
+
+#: ../../templates/show_artist.inc:39
+msgid "Album Name"
+msgstr "Nombre del lbum"
+
+#: ../../templates/show_artist.inc:40
+msgid "Album Year"
+msgstr "Ao del lbum"
+
+#: ../../templates/show_artist.inc:41
+msgid "Total Tracks"
+msgstr "Pistas totales"
+
+#: ../../templates/show_big_art.inc:31
+#, fuzzy
+msgid "Album Art"
+msgstr "Buscar arte del album"
+
+#: ../../templates/show_big_art.inc:35
+msgid "Click to close window"
+msgstr ""
+
+#~ msgid "No Results Found"
+#~ msgstr "No se encontraron resultados"
+
+#~ msgid "New"
+#~ msgstr "Nuevo"
+
+#~ msgid "View All"
+#~ msgstr "Ver todos"
+
+#~ msgid "Import"
+#~ msgstr "Importar"
+
+#~ msgid "Public"
+#~ msgstr "Pblico"
+
+#~ msgid "Your Private"
+#~ msgstr "Tu privado"
+
+#~ msgid "Other Private"
+#~ msgstr "Otro privado"
+
+#~ msgid "There are no playlists of this type"
+#~ msgstr "No hay listas de reproduccin de este tipo"
+
+#~ msgid "View Limit"
+#~ msgstr "Lmite"
+
+#~ msgid "All songs by"
+#~ msgstr "Todas las canciones de"
+
+#~ msgid "owned by"
+#~ msgstr "pertenece a"
+
+#~ msgid "Edit Playlist"
+#~ msgstr "Editar lista de reproduccin"
+
+#~ msgid "Play Random"
+#~ msgstr "Reproducir aleatoreo"
+
+#~ msgid "Welcome to"
+#~ msgstr "Bienvenido a"
+
+#~ msgid "Album Art Located"
+#~ msgstr "Se localiz el arte del lbum"
+
+#~ msgid ""
+#~ "Album Art information has been located in Amazon. If incorrect, click "
+#~ "\"Reset Album Art\" below to remove the artwork."
+#~ msgstr ""
+#~ "Se localiz el arte en Amazon.  Si esta incorrecta, haga click en "
+#~ "\"Eliminar arte\""
+
+#~ msgid "<u>S</u>how all albums"
+#~ msgstr "<u>M</u>ostrar todos los lbumes"
+
+#~ msgid "Select a starting letter or Show all"
+#~ msgstr "Seleccione una letra o Mostrar todo"
+
+#~ msgid "An Unknown Error has occured."
+#~ msgstr "Error desconocido"
+
+#~ msgid "Successfully-Quarantined"
+#~ msgstr "En Cuarentena"
+
+#~ msgid "Successfully-Cataloged"
+#~ msgstr "Catalogada satisfactoriamente"
+
+#~ msgid "Quarantined"
+#~ msgstr "En cuarentena"
+
+#~ msgid "Create/Modify User Accounts for Ampache"
+#~ msgstr "Crear/Modificar cuentas de usuario para Ampache"
+
+#~ msgid "Mail"
+#~ msgstr "Correo"
+
+#~ msgid "Mail your users to notfiy them of changes"
+#~ msgstr "Enviar un mensaje a los usuarios"
+
+#~ msgid "Create/Update/Clean your catalog here"
+#~ msgstr "Creacin/Actualizacin/Mantenimiento del catlogo"
+
+#~ msgid "Modify Site-wide preferences"
+#~ msgstr "Preferencias de todo el sitio"
+
+#~ msgid "Modify Access List Permissions"
+#~ msgstr "Modificar los permisos en las listas de acceso"
+
+#~ msgid "Must have access_control=true in ampache.cfg"
+#~ msgstr "Se requiere que el access_contro=true en ampache.cfg.php"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "Please Ensure All Files Are Tagged Correctly"
+#~ msgstr "Asegrese que todos los archivos estan correctamente etiquetados"
+
+#~ msgid ""
+#~ "Ampache relies on id3 tags to sort data.  If your file is not tagged it "
+#~ "may be deleted."
+#~ msgstr ""
+#~ "Ampache se basa en la informacin de las etiquetas ID3.  Si tu archivo no "
+#~ "esta debidamente etiquetado, se borrar"
+
+#~ msgid "refresh now"
+#~ msgstr "actualizar ahora"
+
+#~ msgid "clear"
+#~ msgstr "limpiear"
Binary files ampache-3.3.2-alpha4/locale/fr_FR/LC_MESSAGES/messages.mo and ampache-3.3.2-beta1/locale/fr_FR/LC_MESSAGES/messages.mo differ
diff -urN ampache-3.3.2-alpha4/locale/fr_FR/LC_MESSAGES/messages.po ampache-3.3.2-beta1/locale/fr_FR/LC_MESSAGES/messages.po
--- ampache-3.3.2-alpha4/locale/fr_FR/LC_MESSAGES/messages.po	2005-12-27 01:32:55.000000000 -0800
+++ ampache-3.3.2-beta1/locale/fr_FR/LC_MESSAGES/messages.po	2006-01-08 23:06:13.000000000 -0800
@@ -2,214 +2,297 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: v0.1a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-29 10:27-0700\n"
+"POT-Creation-Date: 2006-01-07 22:47-0800\n"
 "PO-Revision-Date: 2004-11-12 13:16-1000\n"
-"Last-Translator: HAUTZ Gilles <cocobu@mail.pf>\n"
+"Last-Translator: \tHAUTZ Gilles <cocobu@mail.pf>\n"
 "Language-Team: FRENCH\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"\t\t\tThomas Legay\t<TomAmplius@yahoo.fr>\n"
 
 #: ../../play/index.php:50
 msgid "Session Expired: please log in again at"
+msgstr "Session expir&eacute; : reconnectez vous sur"
+
+#: ../../lib/class/catalog.class.php:281 ../../lib/class/catalog.class.php:566
+#: ../../lib/class/album.class.php:263
+msgid "Error: Unable to open"
+msgstr "Erreur : Impossible d'ouvrir"
+
+#: ../../lib/class/catalog.class.php:304
+msgid "Error: Unable to change to directory"
 msgstr ""
 
-#: ../../lib/preferences.php:211 ../../templates/show_users.inc:97
-msgid "Enable"
+#: ../../lib/class/catalog.class.php:330
+msgid "Error: Unable to get filesize for"
 msgstr ""
 
-#: ../../lib/preferences.php:212 ../../templates/show_users.inc:100
-msgid "Disable"
+#: ../../lib/class/catalog.class.php:365
+msgid "Added"
 msgstr ""
 
-#: ../../lib/preferences.php:224 ../../templates/add_catalog.inc:60
-msgid "Local"
+#: ../../lib/class/catalog.class.php:377
+msgid "is not readable by ampache"
 msgstr ""
 
-#: ../../lib/preferences.php:227
-msgid "Stream"
+#: ../../lib/class/catalog.class.php:441
+msgid "Found in ID3"
 msgstr ""
 
-#: ../../lib/preferences.php:230
-msgid "IceCast"
+#: ../../lib/class/catalog.class.php:445
+msgid "Found on Amazon"
 msgstr ""
 
-#: ../../lib/preferences.php:233
-msgid "Downsample"
+#: ../../lib/class/catalog.class.php:449
+msgid "Found in Folder"
 msgstr ""
 
-#: ../../lib/preferences.php:236
-msgid "Music Player Daemon"
+#: ../../lib/class/catalog.class.php:453
+msgid "Found"
 msgstr ""
 
-#: ../../lib/preferences.php:239
-msgid "SlimServer"
+#: ../../lib/class/catalog.class.php:456
+msgid "Not Found"
 msgstr ""
 
-#: ../../lib/preferences.php:248
-msgid "M3U"
+#: ../../lib/class/catalog.class.php:464
+msgid "Searched"
 msgstr ""
 
-#: ../../lib/preferences.php:249
-msgid "Simple M3U"
+#: ../../lib/class/catalog.class.php:622
+msgid "Starting Dump Album Art"
 msgstr ""
 
-#: ../../lib/preferences.php:250
-msgid "PLS"
+#: ../../lib/class/catalog.class.php:642
+msgid "Written"
 msgstr ""
 
-#: ../../lib/preferences.php:251
-msgid "Asx"
+#: ../../lib/class/catalog.class.php:651
+msgid "Error unable to open file for writting"
 msgstr ""
 
-#: ../../lib/preferences.php:258
-msgid "English"
+#: ../../lib/class/catalog.class.php:658
+msgid "Album Art Dump Complete"
 msgstr ""
 
-#: ../../lib/preferences.php:259
-msgid "British English"
+#: ../../lib/class/catalog.class.php:659 ../../artists.php:64
+#: ../../albums.php:153
+msgid "Return"
 msgstr ""
 
-#: ../../lib/preferences.php:260
-msgid "German"
+#: ../../lib/class/catalog.class.php:728
+msgid "Starting Catalog Build"
 msgstr ""
 
-#: ../../lib/preferences.php:261
-msgid "French"
+#: ../../lib/class/catalog.class.php:733
+msgid "Running Remote Sync"
 msgstr ""
 
-#: ../../lib/preferences.php:262
-msgid "Turkish"
+#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:904
+msgid "Added Playlist From"
 msgstr ""
 
-#: ../../lib/preferences.php:263
-msgid "Spanish"
+#: ../../lib/class/catalog.class.php:752 ../../lib/class/catalog.class.php:913
+#: ../../admin/catalog.php:258
+msgid "Starting Album Art Search"
 msgstr ""
 
-#: ../../lib/preferences.php:264
-msgid "Dutch"
+#: ../../lib/class/catalog.class.php:762
+msgid "Catalog Finished"
 msgstr ""
 
-#: ../../lib/preferences.php:265
-msgid "Simplified Chinese"
+#: ../../lib/class/catalog.class.php:762 ../../lib/class/catalog.class.php:932
+#, fuzzy
+msgid "Total Time"
+msgstr "Temps total"
+
+#: ../../lib/class/catalog.class.php:762 ../../lib/class/catalog.class.php:933
+msgid "Total Songs"
 msgstr ""
 
-#: ../../lib/duplicates.php:80
+#: ../../lib/class/catalog.class.php:763 ../../lib/class/catalog.class.php:933
+msgid "Songs Per Seconds"
+msgstr "Chansons par secondes"
+
+#: ../../lib/class/catalog.class.php:797
+#: ../../lib/class/catalog.class.php:1512
 #, fuzzy
-msgid "Find Duplicates"
-msgstr "Voir les doublons"
+msgid "Updated"
+msgstr "Mise &eacute; jour"
 
-#: ../../lib/duplicates.php:83
-msgid "Search Type"
+#: ../../lib/class/catalog.class.php:804
+msgid "No Update Needed"
+msgstr "Mise &eacute; non n&eacute;c&eacute;caire"
+
+#: ../../lib/class/catalog.class.php:885
+msgid "Starting New Song Search on"
 msgstr ""
 
-#: ../../lib/duplicates.php:91 ../../lib/class/song.class.php:275
-#: ../../templates/show_search.inc:48
-msgid "Title"
+#: ../../lib/class/catalog.class.php:885
+#, fuzzy
+msgid "catalog"
+msgstr "catalogue"
+
+#: ../../lib/class/catalog.class.php:889
+msgid "Running Remote Update"
 msgstr ""
 
-#: ../../lib/duplicates.php:97
-msgid "Artist and Title"
+#: ../../lib/class/catalog.class.php:932
+#, fuzzy
+msgid "Catalog Update Finished"
+msgstr "Effacer les Statistiques des Catalogues"
+
+#: ../../lib/class/catalog.class.php:952 ../../lib/mpd.php:43
+#: ../../lib/mpd.php:52 ../../albums.php:74
+msgid "Error"
+msgstr "Erreur"
+
+#: ../../lib/class/catalog.class.php:952
+msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
 msgstr ""
 
-#: ../../lib/duplicates.php:102
-msgid "Artist, Album and Title"
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
+msgid "Error connecting to"
 msgstr ""
 
-#: ../../lib/duplicates.php:110 ../../templates/menu.inc:39
-#: ../../templates/show_search.inc:153 ../../templates/show_search_bar.inc:50
-msgid "Search"
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
+msgid "Code"
 msgstr ""
 
-#: ../../lib/general.lib.php:640
-msgid "Not Enough Data"
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
+msgid "Reason"
 msgstr ""
 
-#: ../../lib/class/genre.class.php:278
-msgid "Show Genres starting with"
+#: ../../lib/class/catalog.class.php:1007
+msgid "Completed updating remote catalog(s)"
 msgstr ""
 
-#: ../../lib/class/album.class.php:126
-msgid "Various"
+#: ../../lib/class/catalog.class.php:1138
+msgid "Checking"
 msgstr ""
 
-#: ../../lib/class/album.class.php:241 ../../lib/class/catalog.class.php:275
-#: ../../lib/class/catalog.class.php:560
-msgid "Error: Unable to open"
+#: ../../lib/class/catalog.class.php:1196
+msgid "Catalog Clean Done"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:1196
+msgid "files removed"
 msgstr ""
 
+#: ../../lib/class/catalog.class.php:1469
+msgid "Updating the"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:1469 ../../templates/sidebar.inc.php:31
+#, fuzzy
+msgid "Catalog"
+msgstr "Catalogue"
+
+#: ../../lib/class/catalog.class.php:1470
+msgid "songs found checking tag information."
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:1520
+msgid " FOUND"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:1521
+msgid "Searching for new Album Art"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:1525
+msgid "Album Art Already Found"
+msgstr ""
+
+#: ../../lib/class/artist.class.php:223
+msgid "Error: Name Identical"
+msgstr ""
+
+#: ../../lib/class/song.class.php:275 ../../lib/duplicates.php:113
+#: ../../templates/show_search.inc:66
+msgid "Title"
+msgstr "Titre"
+
 #: ../../lib/class/song.class.php:275 ../../lib/class/song.class.php:279
 #: ../../lib/class/song.class.php:283 ../../lib/class/song.class.php:287
 #: ../../lib/class/song.class.php:291 ../../lib/class/song.class.php:295
 #: ../../lib/class/song.class.php:299 ../../lib/class/song.class.php:304
 #: ../../lib/class/song.class.php:309 ../../lib/class/song.class.php:313
 #: ../../lib/class/song.class.php:317 ../../lib/class/song.class.php:322
-#, fuzzy
 msgid "updated to"
-msgstr "Mettre a jour les Catalogues"
+msgstr ""
 
-#: ../../lib/class/song.class.php:279 ../../templates/show_songs.inc:39
-#: ../../templates/show_uploads.inc:39
+#: ../../lib/class/song.class.php:279 ../../templates/show_uploads.inc:39
+#: ../../templates/show_songs.inc:47 ../../templates/list_duplicates.inc:36
 msgid "Bitrate"
-msgstr ""
+msgstr "Bitrate"
 
 #: ../../lib/class/song.class.php:283
 msgid "Rate"
-msgstr ""
+msgstr "Rate"
 
 #: ../../lib/class/song.class.php:287
 msgid "Mode"
-msgstr ""
+msgstr "Mode"
 
-#: ../../lib/class/song.class.php:291 ../../templates/show_songs.inc:37
-#: ../../templates/show_mpdpl.inc:67 ../../templates/show_uploads.inc:38
+#: ../../lib/class/song.class.php:291 ../../templates/show_uploads.inc:38
+#: ../../templates/show_mpdpl.inc:66 ../../templates/show_songs.inc:45
 msgid "Time"
-msgstr ""
+msgstr "Temps"
 
-#: ../../lib/class/song.class.php:295 ../../templates/show_songs.inc:32
-#: ../../templates/show_songs.inc:36 ../../templates/show_mpdpl.inc:66
+#: ../../lib/class/song.class.php:295 ../../templates/show_mpdpl.inc:65
+#: ../../templates/show_songs.inc:39 ../../templates/show_songs.inc:44
 msgid "Track"
-msgstr ""
+msgstr "Piste"
 
 #: ../../lib/class/song.class.php:299
 msgid "Filesize"
-msgstr ""
+msgstr "Taille du fichier"
 
-#: ../../lib/class/song.class.php:304 ../../templates/show_artists.inc:39
-#: ../../templates/show_artists.inc:62 ../../templates/show_songs.inc:34
-#: ../../templates/show_albums.inc:40 ../../templates/show_albums.inc:70
-#: ../../templates/show_search.inc:53 ../../templates/show_mpdpl.inc:64
-#: ../../templates/show_uploads.inc:35 ../../templates/show_search_bar.inc:43
+#: ../../lib/class/song.class.php:304
+#: ../../templates/show_get_albumart.inc.php:33
+#: ../../templates/show_uploads.inc:35 ../../templates/show_mpdpl.inc:63
+#: ../../templates/show_songs.inc:42 ../../templates/show_artists.inc:39
+#: ../../templates/show_artists.inc:62 ../../templates/show_albums.inc:40
+#: ../../templates/show_albums.inc:70 ../../templates/list_duplicates.inc:33
+#: ../../templates/show_search.inc:71
 msgid "Artist"
-msgstr ""
+msgstr "Artiste"
 
-#: ../../lib/class/song.class.php:309 ../../templates/show_songs.inc:35
-#: ../../templates/show_albums.inc:38 ../../templates/show_albums.inc:68
-#: ../../templates/show_search.inc:60 ../../templates/show_mpdpl.inc:65
-#: ../../templates/show_uploads.inc:36 ../../templates/show_search_bar.inc:44
+#: ../../lib/class/song.class.php:309
+#: ../../templates/show_get_albumart.inc.php:41
+#: ../../templates/show_uploads.inc:36 ../../templates/show_mpdpl.inc:64
+#: ../../templates/show_songs.inc:43 ../../templates/show_albums.inc:38
+#: ../../templates/show_albums.inc:68 ../../templates/list_duplicates.inc:34
+#: ../../templates/show_search.inc:78
 msgid "Album"
-msgstr ""
+msgstr "Album"
 
 #: ../../lib/class/song.class.php:313 ../../templates/show_albums.inc:43
-#: ../../templates/show_albums.inc:73 ../../templates/show_search.inc:72
+#: ../../templates/show_albums.inc:73 ../../templates/show_search.inc:90
 msgid "Year"
-msgstr ""
+msgstr "Ann&eacute;e"
 
-#: ../../lib/class/song.class.php:317 ../../templates/list_flagged.inc:46
-#: ../../templates/flag.inc:66
+#: ../../lib/class/song.class.php:317 ../../templates/flag.inc:66
+#: ../../templates/list_flagged.inc:46
 msgid "Comment"
 msgstr ""
 
-#: ../../lib/class/song.class.php:322 ../../templates/show_genres.inc.php:36
-#: ../../templates/show_genre.inc.php:32 ../../templates/show_songs.inc:40
-#: ../../templates/show_search.inc:65 ../../templates/show_browse_menu.inc:37
-#: ../../templates/show_mpdpl.inc:68 ../../templates/show_uploads.inc:37
+#: ../../lib/class/song.class.php:322 ../../templates/show_genre.inc.php:32
+#: ../../templates/show_genres.inc.php:36 ../../templates/sidebar.inc.php:37
+#: ../../templates/show_uploads.inc:37 ../../templates/show_mpdpl.inc:67
+#: ../../templates/show_songs.inc:48 ../../templates/show_browse_menu.inc:37
+#: ../../templates/show_search.inc:83
 msgid "Genre"
 msgstr ""
 
@@ -229,212 +312,206 @@
 msgid "Closed after write"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:298
-msgid "Error: Unable to change to directory"
-msgstr ""
+#: ../../lib/class/genre.class.php:278
+#, fuzzy
+msgid "Show Genres starting with"
+msgstr "<u>V</u>oir les artistes commencant par"
 
-#: ../../lib/class/catalog.class.php:321
-msgid "Error: Unable to get filesize for"
+#: ../../lib/class/album.class.php:151
+msgid "Various"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:340
-msgid "Added Playlist From"
-msgstr ""
+#: ../../lib/duplicates.php:102
+#, fuzzy
+msgid "Find Duplicates"
+msgstr "Voir les doublons"
 
-#: ../../lib/class/catalog.class.php:359
-msgid "Added"
-msgstr ""
+#: ../../lib/duplicates.php:105
+msgid "Search Type"
+msgstr "Recherche un type"
 
-#: ../../lib/class/catalog.class.php:371
-msgid "is not readable by ampache"
-msgstr ""
+#: ../../lib/duplicates.php:119
+msgid "Artist and Title"
+msgstr "Artiste et titre"
 
-#: ../../lib/class/catalog.class.php:435
-msgid "Found in ID3"
-msgstr ""
+#: ../../lib/duplicates.php:124
+msgid "Artist, Album and Title"
+msgstr "Artiste, Album et Titre"
 
-#: ../../lib/class/catalog.class.php:439
-msgid "Found on Amazon"
-msgstr ""
+#: ../../lib/duplicates.php:132 ../../templates/sidebar.inc.php:97
+#: ../../templates/sidebar.inc.php:103 ../../templates/show_search_bar.inc:41
+#: ../../templates/menu.inc:39 ../../templates/show_search.inc:171
+msgid "Search"
+msgstr "Rechercher"
 
-#: ../../lib/class/catalog.class.php:443
-msgid "Found in Folder"
-msgstr ""
+#: ../../lib/preferences.php:252 ../../templates/show_users.inc:118
+msgid "Enable"
+msgstr "Activer"
 
-#: ../../lib/class/catalog.class.php:447
-msgid "Found"
-msgstr ""
+#: ../../lib/preferences.php:253 ../../templates/show_users.inc:121
+#: ../../templates/list_duplicates.inc:31
+msgid "Disable"
+msgstr "Deactiver"
 
-#: ../../lib/class/catalog.class.php:450
-msgid "Not Found"
+#: ../../lib/preferences.php:265 ../../templates/add_catalog.inc:61
+msgid "Local"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:458
-msgid "Searched"
+#: ../../lib/preferences.php:268
+msgid "Stream"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:613
-msgid "Starting Dump Album Art"
+#: ../../lib/preferences.php:271
+msgid "IceCast"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:633
-msgid "Written"
+#: ../../lib/preferences.php:274
+msgid "Downsample"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:642
-msgid "Error unable to open file for writting"
+#: ../../lib/preferences.php:277
+msgid "Music Player Daemon"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:649
-msgid "Album Art Dump Complete"
+#: ../../lib/preferences.php:280
+msgid "SlimServer"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:650 ../../artists.php:63
-#: ../../albums.php:112
-msgid "Return"
+#: ../../lib/preferences.php:289
+msgid "M3U"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:719
-msgid "Starting Catalog Build"
+#: ../../lib/preferences.php:290
+msgid "Simple M3U"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:724
-msgid "Running Remote Sync"
+#: ../../lib/preferences.php:291
+msgid "PLS"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:734 ../../lib/class/catalog.class.php:880
-#: ../../admin/catalog.php:264
-msgid "Starting Album Art Search"
+#: ../../lib/preferences.php:292
+msgid "Asx"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:744
-#, fuzzy
-msgid "Catalog Finished"
-msgstr "Outils pour les Catalogues"
-
-#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:899
-#, fuzzy
-msgid "Total Time"
-msgstr "Outils pour les Catalogues"
-
-#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:900
-#, fuzzy
-msgid "Total Songs"
-msgstr "Voir les chansons desactivees"
-
-#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:900
-msgid "Songs Per Seconds"
+#: ../../lib/preferences.php:293
+msgid "RAM"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:779
-#: ../../lib/class/catalog.class.php:1476
-#, fuzzy
-msgid "Updated"
-msgstr "Mise a jour rapide"
+#: ../../lib/mpd.php:43 ../../lib/mpd.php:52
+msgid "Could not add"
+msgstr "Ajout impossible"
 
-#: ../../lib/class/catalog.class.php:786
-msgid "No Update Needed"
+#: ../../lib/general.lib.php:675
+msgid "Not Enough Data"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:860
-msgid "Starting New Song Search on"
+#: ../../lib/general.lib.php:897 ../../lib/general.lib.php:908
+msgid "English"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:860
-#, fuzzy
-msgid "catalog"
-msgstr "Outils pour les Catalogues"
+#: ../../lib/general.lib.php:907
+msgid "German"
+msgstr "Allemand"
 
-#: ../../lib/class/catalog.class.php:864
-msgid "Running Remote Update"
+#: ../../lib/general.lib.php:909
+msgid "British English"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:899
-#, fuzzy
-msgid "Catalog Update Finished"
-msgstr "Effacer les Statistiques des Catalogues"
-
-#: ../../lib/class/catalog.class.php:919 ../../lib/mpd.php:40
-#: ../../lib/mpd.php:49
-msgid "Error"
+#: ../../lib/general.lib.php:910
+msgid "Spanish"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:919
-msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
-msgstr ""
+#: ../../lib/general.lib.php:911
+msgid "French"
+msgstr "Francais"
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
-msgid "Error connecting to"
+#: ../../lib/general.lib.php:912
+msgid "Italian"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
-msgid "Code"
+#: ../../lib/general.lib.php:913
+msgid "Dutch"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
-msgid "Reason"
+#: ../../lib/general.lib.php:914
+msgid "Turkish"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:974
-msgid "Completed updating remote catalog(s)"
+#: ../../lib/general.lib.php:915
+msgid "Simplified Chinese"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1105
-msgid "Checking"
-msgstr ""
+#: ../../lib/general.lib.php:916
+msgid "Unknown"
+msgstr "Inconnue"
 
-#: ../../lib/class/catalog.class.php:1163
+#: ../../lib/ui.lib.php:222
 #, fuzzy
-msgid "Catalog Clean Done"
-msgstr "Outils pour les Catalogues"
+msgid "Error Access Denied"
+msgstr "Niveau d'access utilisateur"
 
-#: ../../lib/class/catalog.class.php:1163
-msgid "files removed"
-msgstr ""
+#: ../../lib/ui.lib.php:299 ../../templates/sidebar.inc.php:69
+#: ../../templates/header.inc:51 ../../templates/menu.inc:35
+msgid "Browse"
+msgstr "Parcourrir"
 
-#: ../../lib/class/catalog.class.php:1436
-msgid "Updating the"
+#: ../../lib/ui.lib.php:301
+msgid "Show w/o art"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1436 ../../templates/admin_menu.inc:35
+#: ../../lib/ui.lib.php:304
+msgid "Show all"
+msgstr "Montrer tout"
+
+#: ../../lib/ui.lib.php:721
 #, fuzzy
-msgid "Catalog"
-msgstr "Outils pour les Catalogues"
+msgid "No Catalogs Found!"
+msgstr "Pas de r&eacute;sultat trouve"
 
-#: ../../lib/class/catalog.class.php:1437
-msgid "songs found checking tag information."
-msgstr ""
+#: ../../lib/ui.lib.php:722 ../../templates/add_catalog.inc:29
+#, fuzzy
+msgid "Add a Catalog"
+msgstr "Ajouter un catalogue"
 
-#: ../../lib/class/catalog.class.php:1484
-msgid " FOUND"
-msgstr ""
+#: ../../lib/ui.lib.php:723 ../../templates/show_local_catalog_info.inc.php:7
+#, fuzzy
+msgid "Catalog Statistics"
+msgstr "Statistique sur le catalogue"
 
-#: ../../lib/class/catalog.class.php:1485
-msgid "Searching for new Album Art"
-msgstr ""
+#: ../../lib/ui.lib.php:759
+msgid "day"
+msgstr "jour"
 
-#: ../../lib/class/catalog.class.php:1489
-msgid "Album Art Already Found"
-msgstr ""
+#: ../../lib/ui.lib.php:759
+msgid "days"
+msgstr "jours"
 
-#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
-msgid "Could not add"
-msgstr ""
+#: ../../lib/ui.lib.php:761
+msgid "hour"
+msgstr "heure"
+
+#: ../../lib/ui.lib.php:761
+msgid "hours"
+msgstr "heures"
+
+#: ../../lib/ui.lib.php:1053 ../../templates/sidebar.inc.php:128
+#: ../../templates/show_random_play_bar.inc.php:45
+#: ../../templates/show_artists.inc:55 ../../templates/show_random_play.inc:46
+#: ../../templates/show_albums.inc:58
+msgid "All"
+msgstr "Tout"
 
 #: ../../lib/Browser.php:867
 msgid "file"
-msgstr ""
+msgstr "Fichier"
 
 #: ../../lib/Browser.php:871
 msgid "File uploads not supported."
-msgstr ""
+msgstr "Upload de fichier non supporte"
 
 #: ../../lib/Browser.php:889
 msgid "No file uploaded"
-msgstr ""
+msgstr "Pas de fichier uploade"
 
 #: ../../lib/Browser.php:896
 #, php-format
@@ -454,341 +531,237 @@
 "There was a problem with the file upload: The %s was only partially uploaded."
 msgstr ""
 
-#: ../../lib/ui.lib.php:199
-#, fuzzy
-msgid "Playlist Actions"
-msgstr "Mise a jour rapide"
-
-#: ../../lib/ui.lib.php:199
-msgid "New"
-msgstr ""
-
-#: ../../lib/ui.lib.php:200
-msgid "View All"
-msgstr ""
-
-#: ../../lib/ui.lib.php:201
-msgid "Import"
-msgstr ""
-
-#: ../../lib/ui.lib.php:301 ../../templates/menu.inc:35
-msgid "Browse"
-msgstr ""
-
-#: ../../lib/ui.lib.php:303
-msgid "Show w/o art"
-msgstr ""
-
-#: ../../lib/ui.lib.php:306
-msgid "Show all"
-msgstr ""
-
-#: ../../lib/ui.lib.php:446
-msgid "No songs in this playlist."
-msgstr ""
-
-#: ../../lib/ui.lib.php:592
-#, fuzzy
-msgid "No Catalogs Found!"
-msgstr "Outils pour les Catalogues"
-
-#: ../../lib/ui.lib.php:593 ../../templates/add_catalog.inc:28
-#, fuzzy
-msgid "Add a Catalog"
-msgstr "Ajouter un catalogue"
-
-#: ../../lib/ui.lib.php:594 ../../templates/show_local_catalog_info.inc.php:7
+#: ../../lib/upload.php:228
 #, fuzzy
-msgid "Catalog Statistics"
-msgstr "Effacer les Statistiques des Catalogues"
-
-#: ../../lib/ui.lib.php:630
-msgid "day"
-msgstr ""
-
-#: ../../lib/ui.lib.php:630
-msgid "days"
-msgstr ""
-
-#: ../../lib/ui.lib.php:632
-msgid "hour"
-msgstr ""
-
-#: ../../lib/ui.lib.php:632
-msgid "hours"
-msgstr ""
-
-#: ../../lib/upload.php:225
 msgid "The file uploaded successfully"
-msgstr ""
+msgstr "Pas de fichier uploade"
 
-#: ../../lib/upload.php:226
+#: ../../lib/upload.php:229
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ../../lib/upload.php:227
+#: ../../lib/upload.php:230
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ../../lib/upload.php:228
+#: ../../lib/upload.php:231
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ../../lib/upload.php:229
+#: ../../lib/upload.php:232
+#, fuzzy
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Pas de fichier upload&eacute;"
 
-#: ../../lib/upload.php:230
+#: ../../lib/upload.php:233
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ../../modules/lib.php:709
-msgid "Public"
-msgstr ""
+#: ../../lib/rating.lib.php:55
+#, fuzzy
+msgid "Don't Play"
+msgstr "Jouer en local"
 
-#: ../../modules/lib.php:710
-msgid "Your Private"
+#: ../../lib/rating.lib.php:58
+msgid "It's Pretty Bad"
 msgstr ""
 
-#: ../../modules/lib.php:711
-msgid "Other Private"
+#: ../../lib/rating.lib.php:61
+msgid "It's Ok"
 msgstr ""
 
-#: ../../modules/lib.php:792 ../../templates/show_play_selected.inc.php:72
-msgid "View"
+#: ../../lib/rating.lib.php:64
+msgid "It's Pretty Good"
 msgstr ""
 
-#: ../../modules/lib.php:795 ../../templates/show_play_selected.inc.php:73
-#: ../../templates/show_users.inc:52 ../../templates/show_users.inc:86
-msgid "Edit"
+#: ../../lib/rating.lib.php:67
+msgid "I Love It!"
 msgstr ""
 
-#: ../../modules/lib.php:796 ../../templates/catalog.inc:60
-#: ../../templates/show_users.inc:61 ../../templates/show_uploads.inc:50
-msgid "Delete"
-msgstr "Effacer"
-
-#: ../../modules/lib.php:804 ../../templates/show_genres.inc.php:48
-#: ../../templates/show_localplay.inc:41 ../../templates/show_artists.inc:54
-#: ../../templates/show_albums.inc:57 ../../templates/show_artist.inc:80
-#: ../../templates/show_mpdplay.inc:50
-msgid "Play"
-msgstr ""
-
-#: ../../modules/lib.php:805 ../../templates/show_artists.inc:56
-#: ../../templates/show_albums.inc:59 ../../templates/show_mpdplay.inc:85
-msgid "Random"
+#: ../../lib/rating.lib.php:70
+msgid "It's Insane"
 msgstr ""
 
-#: ../../modules/lib.php:811 ../../templates/show_songs.inc:116
-#: ../../templates/show_album.inc:61 ../../templates/show_albums.inc:61
-#: ../../templates/show_artist.inc:82
-msgid "Download"
+#: ../../lib/rating.lib.php:74
+msgid "Off the Charts!"
 msgstr ""
 
-#: ../../modules/lib.php:822
-msgid "There are no playlists of this type"
-msgstr ""
+#: ../../lib/playlist.lib.php:73
+msgid "No songs in this playlist."
+msgstr "Pas de chanson dans cette liste de lecture"
 
-#: ../../modules/lib.php:857
+#: ../../modules/lib.php:537
 msgid "Create a new playlist"
-msgstr ""
+msgstr "Cr&eacute;er un nouvelle liste de lecture"
 
 #: ../../modules/admin.php:46
 #, fuzzy
 msgid "Manage Users"
-msgstr "Mettre a jour les Catalogues"
+msgstr "Gestion des utilisateurs"
 
 #: ../../modules/admin.php:48 ../../templates/show_admin_index.inc:34
 msgid "Add a new user"
-msgstr ""
+msgstr "Ajouter un nouvelle utilisateur"
 
-#: ../../admin/catalog.php:55 ../../templates/catalog.inc:66
+#: ../../admin/catalog.php:49 ../../templates/catalog.inc:63
 msgid "Add to Catalog(s)"
 msgstr "Ajouter au(x) Catalogue(s)"
 
-#: ../../admin/catalog.php:66 ../../templates/catalog.inc:67
+#: ../../admin/catalog.php:60 ../../templates/catalog.inc:64
 msgid "Add to all Catalogs"
-msgstr "Ajouter a tous les Catalogues"
+msgstr "Ajouter &aacute; tous les Catalogues"
 
-#: ../../admin/catalog.php:75
+#: ../../admin/catalog.php:69
 msgid "Error Connecting"
-msgstr ""
+msgstr "Erreur de connection"
 
-#: ../../admin/catalog.php:89 ../../templates/catalog.inc:73
+#: ../../admin/catalog.php:83 ../../templates/catalog.inc:70
 msgid "Update Catalog(s)"
-msgstr "Mettre a jour les Catalogues"
+msgstr "Mettre &aacute; jour le(s) Catalogue(s)"
 
-#: ../../admin/catalog.php:100 ../../templates/catalog.inc:74
+#: ../../admin/catalog.php:94 ../../templates/catalog.inc:71
 msgid "Update All Catalogs"
-msgstr "Tout mettre a jour"
+msgstr "Mettre &aacute; jour tous les catalogues"
 
-#: ../../admin/catalog.php:132 ../../templates/catalog.inc:80
+#: ../../admin/catalog.php:126 ../../templates/catalog.inc:77
 msgid "Clean Catalog(s)"
-msgstr "Nettoyer le(s) Catalogue(s)"
+msgstr "Nettoyer le(s) catalogue(s)"
 
-#: ../../admin/catalog.php:162 ../../templates/catalog.inc:81
+#: ../../admin/catalog.php:156 ../../templates/catalog.inc:78
 msgid "Clean All Catalogs"
 msgstr "Nettoyer tous les Catalogues"
 
-#: ../../admin/catalog.php:212
+#: ../../admin/catalog.php:206
 #, fuzzy
 msgid "Now Playing Cleared"
-msgstr "Effacer Lecture en cours"
+msgstr "Lecture en cours effac&eacute;"
 
-#: ../../admin/catalog.php:212
+#: ../../admin/catalog.php:206
 msgid "All now playing data has been cleared"
 msgstr ""
+"Toutes les donn&eacute;es sur les lectures en cours ont &eacute;t&eacute; "
+"effac&eacute;"
 
-#: ../../admin/catalog.php:217
+#: ../../admin/catalog.php:211
 msgid "Do you really want to clear your catalog?"
-msgstr ""
+msgstr "Etez vous vraiment sur d'effacer votre catalogue?"
 
-#: ../../admin/catalog.php:224
+#: ../../admin/catalog.php:218
 msgid "Do you really want to clear the statistics for this catalog?"
-msgstr ""
+msgstr "Etez vous vraiment sur de effacer les statistiques pour ce catalogue?"
 
-#: ../../admin/catalog.php:241
+#: ../../admin/catalog.php:235
 msgid "Do you really want to delete this catalog?"
-msgstr ""
+msgstr "Etez vous vraiment sur de supprimer ce catalogue?"
 
-#: ../../admin/catalog.php:272
+#: ../../admin/catalog.php:266
 msgid "Album Art Search Finished"
 msgstr ""
 
-#: ../../admin/users.php:76 ../../admin/users.php:123
+#: ../../admin/users.php:72 ../../admin/users.php:119
 msgid "Error Username Required"
-msgstr ""
+msgstr "Erreur Nom d'utilisateur n&eacute;cesssaire"
 
-#: ../../admin/users.php:79 ../../admin/users.php:119
+#: ../../admin/users.php:75 ../../admin/users.php:115
 msgid "Error Passwords don't match"
-msgstr ""
+msgstr "Erreur les mots de passe ne correspondent pas"
 
-#: ../../admin/users.php:128
+#: ../../admin/users.php:124 ../../register.php:136
+#, fuzzy
 msgid "Error Username already exists"
-msgstr ""
+msgstr "Erreur Nom d'utilisateur n&eacute;cesssaire"
 
-#: ../../admin/users.php:149
+#: ../../admin/users.php:145
 msgid "Are you sure you want to permanently delete"
-msgstr ""
+msgstr "Etez vous sure de vouloir supprimer definitivement"
 
-#: ../../admin/users.php:156 ../../templates/show_confirm_action.inc.php:29
-#: ../../templates/show_search.inc:89
+#: ../../admin/users.php:152 ../../templates/show_confirm_action.inc.php:29
+#: ../../templates/show_search.inc:107
 msgid "No"
-msgstr ""
+msgstr "Non"
 
-#: ../../admin/users.php:158
+#: ../../admin/users.php:154
 #, fuzzy
 msgid "User Deleted"
 msgstr "Effacer"
 
-#: ../../admin/users.php:161
+#: ../../admin/users.php:157
 #, fuzzy
 msgid "Delete Error"
 msgstr "Effacer"
 
-#: ../../admin/users.php:161
+#: ../../admin/users.php:157
 msgid "Unable to delete last Admin User"
 msgstr ""
+"Il n'est pas possible de supprimer le dernier utilisateur avec les droits "
+"administrateur"
 
-#: ../../admin/access.php:43
+#: ../../admin/access.php:40
 msgid "Do you really want to delete this Access Record?"
 msgstr ""
 
-#: ../../admin/access.php:51
+#: ../../admin/access.php:48
 #, fuzzy
 msgid "Entry Deleted"
 msgstr "Effacer"
 
-#: ../../admin/access.php:51
+#: ../../admin/access.php:48
 msgid "Your Access List Entry has been removed"
 msgstr ""
 
-#: ../../admin/access.php:61
+#: ../../admin/access.php:58
 msgid "Entry Added"
-msgstr ""
+msgstr "Entr&eacute;e ajout&eacute;"
 
-#: ../../admin/access.php:61
+#: ../../admin/access.php:58
 msgid "Your new Access List Entry has been created"
 msgstr ""
 
-#: ../../admin/mail.php:98
+#: ../../admin/mail.php:94
 msgid "Mail to"
-msgstr ""
+msgstr "Mail pour"
 
-#: ../../admin/mail.php:109
+#: ../../admin/mail.php:105
 #, fuzzy
 msgid "Subject"
-msgstr "Effacer"
+msgstr "Sujet"
 
-#: ../../admin/mail.php:116
+#: ../../admin/mail.php:112
 msgid "Message"
-msgstr ""
+msgstr "Message"
 
-#: ../../admin/mail.php:126
+#: ../../admin/mail.php:122
 msgid "Send Mail"
-msgstr ""
+msgstr "Envoyer le mail"
 
-#: ../../admin/song.php:68
+#: ../../admin/song.php:65
 #, fuzzy
 msgid "Songs Disabled"
-msgstr "Voir les chansons desactivees"
+msgstr "Voir les chansons d&eacute;sactiv&eacute;es"
 
-#: ../../admin/song.php:68
+#: ../../admin/song.php:65
 msgid "The requested song(s) have been disabled"
 msgstr ""
 
-#: ../../admin/song.php:78
+#: ../../admin/song.php:75
 msgid "Songs Enabled"
 msgstr ""
 
-#: ../../admin/song.php:78
+#: ../../admin/song.php:75
 msgid "The requested song(s) have been enabled"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:28
-#: ../../templates/show_install_account.inc.php:59
-#: ../../templates/userform.inc:40 ../../templates/show_users.inc:40
-msgid "Username"
-msgstr ""
-
-#: ../../templates/show_user_registration.inc.php:36
-#: ../../templates/userform.inc:48
-msgid "Full Name"
-msgstr ""
-
-#: ../../templates/show_user_registration.inc.php:44
-#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:55
-msgid "E-mail"
-msgstr ""
-
-#: ../../templates/show_user_registration.inc.php:52
-#: ../../templates/show_install_account.inc.php:63
-#: ../../templates/userform.inc:63 ../../templates/show_login_form.inc:53
-msgid "Password"
-msgstr "Mot de passe"
-
-#: ../../templates/show_user_registration.inc.php:60
-#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
-#, fuzzy
-msgid "Confirm Password"
-msgstr "Mot de passe"
-
-#: ../../templates/show_user_registration.inc.php:69
-msgid "Register User"
-msgstr ""
-
 #: ../../templates/show_install_account.inc.php:35
 #: ../../templates/show_install_config.inc:35
-#: ../../templates/show_install.inc:34
+#: ../../templates/show_install.inc:35
 msgid "Ampache Installation"
-msgstr ""
+msgstr "Installation d'Ampache"
 
 #: ../../templates/show_install_account.inc.php:37
 #: ../../templates/show_install_config.inc:37
-#: ../../templates/show_install.inc:36
+#: ../../templates/show_install.inc:37
 msgid ""
 "This Page handles the installation of the Ampache database and the creation "
 "of the ampache.cfg.php file. Before you continue please make sure that you "
@@ -797,10 +770,12 @@
 
 #: ../../templates/show_install_account.inc.php:40
 #: ../../templates/show_install_config.inc:40
-#: ../../templates/show_install.inc:39
+#: ../../templates/show_install.inc:40
 msgid ""
 "A MySQL Server with a username and password that can create/modify databases"
 msgstr ""
+"Le serveur MySQL avec un utilisateur et mot de passe pouvant cr&eacute;er et "
+"modifier les bases de donn&eacute;es"
 
 #: ../../templates/show_install_account.inc.php:41
 msgid ""
@@ -810,7 +785,7 @@
 
 #: ../../templates/show_install_account.inc.php:43
 #: ../../templates/show_install_config.inc:43
-#: ../../templates/show_install.inc:42
+#: ../../templates/show_install.inc:43
 msgid ""
 "Once you have ensured that you have the above requirements please fill out "
 "the information below. You will only be asked for the required config "
@@ -820,19 +795,21 @@
 
 #: ../../templates/show_install_account.inc.php:48
 #: ../../templates/show_install_config.inc:48
-#: ../../templates/show_install.inc:46
+#: ../../templates/show_install.inc:47
 msgid "Step 1 - Creating and Inserting the Ampache Database"
 msgstr ""
+"&eacute;tape 1 - Cr&eacute;ation et alimentation de la base de donn&eacute;e "
+"d'Ampache"
 
 #: ../../templates/show_install_account.inc.php:49
 msgid "Step 2 - Creating the ampache.cfg.php file"
-msgstr ""
+msgstr "&eacute;tape 2 - Cr&eacute;ation du fichier ampache.cfg.php"
 
 #: ../../templates/show_install_account.inc.php:50
 #: ../../templates/show_install_config.inc:53
-#: ../../templates/show_install.inc:51
+#: ../../templates/show_install.inc:52
 msgid "Step 3 - Setup Initial Account"
-msgstr ""
+msgstr "&eacute;tape 3 - Parametre du compte initial"
 
 #: ../../templates/show_install_account.inc.php:52
 msgid ""
@@ -840,33 +817,123 @@
 "account has been created you will be directed to the login page"
 msgstr ""
 
-#: ../../templates/show_install_account.inc.php:68
+#: ../../templates/show_install_account.inc.php:55
+#, fuzzy
+msgid "Create Admin Account"
+msgstr "Cr&eacute;er compte"
+
+#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/show_user_registration.inc.php:109
+#: ../../templates/userform.inc:40 ../../templates/show_users.inc:43
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/show_user_registration.inc.php:137
+#: ../../templates/userform.inc:63 ../../templates/show_login_form.inc:53
+msgid "Password"
+msgstr "Mot de passe"
+
+#: ../../templates/show_install_account.inc.php:69
 msgid "Create Account"
+msgstr "Cr&eacute;er compte"
+
+#: ../../templates/show_user_registration.inc.php:59
+#, fuzzy
+msgid "Ampache New User Registration"
+msgstr "Installation d'Ampache"
+
+#: ../../templates/show_user_registration.inc.php:74
+#, fuzzy
+msgid "User Agreement"
+msgstr "Effacer"
+
+#: ../../templates/show_user_registration.inc.php:84
+#, fuzzy
+msgid "I Accept"
+msgstr "Accepter"
+
+#: ../../templates/show_user_registration.inc.php:101
+msgid "User Information"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:119
+#: ../../templates/userform.inc:48
+msgid "Full Name"
+msgstr "Nom complet"
+
+#: ../../templates/show_user_registration.inc.php:128
+#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:55
+msgid "E-mail"
+msgstr "E-mail"
+
+#: ../../templates/show_user_registration.inc.php:146
+#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
+#, fuzzy
+msgid "Confirm Password"
+msgstr "Mot de passe"
+
+#: ../../templates/show_user_registration.inc.php:166
+msgid "Clear Info"
 msgstr ""
 
+#: ../../templates/show_user_registration.inc.php:167
+msgid "Register User"
+msgstr "Enregistre un utilisateur"
+
 #: ../../templates/show_confirm_action.inc.php:28
-#: ../../templates/show_search.inc:88
+#: ../../templates/show_search.inc:106
 msgid "Yes"
-msgstr ""
+msgstr "Oui"
 
 #: ../../templates/show_import_playlist.inc.php:26
 msgid "Importing a Playlist from a File"
-msgstr ""
+msgstr "Importer un liste de lecture depuis un fichier"
 
 #: ../../templates/show_import_playlist.inc.php:29
-#: ../../templates/show_search.inc:77 ../../templates/show_uploads.inc:41
-#: ../../templates/show_search_bar.inc:48
+#: ../../templates/show_uploads.inc:41 ../../templates/list_duplicates.inc:38
+#: ../../templates/show_search.inc:95
 msgid "Filename"
-msgstr ""
+msgstr "Nom de fichier"
 
 #: ../../templates/show_import_playlist.inc.php:36
 #, fuzzy
 msgid "Playlist Type"
-msgstr "Mise a jour rapide"
+msgstr "Type de liste de lecture"
 
 #: ../../templates/show_import_playlist.inc.php:49
 msgid "Import Playlist"
-msgstr ""
+msgstr "Importer liste de lecture"
+
+#: ../../templates/show_genre.inc.php:32
+#, fuzzy
+msgid "Viewing"
+msgstr "Voir"
+
+#: ../../templates/show_genre.inc.php:36 ../../templates/sidebar.inc.php:35
+#: ../../templates/sidebar.inc.php:136
+#: ../../templates/show_local_catalog_info.inc.php:18
+#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:65
+#: ../../templates/show_browse_menu.inc:36 ../../templates/show_search.inc:136
+msgid "Albums"
+msgstr "Albums"
+
+#: ../../templates/show_genre.inc.php:41 ../../templates/sidebar.inc.php:36
+#: ../../templates/sidebar.inc.php:135
+#: ../../templates/show_local_catalog_info.inc.php:22
+#: ../../templates/show_browse_menu.inc:35 ../../templates/show_search.inc:137
+msgid "Artists"
+msgstr "Artistes"
+
+#: ../../templates/show_genre.inc.php:46
+#: ../../templates/show_genres.inc.php:37 ../../templates/sidebar.inc.php:133
+#: ../../templates/show_random_play_bar.inc.php:49
+#: ../../templates/show_local_catalog_info.inc.php:26
+#: ../../templates/show_artists.inc:41 ../../templates/show_artists.inc:64
+#: ../../templates/show_albums.inc:41 ../../templates/show_albums.inc:71
+#: ../../templates/show_search.inc:135
+msgid "Songs"
+msgstr "Chansons"
 
 #: ../../templates/show_user.inc.php:26
 msgid "Changing User Information for"
@@ -877,7 +944,7 @@
 #: ../../templates/show_add_access.inc:40
 #: ../../templates/show_access_list.inc:47
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #: ../../templates/show_user.inc.php:48
 msgid "Results Per Page"
@@ -886,7 +953,7 @@
 #: ../../templates/show_user.inc.php:56
 #, fuzzy
 msgid "Update Profile"
-msgstr "Mettre a jour les Catalogues"
+msgstr "Mettre &aacute; jour le profile"
 
 #: ../../templates/show_user.inc.php:67
 #, fuzzy
@@ -907,226 +974,446 @@
 msgid "Clear Stats"
 msgstr "Effacer les Statistiques des Catalogues"
 
+#: ../../templates/show_genres.inc.php:38 ../../templates/show_uploads.inc:32
+#: ../../templates/show_mpdpl.inc:68 ../../templates/show_songs.inc:50
+#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:67
+#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:75
+#: ../../templates/show_access_list.inc:51 ../../templates/show_artist.inc:42
+msgid "Action"
+msgstr "Action"
+
+#: ../../templates/show_genres.inc.php:48
+#: ../../templates/show_playlists.inc.php:63
+#: ../../templates/show_localplay.inc:41 ../../templates/show_artists.inc:54
+#: ../../templates/show_albums.inc:57 ../../templates/show_mpdplay.inc:64
+#: ../../templates/show_artist.inc:67
+msgid "Play"
+msgstr "Jouer"
+
+#: ../../templates/sidebar.inc.php:29
+msgid "Users"
+msgstr "Utilisateurs"
+
+#: ../../templates/sidebar.inc.php:30
+msgid "Mail Users"
+msgstr "Mail Utilisateurs"
+
+#: ../../templates/sidebar.inc.php:32
+#, fuzzy
+msgid "Site Preferences"
+msgstr "Mise &agrave; jour des pr&eacute;f&eacute;rences"
+
+#: ../../templates/sidebar.inc.php:33
+#, fuzzy
+msgid "Access List"
+msgstr "Liste d'access"
+
+#: ../../templates/sidebar.inc.php:38
+#, fuzzy
+msgid "Lists"
+msgstr "Artistes"
+
+#: ../../templates/sidebar.inc.php:45 ../../templates/menu.inc:29
+msgid "Home"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:49 ../../templates/menu.inc:63
+#: ../../templates/menu.inc:66
+msgid "Admin"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:66 ../../templates/menu.inc:40
+msgid "Preferences"
+msgstr "Pr&eacute;f&eacute;rences"
+
+#: ../../templates/sidebar.inc.php:85 ../../templates/menu.inc:43
+#: ../../templates/show_upload.inc:73
+msgid "Upload"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:89
+#: ../../templates/show_playlists.inc.php:28 ../../templates/menu.inc:38
+msgid "Playlists"
+msgstr "Liste de lecture"
+
+#: ../../templates/sidebar.inc.php:93 ../../templates/menu.inc:32
+msgid "Local Play"
+msgstr "Jouer en local"
+
+#: ../../templates/sidebar.inc.php:112
+#: ../../templates/show_playlists.inc.php:66
+#: ../../templates/show_artists.inc:56 ../../templates/show_albums.inc:59
+#: ../../templates/show_mpdplay.inc:114
+msgid "Random"
+msgstr "Al&eacute;atoirement"
+
+#: ../../templates/sidebar.inc.php:134
+#: ../../templates/show_random_play_bar.inc.php:50
+msgid "Minutes"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:137
+#: ../../templates/show_random_play_bar.inc.php:53
+msgid "Less Played"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:141
+#: ../../templates/show_random_play_bar.inc.php:58
+msgid "Enqueue"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:146 ../../templates/menu.inc:75
+#: ../../templates/menu.inc:81 ../../templates/menu.inc:85
+msgid "Logout"
+msgstr "D&eacute;connexion"
+
 #: ../../templates/show_confirmation.inc.php:30
 msgid "Continue"
+msgstr "Continue"
+
+#: ../../templates/show_random_play_bar.inc.php:31
+#: ../../templates/show_random_play.inc:28
+msgid "Play Random Selection"
+msgstr "Jouer une selection al&eacute;atoire"
+
+#: ../../templates/show_random_play_bar.inc.php:51
+#, fuzzy
+msgid "Full Artists"
+msgstr "Artiste complet"
+
+#: ../../templates/show_random_play_bar.inc.php:52
+#: ../../templates/show_random_play.inc:60
+msgid "Full Albums"
+msgstr "Albums complet"
+
+#: ../../templates/show_random_play_bar.inc.php:55
+msgid "from"
+msgstr ""
+
+#: ../../templates/show_random_play_bar.inc.php:59
+msgid "Advanced"
 msgstr ""
 
+#: ../../templates/show_local_catalog_info.inc.php:10
+msgid "Total Users"
+msgstr "Utilisateurs total"
+
+#: ../../templates/show_local_catalog_info.inc.php:14
+msgid "Connected Users"
+msgstr "Utilisateurs connect&eacute;s"
+
+#: ../../templates/show_local_catalog_info.inc.php:30
+#, fuzzy
+msgid "Catalog Size"
+msgstr "Taile du catalogue"
+
+#: ../../templates/show_local_catalog_info.inc.php:34
+#, fuzzy
+msgid "Catalog Time"
+msgstr "Dur&eacute;e du catalogue"
+
 #: ../../templates/show_play_selected.inc.php:49
 msgid "Play Selected"
-msgstr ""
+msgstr "Jouer la s&eacute;l&eacute;ction"
 
 #: ../../templates/show_play_selected.inc.php:52
+#, fuzzy
 msgid "Download Selected"
-msgstr ""
+msgstr "Jouer la s&eacute;l&eacute;ction"
 
-#: ../../templates/show_play_selected.inc.php:55 ../../playlist.php:77
+#: ../../templates/show_play_selected.inc.php:55
 msgid "Flag Selected"
 msgstr ""
 
-#: ../../templates/show_play_selected.inc.php:56 ../../playlist.php:83
+#: ../../templates/show_play_selected.inc.php:56
 msgid "Edit Selected"
-msgstr ""
+msgstr "Editer la selection"
 
-#: ../../templates/show_play_selected.inc.php:63
+#: ../../templates/show_play_selected.inc.php:64
 msgid "Set Track Numbers"
-msgstr ""
+msgstr "D&eacute;finir le num&eacute;ro de la piste"
 
-#: ../../templates/show_play_selected.inc.php:64
+#: ../../templates/show_play_selected.inc.php:65
 msgid "Remove Selected Tracks"
-msgstr ""
+msgstr "Enlever les pistes s&eacute;l&eacute;ctionn&eacute;es"
 
-#: ../../templates/show_play_selected.inc.php:70
+#: ../../templates/show_play_selected.inc.php:71
 msgid "Playlist"
-msgstr ""
+msgstr "Liste de lecture"
 
-#: ../../templates/show_play_selected.inc.php:70
+#: ../../templates/show_play_selected.inc.php:71
 #, fuzzy
 msgid "Add to"
-msgstr "Ajouter un catalogue"
+msgstr "Ajouter &aacute;"
+
+#: ../../templates/show_play_selected.inc.php:73
+#: ../../templates/show_playlists.inc.php:51
+msgid "View"
+msgstr "Voir"
+
+#: ../../templates/show_play_selected.inc.php:74
+#: ../../templates/show_playlists.inc.php:55 ../../templates/show_users.inc:58
+#: ../../templates/show_users.inc:102
+msgid "Edit"
+msgstr "Editer"
+
+#: ../../templates/show_all_recent.inc.php:27 ../../index.php:99
+msgid "Newest Artist Additions"
+msgstr "Artiste r&eacute;cemment ajout&eacute;"
+
+#: ../../templates/show_all_recent.inc.php:30 ../../index.php:106
+msgid "Newest Album Additions"
+msgstr "Albums r&eacute;cemment ajout&eacute;"
 
-#: ../../templates/show_all_popular.inc.php:27 ../../index.php:105
+#: ../../templates/show_all_popular.inc.php:27 ../../index.php:82
 msgid "Most Popular Artists"
-msgstr ""
+msgstr "Artistes les plus populaire"
 
-#: ../../templates/show_all_popular.inc.php:30 ../../index.php:72
+#: ../../templates/show_all_popular.inc.php:30 ../../index.php:61
 msgid "Most Popular Albums"
-msgstr ""
+msgstr "Albums les plus populaire"
 
 #: ../../templates/show_all_popular.inc.php:37
+#, fuzzy
 msgid "Most Popular Genres"
-msgstr ""
+msgstr "Chansons les plus populaire"
 
-#: ../../templates/show_all_popular.inc.php:40 ../../index.php:112
+#: ../../templates/show_all_popular.inc.php:40 ../../index.php:89
 msgid "Most Popular Songs"
-msgstr ""
+msgstr "Chansons les plus populaire"
 
-#: ../../templates/show_local_catalog_info.inc.php:10
-msgid "Total Users"
+#: ../../templates/show_get_albumart.inc.php:28
+msgid "Customize Search"
 msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:14
-msgid "Connected Users"
+#: ../../templates/show_get_albumart.inc.php:49
+msgid "Direct URL to Image"
 msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:18
-#: ../../templates/show_genre.inc.php:36 ../../templates/show_artists.inc:42
-#: ../../templates/show_artists.inc:65 ../../templates/show_search.inc:118
-#: ../../templates/show_browse_menu.inc:36
-msgid "Albums"
+#: ../../templates/show_get_albumart.inc.php:59
+msgid "Get Art"
 msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:22
-#: ../../templates/show_genre.inc.php:41 ../../templates/show_search.inc:119
-#: ../../templates/show_browse_menu.inc:35
-msgid "Artists"
+#: ../../templates/show_rename_artist.inc.php:33
+#: ../../templates/show_rename_artist.inc.php:51
+#, fuzzy
+msgid "Rename"
+msgstr "Nom d'utilisateur"
+
+#: ../../templates/show_rename_artist.inc.php:33
+#, fuzzy
+msgid "to"
+msgstr "Stop"
+
+#: ../../templates/show_rename_artist.inc.php:40
+#: ../../templates/show_search.inc:144
+msgid "OR"
 msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:26
-#: ../../templates/show_genres.inc.php:37
-#: ../../templates/show_genre.inc.php:46
-#: ../../templates/show_random_play_bar.inc.php:49
-#: ../../templates/show_artists.inc:41 ../../templates/show_artists.inc:64
-#: ../../templates/show_albums.inc:41 ../../templates/show_albums.inc:71
-#: ../../templates/show_search.inc:117
-msgid "Songs"
+#: ../../templates/show_rename_artist.inc.php:42
+msgid "Insert current"
 msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:30
+#: ../../templates/show_rename_artist.inc.php:47
 #, fuzzy
-msgid "Catalog Size"
-msgstr "Outils pour les Catalogues"
+msgid "Update id3 tags"
+msgstr "Mettre &aacute; jour les Catalogues"
 
-#: ../../templates/show_local_catalog_info.inc.php:34
+#: ../../templates/show_artist_box.inc.php:26
+msgid "Albums by"
+msgstr "Album de"
+
+#: ../../templates/show_artist_box.inc.php:34
 #, fuzzy
-msgid "Catalog Time"
-msgstr "Outils pour les Catalogues"
+msgid "Show All Songs By"
+msgstr "Voir toutes les chansons de"
 
-#: ../../templates/show_genres.inc.php:38 ../../templates/show_artists.inc:43
-#: ../../templates/show_artists.inc:67 ../../templates/show_songs.inc:42
-#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:75
-#: ../../templates/show_access_list.inc:51 ../../templates/show_artist.inc:55
-#: ../../templates/show_mpdpl.inc:69 ../../templates/show_uploads.inc:32
-msgid "Action"
-msgstr ""
+#: ../../templates/show_artist_box.inc.php:35
+msgid "Play All Songs By"
+msgstr "Jouer toutes les chansons de"
 
-#: ../../templates/show_genre.inc.php:32
-msgid "Viewing"
-msgstr ""
+#: ../../templates/show_artist_box.inc.php:36
+msgid "Play Random Songs By"
+msgstr "Jouer al&eacute;atoirement les chansons de"
 
-#: ../../templates/show_all_recent.inc.php:27 ../../index.php:123
-msgid "Newest Artist Additions"
-msgstr ""
+#: ../../templates/show_artist_box.inc.php:38
+#: ../../templates/show_album.inc:72
+#, fuzzy
+msgid "Update from tags"
+msgstr "Mettre &aacute; jour les Catalogues"
 
-#: ../../templates/show_all_recent.inc.php:30 ../../index.php:130
-msgid "Newest Album Additions"
-msgstr ""
+#: ../../templates/show_artist_box.inc.php:39
+#, fuzzy
+msgid "Rename Artist"
+msgstr "Artiste"
 
-#: ../../templates/show_random_play_bar.inc.php:31
-#: ../../templates/show_random_play.inc:28
-msgid "Play Random Selection"
+#: ../../templates/show_playlists.inc.php:31
+#, fuzzy
+msgid "Playlist Name"
+msgstr "Type de liste de lecture"
+
+#: ../../templates/show_playlists.inc.php:32
+#, fuzzy
+msgid "# Songs"
+msgstr "Chansons"
+
+#: ../../templates/show_playlists.inc.php:33
+msgid "Owner"
 msgstr ""
 
-#: ../../templates/show_random_play_bar.inc.php:45 ../../randomplay.php:70
-#: ../../templates/show_artists.inc:55 ../../templates/show_albums.inc:58
-#: ../../templates/show_random_play.inc:46
-msgid "All"
-msgstr ""
+#: ../../templates/show_playlists.inc.php:34
+#, fuzzy
+msgid "Actions"
+msgstr "Action"
+
+#: ../../templates/show_playlists.inc.php:58
+#: ../../templates/show_uploads.inc:50 ../../templates/catalog.inc:57
+#: ../../templates/show_users.inc:70
+msgid "Delete"
+msgstr "Supprimer"
+
+#: ../../templates/show_playlists.inc.php:71
+#: ../../templates/show_songs.inc:140 ../../templates/show_album.inc:75
+#: ../../templates/show_albums.inc:61 ../../templates/show_artist.inc:69
+msgid "Download"
+msgstr "T&eacute;l&eacute;charger"
+
+#: ../../templates/show_playlist_box.inc.php:33
+#, fuzzy
+msgid "Playlist Actions"
+msgstr "Action pour les liste de lecture"
+
+#: ../../templates/show_playlist_box.inc.php:34
+#, fuzzy
+msgid "Create New Playlist"
+msgstr "Cr&eacute;er un nouvelle liste de lecture"
+
+#: ../../templates/show_playlist_box.inc.php:35
+#, fuzzy
+msgid "View All Playlists"
+msgstr "nouvelle liste de lecture"
+
+#: ../../templates/show_playlist_box.inc.php:36
+#, fuzzy
+msgid "Import From File"
+msgstr "Importer un liste de lecture depuis un fichier"
 
-#: ../../templates/show_random_play_bar.inc.php:50
-msgid "Minutes"
+#: ../../templates/show_playlist_box.inc.php:38
+msgid "Normalize Tracks"
 msgstr ""
 
-#: ../../templates/show_random_play_bar.inc.php:51
-msgid "Full Artists"
-msgstr ""
+#: ../../templates/show_playlist_box.inc.php:39
+#, fuzzy
+msgid "Play This Playlist"
+msgstr "Jouer la liste de lecture compl&eacute;te"
 
-#: ../../templates/show_random_play_bar.inc.php:52
-#: ../../templates/show_random_play.inc:60
-msgid "Full Albums"
-msgstr ""
+#: ../../templates/show_preference_box.inc.php:44
+msgid "Preference"
+msgstr "Pr&eacute;f&eacute;rence"
 
-#: ../../templates/show_random_play_bar.inc.php:53
-msgid "Less Played"
-msgstr ""
+#: ../../templates/show_preference_box.inc.php:45
+msgid "Value"
+msgstr "Valeur"
 
-#: ../../templates/show_random_play_bar.inc.php:55
-msgid "from"
-msgstr ""
+#: ../../templates/show_preference_box.inc.php:47
+msgid "Apply to All"
+msgstr "Appliquer &agrave; tous"
 
-#: ../../templates/show_random_play_bar.inc.php:58
-msgid "Enqueue"
+#: ../../templates/show_preference_box.inc.php:54
+msgid "description"
 msgstr ""
 
-#: ../../templates/show_random_play_bar.inc.php:59
-msgid "Advanced"
-msgstr ""
+#: ../../templates/show_object_rating.inc.php:25
+#: ../../templates/show_songs.inc:52
+#, fuzzy
+msgid "Rating"
+msgstr "Edition des pr&eacute;f&eacute;rences de"
 
-#: ../../localplay.php:79
+#: ../../localplay.php:81
 msgid "Unknown action requested"
 msgstr ""
 
-#: ../../artists.php:48
-msgid "All songs by"
+#: ../../browse.php:48 ../../albums.php:168 ../../albums.php:174
+#: ../../albums.php:181 ../../albums.php:186 ../../albums.php:192
+#, fuzzy
+msgid "Show Albums starting with"
+msgstr "<u>M</u>ontrer seulement les albums commen&ccedil;ant par"
+
+#: ../../browse.php:78 ../../artists.php:128 ../../artists.php:132
+#: ../../artists.php:138 ../../artists.php:151
+#, fuzzy
+msgid "Show Artists starting with"
+msgstr "<u>V</u>oir les artistes commencant par"
+
+#: ../../search.php:45
+msgid "Error: No Keyword Entered"
 msgstr ""
 
-#: ../../artists.php:57 ../../albums.php:106
+#: ../../tv.php:76 ../../templates/show_now_playing.inc:31
+#, fuzzy
+msgid "Now Playing"
+msgstr "En cours de lecture"
+
+#: ../../artists.php:58 ../../albums.php:147
 msgid "Starting Update from Tags"
 msgstr ""
 
-#: ../../artists.php:62 ../../albums.php:111
-#, fuzzy
+#: ../../artists.php:63 ../../albums.php:152
 msgid "Update From Tags Complete"
-msgstr "Mettre a jour les Catalogues"
-
-#: ../../artists.php:72 ../../artists.php:76 ../../artists.php:82
-#: ../../artists.php:95
-msgid "Show Artists starting with"
 msgstr ""
 
-#: ../../amp-mpd.php:176 ../../playlist.php:135
+#: ../../amp-mpd.php:171 ../../playlist.php:63
 msgid "New Playlist"
-msgstr ""
+msgstr "nouvelle liste de lecture"
 
-#: ../../playlist.php:115
-msgid "owned by"
-msgstr ""
+#: ../../playlist.php:46
+#, fuzzy
+msgid "Playlist Deleted"
+msgstr "Jouer la s&eacute;l&eacute;ction"
 
-#: ../../playlist.php:118
-msgid "Edit Playlist"
+#: ../../playlist.php:46
+msgid "The Requested Playlist has been deleted"
 msgstr ""
 
-#: ../../playlist.php:121
-msgid "Play Full Playlist"
-msgstr ""
+#: ../../playlist.php:56
+#, fuzzy
+msgid "Are you sure you want to delete this playlist"
+msgstr "Etez vous sure de vouloir supprimer definitivement"
+
+#: ../../playlist.php:112
+#, fuzzy
+msgid "Playlist Created"
+msgstr "Liste de lecture mise &agrave; jour"
 
-#: ../../playlist.php:122
-msgid "Play Random"
+#: ../../playlist.php:112
+msgid " has been created"
 msgstr ""
 
-#: ../../playlist.php:192
+#: ../../playlist.php:121
 #, fuzzy
-msgid "Playlist updated."
-msgstr "Mise a jour rapide"
+msgid "Remote Selected Tracks"
+msgstr "Enlever les pistes s&eacute;l&eacute;ctionn&eacute;es"
 
-#: ../../index.php:42
-msgid "Welcome to"
-msgstr ""
+#: ../../playlist.php:139
+#, fuzzy
+msgid "Playlist Updated"
+msgstr "Liste de lecture mise &agrave; jour"
 
-#: ../../index.php:44
-msgid "you are currently logged in as"
+#: ../../playlist.php:139
+msgid " has been updated"
 msgstr ""
 
+#: ../../flag.php:38
+msgid "Flagging song completed."
+msgstr "Marqu&eacute; les chansons fini."
+
 #: ../../user.php:45
 msgid "Error: Password Does Not Match or Empty"
-msgstr ""
+msgstr "Error : Mot de pas ne correspond pas ou non renseigner"
 
 #: ../../user.php:51 ../../user.php:62
 msgid "Error: Insufficient Rights"
-msgstr ""
-
-#: ../../flag.php:35
-msgid "Flagging song completed."
-msgstr ""
+msgstr "Error : privil&eacute;ge insuffisant"
 
 #: ../../albums.php:44
 msgid "Album Art Cleared"
@@ -1136,74 +1423,91 @@
 msgid "Album Art information has been removed form the database"
 msgstr ""
 
-#: ../../albums.php:78
-msgid "Album Art Located"
-msgstr ""
-
-#: ../../albums.php:78
-msgid ""
-"Album Art information has been located in Amazon. If incorrect, click "
-"\"Reset Album Art\" below to remove the artwork."
-msgstr ""
-
-#: ../../albums.php:86 ../../albums.php:96
-msgid "Get Art"
+#: ../../albums.php:74
+msgid "No Amazon Developer Key set, amazon album art searching will not work"
 msgstr ""
 
-#: ../../albums.php:90
+#: ../../albums.php:104
 msgid "Album Art Not Located"
 msgstr ""
 
-#: ../../albums.php:90
+#: ../../albums.php:104
 msgid ""
 "Album Art could not be located at this time. This may be due to Amazon being "
 "busy, or the album not being present in their collection."
 msgstr ""
 
-#: ../../albums.php:127 ../../albums.php:133 ../../albums.php:140
-#: ../../albums.php:145 ../../albums.php:150
-msgid "Show Albums starting with"
+#: ../../albums.php:137
+msgid "Album Art Inserted"
 msgstr ""
 
-#: ../../tv.php:76 ../../templates/show_now_playing.inc:31
+#: ../../ratings.php:33
 #, fuzzy
-msgid "Now Playing"
-msgstr "Effacer Lecture en cours"
+msgid "Rating Updated"
+msgstr "Mise &eacute; jour rapide"
 
-#: ../../randomplay.php:60
-msgid "Play Random Selection from Multiple Genres"
+#: ../../ratings.php:33
+msgid "Your rating for this object has been updated"
 msgstr ""
 
-#: ../../randomplay.php:67 ../../templates/show_random_play.inc:34
-msgid "Item count"
+#: ../../register.php:79
+#, fuzzy
+msgid "Error Captcha Required"
+msgstr "Erreur Nom d'utilisateur n&eacute;cesssaire"
+
+#: ../../register.php:86
+msgid "Error Captcha Failed"
 msgstr ""
 
-#: ../../randomplay.php:81 ../../templates/show_random_play.inc:49
-msgid "From genre"
+#: ../../register.php:93
+msgid "You <U>must</U> accept the user agreement"
 msgstr ""
 
-#: ../../randomplay.php:90 ../../templates/show_random_play.inc:59
-msgid "Favor Unplayed"
+#: ../../register.php:98
+msgid "You did not enter a username"
+msgstr ""
+
+#: ../../register.php:102
+msgid "Please fill in your full name (Firstname Lastname)"
+msgstr ""
+
+#: ../../register.php:128
+#, fuzzy
+msgid "You must enter a password"
+msgstr "Mot de passe"
+
+#: ../../register.php:132
+#, fuzzy
+msgid "Your passwords do not match"
+msgstr "Erreur les mots de passe ne correspondent pas"
+
+#: ../../register.php:150
+#, fuzzy
+msgid "Error: Insert Failed"
+msgstr "Error : privil&eacute;ge insuffisant"
+
+#: ../../register.php:165
+msgid "Registration Complete"
 msgstr ""
 
-#: ../../randomplay.php:91
-msgid "Favor Full Albums"
+#: ../../activate.php:42
+msgid "No user with this name registered"
 msgstr ""
 
-#: ../../randomplay.php:92
-msgid "Favor Full Artist"
+#: ../../activate.php:46
+msgid "The validation key used isn't correct."
 msgstr ""
 
-#: ../../randomplay.php:101 ../../templates/show_random_play.inc:66
+#: ../../activate.php:51
 #, fuzzy
-msgid "from catalog"
-msgstr "Ajouter un catalogue"
+msgid "User activated"
+msgstr "Effacer"
 
-#: ../../randomplay.php:112 ../../templates/show_random_play.inc:75
-msgid "Play Random Songs"
+#: ../../activate.php:51
+msgid "This User ID is activated and can be used"
 msgstr ""
 
-#: ../../bin/print_tags.php.inc:43
+#: ../../bin/print_tags.php.inc:42
 msgid ""
 "[print_tags.php.inc]\n"
 "This commandline script will display the tag information for the specified "
@@ -1212,26 +1516,29 @@
 "        \n"
 msgstr ""
 
-#: ../../bin/print_tags.php.inc:49
+#: ../../bin/print_tags.php.inc:48
+#, fuzzy
 msgid "Filename:"
-msgstr ""
+msgstr "Nom de fichier"
 
 #: ../../bin/quarantine_migration.php.inc:49
+#, fuzzy
 msgid "Error: Unable to write to"
-msgstr ""
+msgstr "Erreur : Impossible d'ouvrir"
 
 #: ../../bin/quarantine_migration.php.inc:56
 msgid "Error: Upload directory not inside a catalog"
 msgstr ""
 
 #: ../../bin/quarantine_migration.php.inc:74
+#, fuzzy
 msgid "Moved"
-msgstr ""
+msgstr "Mode"
 
 #: ../../bin/quarantine_migration.php.inc:78
 #, fuzzy
 msgid "Adding"
-msgstr "Ajouter un catalogue"
+msgstr "Ajouter"
 
 #: ../../bin/quarantine_migration.php.inc:78
 msgid "to database"
@@ -1244,7 +1551,7 @@
 #: ../../bin/quarantine_migration.php.inc:97
 #, fuzzy
 msgid "Deleted"
-msgstr "Effacer"
+msgstr "Supprimer"
 
 #: ../../bin/quarantine_migration.php.inc:113
 msgid ""
@@ -1263,123 +1570,203 @@
 msgstr ""
 
 #: ../../bin/quarantine_migration.php.inc:127
+#, fuzzy
 msgid "Continue?  (Y/N):"
-msgstr ""
+msgstr "Continue"
 
 #: ../../bin/quarantine_migration.php.inc:151
+#, fuzzy
 msgid "Error:  "
-msgstr ""
+msgstr "Erreur"
 
 #: ../../bin/quarantine_migration.php.inc:152
 msgid "!\n"
 msgstr ""
 
+#: ../../templates/show_admin_index.inc:27
+#, fuzzy
+msgid "User Management"
+msgstr "Nom d'utilisateur"
+
+#: ../../templates/show_admin_index.inc:28
+msgid "E-mail Management"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:29
+#, fuzzy
+msgid "Catalog Managment"
+msgstr "Outils pour les Catalogues"
+
+#: ../../templates/show_admin_index.inc:30
+msgid "Admin Preferences"
+msgstr "Pr&eacute;f&eacute;rences adiministrateur"
+
+#: ../../templates/show_admin_index.inc:31 ../../templates/catalog.inc:95
+msgid "Access Lists"
+msgstr "Liste d'access"
+
+#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:94
+msgid "Add a catalog"
+msgstr "Ajouter un catalogue"
+
+#: ../../templates/show_admin_index.inc:35 ../../templates/catalog.inc:99
+msgid "Clear Now Playing"
+msgstr "Effacer lecture en cours"
+
+#: ../../templates/show_admin_index.inc:36
+#, fuzzy
+msgid "Add Access List Entry"
+msgstr "Liste d'access"
+
+#: ../../templates/show_admin_index.inc:40
+msgid "Common Functions"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:43
+#, fuzzy
+msgid "Admin Sections"
+msgstr "Section adiministrateur"
+
+#: ../../templates/show_uploads.inc:33
+msgid "Status"
+msgstr ""
+
+#: ../../templates/show_uploads.inc:34 ../../templates/flag.inc:58
+#: ../../templates/list_flagged.inc:41 ../../templates/list_duplicates.inc:32
+msgid "Song"
+msgstr "Chanson"
+
+#: ../../templates/show_uploads.inc:40 ../../templates/show_songs.inc:46
+#: ../../templates/list_duplicates.inc:37
+msgid "Size"
+msgstr "Taille"
+
+#: ../../templates/show_uploads.inc:42
+msgid "User"
+msgstr "Utilisateur"
+
+#: ../../templates/show_uploads.inc:43
+#, fuzzy
+msgid "Date"
+msgstr "Date"
+
+#: ../../templates/show_uploads.inc:49
+#, fuzzy
+msgid "Add"
+msgstr "Ajouter"
+
+#: ../../templates/show_mpdpl.inc:43
+#, fuzzy
+msgid "MPD Server Playlist"
+msgstr "nouvelle liste de lecture"
+
+#: ../../templates/show_mpdpl.inc:45 ../../templates/show_mpdpl.inc:175
+msgid "Refresh the Playlist Window"
+msgstr "Rafraichir la fenetre liste de lecture"
+
+#: ../../templates/show_mpdpl.inc:47 ../../templates/show_mpdpl.inc:177
+msgid "Click to shuffle (randomize) the playlist"
+msgstr ""
+
+#: ../../templates/show_mpdpl.inc:47 ../../templates/show_mpdpl.inc:177
+msgid "shuffle"
+msgstr "Al&eacute;atoire"
+
+#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:178
+#, fuzzy
+msgid "Click to the clear the playlist"
+msgstr "Cr&eacute;er un nouvelle liste de lecture"
+
+#: ../../templates/show_mpdpl.inc:52 ../../templates/show_mpdpl.inc:182
+msgid "Click to the remove all except the Now Playing"
+msgstr ""
+
+#: ../../templates/show_mpdpl.inc:62 ../../templates/show_songs.inc:41
+msgid "Song title"
+msgstr "Titre de la chanson"
+
+#: ../../templates/flag.inc:43
+msgid "Flag song"
+msgstr "Chanson marquer"
+
+#: ../../templates/flag.inc:45
+msgid ""
+"Flag the following song as having one of the problems listed below.  Site "
+"admins will then take the appropriate action for the flagged files."
+msgstr ""
+
+#: ../../templates/flag.inc:62
+msgid "Reason to flag"
+msgstr "Raison du marquage"
+
+#: ../../templates/flag.inc:73
+msgid "Flag Song"
+msgstr "Chanson marquer"
+
 #: ../../templates/customize_catalog.inc:24
 msgid "Settings for catalog in"
-msgstr ""
+msgstr "Parametre pour les catalogues dans"
 
-#: ../../templates/customize_catalog.inc:32 ../../templates/add_catalog.inc:39
+#: ../../templates/customize_catalog.inc:32 ../../templates/add_catalog.inc:40
 msgid "Auto-inserted Fields"
-msgstr ""
+msgstr "insertion automatique des champs"
 
-#: ../../templates/customize_catalog.inc:33 ../../templates/add_catalog.inc:40
+#: ../../templates/customize_catalog.inc:33 ../../templates/add_catalog.inc:41
 msgid "album name"
-msgstr ""
+msgstr "nom de l'album"
 
-#: ../../templates/customize_catalog.inc:34 ../../templates/add_catalog.inc:41
+#: ../../templates/customize_catalog.inc:34 ../../templates/add_catalog.inc:42
 msgid "artist name"
-msgstr ""
+msgstr "nom de l'artiste"
 
 #: ../../templates/customize_catalog.inc:35
 msgid "catalog path"
-msgstr ""
+msgstr "Chemin du catalogue"
 
-#: ../../templates/customize_catalog.inc:36 ../../templates/add_catalog.inc:42
+#: ../../templates/customize_catalog.inc:36 ../../templates/add_catalog.inc:43
 msgid "id3 comment"
-msgstr ""
+msgstr "Commentaire id3"
 
-#: ../../templates/customize_catalog.inc:37 ../../templates/add_catalog.inc:43
+#: ../../templates/customize_catalog.inc:37 ../../templates/add_catalog.inc:44
 msgid "genre"
-msgstr ""
+msgstr "genre"
 
-#: ../../templates/customize_catalog.inc:38 ../../templates/add_catalog.inc:44
+#: ../../templates/customize_catalog.inc:38 ../../templates/add_catalog.inc:45
 msgid "track number (padded with leading 0)"
-msgstr ""
+msgstr "Num&eacute;ro de la piste (padded with leading 0)"
 
-#: ../../templates/customize_catalog.inc:39 ../../templates/add_catalog.inc:45
+#: ../../templates/customize_catalog.inc:39 ../../templates/add_catalog.inc:46
 msgid "song title"
-msgstr ""
+msgstr "titre de chanson"
 
-#: ../../templates/customize_catalog.inc:40 ../../templates/add_catalog.inc:46
+#: ../../templates/customize_catalog.inc:40 ../../templates/add_catalog.inc:47
 msgid "year"
-msgstr ""
+msgstr "Ann&eacute;e"
 
-#: ../../templates/customize_catalog.inc:41 ../../templates/add_catalog.inc:47
+#: ../../templates/customize_catalog.inc:41 ../../templates/add_catalog.inc:48
 msgid "other"
-msgstr ""
+msgstr "Autre"
 
 #: ../../templates/customize_catalog.inc:45
 msgid "ID3 set command"
-msgstr ""
+msgstr "Commande de d&eacute;finition ID3"
 
 #: ../../templates/customize_catalog.inc:51
 msgid "Filename pattern"
 msgstr ""
 
-#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:75
 msgid "Folder Pattern"
 msgstr ""
 
-#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:75
 msgid "(no leading or ending '/')"
 msgstr ""
 
 #: ../../templates/customize_catalog.inc:69
 #, fuzzy
 msgid "Save Catalog Settings"
-msgstr "Effacer les Statistiques des Catalogues"
-
-#: ../../templates/show_admin_index.inc:27
-msgid "User Management"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:28
-msgid "E-mail Management"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:29
-#, fuzzy
-msgid "Catalog Managment"
-msgstr "Outils pour les Catalogues"
-
-#: ../../templates/show_admin_index.inc:30 ../../templates/admin_menu.inc:36
-msgid "Admin Preferences"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:31 ../../templates/catalog.inc:98
-#: ../../templates/admin_menu.inc:37
-msgid "Access Lists"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:97
-msgid "Add a catalog"
-msgstr "Ajouter un catalogue"
-
-#: ../../templates/show_admin_index.inc:35 ../../templates/catalog.inc:102
-msgid "Clear Now Playing"
-msgstr "Effacer Lecture en cours"
-
-#: ../../templates/show_admin_index.inc:36
-msgid "Add Access List Entry"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:40
-msgid "Common Functions"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:43
-msgid "Admin Sections"
-msgstr ""
+msgstr "Sauver les param&egrave;tre du catalogues"
 
 #: ../../templates/show_test.inc:29
 msgid "Ampache Debug"
@@ -1397,15 +1784,15 @@
 
 #: ../../templates/show_test.inc:36
 msgid "STATUS"
-msgstr ""
+msgstr "STATUT"
 
 #: ../../templates/show_test.inc:38
 msgid "DESCRIPTION"
-msgstr ""
+msgstr "DESCRIPTION"
 
 #: ../../templates/show_test.inc:41
 msgid "PHP Version"
-msgstr ""
+msgstr "Version de PHP"
 
 #: ../../templates/show_test.inc:56
 msgid ""
@@ -1415,7 +1802,7 @@
 
 #: ../../templates/show_test.inc:60
 msgid "Mysql for PHP"
-msgstr ""
+msgstr "Mysql pour PHP"
 
 #: ../../templates/show_test.inc:75
 msgid ""
@@ -1425,7 +1812,7 @@
 
 #: ../../templates/show_test.inc:79
 msgid "PHP Session Support"
-msgstr ""
+msgstr "Support des sessions PHP"
 
 #: ../../templates/show_test.inc:94
 msgid ""
@@ -1435,7 +1822,7 @@
 
 #: ../../templates/show_test.inc:98
 msgid "PHP ICONV Support"
-msgstr ""
+msgstr "Support de PHP ICONV"
 
 #: ../../templates/show_test.inc:112
 msgid ""
@@ -1444,9 +1831,9 @@
 msgstr ""
 
 #: ../../templates/show_test.inc:116
-#: ../../templates/show_install_config.inc:87
+#: ../../templates/show_install_config.inc:88
 msgid "Ampache.cfg.php Exists"
-msgstr ""
+msgstr "Ampache.cfg.php existe"
 
 #: ../../templates/show_test.inc:131
 msgid ""
@@ -1456,7 +1843,7 @@
 msgstr ""
 
 #: ../../templates/show_test.inc:137
-#: ../../templates/show_install_config.inc:104
+#: ../../templates/show_install_config.inc:105
 msgid "Ampache.cfg.php Configured?"
 msgstr ""
 
@@ -1502,153 +1889,153 @@
 msgstr ""
 
 #: ../../templates/show_localplay.inc:39 ../../templates/list_header.inc:71
-#: ../../templates/show_mpdplay.inc:48
+#: ../../templates/show_mpdplay.inc:62
 msgid "Prev"
-msgstr ""
+msgstr "Pr&eacute;c&eacute;dant"
 
-#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:49
+#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:63
 msgid "Stop"
-msgstr ""
+msgstr "Stop"
 
-#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:51
+#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:65
 msgid "Pause"
-msgstr ""
+msgstr "Pause"
 
 #: ../../templates/show_localplay.inc:43 ../../templates/list_header.inc:94
-#: ../../templates/show_mpdplay.inc:52
+#: ../../templates/show_mpdplay.inc:66
 msgid "Next"
-msgstr ""
+msgstr "Suivant"
 
 #: ../../templates/show_localplay.inc:49
 msgid "Volume"
-msgstr ""
+msgstr "Volume"
 
 #: ../../templates/show_localplay.inc:53 ../../templates/show_localplay.inc:54
 msgid "Increase Volume"
-msgstr ""
+msgstr "Augmenter le volume"
 
 #: ../../templates/show_localplay.inc:55 ../../templates/show_localplay.inc:56
 msgid "Decrease Volume"
-msgstr ""
+msgstr "Diminuer le volume"
 
 #: ../../templates/show_localplay.inc:62
 msgid "Clear queue"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:30
+#: ../../templates/add_catalog.inc:31
 msgid ""
 "In the form below enter either a local path (i.e. /data/music) or the URL to "
 "a remote Ampache installation (i.e http://theotherampache.com)"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:36
+#: ../../templates/add_catalog.inc:37
 #, fuzzy
 msgid "Catalog Name"
 msgstr "Outils pour les Catalogues"
 
-#: ../../templates/add_catalog.inc:53
+#: ../../templates/add_catalog.inc:54
 msgid "Path"
-msgstr ""
+msgstr "Chemin"
 
-#: ../../templates/add_catalog.inc:57
+#: ../../templates/add_catalog.inc:58
 #, fuzzy
 msgid "Catalog Type"
 msgstr "Outils pour les Catalogues"
 
-#: ../../templates/add_catalog.inc:61
+#: ../../templates/add_catalog.inc:62
 msgid "Remote"
-msgstr ""
+msgstr "Distant"
 
-#: ../../templates/add_catalog.inc:66
+#: ../../templates/add_catalog.inc:67
 msgid "ID3 Set Command"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:70
+#: ../../templates/add_catalog.inc:71
 msgid "Filename Pattern"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:78 ../../templates/catalog.inc:104
+#: ../../templates/add_catalog.inc:79 ../../templates/catalog.inc:101
 msgid "Gather Album Art"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:82
+#: ../../templates/add_catalog.inc:83
 msgid "ID3V2 Tags"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:85
+#: ../../templates/add_catalog.inc:86
 msgid "Amazon"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:88
+#: ../../templates/add_catalog.inc:89
 msgid "File Folder"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:95
+#: ../../templates/add_catalog.inc:96
 msgid "Build Playlists from m3u Files"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:102
+#: ../../templates/add_catalog.inc:103
 #, fuzzy
 msgid "Add Catalog"
-msgstr "Ajouter un catalogue"
-
-#: ../../templates/list_flagged.inc:41 ../../templates/flag.inc:58
-#: ../../templates/show_uploads.inc:34
-msgid "Song"
-msgstr ""
+msgstr "Ajouter un catalogue"
 
-#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:41
+#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:49
 msgid "Flag"
-msgstr ""
+msgstr "Marque"
 
 #: ../../templates/list_flagged.inc:43
 #, fuzzy
 msgid "New Flag"
-msgstr "Effacer Lecture en cours"
+msgstr "nouvelle marque"
 
 #: ../../templates/list_flagged.inc:44
 msgid "Flagged by"
-msgstr ""
+msgstr "marqu&eacute; par"
 
 #: ../../templates/list_flagged.inc:45
 #, fuzzy
 msgid "ID3 Update"
-msgstr "Mise a jour rapide"
+msgstr "mide &agrave; jour ID3"
 
 #: ../../templates/list_flagged.inc:69
 msgid "Accept"
-msgstr ""
+msgstr "Accepter"
 
 #: ../../templates/list_flagged.inc:70
 #, fuzzy
 msgid "Reject"
-msgstr "Effacer"
+msgstr "Refuser"
 
-#: ../../templates/show_songs.inc:33 ../../templates/show_mpdpl.inc:63
-msgid "Song title"
-msgstr ""
+#: ../../templates/header.inc:49
+#, fuzzy
+msgid "You are currently logged in as"
+msgstr "Vous etez actuellement connect&eacute; avec le user"
 
-#: ../../templates/show_songs.inc:38 ../../templates/show_uploads.inc:40
-msgid "Size"
+#: ../../templates/header.inc:58
+msgid "Go!"
 msgstr ""
 
-#: ../../templates/show_songs.inc:119
+#: ../../templates/show_songs.inc:143
 msgid "Direct Link"
-msgstr ""
+msgstr "Lien direct"
 
-#: ../../templates/show_songs.inc:137
+#: ../../templates/show_songs.inc:166
 msgid "Total"
-msgstr ""
+msgstr "Total"
+
+#: ../../templates/show_search_bar.inc:36 ../../templates/show_search.inc:54
+msgid "Search Ampache"
+msgstr "Recherche dans Ampache"
 
 #: ../../templates/show_install_config.inc:41
-#: ../../templates/show_install.inc:40
+#: ../../templates/show_install.inc:41
 msgid ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
 "ampache.cfg.php.dist file"
 msgstr ""
 
 #: ../../templates/show_install_config.inc:49
-#: ../../templates/show_install.inc:50
+#: ../../templates/show_install.inc:51
 msgid "Step 2 - Creating the Ampache.cfg.php file"
 msgstr ""
 
@@ -1659,155 +2046,157 @@
 "download the config file. Please put the downloaded config file in /config"
 msgstr ""
 
-#: ../../templates/show_install_config.inc:59
+#: ../../templates/show_install_config.inc:60
 msgid "Web Path"
 msgstr ""
 
-#: ../../templates/show_install_config.inc:63
-#: ../../templates/show_install.inc:57
+#: ../../templates/show_install_config.inc:64
+#: ../../templates/show_install.inc:59
 msgid "Desired Database Name"
 msgstr ""
 
-#: ../../templates/show_install_config.inc:67
-#: ../../templates/show_install.inc:61
+#: ../../templates/show_install_config.inc:68
+#: ../../templates/show_install.inc:63
 msgid "MySQL Hostname"
-msgstr ""
+msgstr "MySQL Hostname"
 
-#: ../../templates/show_install_config.inc:71
+#: ../../templates/show_install_config.inc:72
 msgid "MySQL Username"
 msgstr ""
 
-#: ../../templates/show_install_config.inc:75
+#: ../../templates/show_install_config.inc:76
 #, fuzzy
 msgid "MySQL Password"
 msgstr "Mot de passe"
 
-#: ../../templates/show_install_config.inc:80
+#: ../../templates/show_install_config.inc:81
 msgid "Write Config"
-msgstr ""
+msgstr "Ecrire la configuration"
 
-#: ../../templates/show_install_config.inc:124
+#: ../../templates/show_install_config.inc:125
 msgid "Check for Config"
 msgstr ""
 
-#: ../../templates/show_album.inc:53
+#: ../../templates/show_album.inc:67
 msgid "Play Album"
-msgstr ""
+msgstr "Jouer l'album"
 
-#: ../../templates/show_album.inc:54
+#: ../../templates/show_album.inc:68
 msgid "Play Random from Album"
-msgstr ""
+msgstr "Jouer al&eacute;atoirement l'album"
 
-#: ../../templates/show_album.inc:55
+#: ../../templates/show_album.inc:69
 msgid "Reset Album Art"
 msgstr ""
 
-#: ../../templates/show_album.inc:56
+#: ../../templates/show_album.inc:70
 msgid "Find Album Art"
 msgstr ""
 
-#: ../../templates/show_album.inc:58 ../../templates/show_artist.inc:37
-#, fuzzy
-msgid "Update from tags"
-msgstr "Mettre a jour les Catalogues"
-
-#: ../../templates/show_preferences.inc:31
+#: ../../templates/show_preferences.inc:42
 msgid "Editing"
-msgstr ""
+msgstr "Edition des pr&eacute;f&eacute;rences de"
 
-#: ../../templates/show_preferences.inc:31
+#: ../../templates/show_preferences.inc:42
 msgid "preferences"
-msgstr ""
+msgstr " "
 
-#: ../../templates/show_preferences.inc:33
+#: ../../templates/show_preferences.inc:44
 msgid "Rebuild Preferences"
-msgstr ""
-
-#: ../../templates/show_preferences.inc:39
-msgid "Preference"
-msgstr ""
-
-#: ../../templates/show_preferences.inc:40
-msgid "Value"
-msgstr ""
-
-#: ../../templates/show_preferences.inc:42
-msgid "Type"
-msgstr ""
+msgstr "Reconstruire les pr&eacute;f&eacute;rences"
 
-#: ../../templates/show_preferences.inc:43
-msgid "Apply to All"
-msgstr ""
-
-#: ../../templates/show_preferences.inc:83
+#: ../../templates/show_preferences.inc:73
 msgid "Update Preferences"
-msgstr ""
+msgstr "Mise &agrave; jour des pr&eacute;f&eacute;rences"
 
-#: ../../templates/show_preferences.inc:87
+#: ../../templates/show_preferences.inc:77
 msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
 
 #: ../../templates/userform.inc:25
 msgid "Adding a New User"
-msgstr ""
+msgstr "Ajouter un nouvelle utilisateur"
 
 #: ../../templates/userform.inc:29
 msgid "Editing existing User"
-msgstr ""
+msgstr "Editer un utilisateur existant"
 
 #: ../../templates/userform.inc:80
 msgid "User Access Level"
-msgstr ""
+msgstr "Niveau d'access utilisateur"
 
 #: ../../templates/userform.inc:96
 msgid "Add User"
-msgstr ""
+msgstr "Ajouter l'utilisateur"
 
 #: ../../templates/userform.inc:101
 #, fuzzy
 msgid "Update User"
-msgstr "Mettre a jour les Catalogues"
+msgstr "Mettre &aacute; jour l'utilisateur"
+
+#: ../../templates/show_random_play.inc:34
+msgid "Item count"
+msgstr "Nombre d'&eacute;l&eacute;ments"
+
+#: ../../templates/show_random_play.inc:49
+msgid "From genre"
+msgstr "Par genre"
+
+#: ../../templates/show_random_play.inc:58
+msgid "Standard"
+msgstr ""
+
+#: ../../templates/show_random_play.inc:59
+msgid "Favor Unplayed"
+msgstr "Favoriser les non jouer"
+
+#: ../../templates/show_random_play.inc:61
+msgid "Full Artist"
+msgstr "Artiste complet"
+
+#: ../../templates/show_random_play.inc:66
+#, fuzzy
+msgid "from catalog"
+msgstr "Ajouter un catalogue"
+
+#: ../../templates/show_random_play.inc:75
+msgid "Play Random Songs"
+msgstr "Jouer une chanson al&eacute;atoire"
 
-#: ../../templates/show_install.inc:48
+#: ../../templates/show_install.inc:49
 msgid ""
 "This step creates and inserts the Ampache database, as such please provide a "
 "mysql account with database creation rights. This step may take a while "
 "depending upon the speed of your computer"
 msgstr ""
 
-#: ../../templates/show_install.inc:65
+#: ../../templates/show_install.inc:67
 msgid "MySQL Administrative Username"
 msgstr ""
 
-#: ../../templates/show_install.inc:69
+#: ../../templates/show_install.inc:71
 msgid "MySQL Administrative Password"
 msgstr ""
 
-#: ../../templates/show_install.inc:74
-msgid "Insert Database"
-msgstr ""
-
-#: ../../templates/flag.inc:43
-msgid "Flag song"
+#: ../../templates/show_install.inc:75
+msgid "Create Database User for New Database"
 msgstr ""
 
-#: ../../templates/flag.inc:45
-msgid ""
-"Flag the following song as having one of the problems listed below.  Site "
-"admins will then take the appropriate action for the flagged files."
+#: ../../templates/show_install.inc:80
+msgid "Ampache Database Username"
 msgstr ""
 
-#: ../../templates/flag.inc:62
-msgid "Reason to flag"
+#: ../../templates/show_install.inc:84
+msgid "Ampache Database User Password"
 msgstr ""
 
-#: ../../templates/flag.inc:73
-msgid "Flag Song"
+#: ../../templates/show_install.inc:89
+msgid "Insert Database"
 msgstr ""
 
 #: ../../templates/show_add_access.inc:31
 msgid "Add Access for a Host"
-msgstr ""
+msgstr "Ajouter un acces pour la machine"
 
 #: ../../templates/show_add_access.inc:33
 msgid ""
@@ -1817,133 +2206,152 @@
 
 #: ../../templates/show_add_access.inc:46
 msgid "Start IP Address"
-msgstr ""
+msgstr "Adresse IP de depart"
 
 #: ../../templates/show_add_access.inc:52
 msgid "End IP Address"
-msgstr ""
+msgstr "Adresse Ip de fin"
 
 #: ../../templates/show_add_access.inc:58
 #: ../../templates/show_access_list.inc:50
 msgid "Level"
-msgstr ""
+msgstr "Niveau"
 
 #: ../../templates/show_add_access.inc:72
 msgid "Add Host"
-msgstr ""
+msgstr "Ajouter machine"
 
-#: ../../templates/catalog.inc:33
+#: ../../templates/catalog.inc:30
 msgid ""
 "Error: ICONV not found, ID3V2 Tags will not import correctly. See <a href="
 "\"http://php.oregonstate.edu/iconv\">Iconv</a> for information on getting "
 "ICONV"
 msgstr ""
 
-#: ../../templates/catalog.inc:42
+#: ../../templates/catalog.inc:39
 msgid "Update Catalogs"
-msgstr "Mettre a jour les Catalogues"
+msgstr "Mettre &aacute; jour les Catalogues"
 
-#: ../../templates/catalog.inc:68
+#: ../../templates/catalog.inc:65
 msgid "Fast Add"
 msgstr "Ajout Rapide"
 
-#: ../../templates/catalog.inc:75
+#: ../../templates/catalog.inc:72
 msgid "Fast Update"
-msgstr "Mise a jour rapide"
+msgstr "Mise &eacute; jour rapide"
 
-#: ../../templates/catalog.inc:88
+#: ../../templates/catalog.inc:85
 msgid "You don't have any catalogs."
 msgstr "Vous avez aucun catalogue"
 
-#: ../../templates/catalog.inc:99
+#: ../../templates/catalog.inc:96
 msgid "Show Duplicate Songs"
 msgstr "Voir les doublons"
 
-#: ../../templates/catalog.inc:100
+#: ../../templates/catalog.inc:97
 msgid "Show Disabled Songs"
-msgstr "Voir les chansons desactivees"
+msgstr "Voir les chansons d&eacute;sactivees"
 
-#: ../../templates/catalog.inc:101
+#: ../../templates/catalog.inc:98
 msgid "Clear Catalog Stats"
 msgstr "Effacer les Statistiques des Catalogues"
 
-#: ../../templates/catalog.inc:103
+#: ../../templates/catalog.inc:100
 msgid "Dump Album Art"
 msgstr ""
 
-#: ../../templates/catalog.inc:105
+#: ../../templates/catalog.inc:102
 msgid "View flagged songs"
-msgstr "Voir les chansons marquees"
+msgstr "Voir les chansons marqu&eacute;es"
 
-#: ../../templates/catalog.inc:106
+#: ../../templates/catalog.inc:103
 msgid "Catalog Tools"
 msgstr "Outils pour les Catalogues"
 
-#: ../../templates/admin_menu.inc:33
-msgid "Users"
-msgstr ""
+#: ../../templates/menu.inc:73 ../../templates/menu.inc:79
+msgid "Account"
+msgstr "Compte"
 
-#: ../../templates/admin_menu.inc:34
-msgid "Mail Users"
+#: ../../templates/menu.inc:74 ../../templates/menu.inc:80
+#: ../../templates/show_users.inc:64 ../../templates/show_users.inc:112
+msgid "Stats"
 msgstr ""
 
-#: ../../templates/menu.inc:29
-msgid "Home"
+#: ../../templates/show_upload.inc:30
+msgid "Uploading Music to Ampache"
 msgstr ""
 
-#: ../../templates/menu.inc:32
-msgid "Local Play"
+#: ../../templates/show_upload.inc:32
+msgid "The following Audio file formats are supported"
 msgstr ""
 
-#: ../../templates/menu.inc:38
-msgid "Playlists"
+#: ../../templates/show_upload.inc:72
+msgid "max_upload_size"
 msgstr ""
 
-#: ../../templates/menu.inc:40
-msgid "Preferences"
-msgstr ""
+#: ../../templates/show_users.inc:40
+msgid "Fullname"
+msgstr "Nom complet"
 
-#: ../../templates/menu.inc:43 ../../templates/show_upload.inc:73
-msgid "Upload"
-msgstr ""
+#: ../../templates/show_users.inc:48
+msgid "Last Seen"
+msgstr "Dernier vue"
 
-#: ../../templates/menu.inc:63 ../../templates/menu.inc:66
-msgid "Admin"
-msgstr ""
+#: ../../templates/show_users.inc:53
+#, fuzzy
+msgid "Registration Date"
+msgstr "Enregistre un utilisateur"
 
-#: ../../templates/menu.inc:73 ../../templates/menu.inc:79
-msgid "Account"
+#: ../../templates/show_users.inc:61 ../../templates/show_users.inc:107
+msgid "Prefs"
 msgstr ""
 
-#: ../../templates/menu.inc:74 ../../templates/menu.inc:80
-msgid "Stats"
+#: ../../templates/show_users.inc:67
+msgid "Access"
 msgstr ""
 
-#: ../../templates/menu.inc:75 ../../templates/menu.inc:81
-#: ../../templates/menu.inc:85
-msgid "Logout"
-msgstr ""
+#: ../../templates/show_users.inc:73
+msgid "On-line"
+msgstr "En ligne"
 
-#: ../../templates/show_upload.inc:30
-msgid "Uploading Music to Ampache"
+#: ../../templates/show_users.inc:126
+#, fuzzy
+msgid "delete"
+msgstr "supprimer"
+
+#: ../../templates/list_duplicates.inc:28
+#, fuzzy
+msgid "Duplicate Songs"
+msgstr "Voir les doublons"
+
+#: ../../templates/list_duplicates.inc:35
+msgid "Length"
 msgstr ""
 
-#: ../../templates/show_upload.inc:32
-msgid "The following Audio file formats are supported"
+#: ../../templates/list_duplicates.inc:74
+msgid "You don"
 msgstr ""
 
-#: ../../templates/show_upload.inc:72
-msgid "max_upload_size"
+#: ../../templates/list_duplicates.inc:74
+msgid ""
+"); ?></p>\n"
+"<?php  } ?>\n"
+"</form>\n"
 msgstr ""
 
 #: ../../templates/show_login_form.inc:49
 #: ../../templates/show_login_form.inc:63
 msgid "Login"
-msgstr "Utilisateur"
+msgstr "Connexion"
 
 #: ../../templates/show_login_form.inc:59
 msgid "Remember Me"
-msgstr ""
+msgstr "m&eacute;moriser"
+
+#: ../../templates/show_login_form.inc:72
+#, fuzzy
+msgid "Register"
+msgstr "Enregistre un utilisateur"
 
 #: ../../templates/show_access_list.inc:34
 msgid "Host Access to Your Catalog"
@@ -1951,234 +2359,211 @@
 
 #: ../../templates/show_access_list.inc:43
 msgid "Add Entry"
-msgstr ""
+msgstr "Ajouter un entr&eacute;e"
 
 #: ../../templates/show_access_list.inc:48
 msgid "Start Address"
-msgstr ""
+msgstr "Adresse de d&eacute;part"
 
 #: ../../templates/show_access_list.inc:49
 msgid "End Address"
-msgstr ""
+msgstr "Adresse de fin"
 
 #: ../../templates/show_access_list.inc:65
 msgid "Revoke"
-msgstr ""
-
-#: ../../templates/show_users.inc:43
-msgid "Fullname"
-msgstr ""
-
-#: ../../templates/show_users.inc:48
-msgid "Last Seen"
-msgstr ""
-
-#: ../../templates/show_users.inc:55 ../../templates/show_users.inc:91
-msgid "Prefs"
-msgstr ""
-
-#: ../../templates/show_users.inc:58
-msgid "Access"
-msgstr ""
+msgstr "Bloquer"
 
-#: ../../templates/show_users.inc:64
-msgid "On-line"
+#: ../../templates/show_search.inc:57
+msgid "Keywords"
 msgstr ""
 
-#: ../../templates/show_users.inc:105
+#: ../../templates/show_search.inc:102
 #, fuzzy
-msgid "delete"
-msgstr "Effacer"
-
-#: ../../templates/show_search.inc:45 ../../templates/show_search_bar.inc:36
-msgid "Search Ampache"
-msgstr ""
-
-#: ../../templates/show_search.inc:84
 msgid "Played"
-msgstr ""
+msgstr "Jouer"
 
-#: ../../templates/show_search.inc:92
+#: ../../templates/show_search.inc:110
+#, fuzzy
 msgid "Min Bitrate"
-msgstr ""
+msgstr "Bitrate"
 
-#: ../../templates/show_search.inc:114
+#: ../../templates/show_search.inc:132
 msgid "Object Type"
-msgstr ""
+msgstr "Type d'objet"
 
-#: ../../templates/show_search.inc:120
+#: ../../templates/show_search.inc:138
+#, fuzzy
 msgid "Genres"
-msgstr ""
+msgstr "genre"
 
-#: ../../templates/show_search.inc:123
+#: ../../templates/show_search.inc:141
 msgid "Operator"
 msgstr ""
 
-#: ../../templates/show_search.inc:126
-msgid "OR"
-msgstr ""
-
-#: ../../templates/show_search.inc:127
+#: ../../templates/show_search.inc:145
 msgid "AND"
 msgstr ""
 
-#: ../../templates/show_search.inc:132
+#: ../../templates/show_search.inc:150
+#, fuzzy
 msgid "Method"
-msgstr ""
+msgstr "Mode"
 
-#: ../../templates/show_search.inc:135
+#: ../../templates/show_search.inc:153
 msgid "Fuzzy"
 msgstr ""
 
-#: ../../templates/show_search.inc:136
+#: ../../templates/show_search.inc:154
 msgid "Exact"
 msgstr ""
 
-#: ../../templates/show_search.inc:139
+#: ../../templates/show_search.inc:157
 msgid "Maxium Results"
 msgstr ""
 
-#: ../../templates/show_search.inc:142
+#: ../../templates/show_search.inc:160
 msgid "Unlimited"
 msgstr ""
 
-#: ../../templates/show_search.inc:154
+#: ../../templates/show_search.inc:172
 msgid "Reset Form"
 msgstr ""
 
-#: ../../templates/show_artist.inc:31
-msgid "Albums by"
+#: ../../templates/show_search.inc:184
+msgid "Save Search As Track on"
+msgstr ""
+
+#: ../../templates/show_search.inc:186
+msgid "Save"
+msgstr ""
+
+#: ../../templates/show_mpdplay.inc:39
+msgid "MPD Play Control"
+msgstr ""
+
+#: ../../templates/show_mpdplay.inc:100
+msgid "Loop"
+msgstr "boucle"
+
+#: ../../templates/show_mpdplay.inc:107 ../../templates/show_mpdplay.inc:120
+msgid "On"
+msgstr ""
+
+#: ../../templates/show_mpdplay.inc:108 ../../templates/show_mpdplay.inc:121
+msgid "Off"
 msgstr ""
 
-#: ../../templates/show_artist.inc:33
+#: ../../templates/show_mpdplay.inc:134
 #, fuzzy
-msgid "Show All Songs By"
-msgstr "Voir les chansons desactivees"
+msgid "Now Playing :"
+msgstr "En cours de lecture"
 
-#: ../../templates/show_artist.inc:34
-msgid "Play All Songs By"
+#: ../../templates/show_mpdplay.inc:163
+msgid "On Deck "
 msgstr ""
 
-#: ../../templates/show_artist.inc:35
-msgid "Play Random Songs By"
+#: ../../templates/show_mpdplay.inc:163
+msgid "(in "
 msgstr ""
 
-#: ../../templates/show_artist.inc:49
+#: ../../templates/show_artist.inc:36
 #, fuzzy
 msgid "Select"
-msgstr "Effacer"
+msgstr "S&eacute;l&eacute;ction"
 
-#: ../../templates/show_artist.inc:51
+#: ../../templates/show_artist.inc:38
 msgid "Cover"
-msgstr ""
+msgstr "Couverture"
 
-#: ../../templates/show_artist.inc:52
+#: ../../templates/show_artist.inc:39
 msgid "Album Name"
-msgstr ""
+msgstr "Nom de l'album"
 
-#: ../../templates/show_artist.inc:53
+#: ../../templates/show_artist.inc:40
 msgid "Album Year"
-msgstr ""
+msgstr "Ann&eacute;e de l'albums"
 
-#: ../../templates/show_artist.inc:54
+#: ../../templates/show_artist.inc:41
+#, fuzzy
 msgid "Total Tracks"
-msgstr ""
+msgstr "Utilisateurs total"
 
-#: ../../templates/show_mpdplay.inc:38
-msgid "MPD Play Control"
-msgstr ""
+#: ../../templates/show_big_art.inc:31
+#, fuzzy
+msgid "Album Art"
+msgstr "Ann&eacute;e de l'albums"
 
-#: ../../templates/show_mpdplay.inc:71
-msgid "Loop"
+#: ../../templates/show_big_art.inc:35
+msgid "Click to close window"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:78 ../../templates/show_mpdplay.inc:91
-msgid "On"
-msgstr ""
+#~ msgid "<u>S</u>how all albums"
+#~ msgstr "<u>M</u>ontrer tout les albums"
 
-#: ../../templates/show_mpdplay.inc:79 ../../templates/show_mpdplay.inc:92
-msgid "Off"
-msgstr ""
+#~ msgid "All songs by"
+#~ msgstr "Toutes les chanson de"
 
-#: ../../templates/show_mpdplay.inc:109
-#, fuzzy
-msgid "Now Playing :"
-msgstr "Effacer Lecture en cours"
+#~ msgid "Welcome to"
+#~ msgstr "bienvenue sur"
 
-#: ../../templates/show_mpdplay.inc:133
-msgid "On Deck "
-msgstr ""
+#~ msgid "New"
+#~ msgstr "Nouveau"
 
-#: ../../templates/show_mpdplay.inc:133
-msgid "(in "
-msgstr ""
+#~ msgid "View All"
+#~ msgstr "Voir Tout"
 
-#: ../../templates/show_mpdpl.inc:44
-msgid "MPD Server Playlist"
-msgstr ""
+#~ msgid "Import"
+#~ msgstr "Importer"
 
-#: ../../templates/show_mpdpl.inc:46 ../../templates/show_mpdpl.inc:184
-msgid "Refresh the Playlist Window"
-msgstr ""
+#~ msgid "Public"
+#~ msgstr "Public"
 
-#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:186
-msgid "Click to shuffle (randomize) the playlist"
-msgstr ""
+#~ msgid "There are no playlists of this type"
+#~ msgstr "Il n'y a pas de liste de lecture de ce type"
 
-#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:186
-msgid "shuffle"
-msgstr ""
+#~ msgid "owned by"
+#~ msgstr "Propri&eacute;t&eacute; de"
 
-#: ../../templates/show_mpdpl.inc:49 ../../templates/show_mpdpl.inc:187
-msgid "Click to the clear the playlist"
-msgstr ""
+#~ msgid "Edit Playlist"
+#~ msgstr "Editer la liste de lecture"
 
-#: ../../templates/show_mpdpl.inc:53 ../../templates/show_mpdpl.inc:191
-msgid "Click to the remove all except the Now Playing"
-msgstr ""
+#~ msgid "Play Random"
+#~ msgstr "Jouer al&eacute;atoirement"
 
-#: ../../templates/show_uploads.inc:33
-msgid "Status"
-msgstr ""
+#~ msgid "An Unknown Error has occured."
+#~ msgstr "Une erreur inconnue est apparue"
 
-#: ../../templates/show_uploads.inc:42
-msgid "User"
-msgstr ""
+#~ msgid "Create/Modify User Accounts for Ampache"
+#~ msgstr "Cr&eacute;ation/Modification des comptes utilisateur pour Ampache"
 
-#: ../../templates/show_uploads.inc:43
-#, fuzzy
-msgid "Date"
-msgstr "Effacer"
+#~ msgid "Mail"
+#~ msgstr "Mail"
 
-#: ../../templates/show_uploads.inc:49
-#, fuzzy
-msgid "Add"
-msgstr "Ajouter un catalogue"
+#~ msgid "Mail your users to notfiy them of changes"
+#~ msgstr ""
+#~ "Envoyer un mail &aacute; vos utilisateurs pour les informer des "
+#~ "changements"
 
-#: ../../templates/show_search_bar.inc:42
-#, fuzzy
-msgid "Song Title"
-msgstr "Voir les chansons desactivees"
+#~ msgid "Create/Update/Clean your catalog here"
+#~ msgstr "Cr&eacute;er/Modifier/nettoyer votre catalogue ici"
 
-#: ../../templates/show_search_bar.inc:45
-msgid "Song Genre"
-msgstr ""
+#~ msgid "Modify Site-wide preferences"
+#~ msgstr "Modifier les pr&eacute;f&eacute;rence du site"
 
-#: ../../templates/show_search_bar.inc:46
-msgid "Song Year"
-msgstr ""
+#~ msgid "Modify Access List Permissions"
+#~ msgstr "Modifier la liste d'access autoris&eacute;"
 
-#: ../../templates/show_search_bar.inc:47
-msgid "Minimum Bitrate"
-msgstr ""
+#~ msgid "Must have access_control=true in ampache.cfg"
+#~ msgstr "Vous devez avoir access_control=true dans ampache.cfg.php"
 
-#: ../../templates/show_random_play.inc:58
-msgid "Standard"
-msgstr ""
+#~ msgid "Type"
+#~ msgstr "Type"
 
-#: ../../templates/show_random_play.inc:61
-msgid "Full Artist"
-msgstr ""
+#~ msgid "refresh now"
+#~ msgstr "rafraichir maintenant"
+
+#~ msgid "clear"
+#~ msgstr "&eacute;ffacer"
 
 #~ msgid "Remove Dead Songs from DB"
 #~ msgstr "Nettoyer la Base de donnees"
Binary files ampache-3.3.2-alpha4/locale/it_IT/LC_MESSAGES/messages.mo and ampache-3.3.2-beta1/locale/it_IT/LC_MESSAGES/messages.mo differ
diff -urN ampache-3.3.2-alpha4/locale/it_IT/LC_MESSAGES/messages.po ampache-3.3.2-beta1/locale/it_IT/LC_MESSAGES/messages.po
--- ampache-3.3.2-alpha4/locale/it_IT/LC_MESSAGES/messages.po	2005-12-27 01:32:54.000000000 -0800
+++ ampache-3.3.2-beta1/locale/it_IT/LC_MESSAGES/messages.po	2006-01-08 23:06:12.000000000 -0800
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2005.
 #
-# Mr-miky <translate@mr-miky.com>, 2005.
+# Mr-miky <translate@mr-miky.com>, 2005, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-29 10:27-0700\n"
-"PO-Revision-Date: 2005-12-21 21:12+0100\n"
+"POT-Creation-Date: 2006-01-07 20:18+0100\n"
+"PO-Revision-Date: 2006-01-08 00:34+0100\n"
 "Last-Translator: Mr-miky <translate@mr-miky.com>\n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
@@ -18,777 +18,733 @@
 "X-Generator: KBabel 1.11\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../../play/index.php:50
-msgid "Session Expired: please log in again at"
-msgstr "Sessione scaduta: Per cortesia rifai il login"
+#: ../../activate.php:42
+msgid "No user with this name registered"
+msgstr "Non c'Ã¨ nessun utente registrato con questo nome"
+
+#: ../../activate.php:46
+msgid "The validation key used isn't correct."
+msgstr "La chiave di validazione usata non Ã¨ corretta"
+
+#: ../../activate.php:51
+msgid "User activated"
+msgstr "Utente attivato"
+
+#: ../../activate.php:51
+msgid "This User ID is activated and can be used"
+msgstr "ID utente attivato ed utilizzabile"
+
+#: ../../ratings.php:33
+msgid "Rating Updated"
+msgstr "Voto aggiornato"
+
+#: ../../ratings.php:33
+msgid "Your rating for this object has been updated"
+msgstr "Il voto per questo oggetto Ã¨ stato aggiornato"
 
-#: ../../lib/preferences.php:211 ../../templates/show_users.inc:97
-msgid "Enable"
-msgstr "Abilitato"
+#: ../../albums.php:44
+msgid "Album Art Cleared"
+msgstr "Copertina creata"
 
-#: ../../lib/preferences.php:212 ../../templates/show_users.inc:100
-msgid "Disable"
-msgstr "Disabilitato"
+#: ../../albums.php:44
+msgid "Album Art information has been removed form the database"
+msgstr "Le informazioni sulla copertina dell' album sono state rimosse dal database"
 
-#: ../../lib/preferences.php:224 ../../templates/add_catalog.inc:60
-msgid "Local"
-msgstr "Locale"
+#: ../../albums.php:74 ../../lib/mpd.php:43 ../../lib/mpd.php:52
+#: ../../lib/class/catalog.class.php:952
+msgid "Error"
+msgstr "Errore"
 
-#: ../../lib/preferences.php:227
-msgid "Stream"
-msgstr "Stream"
+#: ../../albums.php:74
+msgid "No Amazon Developer Key set, amazon album art searching will not work"
+msgstr ""
+"Non Ã¨ impostata una chiave Amazon Developer, la ricerca delle copertine su "
+"Amazon non puÃ² funzionare."
 
-#: ../../lib/preferences.php:230
-msgid "IceCast"
-msgstr "IceCast"
+#: ../../albums.php:104
+msgid "Album Art Not Located"
+msgstr "Copertina non rintracciata"
 
-#: ../../lib/preferences.php:233
-msgid "Downsample"
+#: ../../albums.php:104
+msgid ""
+"Album Art could not be located at this time. This may be due to Amazon being "
+"busy, or the album not being present in their collection."
 msgstr ""
+"La copertina non puÃ² essere rintracciata ora.PuÃ² essere dovuto al fatto che "
+"Amazon Ã¨ occupato o l' album non Ã¨ presente nella loro collezione."
 
-#: ../../lib/preferences.php:236
-msgid "Music Player Daemon"
-msgstr "Music Player Daemon"
+#: ../../albums.php:137
+msgid "Album Art Inserted"
+msgstr "Copertina inserita"
 
-#: ../../lib/preferences.php:239
-msgid "SlimServer"
-msgstr "SlimServer"
+#: ../../albums.php:147 ../../artists.php:58
+msgid "Starting Update from Tags"
+msgstr "Inizio aggiornamento da Tags"
 
-#: ../../lib/preferences.php:248
-msgid "M3U"
-msgstr "M3U"
+#: ../../albums.php:152 ../../artists.php:63
+msgid "Update From Tags Complete"
+msgstr "Aggiornamento da Tags ultimato"
 
-#: ../../lib/preferences.php:249
-msgid "Simple M3U"
-msgstr "M3U semplice"
+#: ../../albums.php:153 ../../artists.php:64
+#: ../../lib/class/catalog.class.php:659
+msgid "Return"
+msgstr "Ritorna"
 
-#: ../../lib/preferences.php:250
-msgid "PLS"
-msgstr "PLS"
+#: ../../albums.php:168 ../../albums.php:174 ../../albums.php:181
+#: ../../albums.php:186 ../../albums.php:192 ../../browse.php:48
+msgid "Show Albums starting with"
+msgstr "Mostra album che iniziano per"
 
-#: ../../lib/preferences.php:251
-msgid "Asx"
-msgstr "Asx"
+#: ../../modules/lib.php:537
+msgid "Create a new playlist"
+msgstr "Crea nuova playlist"
 
-#: ../../lib/preferences.php:258
-msgid "English"
-msgstr "Inglese"
+#: ../../modules/admin.php:46
+msgid "Manage Users"
+msgstr "Gestione utenti"
 
-#: ../../lib/preferences.php:259
-msgid "British English"
-msgstr "Inglese britannico"
+#: ../../modules/admin.php:48 ../../templates/show_admin_index.inc:34
+msgid "Add a new user"
+msgstr "Aggiungi nuovo utente"
 
-#: ../../lib/preferences.php:260
-msgid "German"
-msgstr "Tedesco"
+#: ../../search.php:45
+msgid "Error: No Keyword Entered"
+msgstr "Errore: Nessuna parola chiave inserita"
 
-#: ../../lib/preferences.php:261
-msgid "French"
-msgstr "Francese"
+#: ../../index.php:61 ../../templates/show_all_popular.inc.php:30
+msgid "Most Popular Albums"
+msgstr "Album piÃ¹ popolare"
 
-#: ../../lib/preferences.php:262
-msgid "Turkish"
-msgstr "Turco"
+#: ../../index.php:82 ../../templates/show_all_popular.inc.php:27
+msgid "Most Popular Artists"
+msgstr "Artista piÃ¹ popolare"
 
-#: ../../lib/preferences.php:263
-msgid "Spanish"
-msgstr "Spagnolo"
+#: ../../index.php:89 ../../templates/show_all_popular.inc.php:40
+msgid "Most Popular Songs"
+msgstr "Brani piÃ¹ popolari"
 
-#: ../../lib/preferences.php:264
-msgid "Dutch"
-msgstr "Olandese"
+#: ../../index.php:99 ../../templates/show_all_recent.inc.php:27
+msgid "Newest Artist Additions"
+msgstr "Nuovi artisti aggiunti recentemente"
 
-#: ../../lib/preferences.php:265
-msgid "Simplified Chinese"
-msgstr "Cinese semplificato"
+#: ../../index.php:106 ../../templates/show_all_recent.inc.php:30
+msgid "Newest Album Additions"
+msgstr "Nuovi album aggiunti recentemente"
 
-#: ../../lib/duplicates.php:80
-msgid "Find Duplicates"
-msgstr "Trova duplicati"
+#: ../../localplay.php:81
+msgid "Unknown action requested"
+msgstr "Azione richiesta sconosciuta"
 
-#: ../../lib/duplicates.php:83
-msgid "Search Type"
-msgstr "Tipo di ricerca"
+#: ../../admin/access.php:40
+msgid "Do you really want to delete this Access Record?"
+msgstr ""
 
-#: ../../lib/duplicates.php:91 ../../lib/class/song.class.php:275
-#: ../../templates/show_search.inc:48
-msgid "Title"
-msgstr "Titolo"
+#: ../../admin/access.php:48
+msgid "Entry Deleted"
+msgstr "Voce cancellata"
 
-#: ../../lib/duplicates.php:97
-msgid "Artist and Title"
-msgstr "Artista e titolo"
+#: ../../admin/access.php:48
+msgid "Your Access List Entry has been removed"
+msgstr ""
 
-#: ../../lib/duplicates.php:102
-msgid "Artist, Album and Title"
-msgstr "Artista, album e titolo"
+#: ../../admin/access.php:58
+msgid "Entry Added"
+msgstr "Voce aggiunta"
 
-#: ../../lib/duplicates.php:110 ../../templates/menu.inc:39
-#: ../../templates/show_search.inc:153 ../../templates/show_search_bar.inc:50
-msgid "Search"
-msgstr "Cerca"
+#: ../../admin/access.php:58
+msgid "Your new Access List Entry has been created"
+msgstr ""
 
-#: ../../lib/general.lib.php:640
-msgid "Not Enough Data"
-msgstr "Dati insufficienti"
+#: ../../admin/song.php:65
+msgid "Songs Disabled"
+msgstr "Brani disabilitati"
 
-#: ../../lib/class/genre.class.php:278
-msgid "Show Genres starting with"
-msgstr "Mostra generi che iniziano per"
+#: ../../admin/song.php:65
+msgid "The requested song(s) have been disabled"
+msgstr "I brani richiesti sono stati disabilitati"
 
-#: ../../lib/class/album.class.php:126
-msgid "Various"
-msgstr "Vari"
+#: ../../admin/song.php:75
+msgid "Songs Enabled"
+msgstr "Brani abilitati"
 
-#: ../../lib/class/album.class.php:241 ../../lib/class/catalog.class.php:275
-#: ../../lib/class/catalog.class.php:560
-msgid "Error: Unable to open"
-msgstr "Errore: Impossibile aprire"
+#: ../../admin/song.php:75
+msgid "The requested song(s) have been enabled"
+msgstr "I brani richiesti sono stati abilitati"
 
-#: ../../lib/class/song.class.php:275 ../../lib/class/song.class.php:279
-#: ../../lib/class/song.class.php:283 ../../lib/class/song.class.php:287
-#: ../../lib/class/song.class.php:291 ../../lib/class/song.class.php:295
-#: ../../lib/class/song.class.php:299 ../../lib/class/song.class.php:304
-#: ../../lib/class/song.class.php:309 ../../lib/class/song.class.php:313
-#: ../../lib/class/song.class.php:317 ../../lib/class/song.class.php:322
-msgid "updated to"
-msgstr "aggiornato a"
+#: ../../admin/users.php:72 ../../admin/users.php:119
+msgid "Error Username Required"
+msgstr "Errore, E' necessario un nome utente"
 
-#: ../../lib/class/song.class.php:279 ../../templates/show_songs.inc:39
-#: ../../templates/show_uploads.inc:39
-msgid "Bitrate"
-msgstr "Bitrate"
+#: ../../admin/users.php:75 ../../admin/users.php:115
+msgid "Error Passwords don't match"
+msgstr "Errore password non corrispondente"
 
-#: ../../lib/class/song.class.php:283
-msgid "Rate"
-msgstr "Voto"
+#: ../../admin/users.php:124 ../../register.php:136
+msgid "Error Username already exists"
+msgstr "Errore, Nome utente giÃ  in uso"
 
-#: ../../lib/class/song.class.php:287
-msgid "Mode"
-msgstr "Modo"
+#: ../../admin/users.php:145
+msgid "Are you sure you want to permanently delete"
+msgstr "Sei sicuro di volere cancellare permanentemente"
 
-#: ../../lib/class/song.class.php:291 ../../templates/show_songs.inc:37
-#: ../../templates/show_mpdpl.inc:67 ../../templates/show_uploads.inc:38
-msgid "Time"
-msgstr "Durata"
+#: ../../admin/users.php:152 ../../templates/show_confirm_action.inc.php:29
+#: ../../templates/show_search.inc:107
+msgid "No"
+msgstr "No"
 
-#: ../../lib/class/song.class.php:295 ../../templates/show_songs.inc:32
-#: ../../templates/show_songs.inc:36 ../../templates/show_mpdpl.inc:66
-msgid "Track"
-msgstr "Traccia"
+#: ../../admin/users.php:154
+msgid "User Deleted"
+msgstr "Utente cancellato"
 
-#: ../../lib/class/song.class.php:299
-msgid "Filesize"
-msgstr "Dimensione file"
+#: ../../admin/users.php:157
+msgid "Delete Error"
+msgstr "Errore di cancellazione"
 
-#: ../../lib/class/song.class.php:304 ../../templates/show_artists.inc:39
-#: ../../templates/show_artists.inc:62 ../../templates/show_songs.inc:34
-#: ../../templates/show_albums.inc:40 ../../templates/show_albums.inc:70
-#: ../../templates/show_search.inc:53 ../../templates/show_mpdpl.inc:64
-#: ../../templates/show_uploads.inc:35 ../../templates/show_search_bar.inc:43
-msgid "Artist"
-msgstr "Artista"
+#: ../../admin/users.php:157
+msgid "Unable to delete last Admin User"
+msgstr "Impossibile cancellare l' ultimo utente amministratore"
 
-#: ../../lib/class/song.class.php:309 ../../templates/show_songs.inc:35
-#: ../../templates/show_albums.inc:38 ../../templates/show_albums.inc:68
-#: ../../templates/show_search.inc:60 ../../templates/show_mpdpl.inc:65
-#: ../../templates/show_uploads.inc:36 ../../templates/show_search_bar.inc:44
-msgid "Album"
-msgstr "Album"
+#: ../../admin/mail.php:94
+msgid "Mail to"
+msgstr ""
 
-#: ../../lib/class/song.class.php:313 ../../templates/show_albums.inc:43
-#: ../../templates/show_albums.inc:73 ../../templates/show_search.inc:72
-msgid "Year"
-msgstr "Anno"
+#: ../../admin/mail.php:105
+msgid "Subject"
+msgstr "Oggetto"
 
-#: ../../lib/class/song.class.php:317 ../../templates/list_flagged.inc:46
-#: ../../templates/flag.inc:66
-msgid "Comment"
-msgstr "Commento"
+#: ../../admin/mail.php:112
+msgid "Message"
+msgstr "Messaggio"
 
-#: ../../lib/class/song.class.php:322 ../../templates/show_genres.inc.php:36
-#: ../../templates/show_genre.inc.php:32 ../../templates/show_songs.inc:40
-#: ../../templates/show_search.inc:65 ../../templates/show_browse_menu.inc:37
-#: ../../templates/show_mpdpl.inc:68 ../../templates/show_uploads.inc:37
-msgid "Genre"
-msgstr "Genere"
+#: ../../admin/mail.php:122
+msgid "Send Mail"
+msgstr "Invia Mail"
 
-#: ../../lib/class/stream.class.php:198
-msgid "Opened for writing"
-msgstr "Aperto per la scrittura"
+#: ../../admin/catalog.php:49 ../../templates/catalog.inc:63
+msgid "Add to Catalog(s)"
+msgstr "Aggiungi al/ai cataloghi"
 
-#: ../../lib/class/stream.class.php:203
-msgid "Error, cannot write"
-msgstr "Errore, impossibile scrivere"
+#: ../../admin/catalog.php:60 ../../templates/catalog.inc:64
+msgid "Add to all Catalogs"
+msgstr "Aggiungi a tutti i cataloghi"
 
-#: ../../lib/class/stream.class.php:214
-msgid "Error, cannot write song in file"
-msgstr ""
+#: ../../admin/catalog.php:69
+msgid "Error Connecting"
+msgstr "Errore in connessione"
 
-#: ../../lib/class/stream.class.php:220
-msgid "Closed after write"
-msgstr "Chiuso dopo la scrittura"
+#: ../../admin/catalog.php:83 ../../templates/catalog.inc:70
+msgid "Update Catalog(s)"
+msgstr "Aggiorna catalogo/ghi"
 
-#: ../../lib/class/catalog.class.php:298
-msgid "Error: Unable to change to directory"
-msgstr "Errore: Impossibile cambiare alla cartella"
+#: ../../admin/catalog.php:94 ../../templates/catalog.inc:71
+msgid "Update All Catalogs"
+msgstr "Aggiorna tutti i cataloghi"
 
-#: ../../lib/class/catalog.class.php:321
-msgid "Error: Unable to get filesize for"
-msgstr ""
+#: ../../admin/catalog.php:126 ../../templates/catalog.inc:77
+msgid "Clean Catalog(s)"
+msgstr "Vuota catalogo/ghi"
 
-#: ../../lib/class/catalog.class.php:340
-msgid "Added Playlist From"
-msgstr "Aggiunta playlist da"
+#: ../../admin/catalog.php:156 ../../templates/catalog.inc:78
+msgid "Clean All Catalogs"
+msgstr "Vuota tutti i cataloghi"
 
-#: ../../lib/class/catalog.class.php:359
-msgid "Added"
-msgstr "Aggiunto"
+#: ../../admin/catalog.php:206
+msgid "Now Playing Cleared"
+msgstr "'In esecuzione ora' cancellato"
 
-#: ../../lib/class/catalog.class.php:371
-msgid "is not readable by ampache"
-msgstr "non Ã¨ leggibile da ampache"
+#: ../../admin/catalog.php:206
+msgid "All now playing data has been cleared"
+msgstr "Tutti gli 'In esecuzione ora' sono stati cancellati"
 
-#: ../../lib/class/catalog.class.php:435
-msgid "Found in ID3"
-msgstr "Trovato in ID3"
+#: ../../admin/catalog.php:211
+msgid "Do you really want to clear your catalog?"
+msgstr "Vuoi veramente svuotare il tuo catalogo"
 
-#: ../../lib/class/catalog.class.php:439
-msgid "Found on Amazon"
-msgstr "Trovato in Amazon"
+#: ../../admin/catalog.php:218
+msgid "Do you really want to clear the statistics for this catalog?"
+msgstr "Vuoi veramente eliminare le statistiche di questo catalogo?"
 
-#: ../../lib/class/catalog.class.php:443
-msgid "Found in Folder"
-msgstr "Trovato nelle cartella"
+#: ../../admin/catalog.php:235
+msgid "Do you really want to delete this catalog?"
+msgstr "Vuoi veramente cancellare questo catalogo?"
 
-#: ../../lib/class/catalog.class.php:447
-msgid "Found"
-msgstr "Trovato"
+#: ../../admin/catalog.php:258 ../../lib/class/catalog.class.php:752
+#: ../../lib/class/catalog.class.php:913
+msgid "Starting Album Art Search"
+msgstr "Inizio ricerca copertine."
 
-#: ../../lib/class/catalog.class.php:450
-msgid "Not Found"
-msgstr "Non trovato"
+#: ../../admin/catalog.php:266
+msgid "Album Art Search Finished"
+msgstr "Ricerca copertine terminata"
 
-#: ../../lib/class/catalog.class.php:458
-msgid "Searched"
-msgstr "Cercato"
+#: ../../tv.php:76 ../../templates/show_now_playing.inc:31
+msgid "Now Playing"
+msgstr "In esecuzione"
 
-#: ../../lib/class/catalog.class.php:613
-msgid "Starting Dump Album Art"
-msgstr ""
+#: ../../browse.php:78 ../../artists.php:128 ../../artists.php:132
+#: ../../artists.php:138 ../../artists.php:151
+msgid "Show Artists starting with"
+msgstr "Mostra artisti che iniziano per"
 
-#: ../../lib/class/catalog.class.php:633
-msgid "Written"
-msgstr "Scritto"
+#: ../../register.php:79
+msgid "Error Captcha Required"
+msgstr "Errore Captcha richiesto"
 
-#: ../../lib/class/catalog.class.php:642
-msgid "Error unable to open file for writting"
-msgstr "Errore , impossibile aprire il file per la scrittura"
+#: ../../register.php:86
+msgid "Error Captcha Failed"
+msgstr "Errore Captcha fallito"
 
-#: ../../lib/class/catalog.class.php:649
-msgid "Album Art Dump Complete"
+#: ../../register.php:93
+msgid "You <U>must</U> accept the user agreement"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:650 ../../artists.php:63
-#: ../../albums.php:112
-msgid "Return"
-msgstr "Ritorna"
-
-#: ../../lib/class/catalog.class.php:719
-msgid "Starting Catalog Build"
-msgstr "Avvio costruzione catalogo"
+#: ../../register.php:98
+msgid "You did not enter a username"
+msgstr "Non hai inserito un nome utente"
 
-#: ../../lib/class/catalog.class.php:724
-msgid "Running Remote Sync"
+#: ../../register.php:102
+msgid "Please fill in your full name (Firstname Lastname)"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:734 ../../lib/class/catalog.class.php:880
-#: ../../admin/catalog.php:264
-msgid "Starting Album Art Search"
-msgstr ""
+#: ../../register.php:128
+msgid "You must enter a password"
+msgstr "Devi inserire una password"
 
-#: ../../lib/class/catalog.class.php:744
-msgid "Catalog Finished"
-msgstr "Catalogo terminato"
-
-#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:899
-msgid "Total Time"
-msgstr "Durata totale"
-
-#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:900
-msgid "Total Songs"
-msgstr "Totale brani"
-
-#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:900
-msgid "Songs Per Seconds"
-msgstr "Brani per secondo"
-
-#: ../../lib/class/catalog.class.php:779
-#: ../../lib/class/catalog.class.php:1476
-msgid "Updated"
-msgstr "Aggiornato"
-
-#: ../../lib/class/catalog.class.php:786
-msgid "No Update Needed"
-msgstr "Non Ã¨ necessario aggiornare"
-
-#: ../../lib/class/catalog.class.php:860
-msgid "Starting New Song Search on"
-msgstr "Avvio nuova ricerca brano in"
-
-#: ../../lib/class/catalog.class.php:860
-msgid "catalog"
-msgstr "catalogo"
-
-#: ../../lib/class/catalog.class.php:864
-msgid "Running Remote Update"
-msgstr ""
+#: ../../register.php:132
+msgid "Your passwords do not match"
+msgstr "Le passord non corrispondono"
 
-#: ../../lib/class/catalog.class.php:899
-msgid "Catalog Update Finished"
-msgstr "Aggiornamento catalogo terminato"
+#: ../../register.php:150
+msgid "Error: Insert Failed"
+msgstr "Errore: inserimento fallito"
 
-#: ../../lib/class/catalog.class.php:919 ../../lib/mpd.php:40
-#: ../../lib/mpd.php:49
-msgid "Error"
-msgstr "Errore"
+#: ../../register.php:165
+msgid "Registration Complete"
+msgstr "Registrazione completata"
 
-#: ../../lib/class/catalog.class.php:919
-msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
-msgstr "Impossibile caricare la libreria XMLRPC, verifica che XML-RPC sia abilitato"
+#: ../../amp-mpd.php:171 ../../playlist.php:68
+msgid "New Playlist"
+msgstr "Nuova playlist"
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
-msgid "Error connecting to"
-msgstr "Errore connettendosi a"
+#: ../../templates/show_confirmation.inc.php:30
+msgid "Continue"
+msgstr "Continua"
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
-msgid "Code"
-msgstr "Codice"
+#: ../../templates/show_get_albumart.inc.php:28
+msgid "Customize Search"
+msgstr "Personalizza ricerca"
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
-msgid "Reason"
-msgstr "Motivazione"
+#: ../../templates/show_get_albumart.inc.php:33
+#: ../../lib/class/song.class.php:304 ../../templates/show_artists.inc:39
+#: ../../templates/show_artists.inc:62 ../../templates/show_mpdpl.inc:63
+#: ../../templates/show_uploads.inc:35 ../../templates/show_albums.inc:40
+#: ../../templates/show_albums.inc:70 ../../templates/show_search.inc:71
+#: ../../templates/show_songs.inc:42 ../../templates/list_duplicates.inc:33
+msgid "Artist"
+msgstr "Artista"
 
-#: ../../lib/class/catalog.class.php:974
-msgid "Completed updating remote catalog(s)"
-msgstr ""
+#: ../../templates/show_get_albumart.inc.php:41
+#: ../../lib/class/song.class.php:309 ../../templates/show_mpdpl.inc:64
+#: ../../templates/show_uploads.inc:36 ../../templates/show_albums.inc:38
+#: ../../templates/show_albums.inc:68 ../../templates/show_search.inc:78
+#: ../../templates/show_songs.inc:43 ../../templates/list_duplicates.inc:34
+msgid "Album"
+msgstr "Album"
 
-#: ../../lib/class/catalog.class.php:1105
-msgid "Checking"
-msgstr "Controllo in corso"
+#: ../../templates/show_get_albumart.inc.php:49
+msgid "Direct URL to Image"
+msgstr "URL diretto all' immagine"
 
-#: ../../lib/class/catalog.class.php:1163
-msgid "Catalog Clean Done"
-msgstr "Pulizia catalogo terminata"
+#: ../../templates/show_get_albumart.inc.php:59
+msgid "Get Art"
+msgstr "Preleva copertina"
 
-#: ../../lib/class/catalog.class.php:1163
-msgid "files removed"
-msgstr "files rimossi"
+#: ../../templates/sidebar.inc.php:29
+msgid "Users"
+msgstr "Utenti"
 
-#: ../../lib/class/catalog.class.php:1436
-msgid "Updating the"
-msgstr "Aggiornamento di"
+#: ../../templates/sidebar.inc.php:30
+msgid "Mail Users"
+msgstr "Posta utenti"
 
-#: ../../lib/class/catalog.class.php:1436 ../../templates/admin_menu.inc:35
+#: ../../templates/sidebar.inc.php:31 ../../lib/class/catalog.class.php:1469
 msgid "Catalog"
 msgstr "Catalogo"
 
-#: ../../lib/class/catalog.class.php:1437
-msgid "songs found checking tag information."
-msgstr ""
-
-#: ../../lib/class/catalog.class.php:1484
-msgid " FOUND"
-msgstr "TROVATO"
-
-#: ../../lib/class/catalog.class.php:1485
-msgid "Searching for new Album Art"
-msgstr ""
-
-#: ../../lib/class/catalog.class.php:1489
-msgid "Album Art Already Found"
-msgstr ""
-
-#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
-msgid "Could not add"
-msgstr "Impossibile aggiungere"
-
-#: ../../lib/Browser.php:867
-msgid "file"
-msgstr "file"
-
-#: ../../lib/Browser.php:871
-msgid "File uploads not supported."
-msgstr ""
-
-#: ../../lib/Browser.php:889
-msgid "No file uploaded"
-msgstr ""
+#: ../../templates/sidebar.inc.php:32
+msgid "Site Preferences"
+msgstr "Impostazioni sito"
+
+#: ../../templates/sidebar.inc.php:33
+msgid "Access List"
+msgstr "Liste di accesso"
 
-#: ../../lib/Browser.php:896
-#, php-format
-msgid "There was a problem with the file upload: No %s was uploaded."
-msgstr ""
+#: ../../templates/sidebar.inc.php:35 ../../templates/sidebar.inc.php:136
+#: ../../templates/show_local_catalog_info.inc.php:18
+#: ../../templates/show_genre.inc.php:36 ../../templates/show_artists.inc:42
+#: ../../templates/show_artists.inc:65 ../../templates/show_search.inc:136
+#: ../../templates/show_browse_menu.inc:36
+msgid "Albums"
+msgstr "Albums"
 
-#: ../../lib/Browser.php:901
-#, php-format
-msgid ""
-"There was a problem with the file upload: The %s was larger than the maximum "
-"allowed size (%d bytes)."
-msgstr ""
+#: ../../templates/sidebar.inc.php:36 ../../templates/sidebar.inc.php:135
+#: ../../templates/show_local_catalog_info.inc.php:22
+#: ../../templates/show_genre.inc.php:41 ../../templates/show_search.inc:137
+#: ../../templates/show_browse_menu.inc:35
+msgid "Artists"
+msgstr "Artisti"
 
-#: ../../lib/Browser.php:903
-#, php-format
-msgid "There was a problem with the file upload: The %s was only partially uploaded."
-msgstr ""
+#: ../../templates/sidebar.inc.php:37 ../../templates/show_genre.inc.php:32
+#: ../../templates/show_genres.inc.php:36 ../../lib/class/song.class.php:322
+#: ../../templates/show_mpdpl.inc:67 ../../templates/show_uploads.inc:37
+#: ../../templates/show_search.inc:83 ../../templates/show_songs.inc:48
+#: ../../templates/show_browse_menu.inc:37
+msgid "Genre"
+msgstr "Genere"
 
-#: ../../lib/ui.lib.php:199
-msgid "Playlist Actions"
-msgstr "Azioni Playlist"
+#: ../../templates/sidebar.inc.php:38
+msgid "Lists"
+msgstr "Liste"
 
-#: ../../lib/ui.lib.php:199
-msgid "New"
-msgstr "Nuova"
+#: ../../templates/sidebar.inc.php:45 ../../templates/menu.inc:29
+msgid "Home"
+msgstr "Inizio"
 
-#: ../../lib/ui.lib.php:200
-msgid "View All"
-msgstr "Mostra tutto"
+#: ../../templates/sidebar.inc.php:49 ../../templates/menu.inc:63
+#: ../../templates/menu.inc:66
+msgid "Admin"
+msgstr "Amministrazione"
 
-#: ../../lib/ui.lib.php:201
-msgid "Import"
-msgstr "Importa"
+#: ../../templates/sidebar.inc.php:66 ../../templates/menu.inc:40
+msgid "Preferences"
+msgstr "Impostazioni"
 
-#: ../../lib/ui.lib.php:301 ../../templates/menu.inc:35
+#: ../../templates/sidebar.inc.php:69 ../../lib/ui.lib.php:299
+#: ../../templates/menu.inc:35 ../../templates/header.inc:50
 msgid "Browse"
 msgstr "Sfoglia"
 
-#: ../../lib/ui.lib.php:303
-msgid "Show w/o art"
-msgstr "Mostra senza immagini"
-
-#: ../../lib/ui.lib.php:306
-msgid "Show all"
-msgstr "Mostra tutto"
-
-#: ../../lib/ui.lib.php:446
-msgid "No songs in this playlist."
-msgstr "Non ci sono brani in questa playlist"
-
-#: ../../lib/ui.lib.php:592
-msgid "No Catalogs Found!"
-msgstr "Non Ã¨ stato trovato alcun catalogo"
-
-#: ../../lib/ui.lib.php:593 ../../templates/add_catalog.inc:28
-msgid "Add a Catalog"
-msgstr "Aggiungi un catalogo"
+#: ../../templates/sidebar.inc.php:85 ../../templates/show_upload.inc:73
+#: ../../templates/menu.inc:43
+msgid "Upload"
+msgstr ""
 
-#: ../../lib/ui.lib.php:594 ../../templates/show_local_catalog_info.inc.php:7
-msgid "Catalog Statistics"
-msgstr "Statistiche catalogo"
+#: ../../templates/sidebar.inc.php:89
+#: ../../templates/show_playlists.inc.php:28 ../../templates/menu.inc:38
+msgid "Playlists"
+msgstr "Playlists"
 
-#: ../../lib/ui.lib.php:630
-msgid "day"
-msgstr "giorno"
+#: ../../templates/sidebar.inc.php:93 ../../templates/menu.inc:32
+msgid "Local Play"
+msgstr "Riproduzione locale"
 
-#: ../../lib/ui.lib.php:630
-msgid "days"
-msgstr "giorni"
+#: ../../templates/sidebar.inc.php:97 ../../templates/sidebar.inc.php:103
+#: ../../lib/duplicates.php:132 ../../templates/show_search_bar.inc:41
+#: ../../templates/show_search.inc:171 ../../templates/menu.inc:39
+msgid "Search"
+msgstr "Cerca"
 
-#: ../../lib/ui.lib.php:632
-msgid "hour"
-msgstr "ora"
+#: ../../templates/sidebar.inc.php:112
+#: ../../templates/show_playlists.inc.php:66
+#: ../../templates/show_artists.inc:56 ../../templates/show_albums.inc:59
+#: ../../templates/show_mpdplay.inc:114
+msgid "Random"
+msgstr "Casuale"
 
-#: ../../lib/ui.lib.php:632
-msgid "hours"
-msgstr "ore"
+#: ../../templates/sidebar.inc.php:128
+#: ../../templates/show_random_play_bar.inc.php:45 ../../lib/ui.lib.php:1053
+#: ../../templates/show_artists.inc:55 ../../templates/show_albums.inc:58
+#: ../../templates/show_random_play.inc:46
+msgid "All"
+msgstr "Tutti"
 
-#: ../../lib/upload.php:225
-msgid "The file uploaded successfully"
-msgstr ""
+#: ../../templates/sidebar.inc.php:133
+#: ../../templates/show_random_play_bar.inc.php:49
+#: ../../templates/show_local_catalog_info.inc.php:26
+#: ../../templates/show_genre.inc.php:46
+#: ../../templates/show_genres.inc.php:37 ../../templates/show_artists.inc:41
+#: ../../templates/show_artists.inc:64 ../../templates/show_albums.inc:41
+#: ../../templates/show_albums.inc:71 ../../templates/show_search.inc:135
+msgid "Songs"
+msgstr "Brani"
 
-#: ../../lib/upload.php:226
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+#: ../../templates/sidebar.inc.php:134
+#: ../../templates/show_random_play_bar.inc.php:50
+msgid "Minutes"
+msgstr "Minuti"
 
-#: ../../lib/upload.php:227
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form"
-msgstr ""
+#: ../../templates/sidebar.inc.php:137
+#: ../../templates/show_random_play_bar.inc.php:53
+msgid "Less Played"
+msgstr "Meno ascoltati"
 
-#: ../../lib/upload.php:228
-msgid "The uploaded file was only partially uploaded"
-msgstr ""
+#: ../../templates/sidebar.inc.php:141
+#: ../../templates/show_random_play_bar.inc.php:58
+msgid "Enqueue"
+msgstr "Accoda"
 
-#: ../../lib/upload.php:229
-msgid "No file was uploaded"
-msgstr ""
+#: ../../templates/sidebar.inc.php:146 ../../templates/menu.inc:75
+#: ../../templates/menu.inc:81 ../../templates/menu.inc:85
+msgid "Logout"
+msgstr "Uscita"
 
-#: ../../lib/upload.php:230
-msgid "Missing a temporary folder"
-msgstr "Manca una cartella temporanea"
+#: ../../templates/show_all_popular.inc.php:37
+msgid "Most Popular Genres"
+msgstr "Genere piÃ¹ popolare"
 
-#: ../../modules/lib.php:709
-msgid "Public"
-msgstr "Pubblica"
-
-#: ../../modules/lib.php:710
-msgid "Your Private"
-msgstr "Privata personale"
-
-#: ../../modules/lib.php:711
-msgid "Other Private"
-msgstr "Privata"
+#: ../../templates/show_playlists.inc.php:31
+msgid "Playlist Name"
+msgstr "Nome playlist"
+
+#: ../../templates/show_playlists.inc.php:32
+msgid "# Songs"
+msgstr "NÂ° Brani"
+
+#: ../../templates/show_playlists.inc.php:33
+msgid "Owner"
+msgstr "Proprietario"
+
+#: ../../templates/show_playlists.inc.php:34
+msgid "Actions"
+msgstr "Azioni"
 
-#: ../../modules/lib.php:792 ../../templates/show_play_selected.inc.php:72
+#: ../../templates/show_playlists.inc.php:51
+#: ../../templates/show_play_selected.inc.php:73
 msgid "View"
 msgstr "Visualizza"
 
-#: ../../modules/lib.php:795 ../../templates/show_play_selected.inc.php:73
-#: ../../templates/show_users.inc:52 ../../templates/show_users.inc:86
+#: ../../templates/show_playlists.inc.php:55
+#: ../../templates/show_play_selected.inc.php:74
+#: ../../templates/show_users.inc:58 ../../templates/show_users.inc:102
 msgid "Edit"
 msgstr "Modifica"
 
-#: ../../modules/lib.php:796 ../../templates/catalog.inc:60
-#: ../../templates/show_users.inc:61 ../../templates/show_uploads.inc:50
+#: ../../templates/show_playlists.inc.php:58
+#: ../../templates/show_uploads.inc:50 ../../templates/show_users.inc:70
+#: ../../templates/catalog.inc:57
 msgid "Delete"
 msgstr "Cancella"
 
-#: ../../modules/lib.php:804 ../../templates/show_genres.inc.php:48
-#: ../../templates/show_localplay.inc:41 ../../templates/show_artists.inc:54
-#: ../../templates/show_albums.inc:57 ../../templates/show_artist.inc:80
-#: ../../templates/show_mpdplay.inc:50
+#: ../../templates/show_playlists.inc.php:63
+#: ../../templates/show_genres.inc.php:48 ../../templates/show_artists.inc:54
+#: ../../templates/show_localplay.inc:41 ../../templates/show_albums.inc:57
+#: ../../templates/show_artist.inc:67 ../../templates/show_mpdplay.inc:64
 msgid "Play"
 msgstr "Riproduci"
 
-#: ../../modules/lib.php:805 ../../templates/show_artists.inc:56
-#: ../../templates/show_albums.inc:59 ../../templates/show_mpdplay.inc:85
-msgid "Random"
-msgstr "Casuale"
-
-#: ../../modules/lib.php:811 ../../templates/show_songs.inc:116
-#: ../../templates/show_album.inc:61 ../../templates/show_albums.inc:61
-#: ../../templates/show_artist.inc:82
+#: ../../templates/show_playlists.inc.php:71 ../../templates/show_album.inc:75
+#: ../../templates/show_albums.inc:61 ../../templates/show_artist.inc:69
+#: ../../templates/show_songs.inc:140
 msgid "Download"
 msgstr "Scarica"
 
-#: ../../modules/lib.php:822
-msgid "There are no playlists of this type"
-msgstr "Non ci sono playlist di questo tipo"
+#: ../../templates/show_playlist_box.inc.php:26
+msgid "Playlist Actions"
+msgstr "Azioni Playlist"
 
-#: ../../modules/lib.php:857
-msgid "Create a new playlist"
+#: ../../templates/show_playlist_box.inc.php:27
+msgid "Create New Playlist"
 msgstr "Crea nuova playlist"
 
-#: ../../modules/admin.php:46
-msgid "Manage Users"
-msgstr "Gestione utenti"
+#: ../../templates/show_playlist_box.inc.php:28
+msgid "View All Playlists"
+msgstr "Mostra tutte le playlist"
+
+#: ../../templates/show_playlist_box.inc.php:29
+msgid "Import From File"
+msgstr "Importazione da file"
 
-#: ../../modules/admin.php:48 ../../templates/show_admin_index.inc:34
-msgid "Add a new user"
-msgstr "Aggiungi nuovo utente"
+#: ../../templates/show_preference_box.inc.php:44
+msgid "Preference"
+msgstr "Parametro"
 
-#: ../../admin/catalog.php:55 ../../templates/catalog.inc:66
-msgid "Add to Catalog(s)"
-msgstr "Aggiungi al/ai cataloghi"
+#: ../../templates/show_preference_box.inc.php:45
+msgid "Value"
+msgstr "Valore"
 
-#: ../../admin/catalog.php:66 ../../templates/catalog.inc:67
-msgid "Add to all Catalogs"
-msgstr "Aggiungi a tutti i cataloghi"
+#: ../../templates/show_preference_box.inc.php:47
+msgid "Apply to All"
+msgstr "Applica a tutti"
 
-#: ../../admin/catalog.php:75
-msgid "Error Connecting"
-msgstr "Errore in connessione"
+#: ../../templates/show_preference_box.inc.php:54
+msgid "description"
+msgstr "descrizione"
 
-#: ../../admin/catalog.php:89 ../../templates/catalog.inc:73
-msgid "Update Catalog(s)"
-msgstr "Aggiorna catalogo/ghi"
+#: ../../templates/show_import_playlist.inc.php:26
+msgid "Importing a Playlist from a File"
+msgstr "Importazione playlist da file"
 
-#: ../../admin/catalog.php:100 ../../templates/catalog.inc:74
-msgid "Update All Catalogs"
-msgstr "Aggiorna tutti i cataloghi"
+#: ../../templates/show_import_playlist.inc.php:29
+#: ../../templates/show_uploads.inc:41 ../../templates/show_search.inc:95
+#: ../../templates/list_duplicates.inc:38
+msgid "Filename"
+msgstr "Nome file"
 
-#: ../../admin/catalog.php:132 ../../templates/catalog.inc:80
-msgid "Clean Catalog(s)"
-msgstr "Vuota catalogo/ghi"
+#: ../../templates/show_import_playlist.inc.php:36
+msgid "Playlist Type"
+msgstr "Tipo playlist"
 
-#: ../../admin/catalog.php:162 ../../templates/catalog.inc:81
-msgid "Clean All Catalogs"
-msgstr "Vuota titti i cataloghi"
+#: ../../templates/show_import_playlist.inc.php:49
+msgid "Import Playlist"
+msgstr "Importa playlist"
 
-#: ../../admin/catalog.php:212
-msgid "Now Playing Cleared"
-msgstr ""
+#: ../../templates/show_user_registration.inc.php:59
+msgid "Ampache New User Registration"
+msgstr "Registrazione nuovo utente Ampache"
+
+#: ../../templates/show_user_registration.inc.php:74
+msgid "User Agreement"
+msgstr "Consenso utente"
+
+#: ../../templates/show_user_registration.inc.php:84
+msgid "I Accept"
+msgstr "Accetto"
+
+#: ../../templates/show_user_registration.inc.php:101
+msgid "User Information"
+msgstr "Informazioni utente"
+
+#: ../../templates/show_user_registration.inc.php:109
+#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/userform.inc:40 ../../templates/show_users.inc:43
+msgid "Username"
+msgstr "Nome utente"
 
-#: ../../admin/catalog.php:212
-msgid "All now playing data has been cleared"
-msgstr ""
+#: ../../templates/show_user_registration.inc.php:119
+#: ../../templates/userform.inc:48
+msgid "Full Name"
+msgstr "Nome completo"
 
-#: ../../admin/catalog.php:217
-msgid "Do you really want to clear your catalog?"
-msgstr "Vuoi veramente svuotare il tuo catalogo"
+#: ../../templates/show_user_registration.inc.php:128
+#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:55
+msgid "E-mail"
+msgstr "E-mail"
 
-#: ../../admin/catalog.php:224
-msgid "Do you really want to clear the statistics for this catalog?"
-msgstr "Vuoi veramente eliminare le statistiche di questo catalogo?"
+#: ../../templates/show_user_registration.inc.php:137
+#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/userform.inc:63 ../../templates/show_login_form.inc:53
+msgid "Password"
+msgstr "Password"
 
-#: ../../admin/catalog.php:241
-msgid "Do you really want to delete this catalog?"
-msgstr "Vuoi veramente cancellare questo catalogo?"
-
-#: ../../admin/catalog.php:272
-msgid "Album Art Search Finished"
-msgstr ""
-
-#: ../../admin/users.php:76 ../../admin/users.php:123
-msgid "Error Username Required"
-msgstr "Errore, E' necessario un nome utente"
-
-#: ../../admin/users.php:79 ../../admin/users.php:119
-msgid "Error Passwords don't match"
-msgstr "Errore password non corrispondente"
-
-#: ../../admin/users.php:128
-msgid "Error Username already exists"
-msgstr "Errore, Nome utente giÃ  in uso"
-
-#: ../../admin/users.php:149
-msgid "Are you sure you want to permanently delete"
-msgstr "Sei sicuro di volere cancellare permanentemente"
-
-#: ../../admin/users.php:156 ../../templates/show_confirm_action.inc.php:29
-#: ../../templates/show_search.inc:89
-msgid "No"
-msgstr "No"
-
-#: ../../admin/users.php:158
-msgid "User Deleted"
-msgstr "Utente cancellato"
-
-#: ../../admin/users.php:161
-msgid "Delete Error"
-msgstr "Errore di ancellazione"
-
-#: ../../admin/users.php:161
-msgid "Unable to delete last Admin User"
-msgstr "Impossibile cancellare l' ultimo utente amministratore"
+#: ../../templates/show_user_registration.inc.php:146
+#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
+msgid "Confirm Password"
+msgstr "Conferma password"
 
-#: ../../admin/access.php:43
-msgid "Do you really want to delete this Access Record?"
-msgstr ""
+#: ../../templates/show_user_registration.inc.php:166
+msgid "Clear Info"
+msgstr "Cancella informazioni"
 
-#: ../../admin/access.php:51
-msgid "Entry Deleted"
-msgstr "Voce cancellata"
+#: ../../templates/show_user_registration.inc.php:167
+msgid "Register User"
+msgstr "Registra utente"
 
-#: ../../admin/access.php:51
-msgid "Your Access List Entry has been removed"
-msgstr ""
+#: ../../templates/show_object_rating.inc.php:25
+#: ../../templates/show_songs.inc:52
+msgid "Rating"
+msgstr "Voto"
 
-#: ../../admin/access.php:61
-msgid "Entry Added"
-msgstr "Voce aggiunta"
+#: ../../templates/show_rename_artist.inc.php:33
+#: ../../templates/show_rename_artist.inc.php:51
+msgid "Rename"
+msgstr "Rinomina"
+
+#: ../../templates/show_rename_artist.inc.php:33
+msgid "to"
+msgstr "in"
 
-#: ../../admin/access.php:61
-msgid "Your new Access List Entry has been created"
-msgstr ""
+#: ../../templates/show_rename_artist.inc.php:40
+#: ../../templates/show_search.inc:144
+msgid "OR"
+msgstr "O"
 
-#: ../../admin/mail.php:98
-msgid "Mail to"
+#: ../../templates/show_rename_artist.inc.php:42
+msgid "Insert current"
 msgstr ""
 
-#: ../../admin/mail.php:109
-msgid "Subject"
-msgstr "Oggetto"
-
-#: ../../admin/mail.php:116
-msgid "Message"
-msgstr "Messaggio"
-
-#: ../../admin/mail.php:126
-msgid "Send Mail"
-msgstr "Invia Mail"
+#: ../../templates/show_rename_artist.inc.php:47
+msgid "Update id3 tags"
+msgstr "Aggiorna tags Id3"
 
-#: ../../admin/song.php:68
-msgid "Songs Disabled"
-msgstr "Brani disabilitati"
+#: ../../templates/show_random_play_bar.inc.php:31
+#: ../../templates/show_random_play.inc:28
+msgid "Play Random Selection"
+msgstr "Riproduzione selezione casuale"
 
-#: ../../admin/song.php:68
-msgid "The requested song(s) have been disabled"
-msgstr "I brani richiesti sono stati disabilitati"
+#: ../../templates/show_random_play_bar.inc.php:51
+msgid "Full Artists"
+msgstr "Tutti gli artisti"
 
-#: ../../admin/song.php:78
-msgid "Songs Enabled"
-msgstr "Brani abilitati"
+#: ../../templates/show_random_play_bar.inc.php:52
+#: ../../templates/show_random_play.inc:60
+msgid "Full Albums"
+msgstr "Tutti gli album"
 
-#: ../../admin/song.php:78
-msgid "The requested song(s) have been enabled"
-msgstr "I brani richiesti sono stati abilitati"
+#: ../../templates/show_random_play_bar.inc.php:55
+msgid "from"
+msgstr "da"
 
-#: ../../templates/show_user_registration.inc.php:28
-#: ../../templates/show_install_account.inc.php:59
-#: ../../templates/userform.inc:40 ../../templates/show_users.inc:40
-msgid "Username"
-msgstr "Nome utente"
+#: ../../templates/show_random_play_bar.inc.php:59
+msgid "Advanced"
+msgstr "Avanzato"
 
-#: ../../templates/show_user_registration.inc.php:36
-#: ../../templates/userform.inc:48
-msgid "Full Name"
-msgstr "Nome completo"
+#: ../../templates/show_local_catalog_info.inc.php:7 ../../lib/ui.lib.php:723
+msgid "Catalog Statistics"
+msgstr "Statistiche catalogo"
 
-#: ../../templates/show_user_registration.inc.php:44
-#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:55
-msgid "E-mail"
-msgstr "E-mail"
+#: ../../templates/show_local_catalog_info.inc.php:10
+msgid "Total Users"
+msgstr "Totale utenti"
 
-#: ../../templates/show_user_registration.inc.php:52
-#: ../../templates/show_install_account.inc.php:63
-#: ../../templates/userform.inc:63 ../../templates/show_login_form.inc:53
-msgid "Password"
-msgstr "Password"
+#: ../../templates/show_local_catalog_info.inc.php:14
+msgid "Connected Users"
+msgstr "Utenti connessi"
 
-#: ../../templates/show_user_registration.inc.php:60
-#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
-msgid "Confirm Password"
-msgstr "Conferma password"
+#: ../../templates/show_local_catalog_info.inc.php:30
+msgid "Catalog Size"
+msgstr "Dimensione catalogo"
 
-#: ../../templates/show_user_registration.inc.php:69
-msgid "Register User"
-msgstr "Registra utente"
+#: ../../templates/show_local_catalog_info.inc.php:34
+msgid "Catalog Time"
+msgstr "Durata catalogo"
 
 #: ../../templates/show_install_account.inc.php:35
+#: ../../templates/show_install.inc:35
 #: ../../templates/show_install_config.inc:35
-#: ../../templates/show_install.inc:34
 msgid "Ampache Installation"
 msgstr "Installazione Ampache"
 
 #: ../../templates/show_install_account.inc.php:37
+#: ../../templates/show_install.inc:37
 #: ../../templates/show_install_config.inc:37
-#: ../../templates/show_install.inc:36
 msgid ""
 "This Page handles the installation of the Ampache database and the creation "
 "of the ampache.cfg.php file. Before you continue please make sure that you "
 "have the following pre-requisites"
 msgstr ""
+"Questa pagina gestisce l'installazione del database di Ampache e la "
+"creazione del file ampache.cfg.php. Prima di continuare assicurati di avere "
+"i seguenti pre-requisiti"
 
 #: ../../templates/show_install_account.inc.php:40
+#: ../../templates/show_install.inc:40
 #: ../../templates/show_install_config.inc:40
-#: ../../templates/show_install.inc:39
 msgid "A MySQL Server with a username and password that can create/modify databases"
 msgstr ""
+"Un server MySQL con nome utente e password che consentono di creare/"
+"modificare database"
 
 #: ../../templates/show_install_account.inc.php:41
 msgid ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
 "ampache.cfg.dist.php file"
 msgstr ""
+"Il tuo webserver ha accesso in lettura al file /sql/ampache.sql ed al file "
+"/config/ampache.cfg.dist.php"
 
 #: ../../templates/show_install_account.inc.php:43
+#: ../../templates/show_install.inc:43
 #: ../../templates/show_install_config.inc:43
-#: ../../templates/show_install.inc:42
 msgid ""
 "Once you have ensured that you have the above requirements please fill out "
 "the information below. You will only be asked for the required config "
@@ -797,62 +753,118 @@
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:48
+#: ../../templates/show_install.inc:47
 #: ../../templates/show_install_config.inc:48
-#: ../../templates/show_install.inc:46
 msgid "Step 1 - Creating and Inserting the Ampache Database"
-msgstr ""
+msgstr "Passo 1 - Creazione ed inserimento del database Ampache"
 
 #: ../../templates/show_install_account.inc.php:49
 msgid "Step 2 - Creating the ampache.cfg.php file"
-msgstr ""
+msgstr "Passo 2 - Creazione del file ampache.cfg.php"
 
 #: ../../templates/show_install_account.inc.php:50
+#: ../../templates/show_install.inc:52
 #: ../../templates/show_install_config.inc:53
-#: ../../templates/show_install.inc:51
 msgid "Step 3 - Setup Initial Account"
-msgstr ""
+msgstr "Passo 3 -Impostazione account iniziale"
 
 #: ../../templates/show_install_account.inc.php:52
 msgid ""
 "This step creates your initial Ampache admin account. Once your admin "
 "account has been created you will be directed to the login page"
 msgstr ""
+"Questo passo crea il tuo accouunt iniziale di amministrazione. Una volta che "
+"l' account sarÃ  stato creato verrai ridiretto nella pagina di accesso."
 
-#: ../../templates/show_install_account.inc.php:68
+#: ../../templates/show_install_account.inc.php:55
+msgid "Create Admin Account"
+msgstr "Crea account Amministratore"
+
+#: ../../templates/show_install_account.inc.php:69
 msgid "Create Account"
 msgstr "Crea account"
 
+#: ../../templates/show_genre.inc.php:32
+msgid "Viewing"
+msgstr "Visualizzazione..."
+
+#: ../../templates/show_play_selected.inc.php:49
+msgid "Play Selected"
+msgstr "Riproduci selezionati"
+
+#: ../../templates/show_play_selected.inc.php:52
+msgid "Download Selected"
+msgstr "Scarica selezionati"
+
+#: ../../templates/show_play_selected.inc.php:55
+msgid "Flag Selected"
+msgstr "Modifica marcati"
+
+#: ../../templates/show_play_selected.inc.php:56
+msgid "Edit Selected"
+msgstr "Modifica selezionati"
+
+#: ../../templates/show_play_selected.inc.php:64
+msgid "Set Track Numbers"
+msgstr "Imposta numero brano"
+
+#: ../../templates/show_play_selected.inc.php:65
+msgid "Remove Selected Tracks"
+msgstr "Rimuovi brani selezionati"
+
+#: ../../templates/show_play_selected.inc.php:71
+msgid "Playlist"
+msgstr "Playlist"
+
+#: ../../templates/show_play_selected.inc.php:71
+msgid "Add to"
+msgstr "Aggiungi a"
+
 #: ../../templates/show_confirm_action.inc.php:28
-#: ../../templates/show_search.inc:88
+#: ../../templates/show_search.inc:106
 msgid "Yes"
 msgstr "Si"
 
-#: ../../templates/show_import_playlist.inc.php:26
-msgid "Importing a Playlist from a File"
-msgstr "Importazione playlist da file"
+#: ../../templates/show_genres.inc.php:38 ../../templates/show_artists.inc:43
+#: ../../templates/show_artists.inc:67 ../../templates/show_mpdpl.inc:68
+#: ../../templates/show_uploads.inc:32 ../../templates/show_albums.inc:45
+#: ../../templates/show_albums.inc:75 ../../templates/show_artist.inc:42
+#: ../../templates/show_access_list.inc:51 ../../templates/show_songs.inc:50
+msgid "Action"
+msgstr "Azione"
 
-#: ../../templates/show_import_playlist.inc.php:29
-#: ../../templates/show_search.inc:77 ../../templates/show_uploads.inc:41
-#: ../../templates/show_search_bar.inc:48
-msgid "Filename"
-msgstr "Nome file"
+#: ../../templates/show_artist_box.inc.php:26
+msgid "Albums by"
+msgstr "Album per"
 
-#: ../../templates/show_import_playlist.inc.php:36
-msgid "Playlist Type"
-msgstr "Tipo playlist"
+#: ../../templates/show_artist_box.inc.php:34
+msgid "Show All Songs By"
+msgstr "Mostra tutti i brani di"
 
-#: ../../templates/show_import_playlist.inc.php:49
-msgid "Import Playlist"
-msgstr "Importa playlist"
+#: ../../templates/show_artist_box.inc.php:35
+msgid "Play All Songs By"
+msgstr "Riproduci tutti i brani di"
+
+#: ../../templates/show_artist_box.inc.php:36
+msgid "Play Random Songs By"
+msgstr "Riproduci a caso i brani di"
+
+#: ../../templates/show_artist_box.inc.php:38
+#: ../../templates/show_album.inc:72
+msgid "Update from tags"
+msgstr "Aggiorna dai Tags"
+
+#: ../../templates/show_artist_box.inc.php:39
+msgid "Rename Artist"
+msgstr "Rinomina artista"
 
 #: ../../templates/show_user.inc.php:26
 msgid "Changing User Information for"
 msgstr "Modifica informazioni utente di"
 
-#: ../../templates/show_user.inc.php:31
-#: ../../templates/customize_catalog.inc:29
-#: ../../templates/show_add_access.inc:40
+#: ../../templates/show_user.inc.php:31 ../../templates/show_add_access.inc:40
 #: ../../templates/show_access_list.inc:47
+#: ../../templates/customize_catalog.inc:29
 msgid "Name"
 msgstr "Nome"
 
@@ -880,428 +892,545 @@
 msgid "Clear Stats"
 msgstr "Azzera stati"
 
-#: ../../templates/show_confirmation.inc.php:30
-msgid "Continue"
-msgstr "Continua"
+#: ../../play/index.php:50
+msgid "Session Expired: please log in again at"
+msgstr "Sessione scaduta: Per cortesia rifai il login"
 
-#: ../../templates/show_play_selected.inc.php:49
-msgid "Play Selected"
-msgstr "Riproduci selezionati"
+#: ../../flag.php:38
+msgid "Flagging song completed."
+msgstr "Marcatura brani completata"
 
-#: ../../templates/show_play_selected.inc.php:52
-msgid "Download Selected"
-msgstr "Scarica selezionati"
+#: ../../playlist.php:46
+msgid "Playlist Deleted"
+msgstr "Playlist cancellata"
+
+#: ../../playlist.php:46
+msgid "The Requested Playlist has been deleted"
+msgstr "La playlist richiesta Ã¨ stata cancellata"
+
+#: ../../playlist.php:56
+msgid "Are you sure you want to delete this playlist"
+msgstr "Sei sicuro di volere cancellare questa playlist"
+
+#: ../../playlist.php:112
+msgid "Playlist Created"
+msgstr "Playlist creata."
+
+#: ../../playlist.php:112
+msgid " has been created"
+msgstr " Ã¨ stata creata"
 
-#: ../../templates/show_play_selected.inc.php:55 ../../playlist.php:77
-msgid "Flag Selected"
-msgstr "Modifica marcati"
+#: ../../playlist.php:121
+msgid "Remote Selected Tracks"
+msgstr "Brani selezionati da remoto"
 
-#: ../../templates/show_play_selected.inc.php:56 ../../playlist.php:83
-msgid "Edit Selected"
-msgstr "Modifica selezionati"
+#: ../../playlist.php:139
+msgid "Playlist Updated"
+msgstr "Playlist aggiornata"
+
+#: ../../playlist.php:139
+msgid " has been updated"
+msgstr "Ã¨ stata aggiornata"
+
+#: ../../playlist.php:142
+msgid "Update Selected"
+msgstr "Aggiorna selezione"
 
-#: ../../templates/show_play_selected.inc.php:63
-msgid "Set Track Numbers"
-msgstr "Imposta numero brano"
+#: ../../user.php:45
+msgid "Error: Password Does Not Match or Empty"
+msgstr "Errore: Password non corrispondente o vuota"
 
-#: ../../templates/show_play_selected.inc.php:64
-msgid "Remove Selected Tracks"
-msgstr "Rimuovi brani selezionati"
+#: ../../user.php:51 ../../user.php:62
+msgid "Error: Insufficient Rights"
+msgstr "Errore: Permessi insufficienti"
 
-#: ../../templates/show_play_selected.inc.php:70
-msgid "Playlist"
-msgstr "Playlist"
+#: ../../lib/mpd.php:43 ../../lib/mpd.php:52
+msgid "Could not add"
+msgstr "Impossibile aggiungere"
 
-#: ../../templates/show_play_selected.inc.php:70
-msgid "Add to"
-msgstr "Aggiungi a"
+#: ../../lib/duplicates.php:102
+msgid "Find Duplicates"
+msgstr "Trova duplicati"
 
-#: ../../templates/show_all_popular.inc.php:27 ../../index.php:105
-msgid "Most Popular Artists"
-msgstr "Artista piÃ¹ popolare"
+#: ../../lib/duplicates.php:105
+msgid "Search Type"
+msgstr "Tipo di ricerca"
 
-#: ../../templates/show_all_popular.inc.php:30 ../../index.php:72
-msgid "Most Popular Albums"
-msgstr "Album piÃ¹ popolare"
+#: ../../lib/duplicates.php:113 ../../lib/class/song.class.php:275
+#: ../../templates/show_search.inc:66
+msgid "Title"
+msgstr "Titolo"
 
-#: ../../templates/show_all_popular.inc.php:37
-msgid "Most Popular Genres"
-msgstr "genere piÃ¹ popolare"
+#: ../../lib/duplicates.php:119
+msgid "Artist and Title"
+msgstr "Artista e titolo"
 
-#: ../../templates/show_all_popular.inc.php:40 ../../index.php:112
-msgid "Most Popular Songs"
-msgstr "Brani piÃ¹ popolari"
+#: ../../lib/duplicates.php:124
+msgid "Artist, Album and Title"
+msgstr "Artista, album e titolo"
 
-#: ../../templates/show_local_catalog_info.inc.php:10
-msgid "Total Users"
-msgstr "Totale utenti"
+#: ../../lib/ui.lib.php:222
+msgid "Error Access Denied"
+msgstr "Errore Accesso negato"
 
-#: ../../templates/show_local_catalog_info.inc.php:14
-msgid "Connected Users"
-msgstr "Utenti connessi"
+#: ../../lib/ui.lib.php:301
+msgid "Show w/o art"
+msgstr "Mostra senza immagini"
 
-#: ../../templates/show_local_catalog_info.inc.php:18
-#: ../../templates/show_genre.inc.php:36 ../../templates/show_artists.inc:42
-#: ../../templates/show_artists.inc:65 ../../templates/show_search.inc:118
-#: ../../templates/show_browse_menu.inc:36
-msgid "Albums"
-msgstr "Albums"
+#: ../../lib/ui.lib.php:304
+msgid "Show all"
+msgstr "Mostra tutto"
 
-#: ../../templates/show_local_catalog_info.inc.php:22
-#: ../../templates/show_genre.inc.php:41 ../../templates/show_search.inc:119
-#: ../../templates/show_browse_menu.inc:35
-msgid "Artists"
-msgstr "Artisti"
+#: ../../lib/ui.lib.php:721
+msgid "No Catalogs Found!"
+msgstr "Non Ã¨ stato trovato alcun catalogo"
 
-#: ../../templates/show_local_catalog_info.inc.php:26
-#: ../../templates/show_genres.inc.php:37
-#: ../../templates/show_genre.inc.php:46
-#: ../../templates/show_random_play_bar.inc.php:49
-#: ../../templates/show_artists.inc:41 ../../templates/show_artists.inc:64
-#: ../../templates/show_albums.inc:41 ../../templates/show_albums.inc:71
-#: ../../templates/show_search.inc:117
-msgid "Songs"
-msgstr "Brani"
+#: ../../lib/ui.lib.php:722 ../../templates/add_catalog.inc:29
+msgid "Add a Catalog"
+msgstr "Aggiungi un catalogo"
 
-#: ../../templates/show_local_catalog_info.inc.php:30
-msgid "Catalog Size"
-msgstr "Dimensione catalogo"
+#: ../../lib/ui.lib.php:759
+msgid "day"
+msgstr "giorno"
 
-#: ../../templates/show_local_catalog_info.inc.php:34
-msgid "Catalog Time"
-msgstr "Durata catalogo"
+#: ../../lib/ui.lib.php:759
+msgid "days"
+msgstr "giorni"
 
-#: ../../templates/show_genres.inc.php:38 ../../templates/show_artists.inc:43
-#: ../../templates/show_artists.inc:67 ../../templates/show_songs.inc:42
-#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:75
-#: ../../templates/show_access_list.inc:51 ../../templates/show_artist.inc:55
-#: ../../templates/show_mpdpl.inc:69 ../../templates/show_uploads.inc:32
-msgid "Action"
-msgstr "Azione"
+#: ../../lib/ui.lib.php:761
+msgid "hour"
+msgstr "ora"
 
-#: ../../templates/show_genre.inc.php:32
-msgid "Viewing"
-msgstr "Visualizzazione..."
+#: ../../lib/ui.lib.php:761
+msgid "hours"
+msgstr "ore"
 
-#: ../../templates/show_all_recent.inc.php:27 ../../index.php:123
-msgid "Newest Artist Additions"
-msgstr "Nuovi artisti aggiunti recentemente"
+#: ../../lib/upload.php:228
+msgid "The file uploaded successfully"
+msgstr ""
 
-#: ../../templates/show_all_recent.inc.php:30 ../../index.php:130
-msgid "Newest Album Additions"
-msgstr "Nuovi album aggiunti recentemente"
+#: ../../lib/upload.php:229
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
 
-#: ../../templates/show_random_play_bar.inc.php:31
-#: ../../templates/show_random_play.inc:28
-msgid "Play Random Selection"
-msgstr "Riproduzione selezione casuale"
+#: ../../lib/upload.php:230
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
 
-#: ../../templates/show_random_play_bar.inc.php:45 ../../randomplay.php:70
-#: ../../templates/show_artists.inc:55 ../../templates/show_albums.inc:58
-#: ../../templates/show_random_play.inc:46
-msgid "All"
-msgstr "Tutte"
+#: ../../lib/upload.php:231
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
 
-#: ../../templates/show_random_play_bar.inc.php:50
-msgid "Minutes"
-msgstr "Minuti"
+#: ../../lib/upload.php:232
+msgid "No file was uploaded"
+msgstr ""
 
-#: ../../templates/show_random_play_bar.inc.php:51
-msgid "Full Artists"
-msgstr "Tutti gli artisti"
+#: ../../lib/upload.php:233
+msgid "Missing a temporary folder"
+msgstr "Manca una cartella temporanea"
 
-#: ../../templates/show_random_play_bar.inc.php:52
-#: ../../templates/show_random_play.inc:60
-msgid "Full Albums"
-msgstr "Tutti gli album"
+#: ../../lib/Browser.php:867
+msgid "file"
+msgstr "file"
 
-#: ../../templates/show_random_play_bar.inc.php:53
-msgid "Less Played"
-msgstr "Meno ascoltati"
+#: ../../lib/Browser.php:871
+msgid "File uploads not supported."
+msgstr ""
 
-#: ../../templates/show_random_play_bar.inc.php:55
-msgid "from"
-msgstr "da"
+#: ../../lib/Browser.php:889
+msgid "No file uploaded"
+msgstr ""
 
-#: ../../templates/show_random_play_bar.inc.php:58
-msgid "Enqueue"
-msgstr "Accoda"
+#: ../../lib/Browser.php:896
+#, php-format
+msgid "There was a problem with the file upload: No %s was uploaded."
+msgstr ""
 
-#: ../../templates/show_random_play_bar.inc.php:59
-msgid "Advanced"
-msgstr "Avanzato"
+#: ../../lib/Browser.php:901
+#, php-format
+msgid ""
+"There was a problem with the file upload: The %s was larger than the maximum "
+"allowed size (%d bytes)."
+msgstr ""
 
-#: ../../localplay.php:79
-msgid "Unknown action requested"
-msgstr "Azione richiesta sconosciuta"
+#: ../../lib/Browser.php:903
+#, php-format
+msgid "There was a problem with the file upload: The %s was only partially uploaded."
+msgstr ""
 
-#: ../../artists.php:48
-msgid "All songs by"
-msgstr "Tutte i brani di"
+#: ../../lib/rating.lib.php:55
+msgid "Don't Play"
+msgstr "Non riprodurre"
 
-#: ../../artists.php:57 ../../albums.php:106
-msgid "Starting Update from Tags"
-msgstr "Inizio aggiornamento da Tags"
+#: ../../lib/rating.lib.php:58
+msgid "It's Pretty Bad"
+msgstr ""
 
-#: ../../artists.php:62 ../../albums.php:111
-msgid "Update From Tags Complete"
-msgstr "Aggiornamento da Tags ultimato"
+#: ../../lib/rating.lib.php:61
+msgid "It's Ok"
+msgstr "E' ok"
 
-#: ../../artists.php:72 ../../artists.php:76 ../../artists.php:82
-#: ../../artists.php:95
-msgid "Show Artists starting with"
-msgstr "Mostra artisti che iniziano per"
+#: ../../lib/rating.lib.php:64
+msgid "It's Pretty Good"
+msgstr ""
 
-#: ../../amp-mpd.php:176 ../../playlist.php:135
-msgid "New Playlist"
-msgstr "Nuova playlist"
+#: ../../lib/rating.lib.php:67
+msgid "I Love It!"
+msgstr "lo adoro!"
 
-#: ../../playlist.php:115
-msgid "owned by"
-msgstr "proprietÃ  di"
-
-#: ../../playlist.php:118
-msgid "Edit Playlist"
-msgstr "Modifica playlist"
+#: ../../lib/rating.lib.php:70
+msgid "It's Insane"
+msgstr ""
 
-#: ../../playlist.php:121
-msgid "Play Full Playlist"
-msgstr "Riproduci tutta la playlist"
+#: ../../lib/rating.lib.php:74
+msgid "Off the Charts!"
+msgstr ""
 
-#: ../../playlist.php:122
-msgid "Play Random"
-msgstr "Riproduci casualmente"
-
-#: ../../playlist.php:192
-msgid "Playlist updated."
-msgstr "Playlist aggiornata."
-
-#: ../../index.php:42
-msgid "Welcome to"
-msgstr "Benvenuto su"
-
-#: ../../index.php:44
-msgid "you are currently logged in as"
-msgstr "sei attualmente connesso come"
+#: ../../lib/general.lib.php:675
+msgid "Not Enough Data"
+msgstr "Dati insufficienti"
 
-#: ../../user.php:45
-msgid "Error: Password Does Not Match or Empty"
-msgstr "Errore: Password non corrispondente o vuota"
+#: ../../lib/general.lib.php:897 ../../lib/general.lib.php:908
+msgid "English"
+msgstr "Inglese"
 
-#: ../../user.php:51 ../../user.php:62
-msgid "Error: Insufficient Rights"
-msgstr "Errore: Permessi insufficienti"
+#: ../../lib/general.lib.php:907
+msgid "German"
+msgstr "Tedesco"
 
-#: ../../flag.php:35
-msgid "Flagging song completed."
-msgstr "Marcatura brani completata"
+#: ../../lib/general.lib.php:909
+msgid "British English"
+msgstr "Inglese britannico"
 
-#: ../../albums.php:44
-msgid "Album Art Cleared"
-msgstr ""
+#: ../../lib/general.lib.php:910
+msgid "Spanish"
+msgstr "Spagnolo"
 
-#: ../../albums.php:44
-msgid "Album Art information has been removed form the database"
-msgstr ""
+#: ../../lib/general.lib.php:911
+msgid "French"
+msgstr "Francese"
 
-#: ../../albums.php:78
-msgid "Album Art Located"
-msgstr ""
+#: ../../lib/general.lib.php:912
+msgid "Italian"
+msgstr "Italiano"
 
-#: ../../albums.php:78
-msgid ""
-"Album Art information has been located in Amazon. If incorrect, click "
-"\"Reset Album Art\" below to remove the artwork."
-msgstr ""
+#: ../../lib/general.lib.php:913
+msgid "Dutch"
+msgstr "Olandese"
 
-#: ../../albums.php:86 ../../albums.php:96
-msgid "Get Art"
-msgstr ""
+#: ../../lib/general.lib.php:914
+msgid "Turkish"
+msgstr "Turco"
 
-#: ../../albums.php:90
-msgid "Album Art Not Located"
-msgstr ""
+#: ../../lib/general.lib.php:915
+msgid "Simplified Chinese"
+msgstr "Cinese semplificato"
 
-#: ../../albums.php:90
-msgid ""
-"Album Art could not be located at this time. This may be due to Amazon being "
-"busy, or the album not being present in their collection."
-msgstr ""
+#: ../../lib/general.lib.php:916
+msgid "Unknown"
+msgstr "Sconosciuto"
 
-#: ../../albums.php:127 ../../albums.php:133 ../../albums.php:140
-#: ../../albums.php:145 ../../albums.php:150
-msgid "Show Albums starting with"
-msgstr "Mostra album che iniziano per"
+#: ../../lib/preferences.php:252 ../../templates/show_users.inc:118
+msgid "Enable"
+msgstr "Abilitato"
 
-#: ../../tv.php:76 ../../templates/show_now_playing.inc:31
-msgid "Now Playing"
-msgstr "In esecuzione"
+#: ../../lib/preferences.php:253 ../../templates/show_users.inc:121
+#: ../../templates/list_duplicates.inc:31
+msgid "Disable"
+msgstr "Disabilitato"
 
-#: ../../randomplay.php:60
-#, fuzzy
-msgid "Play Random Selection from Multiple Genres"
-msgstr "Riproduzione selezione casuale"
+#: ../../lib/preferences.php:265 ../../templates/add_catalog.inc:61
+msgid "Local"
+msgstr "Locale"
 
-#: ../../randomplay.php:67 ../../templates/show_random_play.inc:34
-msgid "Item count"
-msgstr "Totale voci"
+#: ../../lib/preferences.php:268
+msgid "Stream"
+msgstr "Stream"
 
-#: ../../randomplay.php:81 ../../templates/show_random_play.inc:49
-msgid "From genre"
-msgstr "Da genere"
+#: ../../lib/preferences.php:271
+msgid "IceCast"
+msgstr "IceCast"
 
-#: ../../randomplay.php:90 ../../templates/show_random_play.inc:59
-msgid "Favor Unplayed"
+#: ../../lib/preferences.php:274
+msgid "Downsample"
 msgstr ""
 
-#: ../../randomplay.php:91
-msgid "Favor Full Albums"
-msgstr ""
+#: ../../lib/preferences.php:277
+msgid "Music Player Daemon"
+msgstr "Music Player Daemon"
 
-#: ../../randomplay.php:92
-msgid "Favor Full Artist"
-msgstr ""
+#: ../../lib/preferences.php:280
+msgid "SlimServer"
+msgstr "SlimServer"
 
-#: ../../randomplay.php:101 ../../templates/show_random_play.inc:66
-msgid "from catalog"
-msgstr "da catalogo"
+#: ../../lib/preferences.php:289
+msgid "M3U"
+msgstr "M3U"
 
-#: ../../randomplay.php:112 ../../templates/show_random_play.inc:75
-msgid "Play Random Songs"
-msgstr "Riproduzione casuale brani"
+#: ../../lib/preferences.php:290
+msgid "Simple M3U"
+msgstr "M3U semplice"
 
-#: ../../bin/print_tags.php.inc:43
-msgid ""
-"[print_tags.php.inc]\n"
-"This commandline script will display the tag information for the specified "
-"filename as it will \n"
-"appear to Ampache. \n"
-"        \n"
-msgstr ""
+#: ../../lib/preferences.php:291
+msgid "PLS"
+msgstr "PLS"
 
-#: ../../bin/print_tags.php.inc:49
-msgid "Filename:"
-msgstr "Nome file:"
+#: ../../lib/preferences.php:292
+msgid "Asx"
+msgstr "Asx"
 
-#: ../../bin/quarantine_migration.php.inc:49
-msgid "Error: Unable to write to"
-msgstr "Errore: Impossibile scrivere su"
+#: ../../lib/preferences.php:293
+msgid "RAM"
+msgstr "RAM"
 
-#: ../../bin/quarantine_migration.php.inc:56
-msgid "Error: Upload directory not inside a catalog"
-msgstr ""
+#: ../../lib/class/stream.class.php:198
+msgid "Opened for writing"
+msgstr "Aperto per la scrittura"
 
-#: ../../bin/quarantine_migration.php.inc:74
-msgid "Moved"
-msgstr "Spostato"
+#: ../../lib/class/stream.class.php:203
+msgid "Error, cannot write"
+msgstr "Errore, impossibile scrivere"
 
-#: ../../bin/quarantine_migration.php.inc:78
-msgid "Adding"
-msgstr "Aggiunta"
+#: ../../lib/class/stream.class.php:214
+msgid "Error, cannot write song in file"
+msgstr "Errore, impossibile scrivere brano sul file"
 
-#: ../../bin/quarantine_migration.php.inc:78
-msgid "to database"
-msgstr "al database"
+#: ../../lib/class/stream.class.php:220
+msgid "Closed after write"
+msgstr "Chiuso dopo la scrittura"
 
-#: ../../bin/quarantine_migration.php.inc:86
-msgid "Move Failed"
-msgstr "Spostamento fallito"
+#: ../../lib/class/catalog.class.php:281 ../../lib/class/catalog.class.php:566
+#: ../../lib/class/album.class.php:263
+msgid "Error: Unable to open"
+msgstr "Errore: Impossibile aprire"
 
-#: ../../bin/quarantine_migration.php.inc:97
-msgid "Deleted"
-msgstr "Cancellato"
+#: ../../lib/class/catalog.class.php:304
+msgid "Error: Unable to change to directory"
+msgstr "Errore: Impossibile cambiare alla cartella"
 
-#: ../../bin/quarantine_migration.php.inc:113
-msgid ""
-"\n"
-"\t\n"
-"************* WARNING *************\n"
-"This script will move, and \n"
-"potentially delete uploaded files.\n"
-"************* WARNING *************\n"
-"\n"
-"All files marked for add will be moved to the upload directory. All files \n"
-"marked for deletion will be deleted. This script must be run as a user with\n"
-"sufficient rights to perform the above two functions. \n"
-"\n"
-"\t\n"
-msgstr ""
+#: ../../lib/class/catalog.class.php:330
+msgid "Error: Unable to get filesize for"
+msgstr "Errore, impossibile leggere la dimensione del file"
 
-#: ../../bin/quarantine_migration.php.inc:127
-msgid "Continue?  (Y/N):"
-msgstr "Continua?  (Y/N):"
+#: ../../lib/class/catalog.class.php:365
+msgid "Added"
+msgstr "Aggiunti"
 
-#: ../../bin/quarantine_migration.php.inc:151
-msgid "Error:  "
-msgstr "Errore:  "
+#: ../../lib/class/catalog.class.php:377
+msgid "is not readable by ampache"
+msgstr "non Ã¨ leggibile da ampache"
 
-#: ../../bin/quarantine_migration.php.inc:152
-msgid "!\n"
-msgstr "!\n"
+#: ../../lib/class/catalog.class.php:441
+msgid "Found in ID3"
+msgstr "Trovato in ID3"
 
-#: ../../templates/customize_catalog.inc:24
-msgid "Settings for catalog in"
-msgstr "Impostazioni per catalogo in"
+#: ../../lib/class/catalog.class.php:445
+msgid "Found on Amazon"
+msgstr "Trovato in Amazon"
 
-#: ../../templates/customize_catalog.inc:32 ../../templates/add_catalog.inc:39
-msgid "Auto-inserted Fields"
-msgstr "Inserimento automatico campi"
+#: ../../lib/class/catalog.class.php:449
+msgid "Found in Folder"
+msgstr "Trovato nelle cartella"
 
-#: ../../templates/customize_catalog.inc:33 ../../templates/add_catalog.inc:40
-msgid "album name"
-msgstr "nome album"
+#: ../../lib/class/catalog.class.php:453
+msgid "Found"
+msgstr "Trovato"
 
-#: ../../templates/customize_catalog.inc:34 ../../templates/add_catalog.inc:41
-msgid "artist name"
-msgstr "nome artista"
+#: ../../lib/class/catalog.class.php:456
+msgid "Not Found"
+msgstr "Non trovato"
 
-#: ../../templates/customize_catalog.inc:35
-msgid "catalog path"
-msgstr "percorso catalogo"
+#: ../../lib/class/catalog.class.php:464
+msgid "Searched"
+msgstr "Cercato"
 
-#: ../../templates/customize_catalog.inc:36 ../../templates/add_catalog.inc:42
-msgid "id3 comment"
-msgstr " commento id3"
+#: ../../lib/class/catalog.class.php:622
+msgid "Starting Dump Album Art"
+msgstr ""
 
-#: ../../templates/customize_catalog.inc:37 ../../templates/add_catalog.inc:43
-msgid "genre"
-msgstr "genere"
+#: ../../lib/class/catalog.class.php:642
+msgid "Written"
+msgstr "Scritto"
 
-#: ../../templates/customize_catalog.inc:38 ../../templates/add_catalog.inc:44
-msgid "track number (padded with leading 0)"
-msgstr "numero traccia (con aggiunta di 0 in fronte)"
+#: ../../lib/class/catalog.class.php:651
+msgid "Error unable to open file for writting"
+msgstr "Errore, impossibile aprire il file per la scrittura"
 
-#: ../../templates/customize_catalog.inc:39 ../../templates/add_catalog.inc:45
-msgid "song title"
-msgstr "tiolo brano"
+#: ../../lib/class/catalog.class.php:658
+msgid "Album Art Dump Complete"
+msgstr ""
 
-#: ../../templates/customize_catalog.inc:40 ../../templates/add_catalog.inc:46
-msgid "year"
-msgstr "anno"
+#: ../../lib/class/catalog.class.php:728
+msgid "Starting Catalog Build"
+msgstr "Avvio costruzione catalogo"
 
-#: ../../templates/customize_catalog.inc:41 ../../templates/add_catalog.inc:47
-msgid "other"
-msgstr "altro"
+#: ../../lib/class/catalog.class.php:733
+msgid "Running Remote Sync"
+msgstr "Sincronizzazione remota in corso"
 
-#: ../../templates/customize_catalog.inc:45
-msgid "ID3 set command"
-msgstr "Comando impostazione ID3"
+#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:904
+msgid "Added Playlist From"
+msgstr "Aggiunta playlist da"
 
-#: ../../templates/customize_catalog.inc:51
-msgid "Filename pattern"
-msgstr "Filtro nome file"
+#: ../../lib/class/catalog.class.php:762
+msgid "Catalog Finished"
+msgstr "Catalogo terminato"
 
-#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
-msgid "Folder Pattern"
-msgstr "Filtro cartelle"
+#: ../../lib/class/catalog.class.php:762 ../../lib/class/catalog.class.php:932
+msgid "Total Time"
+msgstr "Tempo impiegato"
 
-#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
-msgid "(no leading or ending '/')"
-msgstr ""
+#: ../../lib/class/catalog.class.php:762 ../../lib/class/catalog.class.php:933
+msgid "Total Songs"
+msgstr "Totale brani"
 
-#: ../../templates/customize_catalog.inc:69
-msgid "Save Catalog Settings"
-msgstr "Salva impostazioni catalogo"
+#: ../../lib/class/catalog.class.php:763 ../../lib/class/catalog.class.php:933
+msgid "Songs Per Seconds"
+msgstr "Brani per secondo"
+
+#: ../../lib/class/catalog.class.php:797
+#: ../../lib/class/catalog.class.php:1512
+msgid "Updated"
+msgstr "Aggiornato"
+
+#: ../../lib/class/catalog.class.php:804
+msgid "No Update Needed"
+msgstr "Non Ã¨ necessario aggiornare"
+
+#: ../../lib/class/catalog.class.php:885
+msgid "Starting New Song Search on"
+msgstr "Avvio nuova ricerca brano in"
+
+#: ../../lib/class/catalog.class.php:885
+msgid "catalog"
+msgstr "catalogo"
+
+#: ../../lib/class/catalog.class.php:889
+msgid "Running Remote Update"
+msgstr "Aggiornamento remoto in corso"
+
+#: ../../lib/class/catalog.class.php:932
+msgid "Catalog Update Finished"
+msgstr "Aggiornamento catalogo terminato"
+
+#: ../../lib/class/catalog.class.php:952
+msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
+msgstr "Impossibile caricare la libreria XMLRPC, verifica che XML-RPC sia abilitato"
+
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
+msgid "Error connecting to"
+msgstr "Errore connettendosi a"
+
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
+msgid "Code"
+msgstr "Codice"
+
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
+msgid "Reason"
+msgstr "Motivazione"
+
+#: ../../lib/class/catalog.class.php:1007
+msgid "Completed updating remote catalog(s)"
+msgstr "Terminato aggiornamento remoto catalogo(ghi)."
+
+#: ../../lib/class/catalog.class.php:1138
+msgid "Checking"
+msgstr "Controllo in corso"
+
+#: ../../lib/class/catalog.class.php:1196
+msgid "Catalog Clean Done"
+msgstr "Pulizia catalogo terminata"
+
+#: ../../lib/class/catalog.class.php:1196
+msgid "files removed"
+msgstr "files rimossi"
+
+#: ../../lib/class/catalog.class.php:1469
+msgid "Updating the"
+msgstr "Aggiornamento di"
+
+#: ../../lib/class/catalog.class.php:1470
+msgid "songs found checking tag information."
+msgstr "controllo informazioni tag dei brani trovati."
+
+#: ../../lib/class/catalog.class.php:1520
+msgid " FOUND"
+msgstr "TROVATO"
+
+#: ../../lib/class/catalog.class.php:1521
+msgid "Searching for new Album Art"
+msgstr "Ricerca nuova copertina"
+
+#: ../../lib/class/catalog.class.php:1525
+msgid "Album Art Already Found"
+msgstr "Copertina album giÃ  trovata"
+
+#: ../../lib/class/genre.class.php:278
+msgid "Show Genres starting with"
+msgstr "Mostra generi che iniziano per"
+
+#: ../../lib/class/artist.class.php:223
+msgid "Error: Name Identical"
+msgstr "Errore: Nome identico"
+
+#: ../../lib/class/album.class.php:151
+msgid "Various"
+msgstr "Vari"
+
+#: ../../lib/class/song.class.php:275 ../../lib/class/song.class.php:279
+#: ../../lib/class/song.class.php:283 ../../lib/class/song.class.php:287
+#: ../../lib/class/song.class.php:291 ../../lib/class/song.class.php:295
+#: ../../lib/class/song.class.php:299 ../../lib/class/song.class.php:304
+#: ../../lib/class/song.class.php:309 ../../lib/class/song.class.php:313
+#: ../../lib/class/song.class.php:317 ../../lib/class/song.class.php:322
+msgid "updated to"
+msgstr "aggiornato a"
+
+#: ../../lib/class/song.class.php:279 ../../templates/show_uploads.inc:39
+#: ../../templates/show_songs.inc:47 ../../templates/list_duplicates.inc:36
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: ../../lib/class/song.class.php:283
+msgid "Rate"
+msgstr "Voto"
+
+#: ../../lib/class/song.class.php:287
+msgid "Mode"
+msgstr "Modo"
+
+#: ../../lib/class/song.class.php:291 ../../templates/show_mpdpl.inc:66
+#: ../../templates/show_uploads.inc:38 ../../templates/show_songs.inc:45
+msgid "Time"
+msgstr "Durata"
+
+#: ../../lib/class/song.class.php:295 ../../templates/show_mpdpl.inc:65
+#: ../../templates/show_songs.inc:39 ../../templates/show_songs.inc:44
+msgid "Track"
+msgstr "Traccia"
+
+#: ../../lib/class/song.class.php:299
+msgid "Filesize"
+msgstr "Dimensione file"
+
+#: ../../lib/class/song.class.php:313 ../../templates/show_albums.inc:43
+#: ../../templates/show_albums.inc:73 ../../templates/show_search.inc:90
+msgid "Year"
+msgstr "Anno"
+
+#: ../../lib/class/song.class.php:317 ../../templates/flag.inc:66
+#: ../../templates/list_flagged.inc:46
+msgid "Comment"
+msgstr "Commento"
+
+#: ../../lib/playlist.lib.php:73
+msgid "No songs in this playlist."
+msgstr "Non ci sono brani in questa playlist"
 
 #: ../../templates/show_admin_index.inc:27
 msgid "User Management"
@@ -1315,34 +1444,218 @@
 msgid "Catalog Managment"
 msgstr "Gestione catalogo"
 
-#: ../../templates/show_admin_index.inc:30 ../../templates/admin_menu.inc:36
+#: ../../templates/show_admin_index.inc:30
 msgid "Admin Preferences"
 msgstr "Impostazioni amministrazione"
 
-#: ../../templates/show_admin_index.inc:31 ../../templates/catalog.inc:98
-#: ../../templates/admin_menu.inc:37
+#: ../../templates/show_admin_index.inc:31 ../../templates/catalog.inc:95
 msgid "Access Lists"
 msgstr "Liste accesso"
 
-#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:97
-msgid "Add a catalog"
-msgstr "Aggiungi un catalogo"
+#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:94
+msgid "Add a catalog"
+msgstr "Aggiungi un catalogo"
+
+#: ../../templates/show_admin_index.inc:35 ../../templates/catalog.inc:99
+msgid "Clear Now Playing"
+msgstr "Cancella 'Ora in ascolto'"
+
+#: ../../templates/show_admin_index.inc:36
+msgid "Add Access List Entry"
+msgstr "Aggiungi voce a lista accessi"
+
+#: ../../templates/show_admin_index.inc:40
+msgid "Common Functions"
+msgstr "Funzioni comuni"
+
+#: ../../templates/show_admin_index.inc:43
+msgid "Admin Sections"
+msgstr "Sezioni amministratore"
+
+#: ../../templates/show_localplay.inc:30
+msgid "Local Play Control"
+msgstr "Controllo riproduzione locale"
+
+#: ../../templates/show_localplay.inc:35
+msgid "Playback"
+msgstr "Riproduzione"
+
+#: ../../templates/show_localplay.inc:39 ../../templates/show_mpdplay.inc:62
+#: ../../templates/list_header.inc:71
+msgid "Prev"
+msgstr "Precedente"
+
+#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:63
+msgid "Stop"
+msgstr "Arresta"
+
+#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:65
+msgid "Pause"
+msgstr "Pausa"
+
+#: ../../templates/show_localplay.inc:43 ../../templates/show_mpdplay.inc:66
+#: ../../templates/list_header.inc:94
+msgid "Next"
+msgstr "Successivo"
+
+#: ../../templates/show_localplay.inc:49
+msgid "Volume"
+msgstr "Volume"
+
+#: ../../templates/show_localplay.inc:53 ../../templates/show_localplay.inc:54
+msgid "Increase Volume"
+msgstr "Aumenta volume"
+
+#: ../../templates/show_localplay.inc:55 ../../templates/show_localplay.inc:56
+msgid "Decrease Volume"
+msgstr "Diminuisci volume"
+
+#: ../../templates/show_localplay.inc:62
+msgid "Clear queue"
+msgstr "Cancella coda"
+
+#: ../../templates/flag.inc:43
+msgid "Flag song"
+msgstr "Marca brani"
+
+#: ../../templates/flag.inc:45
+msgid ""
+"Flag the following song as having one of the problems listed below.  Site "
+"admins will then take the appropriate action for the flagged files."
+msgstr ""
+"Marca il seguente brano come avente uno dei problemi sottoelencati.  I "
+"gestori del sito effettueranno poi le opportune azioni sui files marcati."
+
+#: ../../templates/flag.inc:58 ../../templates/show_uploads.inc:34
+#: ../../templates/list_flagged.inc:41 ../../templates/list_duplicates.inc:32
+msgid "Song"
+msgstr "Brano"
+
+#: ../../templates/flag.inc:62
+msgid "Reason to flag"
+msgstr "Motivo della marcatura"
+
+#: ../../templates/flag.inc:73
+msgid "Flag Song"
+msgstr "Marca brano"
+
+#: ../../templates/show_mpdpl.inc:43
+msgid "MPD Server Playlist"
+msgstr "MPD Server Playlist"
+
+#: ../../templates/show_mpdpl.inc:45 ../../templates/show_mpdpl.inc:175
+msgid "Refresh the Playlist Window"
+msgstr "Aggiorna la finestra della playlist"
+
+#: ../../templates/show_mpdpl.inc:47 ../../templates/show_mpdpl.inc:177
+msgid "Click to shuffle (randomize) the playlist"
+msgstr "Premi per mescolare a caso la playlist"
+
+#: ../../templates/show_mpdpl.inc:47 ../../templates/show_mpdpl.inc:177
+msgid "shuffle"
+msgstr "mescola"
+
+#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:178
+msgid "Click to the clear the playlist"
+msgstr "Premi per vuotare la playlist"
+
+#: ../../templates/show_mpdpl.inc:52 ../../templates/show_mpdpl.inc:182
+msgid "Click to the remove all except the Now Playing"
+msgstr ""
+
+#: ../../templates/show_mpdpl.inc:62 ../../templates/show_songs.inc:41
+msgid "Song title"
+msgstr "Titolo brano"
+
+#: ../../templates/show_album.inc:67
+msgid "Play Album"
+msgstr "Riproduci album"
+
+#: ../../templates/show_album.inc:68
+msgid "Play Random from Album"
+msgstr "Riproduci casualmente dall' album"
+
+#: ../../templates/show_album.inc:69
+msgid "Reset Album Art"
+msgstr ""
+
+#: ../../templates/show_album.inc:70
+msgid "Find Album Art"
+msgstr "Trova copertina album"
+
+#: ../../templates/show_search_bar.inc:36 ../../templates/show_search.inc:54
+msgid "Search Ampache"
+msgstr "Cerca Ampache"
+
+#: ../../templates/userform.inc:25
+msgid "Adding a New User"
+msgstr "Aggiunta di un nuovo utente"
+
+#: ../../templates/userform.inc:29
+msgid "Editing existing User"
+msgstr "Modifica utente esistente"
+
+#: ../../templates/userform.inc:80
+msgid "User Access Level"
+msgstr "Livello accesso utente"
+
+#: ../../templates/userform.inc:96
+msgid "Add User"
+msgstr "Aggiungi utente"
+
+#: ../../templates/userform.inc:101
+msgid "Update User"
+msgstr "Aggiorna utente"
+
+#: ../../templates/show_add_access.inc:31
+msgid "Add Access for a Host"
+msgstr "Aggiungi accesso ad un Host"
+
+#: ../../templates/show_add_access.inc:33
+msgid ""
+"Use the form below to add a host that you want to have access to your "
+"Ampache catalog."
+msgstr ""
+"Usa il formulario seguente per aggiungere un host che vuoi abbia accesso al "
+"tuo catalogo Ampache"
+
+#: ../../templates/show_add_access.inc:46
+msgid "Start IP Address"
+msgstr "Indirizzo IP iniziale"
+
+#: ../../templates/show_add_access.inc:52
+msgid "End IP Address"
+msgstr "Indirizzo IP finale"
+
+#: ../../templates/show_add_access.inc:58
+#: ../../templates/show_access_list.inc:50
+msgid "Level"
+msgstr "Livello"
+
+#: ../../templates/show_add_access.inc:72
+msgid "Add Host"
+msgstr "Aggiungi Host"
+
+#: ../../templates/show_uploads.inc:33
+msgid "Status"
+msgstr "Stato"
 
-#: ../../templates/show_admin_index.inc:35 ../../templates/catalog.inc:102
-msgid "Clear Now Playing"
-msgstr ""
+#: ../../templates/show_uploads.inc:40 ../../templates/show_songs.inc:46
+#: ../../templates/list_duplicates.inc:37
+msgid "Size"
+msgstr "Dimensione"
 
-#: ../../templates/show_admin_index.inc:36
-msgid "Add Access List Entry"
-msgstr "Aggiungi voce a lista accessi"
+#: ../../templates/show_uploads.inc:42
+msgid "User"
+msgstr "Utente"
 
-#: ../../templates/show_admin_index.inc:40
-msgid "Common Functions"
-msgstr "Funzioni comuni"
+#: ../../templates/show_uploads.inc:43
+msgid "Date"
+msgstr "Data"
 
-#: ../../templates/show_admin_index.inc:43
-msgid "Admin Sections"
-msgstr "Sezioni amministratore"
+#: ../../templates/show_uploads.inc:49
+msgid "Add"
+msgstr "Aggiungi"
 
 #: ../../templates/show_test.inc:29
 msgid "Ampache Debug"
@@ -1353,6 +1666,8 @@
 "You've reached this page because a configuration error has occured. Debug "
 "Information below"
 msgstr ""
+"Hai raggiunto questa pagina perchÃ© si Ã¨ verificato un errore di "
+"configurazione. Seguono informazioni di debug"
 
 #: ../../templates/show_test.inc:34
 msgid "CHECK"
@@ -1374,7 +1689,9 @@
 msgid ""
 "This tests to make sure that you are running a version of PHP that is known "
 "to work with Ampache."
-msgstr "Questo verifica che stai usando una versione di PHP certamente funzionante con Ampache"
+msgstr ""
+"Questo verifica che stai usando una versione di PHP certamente funzionante "
+"con Ampache"
 
 #: ../../templates/show_test.inc:60
 msgid "Mysql for PHP"
@@ -1385,8 +1702,8 @@
 "This test checks to see if you have the mysql extensions loaded for PHP. "
 "These are required for Ampache to work."
 msgstr ""
-"Questo test verifica se le estensioni mysql per PHP sono caricate. "
-"Queste estensioni sono indispensabili per fare funzionare Ampache."
+"Questo test verifica se le estensioni mysql per PHP sono caricate. Queste "
+"estensioni sono indispensabili per fare funzionare Ampache."
 
 #: ../../templates/show_test.inc:79
 msgid "PHP Session Support"
@@ -1397,10 +1714,13 @@
 "This test checks to make sure that you have PHP session support enabled. "
 "Sessions are required for Ampache to work."
 msgstr ""
+"Questo test effettue dei controlli per assicurarsi che tu abbia il supporto "
+"per le sessioni PHP abilitato. Le sessioni sono necessarie ad Ampache per "
+"funzionare."
 
 #: ../../templates/show_test.inc:98
 msgid "PHP ICONV Support"
-msgstr ""
+msgstr "Supporto PHP ICONV"
 
 #: ../../templates/show_test.inc:112
 msgid ""
@@ -1409,9 +1729,9 @@
 msgstr ""
 
 #: ../../templates/show_test.inc:116
-#: ../../templates/show_install_config.inc:87
+#: ../../templates/show_install_config.inc:88
 msgid "Ampache.cfg.php Exists"
-msgstr ""
+msgstr "Ampache.cfg.php esiste"
 
 #: ../../templates/show_test.inc:131
 msgid ""
@@ -1421,7 +1741,7 @@
 msgstr ""
 
 #: ../../templates/show_test.inc:137
-#: ../../templates/show_install_config.inc:104
+#: ../../templates/show_install_config.inc:105
 msgid "Ampache.cfg.php Configured?"
 msgstr "Ampache.cfg.php Configurato?"
 
@@ -1438,7 +1758,7 @@
 
 #: ../../templates/show_test.inc:180
 msgid "Ampache.cfg.php is missing the following:"
-msgstr ""
+msgstr "In Ampache.cfg.php manca quanto segue:"
 
 #: ../../templates/show_test.inc:181
 msgid "Under CONF"
@@ -1458,683 +1778,626 @@
 "cfg.php"
 msgstr ""
 
-#: ../../templates/show_localplay.inc:30
-msgid "Local Play Control"
-msgstr "Controllo riproduzione locale"
-
-#: ../../templates/show_localplay.inc:35
-msgid "Playback"
-msgstr "Riproduzione"
-
-#: ../../templates/show_localplay.inc:39 ../../templates/list_header.inc:71
-#: ../../templates/show_mpdplay.inc:48
-msgid "Prev"
-msgstr "Precedente"
-
-#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:49
-msgid "Stop"
-msgstr "Arresta"
-
-#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:51
-msgid "Pause"
-msgstr "Pausa"
-
-#: ../../templates/show_localplay.inc:43 ../../templates/list_header.inc:94
-#: ../../templates/show_mpdplay.inc:52
-msgid "Next"
-msgstr "Successivo"
-
-#: ../../templates/show_localplay.inc:49
-msgid "Volume"
-msgstr "Volume"
-
-#: ../../templates/show_localplay.inc:53 ../../templates/show_localplay.inc:54
-msgid "Increase Volume"
-msgstr "Aumenta volume"
-
-#: ../../templates/show_localplay.inc:55 ../../templates/show_localplay.inc:56
-msgid "Decrease Volume"
-msgstr "Diminuisci volume"
-
-#: ../../templates/show_localplay.inc:62
-msgid "Clear queue"
-msgstr "Cancella coda"
-
-#: ../../templates/add_catalog.inc:30
-msgid ""
-"In the form below enter either a local path (i.e. /data/music) or the URL to "
-"a remote Ampache installation (i.e http://theotherampache.com)"
-msgstr ""
-
-#: ../../templates/add_catalog.inc:36
-msgid "Catalog Name"
-msgstr "Nome catalogo"
-
-#: ../../templates/add_catalog.inc:53
-msgid "Path"
-msgstr "Percorso"
-
-#: ../../templates/add_catalog.inc:57
-msgid "Catalog Type"
-msgstr "tipo catalogo"
-
-#: ../../templates/add_catalog.inc:61
-msgid "Remote"
-msgstr "Remoto"
-
-#: ../../templates/add_catalog.inc:66
-msgid "ID3 Set Command"
-msgstr "Comando impostazione ID3"
+#: ../../templates/show_big_art.inc:31
+msgid "Album Art"
+msgstr "Copertine"
 
-#: ../../templates/add_catalog.inc:70
-msgid "Filename Pattern"
-msgstr "Filtro nome file"
-
-#: ../../templates/add_catalog.inc:78 ../../templates/catalog.inc:104
-msgid "Gather Album Art"
+#: ../../templates/show_big_art.inc:35
+msgid "Click to close window"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:82
-msgid "ID3V2 Tags"
-msgstr "Tags ID3V2"
-
-#: ../../templates/add_catalog.inc:85
-msgid "Amazon"
-msgstr "Amazon"
-
-#: ../../templates/add_catalog.inc:88
-msgid "File Folder"
-msgstr "Cartella file"
-
-#: ../../templates/add_catalog.inc:95
-msgid "Build Playlists from m3u Files"
-msgstr "Genera  playliste dai file m3u"
-
-#: ../../templates/add_catalog.inc:102
-msgid "Add Catalog"
-msgstr "Aggiungi catalogo"
-
-#: ../../templates/list_flagged.inc:41 ../../templates/flag.inc:58
-#: ../../templates/show_uploads.inc:34
-msgid "Song"
-msgstr "Brano"
-
-#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:41
-msgid "Flag"
-msgstr "Marcatura"
-
-#: ../../templates/list_flagged.inc:43
-msgid "New Flag"
-msgstr "Nuova marcatura"
-
-#: ../../templates/list_flagged.inc:44
-msgid "Flagged by"
-msgstr "Marcata da"
-
-#: ../../templates/list_flagged.inc:45
-msgid "ID3 Update"
-msgstr "Aggiorna ID3"
+#: ../../templates/show_artist.inc:36
+msgid "Select"
+msgstr "Seleziona"
 
-#: ../../templates/list_flagged.inc:69
-msgid "Accept"
-msgstr "Accetta"
+#: ../../templates/show_artist.inc:38
+msgid "Cover"
+msgstr "Copertina"
 
-#: ../../templates/list_flagged.inc:70
-msgid "Reject"
-msgstr "Rifiuta"
+#: ../../templates/show_artist.inc:39
+msgid "Album Name"
+msgstr "Nome album"
 
-#: ../../templates/show_songs.inc:33 ../../templates/show_mpdpl.inc:63
-msgid "Song title"
-msgstr "Titolo brano"
+#: ../../templates/show_artist.inc:40
+msgid "Album Year"
+msgstr "Anno album"
 
-#: ../../templates/show_songs.inc:38 ../../templates/show_uploads.inc:40
-msgid "Size"
-msgstr "Dimensione"
+#: ../../templates/show_artist.inc:41
+msgid "Total Tracks"
+msgstr "Tracce totali"
 
-#: ../../templates/show_songs.inc:119
-msgid "Direct Link"
-msgstr "Collegamento diretto"
+#: ../../templates/show_mpdplay.inc:39
+msgid "MPD Play Control"
+msgstr "MPD Play Control"
 
-#: ../../templates/show_songs.inc:137
-msgid "Total"
-msgstr "Totale"
+#: ../../templates/show_mpdplay.inc:100
+msgid "Loop"
+msgstr "Continuo"
 
-#: ../../templates/show_install_config.inc:41
-#: ../../templates/show_install.inc:40
-msgid ""
-"Your webserver has read access to the /sql/ampache.sql file and the /config/"
-"ampache.cfg.php.dist file"
+#: ../../templates/show_mpdplay.inc:107 ../../templates/show_mpdplay.inc:120
+msgid "On"
 msgstr ""
 
-#: ../../templates/show_install_config.inc:49
-#: ../../templates/show_install.inc:50
-msgid "Step 2 - Creating the Ampache.cfg.php file"
-msgstr "Passso 2 - Creazione del file Ampache.cfg.php"
-
-#: ../../templates/show_install_config.inc:51
-msgid ""
-"This steps takes the basic config values, and first attempts to write them "
-"out directly to your webserver. If access is denied it will prompt you to "
-"download the config file. Please put the downloaded config file in /config"
+#: ../../templates/show_mpdplay.inc:108 ../../templates/show_mpdplay.inc:121
+msgid "Off"
 msgstr ""
 
-#: ../../templates/show_install_config.inc:59
-msgid "Web Path"
-msgstr "Percorso Web"
-
-#: ../../templates/show_install_config.inc:63
-#: ../../templates/show_install.inc:57
-msgid "Desired Database Name"
-msgstr "Nome del database desiderato"
-
-#: ../../templates/show_install_config.inc:67
-#: ../../templates/show_install.inc:61
-msgid "MySQL Hostname"
-msgstr "Server MySQL"
-
-#: ../../templates/show_install_config.inc:71
-msgid "MySQL Username"
-msgstr "Nome utente MySQL"
-
-#: ../../templates/show_install_config.inc:75
-msgid "MySQL Password"
-msgstr "Password MySQL"
-
-#: ../../templates/show_install_config.inc:80
-msgid "Write Config"
-msgstr "Scrivi configurazione"
-
-#: ../../templates/show_install_config.inc:124
-msgid "Check for Config"
-msgstr "Controllo configurazione"
-
-#: ../../templates/show_album.inc:53
-msgid "Play Album"
-msgstr "Riproduci album"
+#: ../../templates/show_mpdplay.inc:134
+msgid "Now Playing :"
+msgstr "In esecuzione:"
 
-#: ../../templates/show_album.inc:54
-msgid "Play Random from Album"
-msgstr "Riproduci casualmente dall' album"
+#: ../../templates/show_mpdplay.inc:163
+msgid "On Deck "
+msgstr "Successivo "
 
-#: ../../templates/show_album.inc:55
-msgid "Reset Album Art"
-msgstr ""
+#: ../../templates/show_mpdplay.inc:163
+msgid "(in "
+msgstr "(tra "
 
-#: ../../templates/show_album.inc:56
-msgid "Find Album Art"
+#: ../../templates/show_upload.inc:30
+msgid "Uploading Music to Ampache"
 msgstr ""
 
-#: ../../templates/show_album.inc:58 ../../templates/show_artist.inc:37
-msgid "Update from tags"
-msgstr "Aggiorna dai Tags"
-
-#: ../../templates/show_preferences.inc:31
-msgid "Editing"
-msgstr "Modifica"
-
-#: ../../templates/show_preferences.inc:31
-msgid "preferences"
-msgstr "impostazioni"
-
-#: ../../templates/show_preferences.inc:33
-msgid "Rebuild Preferences"
-msgstr "Ricostruisci impostazioni"
-
-#: ../../templates/show_preferences.inc:39
-msgid "Preference"
-msgstr "Parametro"
-
-#: ../../templates/show_preferences.inc:40
-msgid "Value"
-msgstr "Valore"
-
-#: ../../templates/show_preferences.inc:42
-msgid "Type"
-msgstr "Tipo"
-
-#: ../../templates/show_preferences.inc:43
-msgid "Apply to All"
-msgstr "Applica a tutti"
-
-#: ../../templates/show_preferences.inc:83
-msgid "Update Preferences"
-msgstr "Aggiorna impostazioni"
-
-#: ../../templates/show_preferences.inc:87
-msgid "Cancel"
-msgstr "Annulla"
-
-#: ../../templates/userform.inc:25
-msgid "Adding a New User"
-msgstr "Aggiunta di un nuovo utente"
-
-#: ../../templates/userform.inc:29
-msgid "Editing existing User"
-msgstr "Modifica utente esistente"
-
-#: ../../templates/userform.inc:80
-msgid "User Access Level"
-msgstr "Livello accesso utente"
-
-#: ../../templates/userform.inc:96
-msgid "Add User"
-msgstr "Aggiungi utente"
+#: ../../templates/show_upload.inc:32
+msgid "The following Audio file formats are supported"
+msgstr "Sono supportati i seguenti formati dei file audio"
 
-#: ../../templates/userform.inc:101
-msgid "Update User"
-msgstr "Aggiorna utente"
+#: ../../templates/show_upload.inc:72
+msgid "max_upload_size"
+msgstr ""
+
+#: ../../templates/show_install.inc:41
+#: ../../templates/show_install_config.inc:41
+msgid ""
+"Your webserver has read access to the /sql/ampache.sql file and the /config/"
+"ampache.cfg.php.dist file"
+msgstr ""
 
-#: ../../templates/show_install.inc:48
+#: ../../templates/show_install.inc:49
 msgid ""
 "This step creates and inserts the Ampache database, as such please provide a "
 "mysql account with database creation rights. This step may take a while "
 "depending upon the speed of your computer"
 msgstr ""
 
-#: ../../templates/show_install.inc:65
+#: ../../templates/show_install.inc:51
+#: ../../templates/show_install_config.inc:49
+msgid "Step 2 - Creating the Ampache.cfg.php file"
+msgstr "Passso 2 - Creazione del file Ampache.cfg.php"
+
+#: ../../templates/show_install.inc:59
+#: ../../templates/show_install_config.inc:64
+msgid "Desired Database Name"
+msgstr "Nome del database desiderato"
+
+#: ../../templates/show_install.inc:63
+#: ../../templates/show_install_config.inc:68
+msgid "MySQL Hostname"
+msgstr "Server MySQL"
+
+#: ../../templates/show_install.inc:67
 msgid "MySQL Administrative Username"
 msgstr "Utente amministratore MySQL"
 
-#: ../../templates/show_install.inc:69
+#: ../../templates/show_install.inc:71
 msgid "MySQL Administrative Password"
 msgstr "Password amministratore MySQL"
 
-#: ../../templates/show_install.inc:74
+#: ../../templates/show_install.inc:75
+msgid "Create Database User for New Database"
+msgstr ""
+
+#: ../../templates/show_install.inc:80
+msgid "Ampache Database Username"
+msgstr "Nome utente del database Ampache"
+
+#: ../../templates/show_install.inc:84
+msgid "Ampache Database User Password"
+msgstr "Password utente del database Ampache"
+
+#: ../../templates/show_install.inc:89
 msgid "Insert Database"
 msgstr "Inserisci database"
 
-#: ../../templates/flag.inc:43
-msgid "Flag song"
-msgstr "Marca brani"
-
-#: ../../templates/flag.inc:45
-msgid ""
-"Flag the following song as having one of the problems listed below.  Site "
-"admins will then take the appropriate action for the flagged files."
+#: ../../templates/show_login_form.inc:49
+#: ../../templates/show_login_form.inc:63
+msgid "Login"
 msgstr ""
 
-#: ../../templates/flag.inc:62
-msgid "Reason to flag"
-msgstr "Motivo della marcatura"
+#: ../../templates/show_login_form.inc:59
+msgid "Remember Me"
+msgstr "Ricordami"
 
-#: ../../templates/flag.inc:73
-msgid "Flag Song"
-msgstr "Marca brano"
+#: ../../templates/show_login_form.inc:72
+msgid "Register"
+msgstr "Registra"
 
-#: ../../templates/show_add_access.inc:31
-msgid "Add Access for a Host"
+#: ../../templates/show_access_list.inc:34
+msgid "Host Access to Your Catalog"
 msgstr ""
 
-#: ../../templates/show_add_access.inc:33
-msgid ""
-"Use the form below to add a host that you want to have access to your "
-"Ampache catalog."
-msgstr ""
+#: ../../templates/show_access_list.inc:43
+msgid "Add Entry"
+msgstr "Aggiungi voce"
 
-#: ../../templates/show_add_access.inc:46
-msgid "Start IP Address"
-msgstr "Indirizzo IP iniziale"
+#: ../../templates/show_access_list.inc:48
+msgid "Start Address"
+msgstr "Indirizzo iniziale"
 
-#: ../../templates/show_add_access.inc:52
-msgid "End IP Address"
-msgstr "Indirizzo IP finale"
+#: ../../templates/show_access_list.inc:49
+msgid "End Address"
+msgstr "Indirizzo finale"
 
-#: ../../templates/show_add_access.inc:58
-#: ../../templates/show_access_list.inc:50
-msgid "Level"
-msgstr "Livello"
+#: ../../templates/show_access_list.inc:65
+msgid "Revoke"
+msgstr "Rovoca"
 
-#: ../../templates/show_add_access.inc:72
-msgid "Add Host"
-msgstr ""
+#: ../../templates/show_search.inc:57
+msgid "Keywords"
+msgstr "Parola chiave"
 
-#: ../../templates/catalog.inc:33
-msgid ""
-"Error: ICONV not found, ID3V2 Tags will not import correctly. See <a href="
-"\"http://php.oregonstate.edu/iconv\">Iconv</a> for information on getting "
-"ICONV"
-msgstr ""
+#: ../../templates/show_search.inc:102
+msgid "Played"
+msgstr "Ascoltato"
 
-#: ../../templates/catalog.inc:42
-msgid "Update Catalogs"
-msgstr "Aggiorna cataloghi"
+#: ../../templates/show_search.inc:110
+msgid "Min Bitrate"
+msgstr "Bitrate min."
 
-#: ../../templates/catalog.inc:68
-msgid "Fast Add"
-msgstr "Aggiunta rapida"
+#: ../../templates/show_search.inc:132
+msgid "Object Type"
+msgstr "Tipo oggetto"
 
-#: ../../templates/catalog.inc:75
-msgid "Fast Update"
-msgstr "Aggiornamento rapido"
+#: ../../templates/show_search.inc:138
+msgid "Genres"
+msgstr "Generi"
 
-#: ../../templates/catalog.inc:88
-msgid "You don't have any catalogs."
-msgstr "Non hai nessun catalogo"
+#: ../../templates/show_search.inc:141
+msgid "Operator"
+msgstr "Operatore"
 
-#: ../../templates/catalog.inc:99
-msgid "Show Duplicate Songs"
-msgstr "Mostra brani duplicati"
+#: ../../templates/show_search.inc:145
+msgid "AND"
+msgstr "E"
 
-#: ../../templates/catalog.inc:100
-msgid "Show Disabled Songs"
-msgstr "Mostra brani disabilitati"
+#: ../../templates/show_search.inc:150
+msgid "Method"
+msgstr "Modo"
 
-#: ../../templates/catalog.inc:101
-msgid "Clear Catalog Stats"
-msgstr "Azzera stato del catalogo"
+#: ../../templates/show_search.inc:153
+msgid "Fuzzy"
+msgstr "Fuzzy"
 
-#: ../../templates/catalog.inc:103
-msgid "Dump Album Art"
+#: ../../templates/show_search.inc:154
+msgid "Exact"
+msgstr "Esatto"
+
+#: ../../templates/show_search.inc:157
+msgid "Maxium Results"
+msgstr "NÂ° massimo risultati"
+
+#: ../../templates/show_search.inc:160
+msgid "Unlimited"
+msgstr "Illimitato"
+
+#: ../../templates/show_search.inc:172
+msgid "Reset Form"
+msgstr "Cancella formulario"
+
+#: ../../templates/show_search.inc:184
+msgid "Save Search As Track on"
 msgstr ""
 
-#: ../../templates/catalog.inc:105
-msgid "View flagged songs"
-msgstr "Mostra brani marcati"
+#: ../../templates/show_search.inc:186
+msgid "Save"
+msgstr "Salva"
 
-#: ../../templates/catalog.inc:106
-msgid "Catalog Tools"
-msgstr "Strumenti catalogo"
+#: ../../templates/customize_catalog.inc:24
+msgid "Settings for catalog in"
+msgstr "Impostazioni per catalogo in"
 
-#: ../../templates/admin_menu.inc:33
-msgid "Users"
-msgstr "Utenti"
+#: ../../templates/customize_catalog.inc:32 ../../templates/add_catalog.inc:40
+msgid "Auto-inserted Fields"
+msgstr "Inserimento automatico campi"
 
-#: ../../templates/admin_menu.inc:34
-msgid "Mail Users"
-msgstr "Posta utenti"
+#: ../../templates/customize_catalog.inc:33 ../../templates/add_catalog.inc:41
+msgid "album name"
+msgstr "nome album"
 
-#: ../../templates/menu.inc:29
-msgid "Home"
-msgstr "Inizio"
+#: ../../templates/customize_catalog.inc:34 ../../templates/add_catalog.inc:42
+msgid "artist name"
+msgstr "nome artista"
 
-#: ../../templates/menu.inc:32
-msgid "Local Play"
-msgstr "Riproduzione locale"
+#: ../../templates/customize_catalog.inc:35
+msgid "catalog path"
+msgstr "percorso catalogo"
 
-#: ../../templates/menu.inc:38
-msgid "Playlists"
-msgstr "Playlists"
+#: ../../templates/customize_catalog.inc:36 ../../templates/add_catalog.inc:43
+msgid "id3 comment"
+msgstr " commento id3"
 
-#: ../../templates/menu.inc:40
-msgid "Preferences"
-msgstr "Impostazioni"
+#: ../../templates/customize_catalog.inc:37 ../../templates/add_catalog.inc:44
+msgid "genre"
+msgstr "genere"
 
-#: ../../templates/menu.inc:43 ../../templates/show_upload.inc:73
-msgid "Upload"
-msgstr ""
+#: ../../templates/customize_catalog.inc:38 ../../templates/add_catalog.inc:45
+msgid "track number (padded with leading 0)"
+msgstr "numero traccia (con aggiunta di 0 in fronte)"
 
-#: ../../templates/menu.inc:63 ../../templates/menu.inc:66
-msgid "Admin"
-msgstr "Amministrazione"
+#: ../../templates/customize_catalog.inc:39 ../../templates/add_catalog.inc:46
+msgid "song title"
+msgstr "tiolo brano"
 
-#: ../../templates/menu.inc:73 ../../templates/menu.inc:79
-msgid "Account"
-msgstr ""
+#: ../../templates/customize_catalog.inc:40 ../../templates/add_catalog.inc:47
+msgid "year"
+msgstr "anno"
 
-#: ../../templates/menu.inc:74 ../../templates/menu.inc:80
-msgid "Stats"
-msgstr "Stato"
+#: ../../templates/customize_catalog.inc:41 ../../templates/add_catalog.inc:48
+msgid "other"
+msgstr "altro"
 
-#: ../../templates/menu.inc:75 ../../templates/menu.inc:81
-#: ../../templates/menu.inc:85
-msgid "Logout"
-msgstr "Uscita"
+#: ../../templates/customize_catalog.inc:45
+msgid "ID3 set command"
+msgstr "Comando impostazione ID3"
 
-#: ../../templates/show_upload.inc:30
-msgid "Uploading Music to Ampache"
-msgstr ""
+#: ../../templates/customize_catalog.inc:51
+msgid "Filename pattern"
+msgstr "Filtro nome file"
 
-#: ../../templates/show_upload.inc:32
-msgid "The following Audio file formats are supported"
-msgstr "Sono supportati i seguenti formati dei file audio"
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:75
+msgid "Folder Pattern"
+msgstr "Filtro cartelle"
 
-#: ../../templates/show_upload.inc:72
-msgid "max_upload_size"
-msgstr ""
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:75
+msgid "(no leading or ending '/')"
+msgstr "(non inizianti o terminanti per '/')"
 
-#: ../../templates/show_login_form.inc:49
-#: ../../templates/show_login_form.inc:63
-msgid "Login"
-msgstr ""
+#: ../../templates/customize_catalog.inc:69
+msgid "Save Catalog Settings"
+msgstr "Salva impostazioni catalogo"
 
-#: ../../templates/show_login_form.inc:59
-msgid "Remember Me"
-msgstr "Ricordami"
+#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:49
+msgid "Flag"
+msgstr "Marcatura"
 
-#: ../../templates/show_access_list.inc:34
-msgid "Host Access to Your Catalog"
+#: ../../templates/list_flagged.inc:43
+msgid "New Flag"
+msgstr "Nuova marcatura"
+
+#: ../../templates/list_flagged.inc:44
+msgid "Flagged by"
+msgstr "Marcata da"
+
+#: ../../templates/list_flagged.inc:45
+msgid "ID3 Update"
+msgstr "Aggiorna ID3"
+
+#: ../../templates/list_flagged.inc:69
+msgid "Accept"
+msgstr "Accetta"
+
+#: ../../templates/list_flagged.inc:70
+msgid "Reject"
+msgstr "Rifiuta"
+
+#: ../../templates/show_random_play.inc:34
+msgid "Item count"
+msgstr "Totale voci"
+
+#: ../../templates/show_random_play.inc:49
+msgid "From genre"
+msgstr "Da genere"
+
+#: ../../templates/show_random_play.inc:58
+msgid "Standard"
+msgstr "Standard"
+
+#: ../../templates/show_random_play.inc:59
+msgid "Favor Unplayed"
 msgstr ""
 
-#: ../../templates/show_access_list.inc:43
-msgid "Add Entry"
-msgstr "Aggiungi voce"
+#: ../../templates/show_random_play.inc:61
+msgid "Full Artist"
+msgstr "Artista completo"
+
+#: ../../templates/show_random_play.inc:66
+msgid "from catalog"
+msgstr "da catalogo"
+
+#: ../../templates/show_random_play.inc:75
+msgid "Play Random Songs"
+msgstr "Riproduzione casuale brani"
+
+#: ../../templates/show_preferences.inc:42
+msgid "Editing"
+msgstr "Modifica"
 
-#: ../../templates/show_access_list.inc:48
-msgid "Start Address"
-msgstr "Indirizzo iniziale"
+#: ../../templates/show_preferences.inc:42
+msgid "preferences"
+msgstr "impostazioni"
 
-#: ../../templates/show_access_list.inc:49
-msgid "End Address"
-msgstr "Indirizzo finale"
+#: ../../templates/show_preferences.inc:44
+msgid "Rebuild Preferences"
+msgstr "Ricostruisci impostazioni"
 
-#: ../../templates/show_access_list.inc:65
-msgid "Revoke"
-msgstr "Rovoca"
+#: ../../templates/show_preferences.inc:73
+msgid "Update Preferences"
+msgstr "Aggiorna impostazioni"
 
-#: ../../templates/show_users.inc:43
+#: ../../templates/show_preferences.inc:77
+msgid "Cancel"
+msgstr "Annulla"
+
+#: ../../templates/show_users.inc:40
 msgid "Fullname"
 msgstr "Nome completo"
 
 #: ../../templates/show_users.inc:48
 msgid "Last Seen"
-msgstr "Visto ultima volta"
+msgstr "Ultimo accesso"
+
+#: ../../templates/show_users.inc:53
+msgid "Registration Date"
+msgstr "Data registrazione"
 
-#: ../../templates/show_users.inc:55 ../../templates/show_users.inc:91
+#: ../../templates/show_users.inc:61 ../../templates/show_users.inc:107
 msgid "Prefs"
 msgstr "Impostazioni"
 
-#: ../../templates/show_users.inc:58
+#: ../../templates/show_users.inc:64 ../../templates/show_users.inc:112
+#: ../../templates/menu.inc:74 ../../templates/menu.inc:80
+msgid "Stats"
+msgstr "Stato"
+
+#: ../../templates/show_users.inc:67
 msgid "Access"
 msgstr "Accesso"
 
-#: ../../templates/show_users.inc:64
+#: ../../templates/show_users.inc:73
 msgid "On-line"
 msgstr "In linea"
 
-#: ../../templates/show_users.inc:105
+#: ../../templates/show_users.inc:126
 msgid "delete"
-msgstr "cancella"
+msgstr "elimina"
 
-#: ../../templates/show_search.inc:45 ../../templates/show_search_bar.inc:36
-msgid "Search Ampache"
-msgstr "Cerca Ampache"
-
-#: ../../templates/show_search.inc:84
-#, fuzzy
-msgid "Played"
-msgstr "Riproduci"
+#: ../../templates/catalog.inc:30
+msgid ""
+"Error: ICONV not found, ID3V2 Tags will not import correctly. See <a href="
+"\"http://php.oregonstate.edu/iconv\">Iconv</a> for information on getting "
+"ICONV"
+msgstr ""
 
-#: ../../templates/show_search.inc:92
-#, fuzzy
-msgid "Min Bitrate"
-msgstr "Bitrate"
+#: ../../templates/catalog.inc:39
+msgid "Update Catalogs"
+msgstr "Aggiorna cataloghi"
 
-#: ../../templates/show_search.inc:114
-msgid "Object Type"
-msgstr "Tipo oggetto"
+#: ../../templates/catalog.inc:65
+msgid "Fast Add"
+msgstr "Aggiunta rapida"
 
-#: ../../templates/show_search.inc:120
-#, fuzzy
-msgid "Genres"
-msgstr "Genere"
+#: ../../templates/catalog.inc:72
+msgid "Fast Update"
+msgstr "Aggiornamento rapido"
 
-#: ../../templates/show_search.inc:123
-msgid "Operator"
-msgstr "Operatore"
+#: ../../templates/catalog.inc:85
+msgid "You don't have any catalogs."
+msgstr "Non hai nessun catalogo"
 
-#: ../../templates/show_search.inc:126
-msgid "OR"
-msgstr "O"
+#: ../../templates/catalog.inc:96
+msgid "Show Duplicate Songs"
+msgstr "Mostra brani duplicati"
 
-#: ../../templates/show_search.inc:127
-msgid "AND"
-msgstr "E"
+#: ../../templates/catalog.inc:97
+msgid "Show Disabled Songs"
+msgstr "Mostra brani disabilitati"
 
-#: ../../templates/show_search.inc:132
-#, fuzzy
-msgid "Method"
-msgstr "Modo"
+#: ../../templates/catalog.inc:98
+msgid "Clear Catalog Stats"
+msgstr "Azzera stato del catalogo"
 
-#: ../../templates/show_search.inc:135
-msgid "Fuzzy"
-msgstr "Fuzzy"
+#: ../../templates/catalog.inc:100
+msgid "Dump Album Art"
+msgstr ""
 
-#: ../../templates/show_search.inc:136
-msgid "Exact"
-msgstr "Esatto"
+#: ../../templates/catalog.inc:101 ../../templates/add_catalog.inc:79
+msgid "Gather Album Art"
+msgstr ""
 
-#: ../../templates/show_search.inc:139
-msgid "Maxium Results"
-msgstr "NÂ° massimo risultati"
+#: ../../templates/catalog.inc:102
+msgid "View flagged songs"
+msgstr "Mostra brani marcati"
 
-#: ../../templates/show_search.inc:142
-msgid "Unlimited"
-msgstr "Illimitato"
+#: ../../templates/catalog.inc:103
+msgid "Catalog Tools"
+msgstr "Strumenti catalogo"
 
-#: ../../templates/show_search.inc:154
-msgid "Reset Form"
-msgstr "Cancella formulario"
+#: ../../templates/add_catalog.inc:31
+msgid ""
+"In the form below enter either a local path (i.e. /data/music) or the URL to "
+"a remote Ampache installation (i.e http://theotherampache.com)"
+msgstr ""
+"Nel formulario seguente inserisci od un percorso locale (ad es. /data/"
+"musica) o l' ULR ad una installazione remota di Ampache (ad es. http://"
+"theotherampache.com)"
 
-#: ../../templates/show_artist.inc:31
-msgid "Albums by"
-msgstr "Album per"
+#: ../../templates/add_catalog.inc:37
+msgid "Catalog Name"
+msgstr "Nome catalogo"
 
-#: ../../templates/show_artist.inc:33
-msgid "Show All Songs By"
-msgstr "Mostra tutti i brani di"
+#: ../../templates/add_catalog.inc:54
+msgid "Path"
+msgstr "Percorso"
 
-#: ../../templates/show_artist.inc:34
-msgid "Play All Songs By"
-msgstr "Riproduci tutti i brani di"
+#: ../../templates/add_catalog.inc:58
+msgid "Catalog Type"
+msgstr "tipo catalogo"
 
-#: ../../templates/show_artist.inc:35
-msgid "Play Random Songs By"
-msgstr "Riproduci a caso i brani di"
+#: ../../templates/add_catalog.inc:62
+msgid "Remote"
+msgstr "Remoto"
 
-#: ../../templates/show_artist.inc:49
-msgid "Select"
-msgstr "Seleziona"
+#: ../../templates/add_catalog.inc:67
+msgid "ID3 Set Command"
+msgstr "Comando impostazione ID3"
 
-#: ../../templates/show_artist.inc:51
-msgid "Cover"
-msgstr "Copertina"
+#: ../../templates/add_catalog.inc:71
+msgid "Filename Pattern"
+msgstr "Filtro nome file"
 
-#: ../../templates/show_artist.inc:52
-msgid "Album Name"
-msgstr "Nome album"
+#: ../../templates/add_catalog.inc:83
+msgid "ID3V2 Tags"
+msgstr "Tags ID3V2"
 
-#: ../../templates/show_artist.inc:53
-msgid "Album Year"
-msgstr "Anno album"
+#: ../../templates/add_catalog.inc:86
+msgid "Amazon"
+msgstr "Amazon"
 
-#: ../../templates/show_artist.inc:54
-msgid "Total Tracks"
-msgstr "Tracce totali"
+#: ../../templates/add_catalog.inc:89
+msgid "File Folder"
+msgstr "Cartella file"
 
-#: ../../templates/show_mpdplay.inc:38
-msgid "MPD Play Control"
-msgstr "MPD Play Control"
+#: ../../templates/add_catalog.inc:96
+msgid "Build Playlists from m3u Files"
+msgstr "Genera  playliste dai file m3u"
 
-#: ../../templates/show_mpdplay.inc:71
-msgid "Loop"
-msgstr "Continuo"
+#: ../../templates/add_catalog.inc:103
+msgid "Add Catalog"
+msgstr "Aggiungi catalogo"
 
-#: ../../templates/show_mpdplay.inc:78 ../../templates/show_mpdplay.inc:91
-msgid "On"
+#: ../../templates/menu.inc:73 ../../templates/menu.inc:79
+msgid "Account"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:79 ../../templates/show_mpdplay.inc:92
-msgid "Off"
+#: ../../templates/show_songs.inc:143
+msgid "Direct Link"
+msgstr "Collegamento diretto"
+
+#: ../../templates/show_songs.inc:166
+msgid "Total"
+msgstr "Totale"
+
+#: ../../templates/show_install_config.inc:51
+msgid ""
+"This steps takes the basic config values, and first attempts to write them "
+"out directly to your webserver. If access is denied it will prompt you to "
+"download the config file. Please put the downloaded config file in /config"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:109
-msgid "Now Playing :"
-msgstr "In esecuzione:"
+#: ../../templates/show_install_config.inc:60
+msgid "Web Path"
+msgstr "Percorso Web"
 
-#: ../../templates/show_mpdplay.inc:133
-msgid "On Deck "
-msgstr "Successivo "
+#: ../../templates/show_install_config.inc:72
+msgid "MySQL Username"
+msgstr "Nome utente MySQL"
 
-#: ../../templates/show_mpdplay.inc:133
-msgid "(in "
-msgstr "(tra "
+#: ../../templates/show_install_config.inc:76
+msgid "MySQL Password"
+msgstr "Password MySQL"
 
-#: ../../templates/show_mpdpl.inc:44
-msgid "MPD Server Playlist"
-msgstr "MPD Server Playlist"
+#: ../../templates/show_install_config.inc:81
+msgid "Write Config"
+msgstr "Scrivi configurazione"
 
-#: ../../templates/show_mpdpl.inc:46 ../../templates/show_mpdpl.inc:184
-msgid "Refresh the Playlist Window"
-msgstr "Aggiorna la finestra della playlist"
+#: ../../templates/show_install_config.inc:125
+msgid "Check for Config"
+msgstr "Controllo configurazione"
 
-#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:186
-msgid "Click to shuffle (randomize) the playlist"
-msgstr "Premi per mescolare a caso la playlist"
+#: ../../templates/header.inc:48
+msgid "You are currently logged in as"
+msgstr "Sei attualmente connesso come"
+
+#: ../../templates/header.inc:57
+msgid "Go!"
+msgstr "Vai!"
+
+#: ../../templates/list_duplicates.inc:28
+msgid "Duplicate Songs"
+msgstr "Brani duplicati"
 
-#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:186
-msgid "shuffle"
-msgstr "mescola"
+#: ../../templates/list_duplicates.inc:35
+msgid "Length"
+msgstr "Durata"
 
-#: ../../templates/show_mpdpl.inc:49 ../../templates/show_mpdpl.inc:187
-msgid "Click to the clear the playlist"
-msgstr "Premi per vuotare la playlist"
+#: ../../templates/list_duplicates.inc:74
+msgid "You don"
+msgstr ""
 
-#: ../../templates/show_mpdpl.inc:53 ../../templates/show_mpdpl.inc:191
-msgid "Click to the remove all except the Now Playing"
+#: ../../templates/list_duplicates.inc:74
+msgid ""
+"); ?></p>\n"
+"<?php  } ?>\n"
+"</form>\n"
 msgstr ""
 
-#: ../../templates/show_uploads.inc:33
-msgid "Status"
-msgstr "Stato"
+#: ../../bin/print_tags.php.inc:42
+msgid ""
+"[print_tags.php.inc]\n"
+"This commandline script will display the tag information for the specified "
+"filename as it will \n"
+"appear to Ampache. \n"
+"        \n"
+msgstr ""
 
-#: ../../templates/show_uploads.inc:42
-msgid "User"
-msgstr "Utente"
+#: ../../bin/print_tags.php.inc:48
+msgid "Filename:"
+msgstr "Nome file:"
 
-#: ../../templates/show_uploads.inc:43
-msgid "Date"
-msgstr "Data"
+#: ../../bin/quarantine_migration.php.inc:49
+msgid "Error: Unable to write to"
+msgstr "Errore: Impossibile scrivere su"
 
-#: ../../templates/show_uploads.inc:49
-msgid "Add"
-msgstr "Aggiungi"
+#: ../../bin/quarantine_migration.php.inc:56
+msgid "Error: Upload directory not inside a catalog"
+msgstr ""
 
-#: ../../templates/show_search_bar.inc:42
-#, fuzzy
-msgid "Song Title"
-msgstr "Titolo brano"
+#: ../../bin/quarantine_migration.php.inc:74
+msgid "Moved"
+msgstr "Spostato"
 
-#: ../../templates/show_search_bar.inc:45
-#, fuzzy
-msgid "Song Genre"
-msgstr "genere"
+#: ../../bin/quarantine_migration.php.inc:78
+msgid "Adding"
+msgstr "Aggiunta"
 
-#: ../../templates/show_search_bar.inc:46
-#, fuzzy
-msgid "Song Year"
-msgstr "Titolo brano"
+#: ../../bin/quarantine_migration.php.inc:78
+msgid "to database"
+msgstr "al database"
 
-#: ../../templates/show_search_bar.inc:47
-#, fuzzy
-msgid "Minimum Bitrate"
-msgstr "Bitrate"
+#: ../../bin/quarantine_migration.php.inc:86
+msgid "Move Failed"
+msgstr "Spostamento fallito"
 
-#: ../../templates/show_random_play.inc:58
-msgid "Standard"
-msgstr "Standard"
+#: ../../bin/quarantine_migration.php.inc:97
+msgid "Deleted"
+msgstr "Cancellato"
 
-#: ../../templates/show_random_play.inc:61
-msgid "Full Artist"
-msgstr "Artista completo"
+#: ../../bin/quarantine_migration.php.inc:113
+msgid ""
+"\n"
+"\t\n"
+"************* WARNING *************\n"
+"This script will move, and \n"
+"potentially delete uploaded files.\n"
+"************* WARNING *************\n"
+"\n"
+"All files marked for add will be moved to the upload directory. All files \n"
+"marked for deletion will be deleted. This script must be run as a user with\n"
+"sufficient rights to perform the above two functions. \n"
+"\n"
+"\t\n"
+msgstr ""
+
+#: ../../bin/quarantine_migration.php.inc:127
+msgid "Continue?  (Y/N):"
+msgstr "Continua?  (Y/N):"
+
+#: ../../bin/quarantine_migration.php.inc:151
+msgid "Error:  "
+msgstr "Errore:  "
+
+#: ../../bin/quarantine_migration.php.inc:152
+msgid "!\n"
+msgstr "!\n"
 
 
diff -urN ampache-3.3.2-alpha4/locale/nl_NL/LC_MESSAGES/messages.po ampache-3.3.2-beta1/locale/nl_NL/LC_MESSAGES/messages.po
--- ampache-3.3.2-alpha4/locale/nl_NL/LC_MESSAGES/messages.po	2005-12-27 01:32:54.000000000 -0800
+++ ampache-3.3.2-beta1/locale/nl_NL/LC_MESSAGES/messages.po	2006-01-08 23:06:12.000000000 -0800
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-14 16:23-0700\n"
+"POT-Creation-Date: 2006-01-07 22:47-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Ruud Schilders <ruudboy@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,515 +20,527 @@
 msgid "Session Expired: please log in again at"
 msgstr "Sessie Verlopen: Log a.u.b. nogmaals in"
 
-#: ../../lib/preferences.php:211 ../../templates/show_users.inc:97
-msgid "Enable"
-msgstr "Geaktiveerd"
-
-#: ../../lib/preferences.php:212 ../../templates/show_users.inc:100
-msgid "Disable"
-msgstr "Ge-deaktiveerd"
-
-#: ../../lib/preferences.php:224 ../../templates/add_catalog.inc:60
-msgid "Local"
-msgstr "Lokaal"
-
-#: ../../lib/preferences.php:227
-msgid "Stream"
-msgstr ""
-
-#: ../../lib/preferences.php:230
-msgid "IceCast"
-msgstr ""
-
-#: ../../lib/preferences.php:233
-msgid "Downsample"
-msgstr ""
-
-#: ../../lib/preferences.php:236
-msgid "Music Player Daemon"
-msgstr ""
-
-#: ../../lib/preferences.php:239
-msgid "SlimServer"
-msgstr ""
-
-#: ../../lib/preferences.php:248
-msgid "M3U"
-msgstr ""
-
-#: ../../lib/preferences.php:249
-msgid "Simple M3U"
-msgstr "Eenvoudige M3U"
-
-#: ../../lib/preferences.php:250
-msgid "PLS"
-msgstr ""
-
-#: ../../lib/preferences.php:251
-msgid "Asx"
-msgstr ""
-
-#: ../../lib/preferences.php:258
-msgid "English"
-msgstr "Engels"
-
-#: ../../lib/preferences.php:259
-#, fuzzy
-msgid "British English"
-msgstr "Engels"
-
-#: ../../lib/preferences.php:260
-msgid "German"
-msgstr "Duits"
-
-#: ../../lib/preferences.php:261
-msgid "French"
-msgstr "Frans"
-
-#: ../../lib/preferences.php:262
-msgid "Turkish"
-msgstr "Turks"
-
-#: ../../lib/preferences.php:263
-msgid "Spanish"
-msgstr ""
-
-#: ../../lib/preferences.php:264
-msgid "Norwegian"
-msgstr ""
-
-#: ../../lib/preferences.php:265
-msgid "Simplified Chinese"
-msgstr ""
-
-#: ../../lib/duplicates.php:80
-msgid "Find Duplicates"
-msgstr "Zoek dubbele"
-
-#: ../../lib/duplicates.php:83 ../../templates/show_search.inc:74
-msgid "Search Type"
-msgstr "Zoek Type"
-
-#: ../../lib/duplicates.php:91 ../../lib/class/song.class.php:275
-msgid "Title"
-msgstr "Titel"
-
-#: ../../lib/duplicates.php:97
-msgid "Artist and Title"
-msgstr "Artiest en Titel"
-
-#: ../../lib/duplicates.php:102
-msgid "Artist, Album and Title"
-msgstr "Artiest, Album en Titel"
-
-#: ../../lib/duplicates.php:110 ../../templates/menu.inc:39
-#: ../../templates/show_search.inc:37 ../../templates/show_search.inc:83
-#: ../../templates/show_search_bar.inc:71
-msgid "Search"
-msgstr "Zoeken"
-
-#: ../../lib/general.lib.php:640
-msgid "Not Enough Data"
-msgstr ""
-
-#: ../../lib/search.php:52 ../../lib/search.php:68 ../../lib/search.php:84
-#: ../../lib/search.php:100 ../../lib/search.php:116 ../../lib/search.php:133
-#: ../../lib/search.php:145 ../../lib/search.php:161 ../../lib/search.php:177
-msgid "No Results Found"
-msgstr "Geen Resultaten Gevonden"
-
-#: ../../lib/class/genre.class.php:278
-#, fuzzy
-msgid "Show Genres starting with"
-msgstr "<u>T</u>oon artiesten beginnend met"
-
-#: ../../lib/class/album.class.php:126
-msgid "Various"
-msgstr "Diverse"
-
-#: ../../lib/class/album.class.php:241 ../../lib/class/catalog.class.php:275
-#: ../../lib/class/catalog.class.php:560
+#: ../../lib/class/catalog.class.php:281 ../../lib/class/catalog.class.php:566
+#: ../../lib/class/album.class.php:263
 msgid "Error: Unable to open"
 msgstr "Fout: Kon niet openen"
 
-#: ../../lib/class/song.class.php:275 ../../lib/class/song.class.php:279
-#: ../../lib/class/song.class.php:283 ../../lib/class/song.class.php:287
-#: ../../lib/class/song.class.php:291 ../../lib/class/song.class.php:295
-#: ../../lib/class/song.class.php:299 ../../lib/class/song.class.php:304
-#: ../../lib/class/song.class.php:309 ../../lib/class/song.class.php:313
-#: ../../lib/class/song.class.php:317 ../../lib/class/song.class.php:322
-msgid "updated to"
-msgstr "bijgewerkt tot"
-
-#: ../../lib/class/song.class.php:279 ../../templates/show_songs.inc:39
-#: ../../templates/show_uploads.inc:39
-msgid "Bitrate"
-msgstr "Bitratio"
-
-#: ../../lib/class/song.class.php:283
-msgid "Rate"
-msgstr "Ratio"
-
-#: ../../lib/class/song.class.php:287
-msgid "Mode"
-msgstr ""
-
-#: ../../lib/class/song.class.php:291 ../../templates/show_songs.inc:37
-#: ../../templates/show_mpdpl.inc:66 ../../templates/show_uploads.inc:38
-msgid "Time"
-msgstr "Tijd"
-
-#: ../../lib/class/song.class.php:295 ../../templates/show_songs.inc:32
-#: ../../templates/show_songs.inc:36 ../../templates/show_mpdpl.inc:65
-msgid "Track"
-msgstr "Nummer"
-
-#: ../../lib/class/song.class.php:299
-msgid "Filesize"
-msgstr "Bestandsgrootte"
-
-#: ../../lib/class/song.class.php:304 ../../templates/show_artists.inc:39
-#: ../../templates/show_artists.inc:62 ../../templates/show_songs.inc:34
-#: ../../templates/show_albums.inc:40 ../../templates/show_albums.inc:70
-#: ../../templates/show_mpdpl.inc:63 ../../templates/show_uploads.inc:35
-msgid "Artist"
-msgstr "Artiest"
-
-#: ../../lib/class/song.class.php:309 ../../templates/show_songs.inc:35
-#: ../../templates/show_albums.inc:38 ../../templates/show_albums.inc:68
-#: ../../templates/show_mpdpl.inc:64 ../../templates/show_uploads.inc:36
-msgid "Album"
-msgstr ""
-
-#: ../../lib/class/song.class.php:313 ../../templates/show_albums.inc:43
-#: ../../templates/show_albums.inc:73
-msgid "Year"
-msgstr "Jaar"
-
-#: ../../lib/class/song.class.php:317 ../../templates/list_flagged.inc:46
-#: ../../templates/flag.inc:66
-msgid "Comment"
-msgstr "Commentaar"
-
-#: ../../lib/class/song.class.php:322 ../../templates/show_genres.inc.php:36
-#: ../../templates/show_genre.inc.php:32 ../../templates/show_songs.inc:40
-#: ../../templates/show_browse_menu.inc:37 ../../templates/show_mpdpl.inc:67
-#: ../../templates/show_uploads.inc:37
-msgid "Genre"
-msgstr ""
-
-#: ../../lib/class/stream.class.php:198
-#, fuzzy
-msgid "Opened for writing"
-msgstr "Geopend om te schrijven"
-
-#: ../../lib/class/stream.class.php:203
-msgid "Error, cannot write"
-msgstr "Fout, kan niet schrijven"
-
-#: ../../lib/class/stream.class.php:214
-msgid "Error, cannot write song in file"
-msgstr "Fout, kan liedje niet in bestand wegschrijven"
-
-#: ../../lib/class/stream.class.php:220
-msgid "Closed after write"
-msgstr "Gesloten na schrijven"
-
-#: ../../lib/class/catalog.class.php:298
+#: ../../lib/class/catalog.class.php:304
 msgid "Error: Unable to change to directory"
 msgstr "Fout: Kon niet van directory veranderen"
 
-#: ../../lib/class/catalog.class.php:321
+#: ../../lib/class/catalog.class.php:330
 msgid "Error: Unable to get filesize for"
 msgstr "Fout: Kon bestandsgrootte niet achterhalen voor"
 
-#: ../../lib/class/catalog.class.php:340
-msgid "Added Playlist From"
-msgstr "Speellijst Toegevoegd Van"
-
-#: ../../lib/class/catalog.class.php:359
+#: ../../lib/class/catalog.class.php:365
 msgid "Added"
 msgstr "Toegevoegd"
 
-#: ../../lib/class/catalog.class.php:371
+#: ../../lib/class/catalog.class.php:377
 msgid "is not readable by ampache"
 msgstr "kan niet worden gelezen door ampache"
 
-#: ../../lib/class/catalog.class.php:435
+#: ../../lib/class/catalog.class.php:441
 msgid "Found in ID3"
 msgstr "Gevonden in ID3"
 
-#: ../../lib/class/catalog.class.php:439
+#: ../../lib/class/catalog.class.php:445
 msgid "Found on Amazon"
 msgstr "Gevonden op Amazon"
 
-#: ../../lib/class/catalog.class.php:443
+#: ../../lib/class/catalog.class.php:449
 msgid "Found in Folder"
 msgstr "Gevonden in Map"
 
-#: ../../lib/class/catalog.class.php:447
+#: ../../lib/class/catalog.class.php:453
 msgid "Found"
 msgstr "Gevonden"
 
-#: ../../lib/class/catalog.class.php:450
+#: ../../lib/class/catalog.class.php:456
 msgid "Not Found"
 msgstr "Niet Gevonden"
 
-#: ../../lib/class/catalog.class.php:458
+#: ../../lib/class/catalog.class.php:464
 msgid "Searched"
 msgstr "Gezocht"
 
-#: ../../lib/class/catalog.class.php:613
+#: ../../lib/class/catalog.class.php:622
 msgid "Starting Dump Album Art"
 msgstr "Start Dumpen Album Hoesjes"
 
-#: ../../lib/class/catalog.class.php:633
+#: ../../lib/class/catalog.class.php:642
 msgid "Written"
 msgstr "Geschreven"
 
-#: ../../lib/class/catalog.class.php:642
+#: ../../lib/class/catalog.class.php:651
 msgid "Error unable to open file for writting"
 msgstr "Fout kon bestand niet openen voor schrijven"
 
-#: ../../lib/class/catalog.class.php:649
+#: ../../lib/class/catalog.class.php:658
 msgid "Album Art Dump Complete"
 msgstr "Album Hoesjes Dump Compleet"
 
-#: ../../lib/class/catalog.class.php:650 ../../artists.php:63
-#: ../../albums.php:112
+#: ../../lib/class/catalog.class.php:659 ../../artists.php:64
+#: ../../albums.php:153
 msgid "Return"
 msgstr "Terug"
 
-#: ../../lib/class/catalog.class.php:719
+#: ../../lib/class/catalog.class.php:728
 msgid "Starting Catalog Build"
 msgstr "Start Catalogus Opbouwen"
 
-#: ../../lib/class/catalog.class.php:724
+#: ../../lib/class/catalog.class.php:733
 msgid "Running Remote Sync"
 msgstr "Draait Synchronisatie Op Afstand"
 
-#: ../../lib/class/catalog.class.php:734 ../../lib/class/catalog.class.php:880
-#: ../../admin/catalog.php:264
+#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:904
+msgid "Added Playlist From"
+msgstr "Speellijst Toegevoegd Van"
+
+#: ../../lib/class/catalog.class.php:752 ../../lib/class/catalog.class.php:913
+#: ../../admin/catalog.php:258
 msgid "Starting Album Art Search"
 msgstr "Start Zoeken van Album Hoesjes"
 
-#: ../../lib/class/catalog.class.php:744
+#: ../../lib/class/catalog.class.php:762
 msgid "Catalog Finished"
 msgstr "Catalogus Klaar"
 
-#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:899
+#: ../../lib/class/catalog.class.php:762 ../../lib/class/catalog.class.php:932
 msgid "Total Time"
 msgstr "Totale Tijdsduur"
 
-#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:900
+#: ../../lib/class/catalog.class.php:762 ../../lib/class/catalog.class.php:933
 msgid "Total Songs"
 msgstr "Totaal Liedjes"
 
-#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:900
+#: ../../lib/class/catalog.class.php:763 ../../lib/class/catalog.class.php:933
 msgid "Songs Per Seconds"
 msgstr "Liedjes Per Seconde"
 
-#: ../../lib/class/catalog.class.php:779
-#: ../../lib/class/catalog.class.php:1476
+#: ../../lib/class/catalog.class.php:797
+#: ../../lib/class/catalog.class.php:1512
 msgid "Updated"
 msgstr "Bijgewerkt"
 
-#: ../../lib/class/catalog.class.php:786
+#: ../../lib/class/catalog.class.php:804
 msgid "No Update Needed"
 msgstr "Bijwerken Niet Nodig"
 
-#: ../../lib/class/catalog.class.php:860
+#: ../../lib/class/catalog.class.php:885
 msgid "Starting New Song Search on"
 msgstr "Start Nieuwe Liedjes Zoekopdracht op"
 
-#: ../../lib/class/catalog.class.php:860
+#: ../../lib/class/catalog.class.php:885
 msgid "catalog"
 msgstr "catalogus"
 
-#: ../../lib/class/catalog.class.php:864
+#: ../../lib/class/catalog.class.php:889
 msgid "Running Remote Update"
 msgstr "Werkt Bij Op Afstand"
 
-#: ../../lib/class/catalog.class.php:899
+#: ../../lib/class/catalog.class.php:932
 msgid "Catalog Update Finished"
 msgstr "Catalogus Bijwerken Klaar"
 
-#: ../../lib/class/catalog.class.php:919 ../../lib/mpd.php:40
-#: ../../lib/mpd.php:49
+#: ../../lib/class/catalog.class.php:952 ../../lib/mpd.php:43
+#: ../../lib/mpd.php:52 ../../albums.php:74
 msgid "Error"
 msgstr "Fout"
 
-#: ../../lib/class/catalog.class.php:919
+#: ../../lib/class/catalog.class.php:952
 msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
 msgstr ""
 "Kon XMLRPB bibliotheek niet laden, controleer of XML-RPC geaktiveerd is"
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
 msgid "Error connecting to"
 msgstr "Fout met verbinden naar"
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
 msgid "Code"
 msgstr "Code"
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
 msgid "Reason"
 msgstr "Reden"
 
-#: ../../lib/class/catalog.class.php:974
+#: ../../lib/class/catalog.class.php:1007
 msgid "Completed updating remote catalog(s)"
 msgstr "Bijwerken catalogus(sen) op afstand klaar"
 
-#: ../../lib/class/catalog.class.php:1105
+#: ../../lib/class/catalog.class.php:1138
 msgid "Checking"
 msgstr "Controleren"
 
-#: ../../lib/class/catalog.class.php:1163
+#: ../../lib/class/catalog.class.php:1196
 msgid "Catalog Clean Done"
 msgstr "Catalogus Opschonen Klaar"
 
-#: ../../lib/class/catalog.class.php:1163
+#: ../../lib/class/catalog.class.php:1196
 msgid "files removed"
 msgstr "bestanden verwijderd"
 
-#: ../../lib/class/catalog.class.php:1436
+#: ../../lib/class/catalog.class.php:1469
 msgid "Updating the"
 msgstr "Bijwerken van de"
 
-#: ../../lib/class/catalog.class.php:1436 ../../templates/admin_menu.inc:35
+#: ../../lib/class/catalog.class.php:1469 ../../templates/sidebar.inc.php:31
 msgid "Catalog"
 msgstr "Catalogus"
 
-#: ../../lib/class/catalog.class.php:1437
+#: ../../lib/class/catalog.class.php:1470
 msgid "songs found checking tag information."
 msgstr "liedjes gevonden controleert label informatie"
 
-#: ../../lib/class/catalog.class.php:1484
+#: ../../lib/class/catalog.class.php:1520
 msgid " FOUND"
 msgstr "GEVONDEN"
 
-#: ../../lib/class/catalog.class.php:1485
+#: ../../lib/class/catalog.class.php:1521
 msgid "Searching for new Album Art"
 msgstr "Zoekt naar nieuwe Album Hoesjes"
 
-#: ../../lib/class/catalog.class.php:1489
+#: ../../lib/class/catalog.class.php:1525
 msgid "Album Art Already Found"
 msgstr "Album Hoesjes Al Gevonden"
 
-#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
-msgid "Could not add"
-msgstr "Kon niet toevoegen"
+#: ../../lib/class/artist.class.php:223
+msgid "Error: Name Identical"
+msgstr ""
 
-#: ../../lib/Browser.php:867
-msgid "file"
-msgstr "bestand"
+#: ../../lib/class/song.class.php:275 ../../lib/duplicates.php:113
+#: ../../templates/show_search.inc:66
+msgid "Title"
+msgstr "Titel"
 
-#: ../../lib/Browser.php:871
-msgid "File uploads not supported."
-msgstr "Bestanden uploaden niet ondersteund."
+#: ../../lib/class/song.class.php:275 ../../lib/class/song.class.php:279
+#: ../../lib/class/song.class.php:283 ../../lib/class/song.class.php:287
+#: ../../lib/class/song.class.php:291 ../../lib/class/song.class.php:295
+#: ../../lib/class/song.class.php:299 ../../lib/class/song.class.php:304
+#: ../../lib/class/song.class.php:309 ../../lib/class/song.class.php:313
+#: ../../lib/class/song.class.php:317 ../../lib/class/song.class.php:322
+msgid "updated to"
+msgstr "bijgewerkt tot"
 
-#: ../../lib/Browser.php:889
-msgid "No file uploaded"
-msgstr "Geen bestand ge-upload."
+#: ../../lib/class/song.class.php:279 ../../templates/show_uploads.inc:39
+#: ../../templates/show_songs.inc:47 ../../templates/list_duplicates.inc:36
+msgid "Bitrate"
+msgstr "Bitratio"
 
-#: ../../lib/Browser.php:896
-#, php-format
-msgid "There was a problem with the file upload: No %s was uploaded."
-msgstr "Er was een probleem met de bestands-upload: Geen %s was ge-upload."
+#: ../../lib/class/song.class.php:283
+msgid "Rate"
+msgstr "Ratio"
 
-#: ../../lib/Browser.php:901
-#, php-format
-msgid ""
-"There was a problem with the file upload: The %s was larger than the maximum "
-"allowed size (%d bytes)."
+#: ../../lib/class/song.class.php:287
+msgid "Mode"
 msgstr ""
-"Er was een probleem met de bestands-upload: De %s was groter dan de maximum "
-"toegestane grootte (%d bytes)."
 
-#: ../../lib/Browser.php:903
-#, php-format
-msgid ""
-"There was a problem with the file upload: The %s was only partially uploaded."
-msgstr ""
-"Er was een probleem met de bestands-upload: De %s was slechts gedeeltelijk "
-"ge-upload."
+#: ../../lib/class/song.class.php:291 ../../templates/show_uploads.inc:38
+#: ../../templates/show_mpdpl.inc:66 ../../templates/show_songs.inc:45
+msgid "Time"
+msgstr "Tijd"
 
-#: ../../lib/ui.lib.php:199
-msgid "Playlist Actions"
-msgstr "Speellijst Akties"
+#: ../../lib/class/song.class.php:295 ../../templates/show_mpdpl.inc:65
+#: ../../templates/show_songs.inc:39 ../../templates/show_songs.inc:44
+msgid "Track"
+msgstr "Nummer"
 
-#: ../../lib/ui.lib.php:199
-msgid "New"
-msgstr "Nieuw"
-
-#: ../../lib/ui.lib.php:200
-msgid "View All"
-msgstr "Bekijk Alles"
-
-#: ../../lib/ui.lib.php:201
-msgid "Import"
-msgstr "Importeren"
+#: ../../lib/class/song.class.php:299
+msgid "Filesize"
+msgstr "Bestandsgrootte"
 
-#: ../../lib/ui.lib.php:301 ../../templates/menu.inc:35
-msgid "Browse"
-msgstr "Bladeren"
+#: ../../lib/class/song.class.php:304
+#: ../../templates/show_get_albumart.inc.php:33
+#: ../../templates/show_uploads.inc:35 ../../templates/show_mpdpl.inc:63
+#: ../../templates/show_songs.inc:42 ../../templates/show_artists.inc:39
+#: ../../templates/show_artists.inc:62 ../../templates/show_albums.inc:40
+#: ../../templates/show_albums.inc:70 ../../templates/list_duplicates.inc:33
+#: ../../templates/show_search.inc:71
+msgid "Artist"
+msgstr "Artiest"
 
-#: ../../lib/ui.lib.php:303
-msgid "Show w/o art"
-msgstr "Toon zonder hoesje"
+#: ../../lib/class/song.class.php:309
+#: ../../templates/show_get_albumart.inc.php:41
+#: ../../templates/show_uploads.inc:36 ../../templates/show_mpdpl.inc:64
+#: ../../templates/show_songs.inc:43 ../../templates/show_albums.inc:38
+#: ../../templates/show_albums.inc:68 ../../templates/list_duplicates.inc:34
+#: ../../templates/show_search.inc:78
+msgid "Album"
+msgstr ""
 
-#: ../../lib/ui.lib.php:306
-msgid "Show all"
-msgstr "Toon alles"
+#: ../../lib/class/song.class.php:313 ../../templates/show_albums.inc:43
+#: ../../templates/show_albums.inc:73 ../../templates/show_search.inc:90
+msgid "Year"
+msgstr "Jaar"
 
-#: ../../lib/ui.lib.php:446
-msgid "No songs in this playlist."
-msgstr "Geen liedjes in deze speellijst."
+#: ../../lib/class/song.class.php:317 ../../templates/flag.inc:66
+#: ../../templates/list_flagged.inc:46
+msgid "Comment"
+msgstr "Commentaar"
 
-#: ../../lib/ui.lib.php:592
-#, fuzzy
-msgid "No Catalogs Found!"
-msgstr "Niet Gevonden"
+#: ../../lib/class/song.class.php:322 ../../templates/show_genre.inc.php:32
+#: ../../templates/show_genres.inc.php:36 ../../templates/sidebar.inc.php:37
+#: ../../templates/show_uploads.inc:37 ../../templates/show_mpdpl.inc:67
+#: ../../templates/show_songs.inc:48 ../../templates/show_browse_menu.inc:37
+#: ../../templates/show_search.inc:83
+msgid "Genre"
+msgstr ""
 
-#: ../../lib/ui.lib.php:593 ../../templates/add_catalog.inc:28
-msgid "Add a Catalog"
-msgstr "Catalogus toevoegen"
+#: ../../lib/class/stream.class.php:198
+#, fuzzy
+msgid "Opened for writing"
+msgstr "Geopend om te schrijven"
 
-#: ../../lib/ui.lib.php:594 ../../templates/show_local_catalog_info.inc.php:7
-msgid "Catalog Statistics"
-msgstr "Catalogus Statistieken"
+#: ../../lib/class/stream.class.php:203
+msgid "Error, cannot write"
+msgstr "Fout, kan niet schrijven"
 
-#: ../../lib/ui.lib.php:630
-msgid "day"
-msgstr "dag"
+#: ../../lib/class/stream.class.php:214
+msgid "Error, cannot write song in file"
+msgstr "Fout, kan liedje niet in bestand wegschrijven"
 
-#: ../../lib/ui.lib.php:630
+#: ../../lib/class/stream.class.php:220
+msgid "Closed after write"
+msgstr "Gesloten na schrijven"
+
+#: ../../lib/class/genre.class.php:278
+#, fuzzy
+msgid "Show Genres starting with"
+msgstr "<u>T</u>oon artiesten beginnend met"
+
+#: ../../lib/class/album.class.php:151
+msgid "Various"
+msgstr "Diverse"
+
+#: ../../lib/duplicates.php:102
+msgid "Find Duplicates"
+msgstr "Zoek dubbele"
+
+#: ../../lib/duplicates.php:105
+msgid "Search Type"
+msgstr "Zoek Type"
+
+#: ../../lib/duplicates.php:119
+msgid "Artist and Title"
+msgstr "Artiest en Titel"
+
+#: ../../lib/duplicates.php:124
+msgid "Artist, Album and Title"
+msgstr "Artiest, Album en Titel"
+
+#: ../../lib/duplicates.php:132 ../../templates/sidebar.inc.php:97
+#: ../../templates/sidebar.inc.php:103 ../../templates/show_search_bar.inc:41
+#: ../../templates/menu.inc:39 ../../templates/show_search.inc:171
+msgid "Search"
+msgstr "Zoeken"
+
+#: ../../lib/preferences.php:252 ../../templates/show_users.inc:118
+msgid "Enable"
+msgstr "Geaktiveerd"
+
+#: ../../lib/preferences.php:253 ../../templates/show_users.inc:121
+#: ../../templates/list_duplicates.inc:31
+msgid "Disable"
+msgstr "Ge-deaktiveerd"
+
+#: ../../lib/preferences.php:265 ../../templates/add_catalog.inc:61
+msgid "Local"
+msgstr "Lokaal"
+
+#: ../../lib/preferences.php:268
+msgid "Stream"
+msgstr ""
+
+#: ../../lib/preferences.php:271
+msgid "IceCast"
+msgstr ""
+
+#: ../../lib/preferences.php:274
+msgid "Downsample"
+msgstr ""
+
+#: ../../lib/preferences.php:277
+msgid "Music Player Daemon"
+msgstr ""
+
+#: ../../lib/preferences.php:280
+msgid "SlimServer"
+msgstr ""
+
+#: ../../lib/preferences.php:289
+msgid "M3U"
+msgstr ""
+
+#: ../../lib/preferences.php:290
+msgid "Simple M3U"
+msgstr "Eenvoudige M3U"
+
+#: ../../lib/preferences.php:291
+msgid "PLS"
+msgstr ""
+
+#: ../../lib/preferences.php:292
+msgid "Asx"
+msgstr ""
+
+#: ../../lib/preferences.php:293
+msgid "RAM"
+msgstr ""
+
+#: ../../lib/mpd.php:43 ../../lib/mpd.php:52
+msgid "Could not add"
+msgstr "Kon niet toevoegen"
+
+#: ../../lib/general.lib.php:675
+msgid "Not Enough Data"
+msgstr ""
+
+#: ../../lib/general.lib.php:897 ../../lib/general.lib.php:908
+msgid "English"
+msgstr "Engels"
+
+#: ../../lib/general.lib.php:907
+msgid "German"
+msgstr "Duits"
+
+#: ../../lib/general.lib.php:909
+#, fuzzy
+msgid "British English"
+msgstr "Engels"
+
+#: ../../lib/general.lib.php:910
+msgid "Spanish"
+msgstr ""
+
+#: ../../lib/general.lib.php:911
+msgid "French"
+msgstr "Frans"
+
+#: ../../lib/general.lib.php:912
+msgid "Italian"
+msgstr ""
+
+#: ../../lib/general.lib.php:913
+msgid "Dutch"
+msgstr ""
+
+#: ../../lib/general.lib.php:914
+msgid "Turkish"
+msgstr "Turks"
+
+#: ../../lib/general.lib.php:915
+msgid "Simplified Chinese"
+msgstr ""
+
+#: ../../lib/general.lib.php:916
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: ../../lib/ui.lib.php:222
+#, fuzzy
+msgid "Error Access Denied"
+msgstr "Gebruiker Toegangsniveau"
+
+#: ../../lib/ui.lib.php:299 ../../templates/sidebar.inc.php:69
+#: ../../templates/header.inc:51 ../../templates/menu.inc:35
+msgid "Browse"
+msgstr "Bladeren"
+
+#: ../../lib/ui.lib.php:301
+msgid "Show w/o art"
+msgstr "Toon zonder hoesje"
+
+#: ../../lib/ui.lib.php:304
+msgid "Show all"
+msgstr "Toon alles"
+
+#: ../../lib/ui.lib.php:721
+#, fuzzy
+msgid "No Catalogs Found!"
+msgstr "Niet Gevonden"
+
+#: ../../lib/ui.lib.php:722 ../../templates/add_catalog.inc:29
+msgid "Add a Catalog"
+msgstr "Catalogus toevoegen"
+
+#: ../../lib/ui.lib.php:723 ../../templates/show_local_catalog_info.inc.php:7
+msgid "Catalog Statistics"
+msgstr "Catalogus Statistieken"
+
+#: ../../lib/ui.lib.php:759
+msgid "day"
+msgstr "dag"
+
+#: ../../lib/ui.lib.php:759
 msgid "days"
 msgstr "dagen"
 
-#: ../../lib/ui.lib.php:632
+#: ../../lib/ui.lib.php:761
 msgid "hour"
 msgstr "uur"
 
-#: ../../lib/ui.lib.php:632
+#: ../../lib/ui.lib.php:761
 msgid "hours"
 msgstr "uren"
 
-#: ../../lib/upload.php:225
+#: ../../lib/ui.lib.php:1053 ../../templates/sidebar.inc.php:128
+#: ../../templates/show_random_play_bar.inc.php:45
+#: ../../templates/show_artists.inc:55 ../../templates/show_random_play.inc:46
+#: ../../templates/show_albums.inc:58
+msgid "All"
+msgstr "Alles"
+
+#: ../../lib/Browser.php:867
+msgid "file"
+msgstr "bestand"
+
+#: ../../lib/Browser.php:871
+msgid "File uploads not supported."
+msgstr "Bestanden uploaden niet ondersteund."
+
+#: ../../lib/Browser.php:889
+msgid "No file uploaded"
+msgstr "Geen bestand ge-upload."
+
+#: ../../lib/Browser.php:896
+#, php-format
+msgid "There was a problem with the file upload: No %s was uploaded."
+msgstr "Er was een probleem met de bestands-upload: Geen %s was ge-upload."
+
+#: ../../lib/Browser.php:901
+#, php-format
+msgid ""
+"There was a problem with the file upload: The %s was larger than the maximum "
+"allowed size (%d bytes)."
+msgstr ""
+"Er was een probleem met de bestands-upload: De %s was groter dan de maximum "
+"toegestane grootte (%d bytes)."
+
+#: ../../lib/Browser.php:903
+#, php-format
+msgid ""
+"There was a problem with the file upload: The %s was only partially uploaded."
+msgstr ""
+"Er was een probleem met de bestands-upload: De %s was slechts gedeeltelijk "
+"ge-upload."
+
+#: ../../lib/upload.php:228
 #, fuzzy
 msgid "The file uploaded successfully"
 msgstr "Geen bestand ge-upload."
 
-#: ../../lib/upload.php:226
+#: ../../lib/upload.php:229
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 "Het ge-uploade bestand overschrijdt de upload_max_filesize parameter in php."
 "ini"
 
-#: ../../lib/upload.php:227
+#: ../../lib/upload.php:230
 #, fuzzy
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
@@ -537,69 +549,54 @@
 "Het ge-uploade bestand overschrijdt de MAX_FILE_SIZE parameter "
 "gespecificeerd in het HTML formulier."
 
-#: ../../lib/upload.php:228
+#: ../../lib/upload.php:231
 #, fuzzy
 msgid "The uploaded file was only partially uploaded"
 msgstr "Het ge-uploade bestand was slechts gedeeltelijk ge-upload."
 
-#: ../../lib/upload.php:229
+#: ../../lib/upload.php:232
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Er is geen bestand ge-ulpoad."
 
-#: ../../lib/upload.php:230
+#: ../../lib/upload.php:233
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ../../modules/lib.php:708
-msgid "Public"
-msgstr "Openbaar"
-
-#: ../../modules/lib.php:709
-msgid "Your Private"
-msgstr "Jouw Prive"
-
-#: ../../modules/lib.php:710
-msgid "Other Private"
-msgstr "Andere Prive"
+#: ../../lib/rating.lib.php:55
+#, fuzzy
+msgid "Don't Play"
+msgstr "Lokaal Afspelen"
 
-#: ../../modules/lib.php:791 ../../templates/show_play_selected.inc.php:72
-msgid "View"
-msgstr "Bekijken"
+#: ../../lib/rating.lib.php:58
+msgid "It's Pretty Bad"
+msgstr ""
 
-#: ../../modules/lib.php:794 ../../templates/show_play_selected.inc.php:73
-#: ../../templates/show_users.inc:52 ../../templates/show_users.inc:86
-msgid "Edit"
-msgstr "Aanpassen"
+#: ../../lib/rating.lib.php:61
+msgid "It's Ok"
+msgstr ""
 
-#: ../../modules/lib.php:795 ../../templates/catalog.inc:60
-#: ../../templates/show_users.inc:61 ../../templates/show_uploads.inc:50
-msgid "Delete"
-msgstr "Verwijderen"
+#: ../../lib/rating.lib.php:64
+msgid "It's Pretty Good"
+msgstr ""
 
-#: ../../modules/lib.php:803 ../../templates/show_genres.inc.php:48
-#: ../../templates/show_localplay.inc:41 ../../templates/show_artists.inc:54
-#: ../../templates/show_albums.inc:57 ../../templates/show_artist.inc:78
-#: ../../templates/show_mpdplay.inc:50
-msgid "Play"
-msgstr "Afspelen"
+#: ../../lib/rating.lib.php:67
+msgid "I Love It!"
+msgstr ""
 
-#: ../../modules/lib.php:804 ../../templates/show_artists.inc:56
-#: ../../templates/show_albums.inc:59 ../../templates/show_mpdplay.inc:85
-msgid "Random"
-msgstr "Willekeurig"
+#: ../../lib/rating.lib.php:70
+msgid "It's Insane"
+msgstr ""
 
-#: ../../modules/lib.php:810 ../../templates/show_songs.inc:110
-#: ../../templates/show_album.inc:61 ../../templates/show_albums.inc:61
-#: ../../templates/show_artist.inc:80
-msgid "Download"
+#: ../../lib/rating.lib.php:74
+msgid "Off the Charts!"
 msgstr ""
 
-#: ../../modules/lib.php:821
-msgid "There are no playlists of this type"
-msgstr "Er zijn geen speellijsten van dit type"
+#: ../../lib/playlist.lib.php:73
+msgid "No songs in this playlist."
+msgstr "Geen liedjes in deze speellijst."
 
-#: ../../modules/lib.php:856
+#: ../../modules/lib.php:537
 msgid "Create a new playlist"
 msgstr "Maak een nieuwe speellijst"
 
@@ -611,178 +608,153 @@
 msgid "Add a new user"
 msgstr "Gebruiker Toevoegen"
 
-#: ../../admin/catalog.php:55 ../../templates/catalog.inc:66
+#: ../../admin/catalog.php:49 ../../templates/catalog.inc:63
 msgid "Add to Catalog(s)"
 msgstr "Voeg toe aan catalogus(sen)"
 
-#: ../../admin/catalog.php:66 ../../templates/catalog.inc:67
+#: ../../admin/catalog.php:60 ../../templates/catalog.inc:64
 msgid "Add to all Catalogs"
 msgstr "Voeg toe aan alle Catalogussen"
 
-#: ../../admin/catalog.php:75
+#: ../../admin/catalog.php:69
 msgid "Error Connecting"
 msgstr "Fout bij Verbinding"
 
-#: ../../admin/catalog.php:89 ../../templates/catalog.inc:73
+#: ../../admin/catalog.php:83 ../../templates/catalog.inc:70
 msgid "Update Catalog(s)"
 msgstr "Catalogus(sen) Bijwerken"
 
-#: ../../admin/catalog.php:100 ../../templates/catalog.inc:74
+#: ../../admin/catalog.php:94 ../../templates/catalog.inc:71
 msgid "Update All Catalogs"
 msgstr "Alle Catalogussen Bijwerken"
 
-#: ../../admin/catalog.php:132 ../../templates/catalog.inc:80
+#: ../../admin/catalog.php:126 ../../templates/catalog.inc:77
 msgid "Clean Catalog(s)"
 msgstr "Catalogus(sen) Opschonen"
 
-#: ../../admin/catalog.php:162 ../../templates/catalog.inc:81
+#: ../../admin/catalog.php:156 ../../templates/catalog.inc:78
 msgid "Clean All Catalogs"
 msgstr "Alle Catalogussen Opschonen"
 
-#: ../../admin/catalog.php:211
+#: ../../admin/catalog.php:206
 msgid "Now Playing Cleared"
 msgstr "Speelt Nu Leeggemaakt"
 
-#: ../../admin/catalog.php:211
+#: ../../admin/catalog.php:206
 msgid "All now playing data has been cleared"
 msgstr "Alle Speelt Nu gegevens zijn leeggemaakt."
 
-#: ../../admin/catalog.php:216
+#: ../../admin/catalog.php:211
 msgid "Do you really want to clear your catalog?"
 msgstr "Wilt u echt uw catalogus leegmaken?"
 
-#: ../../admin/catalog.php:223
+#: ../../admin/catalog.php:218
 msgid "Do you really want to clear the statistics for this catalog?"
 msgstr "Wilt u echt de statistieken voor deze catalogus leegmaken?"
 
-#: ../../admin/catalog.php:241
+#: ../../admin/catalog.php:235
 msgid "Do you really want to delete this catalog?"
 msgstr "Wilt u echt deze catalogus verwijderen?"
 
-#: ../../admin/catalog.php:272
+#: ../../admin/catalog.php:266
 msgid "Album Art Search Finished"
 msgstr "Album Hoesjes Zoeken Klaar"
 
-#: ../../admin/users.php:76 ../../admin/users.php:122
+#: ../../admin/users.php:72 ../../admin/users.php:119
 msgid "Error Username Required"
 msgstr "Fout Gebruikersnaam Vereist"
 
-#: ../../admin/users.php:79 ../../admin/users.php:119
+#: ../../admin/users.php:75 ../../admin/users.php:115
 msgid "Error Passwords don't match"
 msgstr "Fout Wachtwoorden niet hetzelfde"
 
-#: ../../admin/users.php:136
+#: ../../admin/users.php:124 ../../register.php:136
+#, fuzzy
+msgid "Error Username already exists"
+msgstr "Fout Gebruikersnaam Vereist"
+
+#: ../../admin/users.php:145
 msgid "Are you sure you want to permanently delete"
 msgstr "Weet u zeker dat u dit permanent wilt verwijderen:"
 
-#: ../../admin/users.php:143 ../../templates/show_confirm_action.inc.php:29
+#: ../../admin/users.php:152 ../../templates/show_confirm_action.inc.php:29
+#: ../../templates/show_search.inc:107
 msgid "No"
 msgstr "Nee"
 
-#: ../../admin/users.php:145
+#: ../../admin/users.php:154
 msgid "User Deleted"
 msgstr "Gebruiker Verwijderd"
 
-#: ../../admin/users.php:148
+#: ../../admin/users.php:157
 msgid "Delete Error"
 msgstr "Fout bij Verwijderen"
 
-#: ../../admin/users.php:148
+#: ../../admin/users.php:157
 msgid "Unable to delete last Admin User"
 msgstr "Kan niet de laatste beheerder verwijderen"
 
-#: ../../admin/access.php:43
+#: ../../admin/access.php:40
 msgid "Do you really want to delete this Access Record?"
 msgstr "Wilt u echt deze toegangs gegevens verwijderen?"
 
-#: ../../admin/access.php:51
+#: ../../admin/access.php:48
 msgid "Entry Deleted"
 msgstr "Gegeven Verwijderd"
 
-#: ../../admin/access.php:51
+#: ../../admin/access.php:48
 msgid "Your Access List Entry has been removed"
 msgstr "Uw toegangslijst gegeven is verwijderd"
 
-#: ../../admin/access.php:61
+#: ../../admin/access.php:58
 msgid "Entry Added"
 msgstr "Gegeven toegevoegd"
 
-#: ../../admin/access.php:61
+#: ../../admin/access.php:58
 msgid "Your new Access List Entry has been created"
 msgstr "Uw nieuwe Toegangslijst gegeven is aangemaakt"
 
-#: ../../admin/mail.php:98
+#: ../../admin/mail.php:94
 msgid "Mail to"
 msgstr "Mail naar"
 
-#: ../../admin/mail.php:109
+#: ../../admin/mail.php:105
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: ../../admin/mail.php:116
+#: ../../admin/mail.php:112
 msgid "Message"
 msgstr "Bericht"
 
-#: ../../admin/mail.php:126
+#: ../../admin/mail.php:122
 msgid "Send Mail"
 msgstr "Verstuur mail"
 
-#: ../../admin/song.php:68
+#: ../../admin/song.php:65
 msgid "Songs Disabled"
 msgstr "Liedjes Uitgeschakeld"
 
-#: ../../admin/song.php:68
+#: ../../admin/song.php:65
 msgid "The requested song(s) have been disabled"
 msgstr "De gevraagde liedjes zijn uitgeschakeld"
 
-#: ../../admin/song.php:78
+#: ../../admin/song.php:75
 msgid "Songs Enabled"
 msgstr "Liedjes Aktief"
 
-#: ../../admin/song.php:78
+#: ../../admin/song.php:75
 msgid "The requested song(s) have been enabled"
 msgstr "De gevraagde liedjes zijn aktief gemaakt"
 
-#: ../../templates/show_user_registration.inc.php:28
-#: ../../templates/show_install_account.inc.php:59
-#: ../../templates/userform.inc:40 ../../templates/show_users.inc:40
-msgid "Username"
-msgstr "Gebruikersnaam"
-
-#: ../../templates/show_user_registration.inc.php:36
-#: ../../templates/userform.inc:48
-msgid "Full Name"
-msgstr "Volledige Naam"
-
-#: ../../templates/show_user_registration.inc.php:44
-#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:55
-msgid "E-mail"
-msgstr ""
-
-#: ../../templates/show_user_registration.inc.php:52
-#: ../../templates/show_install_account.inc.php:63
-#: ../../templates/userform.inc:63 ../../templates/show_login_form.inc:53
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: ../../templates/show_user_registration.inc.php:60
-#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
-msgid "Confirm Password"
-msgstr "Bevestig Wachtwoord"
-
-#: ../../templates/show_user_registration.inc.php:69
-msgid "Register User"
-msgstr "Registreer Gebruiker"
-
 #: ../../templates/show_install_account.inc.php:35
 #: ../../templates/show_install_config.inc:35
-#: ../../templates/show_install.inc:34
+#: ../../templates/show_install.inc:35
 msgid "Ampache Installation"
 msgstr "Ampache Installatie"
 
 #: ../../templates/show_install_account.inc.php:37
 #: ../../templates/show_install_config.inc:37
-#: ../../templates/show_install.inc:36
+#: ../../templates/show_install.inc:37
 #, fuzzy
 msgid ""
 "This Page handles the installation of the Ampache database and the creation "
@@ -795,7 +767,7 @@
 
 #: ../../templates/show_install_account.inc.php:40
 #: ../../templates/show_install_config.inc:40
-#: ../../templates/show_install.inc:39
+#: ../../templates/show_install.inc:40
 msgid ""
 "A MySQL Server with a username and password that can create/modify databases"
 msgstr ""
@@ -812,7 +784,7 @@
 
 #: ../../templates/show_install_account.inc.php:43
 #: ../../templates/show_install_config.inc:43
-#: ../../templates/show_install.inc:42
+#: ../../templates/show_install.inc:43
 msgid ""
 "Once you have ensured that you have the above requirements please fill out "
 "the information below. You will only be asked for the required config "
@@ -826,7 +798,7 @@
 
 #: ../../templates/show_install_account.inc.php:48
 #: ../../templates/show_install_config.inc:48
-#: ../../templates/show_install.inc:46
+#: ../../templates/show_install.inc:47
 msgid "Step 1 - Creating and Inserting the Ampache Database"
 msgstr "Stap 1 - Aanmaken en Laden van de Ampache Database"
 
@@ -836,7 +808,7 @@
 
 #: ../../templates/show_install_account.inc.php:50
 #: ../../templates/show_install_config.inc:53
-#: ../../templates/show_install.inc:51
+#: ../../templates/show_install.inc:52
 msgid "Step 3 - Setup Initial Account"
 msgstr "Stap 3 - Aanmaken Eerste Gebruiker"
 
@@ -848,11 +820,71 @@
 "Deze stap maakt uw eerste Ampache beheerder aan. Als uw beheerder eenmaal is "
 "aangemaakt wordt u doorgestuurd naar de inlog pagina"
 
-#: ../../templates/show_install_account.inc.php:68
+#: ../../templates/show_install_account.inc.php:55
+#, fuzzy
+msgid "Create Admin Account"
+msgstr "Aanmaken Gebruiker"
+
+#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/show_user_registration.inc.php:109
+#: ../../templates/userform.inc:40 ../../templates/show_users.inc:43
+msgid "Username"
+msgstr "Gebruikersnaam"
+
+#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/show_user_registration.inc.php:137
+#: ../../templates/userform.inc:63 ../../templates/show_login_form.inc:53
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: ../../templates/show_install_account.inc.php:69
 msgid "Create Account"
 msgstr "Aanmaken Gebruiker"
 
+#: ../../templates/show_user_registration.inc.php:59
+#, fuzzy
+msgid "Ampache New User Registration"
+msgstr "Ampache Installatie"
+
+#: ../../templates/show_user_registration.inc.php:74
+#, fuzzy
+msgid "User Agreement"
+msgstr "Gebruikersnaam"
+
+#: ../../templates/show_user_registration.inc.php:84
+#, fuzzy
+msgid "I Accept"
+msgstr "Accepteren"
+
+#: ../../templates/show_user_registration.inc.php:101
+msgid "User Information"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:119
+#: ../../templates/userform.inc:48
+msgid "Full Name"
+msgstr "Volledige Naam"
+
+#: ../../templates/show_user_registration.inc.php:128
+#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:55
+msgid "E-mail"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:146
+#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
+msgid "Confirm Password"
+msgstr "Bevestig Wachtwoord"
+
+#: ../../templates/show_user_registration.inc.php:166
+msgid "Clear Info"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:167
+msgid "Register User"
+msgstr "Registreer Gebruiker"
+
 #: ../../templates/show_confirm_action.inc.php:28
+#: ../../templates/show_search.inc:106
 msgid "Yes"
 msgstr "Ja"
 
@@ -861,7 +893,8 @@
 msgstr "Speellijst importeren uit een Bestand"
 
 #: ../../templates/show_import_playlist.inc.php:29
-#: ../../templates/show_uploads.inc:41
+#: ../../templates/show_uploads.inc:41 ../../templates/list_duplicates.inc:38
+#: ../../templates/show_search.inc:95
 msgid "Filename"
 msgstr "Bestandsnaam"
 
@@ -873,6 +906,36 @@
 msgid "Import Playlist"
 msgstr "Speellijst Importeren"
 
+#: ../../templates/show_genre.inc.php:32
+#, fuzzy
+msgid "Viewing"
+msgstr "Bekijken"
+
+#: ../../templates/show_genre.inc.php:36 ../../templates/sidebar.inc.php:35
+#: ../../templates/sidebar.inc.php:136
+#: ../../templates/show_local_catalog_info.inc.php:18
+#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:65
+#: ../../templates/show_browse_menu.inc:36 ../../templates/show_search.inc:136
+msgid "Albums"
+msgstr ""
+
+#: ../../templates/show_genre.inc.php:41 ../../templates/sidebar.inc.php:36
+#: ../../templates/sidebar.inc.php:135
+#: ../../templates/show_local_catalog_info.inc.php:22
+#: ../../templates/show_browse_menu.inc:35 ../../templates/show_search.inc:137
+msgid "Artists"
+msgstr "Artiesten"
+
+#: ../../templates/show_genre.inc.php:46
+#: ../../templates/show_genres.inc.php:37 ../../templates/sidebar.inc.php:133
+#: ../../templates/show_random_play_bar.inc.php:49
+#: ../../templates/show_local_catalog_info.inc.php:26
+#: ../../templates/show_artists.inc:41 ../../templates/show_artists.inc:64
+#: ../../templates/show_albums.inc:41 ../../templates/show_albums.inc:71
+#: ../../templates/show_search.inc:135
+msgid "Songs"
+msgstr "Liedjes"
+
 #: ../../templates/show_user.inc.php:26
 msgid "Changing User Information for"
 msgstr ""
@@ -908,10 +971,143 @@
 msgid "Clear Stats"
 msgstr "Statistieken Verwijderen"
 
+#: ../../templates/show_genres.inc.php:38 ../../templates/show_uploads.inc:32
+#: ../../templates/show_mpdpl.inc:68 ../../templates/show_songs.inc:50
+#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:67
+#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:75
+#: ../../templates/show_access_list.inc:51 ../../templates/show_artist.inc:42
+msgid "Action"
+msgstr "Aktie"
+
+#: ../../templates/show_genres.inc.php:48
+#: ../../templates/show_playlists.inc.php:63
+#: ../../templates/show_localplay.inc:41 ../../templates/show_artists.inc:54
+#: ../../templates/show_albums.inc:57 ../../templates/show_mpdplay.inc:64
+#: ../../templates/show_artist.inc:67
+msgid "Play"
+msgstr "Afspelen"
+
+#: ../../templates/sidebar.inc.php:29
+msgid "Users"
+msgstr "Gebruikers"
+
+#: ../../templates/sidebar.inc.php:30
+msgid "Mail Users"
+msgstr "Mail Gebruikers"
+
+#: ../../templates/sidebar.inc.php:32
+#, fuzzy
+msgid "Site Preferences"
+msgstr "Voorkeuren Bijwerken"
+
+#: ../../templates/sidebar.inc.php:33
+#, fuzzy
+msgid "Access List"
+msgstr "Toegangs lijsten"
+
+#: ../../templates/sidebar.inc.php:38
+#, fuzzy
+msgid "Lists"
+msgstr "Artiesten"
+
+#: ../../templates/sidebar.inc.php:45 ../../templates/menu.inc:29
+msgid "Home"
+msgstr "Begin"
+
+#: ../../templates/sidebar.inc.php:49 ../../templates/menu.inc:63
+#: ../../templates/menu.inc:66
+msgid "Admin"
+msgstr "Beheer"
+
+#: ../../templates/sidebar.inc.php:66 ../../templates/menu.inc:40
+msgid "Preferences"
+msgstr "Voorkeuren"
+
+#: ../../templates/sidebar.inc.php:85 ../../templates/menu.inc:43
+#: ../../templates/show_upload.inc:73
+msgid "Upload"
+msgstr "Uploaden"
+
+#: ../../templates/sidebar.inc.php:89
+#: ../../templates/show_playlists.inc.php:28 ../../templates/menu.inc:38
+msgid "Playlists"
+msgstr "Speellijsten"
+
+#: ../../templates/sidebar.inc.php:93 ../../templates/menu.inc:32
+msgid "Local Play"
+msgstr "Lokaal Afspelen"
+
+#: ../../templates/sidebar.inc.php:112
+#: ../../templates/show_playlists.inc.php:66
+#: ../../templates/show_artists.inc:56 ../../templates/show_albums.inc:59
+#: ../../templates/show_mpdplay.inc:114
+msgid "Random"
+msgstr "Willekeurig"
+
+#: ../../templates/sidebar.inc.php:134
+#: ../../templates/show_random_play_bar.inc.php:50
+msgid "Minutes"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:137
+#: ../../templates/show_random_play_bar.inc.php:53
+msgid "Less Played"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:141
+#: ../../templates/show_random_play_bar.inc.php:58
+msgid "Enqueue"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:146 ../../templates/menu.inc:75
+#: ../../templates/menu.inc:81 ../../templates/menu.inc:85
+msgid "Logout"
+msgstr "Uitloggen"
+
 #: ../../templates/show_confirmation.inc.php:30
 msgid "Continue"
 msgstr "Doorgaan"
 
+#: ../../templates/show_random_play_bar.inc.php:31
+#: ../../templates/show_random_play.inc:28
+msgid "Play Random Selection"
+msgstr "Speel Willekeurige Selectie"
+
+#: ../../templates/show_random_play_bar.inc.php:51
+#, fuzzy
+msgid "Full Artists"
+msgstr "Volledige Artiest"
+
+#: ../../templates/show_random_play_bar.inc.php:52
+#: ../../templates/show_random_play.inc:60
+msgid "Full Albums"
+msgstr "Volledige Albums"
+
+#: ../../templates/show_random_play_bar.inc.php:55
+msgid "from"
+msgstr ""
+
+#: ../../templates/show_random_play_bar.inc.php:59
+#, fuzzy
+msgid "Advanced"
+msgstr "Toegevoegd"
+
+#: ../../templates/show_local_catalog_info.inc.php:10
+msgid "Total Users"
+msgstr "Totaal Aantal Gebruikers"
+
+#: ../../templates/show_local_catalog_info.inc.php:14
+msgid "Connected Users"
+msgstr "Verbonden Gebruikers"
+
+#: ../../templates/show_local_catalog_info.inc.php:30
+msgid "Catalog Size"
+msgstr "Catalogus Grootte"
+
+#: ../../templates/show_local_catalog_info.inc.php:34
+msgid "Catalog Time"
+msgstr "Catalogus Tijd"
+
 #: ../../templates/show_play_selected.inc.php:49
 msgid "Play Selected"
 msgstr "Selectie Afspelen"
@@ -921,35 +1117,54 @@
 msgid "Download Selected"
 msgstr "Selectie Aanvinken"
 
-#: ../../templates/show_play_selected.inc.php:55 ../../playlist.php:77
+#: ../../templates/show_play_selected.inc.php:55
 msgid "Flag Selected"
 msgstr "Selectie Aanvinken"
 
-#: ../../templates/show_play_selected.inc.php:56 ../../playlist.php:83
+#: ../../templates/show_play_selected.inc.php:56
 msgid "Edit Selected"
 msgstr "Selectie Bewerken"
 
-#: ../../templates/show_play_selected.inc.php:63
+#: ../../templates/show_play_selected.inc.php:64
 msgid "Set Track Numbers"
 msgstr "Nummering"
 
-#: ../../templates/show_play_selected.inc.php:64
+#: ../../templates/show_play_selected.inc.php:65
 msgid "Remove Selected Tracks"
 msgstr "Verwijder Geselecteerde Nummers"
 
-#: ../../templates/show_play_selected.inc.php:70
+#: ../../templates/show_play_selected.inc.php:71
 msgid "Playlist"
 msgstr "Speellijst"
 
-#: ../../templates/show_play_selected.inc.php:70
+#: ../../templates/show_play_selected.inc.php:71
 msgid "Add to"
 msgstr "Voeg toe aan"
 
-#: ../../templates/show_all_popular.inc.php:27 ../../index.php:98
+#: ../../templates/show_play_selected.inc.php:73
+#: ../../templates/show_playlists.inc.php:51
+msgid "View"
+msgstr "Bekijken"
+
+#: ../../templates/show_play_selected.inc.php:74
+#: ../../templates/show_playlists.inc.php:55 ../../templates/show_users.inc:58
+#: ../../templates/show_users.inc:102
+msgid "Edit"
+msgstr "Aanpassen"
+
+#: ../../templates/show_all_recent.inc.php:27 ../../index.php:99
+msgid "Newest Artist Additions"
+msgstr "Nieuwste Artiest Toevoegingen"
+
+#: ../../templates/show_all_recent.inc.php:30 ../../index.php:106
+msgid "Newest Album Additions"
+msgstr "Nieuwste Album Toevoegingen"
+
+#: ../../templates/show_all_popular.inc.php:27 ../../index.php:82
 msgid "Most Popular Artists"
 msgstr "Meest Populaire Artiesten"
 
-#: ../../templates/show_all_popular.inc.php:30 ../../index.php:71
+#: ../../templates/show_all_popular.inc.php:30 ../../index.php:61
 msgid "Most Popular Albums"
 msgstr "Meest Populaire Albums"
 
@@ -958,120 +1173,231 @@
 msgid "Most Popular Genres"
 msgstr "Meest Populaire Liedjes"
 
-#: ../../templates/show_all_popular.inc.php:40 ../../index.php:105
+#: ../../templates/show_all_popular.inc.php:40 ../../index.php:89
 msgid "Most Popular Songs"
 msgstr "Meest Populaire Liedjes"
 
-#: ../../templates/show_local_catalog_info.inc.php:10
-msgid "Total Users"
-msgstr "Totaal Aantal Gebruikers"
+#: ../../templates/show_get_albumart.inc.php:28
+msgid "Customize Search"
+msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:14
-msgid "Connected Users"
-msgstr "Verbonden Gebruikers"
+#: ../../templates/show_get_albumart.inc.php:49
+msgid "Direct URL to Image"
+msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:18
-#: ../../templates/show_genre.inc.php:36 ../../templates/show_artists.inc:42
-#: ../../templates/show_artists.inc:65 ../../templates/show_browse_menu.inc:36
-msgid "Albums"
+#: ../../templates/show_get_albumart.inc.php:59
+msgid "Get Art"
+msgstr "Haal Hoesje"
+
+#: ../../templates/show_rename_artist.inc.php:33
+#: ../../templates/show_rename_artist.inc.php:51
+#, fuzzy
+msgid "Rename"
+msgstr "Gebruikersnaam"
+
+#: ../../templates/show_rename_artist.inc.php:33
+msgid "to"
 msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:22
-#: ../../templates/show_genre.inc.php:41
-#: ../../templates/show_browse_menu.inc:35
-msgid "Artists"
-msgstr "Artiesten"
+#: ../../templates/show_rename_artist.inc.php:40
+#: ../../templates/show_search.inc:144
+msgid "OR"
+msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:26
-#: ../../templates/show_genres.inc.php:37
-#: ../../templates/show_genre.inc.php:46 ../../templates/show_artists.inc:41
-#: ../../templates/show_artists.inc:64 ../../templates/show_albums.inc:41
-#: ../../templates/show_albums.inc:71
-msgid "Songs"
-msgstr "Liedjes"
+#: ../../templates/show_rename_artist.inc.php:42
+msgid "Insert current"
+msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:30
-msgid "Catalog Size"
-msgstr "Catalogus Grootte"
+#: ../../templates/show_rename_artist.inc.php:47
+#, fuzzy
+msgid "Update id3 tags"
+msgstr "Bijwerken uit labels"
 
-#: ../../templates/show_local_catalog_info.inc.php:34
-msgid "Catalog Time"
-msgstr "Catalogus Tijd"
+#: ../../templates/show_artist_box.inc.php:26
+msgid "Albums by"
+msgstr "Albums van"
 
-#: ../../templates/show_genres.inc.php:38 ../../templates/show_artists.inc:43
-#: ../../templates/show_artists.inc:67 ../../templates/show_songs.inc:42
-#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:75
-#: ../../templates/show_access_list.inc:51 ../../templates/show_artist.inc:55
-#: ../../templates/show_mpdpl.inc:68 ../../templates/show_uploads.inc:32
-msgid "Action"
+#: ../../templates/show_artist_box.inc.php:34
+msgid "Show All Songs By"
+msgstr "Toon alle liedjes door"
+
+#: ../../templates/show_artist_box.inc.php:35
+msgid "Play All Songs By"
+msgstr "Speel alle liedjes van"
+
+#: ../../templates/show_artist_box.inc.php:36
+msgid "Play Random Songs By"
+msgstr "Speel willekeurige liedjes van"
+
+#: ../../templates/show_artist_box.inc.php:38
+#: ../../templates/show_album.inc:72
+msgid "Update from tags"
+msgstr "Bijwerken uit labels"
+
+#: ../../templates/show_artist_box.inc.php:39
+#, fuzzy
+msgid "Rename Artist"
+msgstr "Artiest"
+
+#: ../../templates/show_playlists.inc.php:31
+#, fuzzy
+msgid "Playlist Name"
+msgstr "Speellijst type"
+
+#: ../../templates/show_playlists.inc.php:32
+#, fuzzy
+msgid "# Songs"
+msgstr "Liedjes"
+
+#: ../../templates/show_playlists.inc.php:33
+msgid "Owner"
+msgstr ""
+
+#: ../../templates/show_playlists.inc.php:34
+#, fuzzy
+msgid "Actions"
 msgstr "Aktie"
 
-#: ../../templates/show_genre.inc.php:32
+#: ../../templates/show_playlists.inc.php:58
+#: ../../templates/show_uploads.inc:50 ../../templates/catalog.inc:57
+#: ../../templates/show_users.inc:70
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: ../../templates/show_playlists.inc.php:71
+#: ../../templates/show_songs.inc:140 ../../templates/show_album.inc:75
+#: ../../templates/show_albums.inc:61 ../../templates/show_artist.inc:69
+msgid "Download"
+msgstr ""
+
+#: ../../templates/show_playlist_box.inc.php:33
+msgid "Playlist Actions"
+msgstr "Speellijst Akties"
+
+#: ../../templates/show_playlist_box.inc.php:34
 #, fuzzy
-msgid "Viewing"
-msgstr "Bekijken"
+msgid "Create New Playlist"
+msgstr "Maak een nieuwe speellijst"
 
-#: ../../templates/show_all_recent.inc.php:27 ../../index.php:115
-msgid "Newest Artist Additions"
-msgstr "Nieuwste Artiest Toevoegingen"
+#: ../../templates/show_playlist_box.inc.php:35
+#, fuzzy
+msgid "View All Playlists"
+msgstr "Nieuwe Speellijst"
+
+#: ../../templates/show_playlist_box.inc.php:36
+#, fuzzy
+msgid "Import From File"
+msgstr "Speellijst importeren uit een Bestand"
+
+#: ../../templates/show_playlist_box.inc.php:38
+#, fuzzy
+msgid "Normalize Tracks"
+msgstr "Aantal Nummers"
+
+#: ../../templates/show_playlist_box.inc.php:39
+#, fuzzy
+msgid "Play This Playlist"
+msgstr "Speel de Gehele Speellijst"
+
+#: ../../templates/show_preference_box.inc.php:44
+msgid "Preference"
+msgstr "Voorkeur"
+
+#: ../../templates/show_preference_box.inc.php:45
+msgid "Value"
+msgstr "Waarde"
+
+#: ../../templates/show_preference_box.inc.php:47
+msgid "Apply to All"
+msgstr "Toepassen op alles"
+
+#: ../../templates/show_preference_box.inc.php:54
+msgid "description"
+msgstr ""
+
+#: ../../templates/show_object_rating.inc.php:25
+#: ../../templates/show_songs.inc:52
+#, fuzzy
+msgid "Rating"
+msgstr "Bewerken"
+
+#: ../../localplay.php:81
+msgid "Unknown action requested"
+msgstr "Onbekende aktie gevraagd"
+
+#: ../../browse.php:48 ../../albums.php:168 ../../albums.php:174
+#: ../../albums.php:181 ../../albums.php:186 ../../albums.php:192
+#, fuzzy
+msgid "Show Albums starting with"
+msgstr "<u>T</u>oon alleen albums beginnend met"
 
-#: ../../templates/show_all_recent.inc.php:30 ../../index.php:122
-msgid "Newest Album Additions"
-msgstr "Nieuwste Album Toevoegingen"
+#: ../../browse.php:78 ../../artists.php:128 ../../artists.php:132
+#: ../../artists.php:138 ../../artists.php:151
+#, fuzzy
+msgid "Show Artists starting with"
+msgstr "<u>T</u>oon artiesten beginnend met"
 
-#: ../../localplay.php:79
-msgid "Unknown action requested"
-msgstr "Onbekende aktie gevraagd"
+#: ../../search.php:45
+msgid "Error: No Keyword Entered"
+msgstr ""
 
-#: ../../artists.php:48
-msgid "All songs by"
-msgstr "Alle liedjes van"
+#: ../../tv.php:76 ../../templates/show_now_playing.inc:31
+msgid "Now Playing"
+msgstr "Speelt Nu"
 
-#: ../../artists.php:57 ../../albums.php:106
+#: ../../artists.php:58 ../../albums.php:147
 msgid "Starting Update from Tags"
 msgstr "Start Bijwerken vanuit Labels"
 
-#: ../../artists.php:62 ../../albums.php:111
+#: ../../artists.php:63 ../../albums.php:152
 msgid "Update From Tags Complete"
 msgstr "Bijwerken vanuit Labels Klaar"
 
-#: ../../artists.php:72 ../../artists.php:76 ../../artists.php:82
-#: ../../artists.php:95
-#, fuzzy
-msgid "Show Artists starting with"
-msgstr "<u>T</u>oon artiesten beginnend met"
-
-#: ../../amp-mpd.php:176 ../../playlist.php:135
+#: ../../amp-mpd.php:171 ../../playlist.php:63
 msgid "New Playlist"
 msgstr "Nieuwe Speellijst"
 
-#: ../../playlist.php:115
-msgid "owned by"
-msgstr "eigendom van"
-
-#: ../../playlist.php:118
-msgid "Edit Playlist"
-msgstr "Bewerk Speellijst"
+#: ../../playlist.php:46
+#, fuzzy
+msgid "Playlist Deleted"
+msgstr "Selectie Afspelen"
 
-#: ../../playlist.php:121
-msgid "Play Full Playlist"
-msgstr "Speel de Gehele Speellijst"
+#: ../../playlist.php:46
+#, fuzzy
+msgid "The Requested Playlist has been deleted"
+msgstr "De gevraagde liedjes zijn aktief gemaakt"
 
-#: ../../playlist.php:122
-msgid "Play Random"
-msgstr "Speel Willekeurig"
+#: ../../playlist.php:56
+#, fuzzy
+msgid "Are you sure you want to delete this playlist"
+msgstr "Weet u zeker dat u dit permanent wilt verwijderen:"
 
-#: ../../playlist.php:192
-msgid "Playlist updated."
+#: ../../playlist.php:112
+#, fuzzy
+msgid "Playlist Created"
 msgstr "Speellijst Bijgewerkt"
 
-#: ../../index.php:41
-msgid "Welcome to"
-msgstr "Welkom bij"
+#: ../../playlist.php:112
+msgid " has been created"
+msgstr ""
 
-#: ../../index.php:43
-msgid "you are currently logged in as"
-msgstr "u bent momenteel aangemeld als"
+#: ../../playlist.php:121
+#, fuzzy
+msgid "Remote Selected Tracks"
+msgstr "Verwijder Geselecteerde Nummers"
+
+#: ../../playlist.php:139
+#, fuzzy
+msgid "Playlist Updated"
+msgstr "Speellijst Bijgewerkt"
+
+#: ../../playlist.php:139
+msgid " has been updated"
+msgstr ""
+
+#: ../../flag.php:38
+msgid "Flagging song completed."
+msgstr "Aanvinken Liedje Gedaan"
 
 #: ../../user.php:45
 msgid "Error: Password Does Not Match or Empty"
@@ -1081,10 +1407,6 @@
 msgid "Error: Insufficient Rights"
 msgstr "Fout: Onvoldoende Rechten"
 
-#: ../../flag.php:35
-msgid "Flagging song completed."
-msgstr "Aanvinken Liedje Gedaan"
-
 #: ../../albums.php:44
 msgid "Album Art Cleared"
 msgstr "Album Hoesje Verwijderd"
@@ -1093,27 +1415,15 @@
 msgid "Album Art information has been removed form the database"
 msgstr "Album Hoes informatie is verwijderd uit de database"
 
-#: ../../albums.php:78
-msgid "Album Art Located"
-msgstr "Album Hoesje Gevonden"
-
-#: ../../albums.php:78
-msgid ""
-"Album Art information has been located in Amazon. If incorrect, click "
-"\"Reset Album Art\" below to remove the artwork."
+#: ../../albums.php:74
+msgid "No Amazon Developer Key set, amazon album art searching will not work"
 msgstr ""
-"Album Hoes Informatie is gevonden in Amazon. Als dit niet juist is, klik "
-"\"Herstel Album Hoesje\" hieronder om het plaatje te verwijderen."
-
-#: ../../albums.php:86 ../../albums.php:96
-msgid "Get Art"
-msgstr "Haal Hoesje"
 
-#: ../../albums.php:90
+#: ../../albums.php:104
 msgid "Album Art Not Located"
 msgstr "Album Hoesje Niet Gevonden"
 
-#: ../../albums.php:90
+#: ../../albums.php:104
 msgid ""
 "Album Art could not be located at this time. This may be due to Amazon being "
 "busy, or the album not being present in their collection."
@@ -1121,11 +1431,90 @@
 "Album Hoesje kon nu niet worden gevonden. Dit kan komen doordat Amazon druk "
 "is, of het album bestaat niet in hun collectie."
 
-#: ../../albums.php:127 ../../albums.php:133 ../../albums.php:140
-#: ../../albums.php:145 ../../albums.php:150
+#: ../../albums.php:137
 #, fuzzy
-msgid "Show Albums starting with"
-msgstr "<u>T</u>oon alleen albums beginnend met"
+msgid "Album Art Inserted"
+msgstr "Album Hoesje Verwijderd"
+
+#: ../../ratings.php:33
+#, fuzzy
+msgid "Rating Updated"
+msgstr "Snel Bijwerken"
+
+#: ../../ratings.php:33
+msgid "Your rating for this object has been updated"
+msgstr ""
+
+#: ../../register.php:79
+#, fuzzy
+msgid "Error Captcha Required"
+msgstr "Fout Gebruikersnaam Vereist"
+
+#: ../../register.php:86
+msgid "Error Captcha Failed"
+msgstr ""
+
+#: ../../register.php:93
+msgid "You <U>must</U> accept the user agreement"
+msgstr ""
+
+#: ../../register.php:98
+msgid "You did not enter a username"
+msgstr ""
+
+#: ../../register.php:102
+msgid "Please fill in your full name (Firstname Lastname)"
+msgstr ""
+
+#: ../../register.php:128
+#, fuzzy
+msgid "You must enter a password"
+msgstr "Geef Wachtwoord"
+
+#: ../../register.php:132
+#, fuzzy
+msgid "Your passwords do not match"
+msgstr "Fout Wachtwoorden niet hetzelfde"
+
+#: ../../register.php:150
+#, fuzzy
+msgid "Error: Insert Failed"
+msgstr "Fout: Onvoldoende Rechten"
+
+#: ../../register.php:165
+msgid "Registration Complete"
+msgstr ""
+
+#: ../../activate.php:42
+msgid "No user with this name registered"
+msgstr ""
+
+#: ../../activate.php:46
+msgid "The validation key used isn't correct."
+msgstr ""
+
+#: ../../activate.php:51
+#, fuzzy
+msgid "User activated"
+msgstr "Gebruiker Verwijderd"
+
+#: ../../activate.php:51
+msgid "This User ID is activated and can be used"
+msgstr ""
+
+#: ../../bin/print_tags.php.inc:42
+msgid ""
+"[print_tags.php.inc]\n"
+"This commandline script will display the tag information for the specified "
+"filename as it will \n"
+"appear to Ampache. \n"
+"        \n"
+msgstr ""
+
+#: ../../bin/print_tags.php.inc:48
+#, fuzzy
+msgid "Filename:"
+msgstr "Bestandsnaam"
 
 #: ../../bin/quarantine_migration.php.inc:49
 #, fuzzy
@@ -1190,19 +1579,141 @@
 msgid "!\n"
 msgstr ""
 
+#: ../../templates/show_admin_index.inc:27
+#, fuzzy
+msgid "User Management"
+msgstr "Gebruikersnaam"
+
+#: ../../templates/show_admin_index.inc:28
+msgid "E-mail Management"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:29
+#, fuzzy
+msgid "Catalog Managment"
+msgstr "Catalogus Naam"
+
+#: ../../templates/show_admin_index.inc:30
+msgid "Admin Preferences"
+msgstr "Beheer Voorkeuren"
+
+#: ../../templates/show_admin_index.inc:31 ../../templates/catalog.inc:95
+msgid "Access Lists"
+msgstr "Toegangs lijsten"
+
+#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:94
+msgid "Add a catalog"
+msgstr "Catalogus toevoegen"
+
+#: ../../templates/show_admin_index.inc:35 ../../templates/catalog.inc:99
+msgid "Clear Now Playing"
+msgstr "Nu Spelen Leegmaken"
+
+#: ../../templates/show_admin_index.inc:36
+#, fuzzy
+msgid "Add Access List Entry"
+msgstr "Toegangs lijsten"
+
+#: ../../templates/show_admin_index.inc:40
+#, fuzzy
+msgid "Common Functions"
+msgstr "DB Connectie"
+
+#: ../../templates/show_admin_index.inc:43
+#, fuzzy
+msgid "Admin Sections"
+msgstr "Beheer Afdeling"
+
+#: ../../templates/show_uploads.inc:33
+#, fuzzy
+msgid "Status"
+msgstr "Statistieken"
+
+#: ../../templates/show_uploads.inc:34 ../../templates/flag.inc:58
+#: ../../templates/list_flagged.inc:41 ../../templates/list_duplicates.inc:32
+msgid "Song"
+msgstr "Liedje"
+
+#: ../../templates/show_uploads.inc:40 ../../templates/show_songs.inc:46
+#: ../../templates/list_duplicates.inc:37
+msgid "Size"
+msgstr "Grootte"
+
+#: ../../templates/show_uploads.inc:42
+msgid "User"
+msgstr "Gebruiker"
+
+#: ../../templates/show_uploads.inc:43
+msgid "Date"
+msgstr "Datum"
+
+#: ../../templates/show_uploads.inc:49
+msgid "Add"
+msgstr "Toevoegen"
+
+#: ../../templates/show_mpdpl.inc:43
+#, fuzzy
+msgid "MPD Server Playlist"
+msgstr "Server Speellijst"
+
+#: ../../templates/show_mpdpl.inc:45 ../../templates/show_mpdpl.inc:175
+msgid "Refresh the Playlist Window"
+msgstr "Ververs het speellijst venster"
+
+#: ../../templates/show_mpdpl.inc:47 ../../templates/show_mpdpl.inc:177
+msgid "Click to shuffle (randomize) the playlist"
+msgstr "Klik om de speellijst willekeurig te maken"
+
+#: ../../templates/show_mpdpl.inc:47 ../../templates/show_mpdpl.inc:177
+msgid "shuffle"
+msgstr "willekeurig"
+
+#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:178
+#, fuzzy
+msgid "Click to the clear the playlist"
+msgstr "Klik om de speellijst leeg te maken"
+
+#: ../../templates/show_mpdpl.inc:52 ../../templates/show_mpdpl.inc:182
+msgid "Click to the remove all except the Now Playing"
+msgstr ""
+
+#: ../../templates/show_mpdpl.inc:62 ../../templates/show_songs.inc:41
+msgid "Song title"
+msgstr "Titel liedje"
+
+#: ../../templates/flag.inc:43
+msgid "Flag song"
+msgstr "Liedje aanvinken"
+
+#: ../../templates/flag.inc:45
+msgid ""
+"Flag the following song as having one of the problems listed below.  Site "
+"admins will then take the appropriate action for the flagged files."
+msgstr ""
+"Vink het volgende liedje aan zodat site beheerders kunnen zien dat deze 1 "
+"van de volgende problemen heeft. Zij zullen dan aktie hierop ondernemen."
+
+#: ../../templates/flag.inc:62
+msgid "Reason to flag"
+msgstr "Reden voor aanvinken"
+
+#: ../../templates/flag.inc:73
+msgid "Flag Song"
+msgstr "Liedje Aanvinken"
+
 #: ../../templates/customize_catalog.inc:24
 msgid "Settings for catalog in"
 msgstr "Instellingen voor catalogus in"
 
-#: ../../templates/customize_catalog.inc:32 ../../templates/add_catalog.inc:39
+#: ../../templates/customize_catalog.inc:32 ../../templates/add_catalog.inc:40
 msgid "Auto-inserted Fields"
 msgstr "Automatisch ingevulde Velden"
 
-#: ../../templates/customize_catalog.inc:33 ../../templates/add_catalog.inc:40
+#: ../../templates/customize_catalog.inc:33 ../../templates/add_catalog.inc:41
 msgid "album name"
 msgstr "album naam"
 
-#: ../../templates/customize_catalog.inc:34 ../../templates/add_catalog.inc:41
+#: ../../templates/customize_catalog.inc:34 ../../templates/add_catalog.inc:42
 msgid "artist name"
 msgstr "artiesten naam"
 
@@ -1210,27 +1721,27 @@
 msgid "catalog path"
 msgstr "catalogus pad"
 
-#: ../../templates/customize_catalog.inc:36 ../../templates/add_catalog.inc:42
+#: ../../templates/customize_catalog.inc:36 ../../templates/add_catalog.inc:43
 msgid "id3 comment"
 msgstr "id3 commentaar"
 
-#: ../../templates/customize_catalog.inc:37 ../../templates/add_catalog.inc:43
+#: ../../templates/customize_catalog.inc:37 ../../templates/add_catalog.inc:44
 msgid "genre"
 msgstr ""
 
-#: ../../templates/customize_catalog.inc:38 ../../templates/add_catalog.inc:44
+#: ../../templates/customize_catalog.inc:38 ../../templates/add_catalog.inc:45
 msgid "track number (padded with leading 0)"
 msgstr "liedje nummer (aanvullen met een begin-0)"
 
-#: ../../templates/customize_catalog.inc:39 ../../templates/add_catalog.inc:45
+#: ../../templates/customize_catalog.inc:39 ../../templates/add_catalog.inc:46
 msgid "song title"
 msgstr "titel liedje"
 
-#: ../../templates/customize_catalog.inc:40 ../../templates/add_catalog.inc:46
+#: ../../templates/customize_catalog.inc:40 ../../templates/add_catalog.inc:47
 msgid "year"
 msgstr "jaar"
 
-#: ../../templates/customize_catalog.inc:41 ../../templates/add_catalog.inc:47
+#: ../../templates/customize_catalog.inc:41 ../../templates/add_catalog.inc:48
 msgid "other"
 msgstr "overig"
 
@@ -1242,11 +1753,11 @@
 msgid "Filename pattern"
 msgstr "Bestandsnaam Pattroon"
 
-#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:75
 msgid "Folder Pattern"
 msgstr "Map Pattroon"
 
-#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:75
 msgid "(no leading or ending '/')"
 msgstr "(geen '/' aan het begin of eind)"
 
@@ -1254,52 +1765,6 @@
 msgid "Save Catalog Settings"
 msgstr "Catalogus Instellingen Opslaan"
 
-#: ../../templates/show_admin_index.inc:27
-#, fuzzy
-msgid "User Management"
-msgstr "Gebruikersnaam"
-
-#: ../../templates/show_admin_index.inc:28
-msgid "E-mail Management"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:29
-#, fuzzy
-msgid "Catalog Managment"
-msgstr "Catalogus Naam"
-
-#: ../../templates/show_admin_index.inc:30 ../../templates/admin_menu.inc:36
-msgid "Admin Preferences"
-msgstr "Beheer Voorkeuren"
-
-#: ../../templates/show_admin_index.inc:31 ../../templates/catalog.inc:98
-#: ../../templates/admin_menu.inc:37
-msgid "Access Lists"
-msgstr "Toegangs lijsten"
-
-#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:97
-msgid "Add a catalog"
-msgstr "Catalogus toevoegen"
-
-#: ../../templates/show_admin_index.inc:35 ../../templates/catalog.inc:102
-msgid "Clear Now Playing"
-msgstr "Nu Spelen Leegmaken"
-
-#: ../../templates/show_admin_index.inc:36
-#, fuzzy
-msgid "Add Access List Entry"
-msgstr "Toegangs lijsten"
-
-#: ../../templates/show_admin_index.inc:40
-#, fuzzy
-msgid "Common Functions"
-msgstr "DB Connectie"
-
-#: ../../templates/show_admin_index.inc:43
-#, fuzzy
-msgid "Admin Sections"
-msgstr "Beheer Afdeling"
-
 #: ../../templates/show_test.inc:29
 msgid "Ampache Debug"
 msgstr ""
@@ -1372,7 +1837,7 @@
 "Ondersteuning is niet vereist voor Ampache, maar wel aangeraden."
 
 #: ../../templates/show_test.inc:116
-#: ../../templates/show_install_config.inc:87
+#: ../../templates/show_install_config.inc:88
 msgid "Ampache.cfg.php Exists"
 msgstr "Ampache.cfg.php Bestaat"
 
@@ -1387,7 +1852,7 @@
 "\tdeze is niet leesbaar door uw webserver."
 
 #: ../../templates/show_test.inc:137
-#: ../../templates/show_install_config.inc:104
+#: ../../templates/show_install_config.inc:105
 msgid "Ampache.cfg.php Configured?"
 msgstr "Ampache.cfg.php Geconfigureerd?"
 
@@ -1438,20 +1903,20 @@
 msgstr "Afspelen"
 
 #: ../../templates/show_localplay.inc:39 ../../templates/list_header.inc:71
-#: ../../templates/show_mpdplay.inc:48
+#: ../../templates/show_mpdplay.inc:62
 msgid "Prev"
 msgstr "Vorig"
 
-#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:49
+#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:63
 msgid "Stop"
 msgstr ""
 
-#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:51
+#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:65
 msgid "Pause"
 msgstr "Pauze"
 
 #: ../../templates/show_localplay.inc:43 ../../templates/list_header.inc:94
-#: ../../templates/show_mpdplay.inc:52
+#: ../../templates/show_mpdplay.inc:66
 msgid "Next"
 msgstr "Volgend"
 
@@ -1471,7 +1936,7 @@
 msgid "Clear queue"
 msgstr "Wachtrij vrijmaken"
 
-#: ../../templates/add_catalog.inc:30
+#: ../../templates/add_catalog.inc:31
 msgid ""
 "In the form below enter either a local path (i.e. /data/music) or the URL to "
 "a remote Ampache installation (i.e http://theotherampache.com)"
@@ -1480,60 +1945,55 @@
 "URL naar een Ampache installatie op afstand (bijv http://theotherampache."
 "com) invullen"
 
-#: ../../templates/add_catalog.inc:36
+#: ../../templates/add_catalog.inc:37
 msgid "Catalog Name"
 msgstr "Catalogus Naam"
 
-#: ../../templates/add_catalog.inc:53
+#: ../../templates/add_catalog.inc:54
 msgid "Path"
 msgstr "Pad"
 
-#: ../../templates/add_catalog.inc:57
+#: ../../templates/add_catalog.inc:58
 msgid "Catalog Type"
 msgstr "Catalogus Type"
 
-#: ../../templates/add_catalog.inc:61
+#: ../../templates/add_catalog.inc:62
 msgid "Remote"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:66
+#: ../../templates/add_catalog.inc:67
 msgid "ID3 Set Command"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:70
+#: ../../templates/add_catalog.inc:71
 msgid "Filename Pattern"
 msgstr "Bestandsnaam Pattroon"
 
-#: ../../templates/add_catalog.inc:78 ../../templates/catalog.inc:104
+#: ../../templates/add_catalog.inc:79 ../../templates/catalog.inc:101
 msgid "Gather Album Art"
 msgstr "Verzamel Album Hoesjes"
 
-#: ../../templates/add_catalog.inc:82
+#: ../../templates/add_catalog.inc:83
 msgid "ID3V2 Tags"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:85
+#: ../../templates/add_catalog.inc:86
 msgid "Amazon"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:88
+#: ../../templates/add_catalog.inc:89
 msgid "File Folder"
 msgstr "Bestands map"
 
-#: ../../templates/add_catalog.inc:95
+#: ../../templates/add_catalog.inc:96
 msgid "Build Playlists from m3u Files"
 msgstr "Bouw Speellijsten uit m3u bestanden"
 
-#: ../../templates/add_catalog.inc:102
+#: ../../templates/add_catalog.inc:103
 msgid "Add Catalog"
 msgstr "Catalogus toevoegen"
 
-#: ../../templates/list_flagged.inc:41 ../../templates/flag.inc:58
-#: ../../templates/show_uploads.inc:34
-msgid "Song"
-msgstr "Liedje"
-
-#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:41
+#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:49
 msgid "Flag"
 msgstr "Aanvinken"
 
@@ -1557,29 +2017,29 @@
 msgid "Reject"
 msgstr "Afwijzen"
 
-#: ../../templates/show_artists.inc:55 ../../templates/show_albums.inc:58
-#: ../../templates/show_random_play.inc:46
-msgid "All"
-msgstr "Alles"
-
-#: ../../templates/show_songs.inc:33 ../../templates/show_mpdpl.inc:62
-msgid "Song title"
-msgstr "Titel liedje"
+#: ../../templates/header.inc:49
+#, fuzzy
+msgid "You are currently logged in as"
+msgstr "u bent momenteel aangemeld als"
 
-#: ../../templates/show_songs.inc:38 ../../templates/show_uploads.inc:40
-msgid "Size"
-msgstr "Grootte"
+#: ../../templates/header.inc:58
+msgid "Go!"
+msgstr ""
 
-#: ../../templates/show_songs.inc:113
+#: ../../templates/show_songs.inc:143
 msgid "Direct Link"
 msgstr "Directe Link"
 
-#: ../../templates/show_songs.inc:131
+#: ../../templates/show_songs.inc:166
 msgid "Total"
 msgstr "Totaal"
 
+#: ../../templates/show_search_bar.inc:36 ../../templates/show_search.inc:54
+msgid "Search Ampache"
+msgstr "Doorzoek Ampache"
+
 #: ../../templates/show_install_config.inc:41
-#: ../../templates/show_install.inc:40
+#: ../../templates/show_install.inc:41
 msgid ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
 "ampache.cfg.php.dist file"
@@ -1588,7 +2048,7 @@
 "config/ampache.cfg.php.dist bestand"
 
 #: ../../templates/show_install_config.inc:49
-#: ../../templates/show_install.inc:50
+#: ../../templates/show_install.inc:51
 msgid "Step 2 - Creating the Ampache.cfg.php file"
 msgstr "Stap 2 - Aanmaken van het Ampache.cfg.php bestand"
 
@@ -1602,89 +2062,69 @@
 "te schrijven naar uw webserver. Als toegang wordt geweigerd zal hij u vragen "
 "het bestand te downloaden. Zet dit configuratie bestand in /config"
 
-#: ../../templates/show_install_config.inc:59
+#: ../../templates/show_install_config.inc:60
 msgid "Web Path"
 msgstr "Web Pad"
 
-#: ../../templates/show_install_config.inc:63
-#: ../../templates/show_install.inc:57
+#: ../../templates/show_install_config.inc:64
+#: ../../templates/show_install.inc:59
 msgid "Desired Database Name"
 msgstr "Gewenste Database Naam"
 
-#: ../../templates/show_install_config.inc:67
-#: ../../templates/show_install.inc:61
+#: ../../templates/show_install_config.inc:68
+#: ../../templates/show_install.inc:63
 msgid "MySQL Hostname"
 msgstr "Mysql Hostnaam"
 
-#: ../../templates/show_install_config.inc:71
+#: ../../templates/show_install_config.inc:72
 msgid "MySQL Username"
 msgstr "MySQL Gebruikersnaam"
 
-#: ../../templates/show_install_config.inc:75
+#: ../../templates/show_install_config.inc:76
 msgid "MySQL Password"
 msgstr "MySQL Wachtwoord"
 
-#: ../../templates/show_install_config.inc:80
+#: ../../templates/show_install_config.inc:81
 msgid "Write Config"
 msgstr "Schrijf Configuratie"
 
-#: ../../templates/show_install_config.inc:124
+#: ../../templates/show_install_config.inc:125
 msgid "Check for Config"
 msgstr "Controleer Configuratie"
 
-#: ../../templates/show_album.inc:53
+#: ../../templates/show_album.inc:67
 msgid "Play Album"
 msgstr "Speel Album"
 
-#: ../../templates/show_album.inc:54
+#: ../../templates/show_album.inc:68
 msgid "Play Random from Album"
 msgstr "Speel Willekeurig uit Album"
 
-#: ../../templates/show_album.inc:55
+#: ../../templates/show_album.inc:69
 msgid "Reset Album Art"
 msgstr "Herstel Album Hoesje"
 
-#: ../../templates/show_album.inc:56
+#: ../../templates/show_album.inc:70
 msgid "Find Album Art"
 msgstr "Zoek Album Hoesje"
 
-#: ../../templates/show_album.inc:58 ../../templates/show_artist.inc:37
-msgid "Update from tags"
-msgstr "Bijwerken uit labels"
-
-#: ../../templates/show_preferences.inc:31
+#: ../../templates/show_preferences.inc:42
 msgid "Editing"
 msgstr "Bewerken"
 
-#: ../../templates/show_preferences.inc:31
+#: ../../templates/show_preferences.inc:42
 msgid "preferences"
 msgstr "voorkeuren"
 
-#: ../../templates/show_preferences.inc:33
+#: ../../templates/show_preferences.inc:44
 msgid "Rebuild Preferences"
 msgstr "Voorkeuren Herbouwen"
 
-#: ../../templates/show_preferences.inc:39
-msgid "Preference"
-msgstr "Voorkeur"
-
-#: ../../templates/show_preferences.inc:40
-msgid "Value"
-msgstr "Waarde"
-
-#: ../../templates/show_preferences.inc:42
-msgid "Type"
-msgstr ""
-
-#: ../../templates/show_preferences.inc:43
-msgid "Apply to All"
-msgstr "Toepassen op alles"
-
-#: ../../templates/show_preferences.inc:83
+#: ../../templates/show_preferences.inc:73
 msgid "Update Preferences"
 msgstr "Voorkeuren Bijwerken"
 
-#: ../../templates/show_preferences.inc:87
+#: ../../templates/show_preferences.inc:77
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -1708,7 +2148,35 @@
 msgid "Update User"
 msgstr "Gebruiker Bijwerken"
 
-#: ../../templates/show_install.inc:48
+#: ../../templates/show_random_play.inc:34
+msgid "Item count"
+msgstr "Aantal"
+
+#: ../../templates/show_random_play.inc:49
+msgid "From genre"
+msgstr "Van genre"
+
+#: ../../templates/show_random_play.inc:58
+msgid "Standard"
+msgstr ""
+
+#: ../../templates/show_random_play.inc:59
+msgid "Favor Unplayed"
+msgstr "Voorkeur voor Ongespeelde"
+
+#: ../../templates/show_random_play.inc:61
+msgid "Full Artist"
+msgstr "Volledige Artiest"
+
+#: ../../templates/show_random_play.inc:66
+msgid "from catalog"
+msgstr "uit catalogus"
+
+#: ../../templates/show_random_play.inc:75
+msgid "Play Random Songs"
+msgstr "Speel Willekeurige Liedjes"
+
+#: ../../templates/show_install.inc:49
 msgid ""
 "This step creates and inserts the Ampache database, as such please provide a "
 "mysql account with database creation rights. This step may take a while "
@@ -1718,37 +2186,30 @@
 "gebruiker met database creatie rechten. Deze stap kan een tijdje duren "
 "afhankelijk van de snelheid van uw computer"
 
-#: ../../templates/show_install.inc:65
+#: ../../templates/show_install.inc:67
 msgid "MySQL Administrative Username"
 msgstr "MySQL Beheerder Gebruikersnaam"
 
-#: ../../templates/show_install.inc:69
+#: ../../templates/show_install.inc:71
 msgid "MySQL Administrative Password"
 msgstr "MySQL Beheerder Wachtwoord"
 
-#: ../../templates/show_install.inc:74
-msgid "Insert Database"
-msgstr "Database Laden"
+#: ../../templates/show_install.inc:75
+msgid "Create Database User for New Database"
+msgstr ""
 
-#: ../../templates/flag.inc:43
-msgid "Flag song"
-msgstr "Liedje aanvinken"
+#: ../../templates/show_install.inc:80
+#, fuzzy
+msgid "Ampache Database Username"
+msgstr "Gewenste Database Naam"
 
-#: ../../templates/flag.inc:45
-msgid ""
-"Flag the following song as having one of the problems listed below.  Site "
-"admins will then take the appropriate action for the flagged files."
+#: ../../templates/show_install.inc:84
+msgid "Ampache Database User Password"
 msgstr ""
-"Vink het volgende liedje aan zodat site beheerders kunnen zien dat deze 1 "
-"van de volgende problemen heeft. Zij zullen dan aktie hierop ondernemen."
-
-#: ../../templates/flag.inc:62
-msgid "Reason to flag"
-msgstr "Reden voor aanvinken"
 
-#: ../../templates/flag.inc:73
-msgid "Flag Song"
-msgstr "Liedje Aanvinken"
+#: ../../templates/show_install.inc:89
+msgid "Insert Database"
+msgstr "Database Laden"
 
 #: ../../templates/show_add_access.inc:31
 msgid "Add Access for a Host"
@@ -1779,7 +2240,7 @@
 msgid "Add Host"
 msgstr "PC Toevoegen"
 
-#: ../../templates/catalog.inc:33
+#: ../../templates/catalog.inc:30
 msgid ""
 "Error: ICONV not found, ID3V2 Tags will not import correctly. See <a href="
 "\"http://php.oregonstate.edu/iconv\">Iconv</a> for information on getting "
@@ -1789,91 +2250,55 @@
 "<a href=\"http://php.oregonstate.edu/iconv\">Iconv</a> voor informatie over "
 "het verkrijgen van ICONV"
 
-#: ../../templates/catalog.inc:42
+#: ../../templates/catalog.inc:39
 msgid "Update Catalogs"
 msgstr "Catalogus Bijwerken"
 
-#: ../../templates/catalog.inc:68
+#: ../../templates/catalog.inc:65
 msgid "Fast Add"
 msgstr "Snel Toevoegen"
 
-#: ../../templates/catalog.inc:75
+#: ../../templates/catalog.inc:72
 msgid "Fast Update"
 msgstr "Snel Bijwerken"
 
-#: ../../templates/catalog.inc:88
+#: ../../templates/catalog.inc:85
 msgid "You don't have any catalogs."
 msgstr "U heeft geen catalogussen"
 
-#: ../../templates/catalog.inc:99
+#: ../../templates/catalog.inc:96
 msgid "Show Duplicate Songs"
 msgstr "Toon Dubbele Liedjes"
 
-#: ../../templates/catalog.inc:100
+#: ../../templates/catalog.inc:97
 msgid "Show Disabled Songs"
 msgstr "Toon Uitgeschakelde Liedjes"
 
-#: ../../templates/catalog.inc:101
+#: ../../templates/catalog.inc:98
 msgid "Clear Catalog Stats"
 msgstr "Catalogus Statistieken Leegmaken"
 
-#: ../../templates/catalog.inc:103
+#: ../../templates/catalog.inc:100
 msgid "Dump Album Art"
 msgstr "Dump Album Hoesjes"
 
-#: ../../templates/catalog.inc:105
+#: ../../templates/catalog.inc:102
 msgid "View flagged songs"
 msgstr "Bekijk Aangevinkte Liedjes"
 
-#: ../../templates/catalog.inc:106
+#: ../../templates/catalog.inc:103
 msgid "Catalog Tools"
 msgstr "Catalogus Gereedschap"
 
-#: ../../templates/admin_menu.inc:33
-msgid "Users"
-msgstr "Gebruikers"
-
-#: ../../templates/admin_menu.inc:34
-msgid "Mail Users"
-msgstr "Mail Gebruikers"
-
-#: ../../templates/menu.inc:29
-msgid "Home"
-msgstr "Begin"
-
-#: ../../templates/menu.inc:32
-msgid "Local Play"
-msgstr "Lokaal Afspelen"
-
-#: ../../templates/menu.inc:38
-msgid "Playlists"
-msgstr "Speellijsten"
-
-#: ../../templates/menu.inc:40
-msgid "Preferences"
-msgstr "Voorkeuren"
-
-#: ../../templates/menu.inc:43 ../../templates/show_upload.inc:73
-msgid "Upload"
-msgstr "Uploaden"
-
-#: ../../templates/menu.inc:63 ../../templates/menu.inc:66
-msgid "Admin"
-msgstr "Beheer"
-
 #: ../../templates/menu.inc:73 ../../templates/menu.inc:79
 msgid "Account"
 msgstr "Profiel"
 
 #: ../../templates/menu.inc:74 ../../templates/menu.inc:80
+#: ../../templates/show_users.inc:64 ../../templates/show_users.inc:112
 msgid "Stats"
 msgstr "Statistieken"
 
-#: ../../templates/menu.inc:75 ../../templates/menu.inc:81
-#: ../../templates/menu.inc:85
-msgid "Logout"
-msgstr "Uitloggen"
-
 #: ../../templates/show_upload.inc:30
 msgid "Uploading Music to Ampache"
 msgstr ""
@@ -1886,9 +2311,54 @@
 msgid "max_upload_size"
 msgstr ""
 
-#: ../../templates/show_now_playing.inc:31
-msgid "Now Playing"
-msgstr "Speelt Nu"
+#: ../../templates/show_users.inc:40
+msgid "Fullname"
+msgstr "Volledige Naam"
+
+#: ../../templates/show_users.inc:48
+msgid "Last Seen"
+msgstr "Laatst Gezien"
+
+#: ../../templates/show_users.inc:53
+#, fuzzy
+msgid "Registration Date"
+msgstr "Registreer Gebruiker"
+
+#: ../../templates/show_users.inc:61 ../../templates/show_users.inc:107
+msgid "Prefs"
+msgstr "Voorkeuren"
+
+#: ../../templates/show_users.inc:67
+msgid "Access"
+msgstr "Toegang"
+
+#: ../../templates/show_users.inc:73
+msgid "On-line"
+msgstr ""
+
+#: ../../templates/show_users.inc:126
+msgid "delete"
+msgstr "verwijderen"
+
+#: ../../templates/list_duplicates.inc:28
+#, fuzzy
+msgid "Duplicate Songs"
+msgstr "Toon Dubbele Liedjes"
+
+#: ../../templates/list_duplicates.inc:35
+msgid "Length"
+msgstr ""
+
+#: ../../templates/list_duplicates.inc:74
+msgid "You don"
+msgstr ""
+
+#: ../../templates/list_duplicates.inc:74
+msgid ""
+"); ?></p>\n"
+"<?php  } ?>\n"
+"</form>\n"
+msgstr ""
 
 #: ../../templates/show_login_form.inc:49
 #: ../../templates/show_login_form.inc:63
@@ -1899,6 +2369,11 @@
 msgid "Remember Me"
 msgstr "Onthoud mij"
 
+#: ../../templates/show_login_form.inc:72
+#, fuzzy
+msgid "Register"
+msgstr "Registreer Gebruiker"
+
 #: ../../templates/show_access_list.inc:34
 msgid "Host Access to Your Catalog"
 msgstr "PC Toegang tot uw Catalogus"
@@ -1919,181 +2394,174 @@
 msgid "Revoke"
 msgstr "Terugtrekken"
 
-#: ../../templates/show_users.inc:43
-msgid "Fullname"
-msgstr "Volledige Naam"
-
-#: ../../templates/show_users.inc:48
-msgid "Last Seen"
-msgstr "Laatst Gezien"
+#: ../../templates/show_search.inc:57
+msgid "Keywords"
+msgstr ""
 
-#: ../../templates/show_users.inc:55 ../../templates/show_users.inc:91
-msgid "Prefs"
-msgstr "Voorkeuren"
+#: ../../templates/show_search.inc:102
+#, fuzzy
+msgid "Played"
+msgstr "Afspelen"
 
-#: ../../templates/show_users.inc:58
-msgid "Access"
-msgstr "Toegang"
+#: ../../templates/show_search.inc:110
+#, fuzzy
+msgid "Min Bitrate"
+msgstr "Bitratio"
 
-#: ../../templates/show_users.inc:64
-msgid "On-line"
+#: ../../templates/show_search.inc:132
+msgid "Object Type"
 msgstr ""
 
-#: ../../templates/show_users.inc:105
-msgid "delete"
-msgstr "verwijderen"
-
-#: ../../templates/show_search.inc:34 ../../templates/show_search_bar.inc:36
-msgid "Search Ampache"
-msgstr "Doorzoek Ampache"
+#: ../../templates/show_search.inc:138
+msgid "Genres"
+msgstr ""
 
-#: ../../templates/show_search.inc:41
-msgid "Object Type"
+#: ../../templates/show_search.inc:141
+msgid "Operator"
 msgstr ""
 
-#: ../../templates/show_artist.inc:31
-msgid "Albums by"
-msgstr "Albums van"
+#: ../../templates/show_search.inc:145
+msgid "AND"
+msgstr ""
 
-#: ../../templates/show_artist.inc:33
-msgid "Show All Songs By"
-msgstr "Toon alle liedjes door"
+#: ../../templates/show_search.inc:150
+msgid "Method"
+msgstr ""
 
-#: ../../templates/show_artist.inc:34
-msgid "Play All Songs By"
-msgstr "Speel alle liedjes van"
+#: ../../templates/show_search.inc:153
+msgid "Fuzzy"
+msgstr ""
 
-#: ../../templates/show_artist.inc:35
-msgid "Play Random Songs By"
-msgstr "Speel willekeurige liedjes van"
+#: ../../templates/show_search.inc:154
+msgid "Exact"
+msgstr ""
 
-#: ../../templates/show_artist.inc:49
-msgid "Select"
-msgstr "Selecteer"
+#: ../../templates/show_search.inc:157
+msgid "Maxium Results"
+msgstr ""
 
-#: ../../templates/show_artist.inc:51
-msgid "Cover"
-msgstr "Hoesje"
+#: ../../templates/show_search.inc:160
+msgid "Unlimited"
+msgstr ""
 
-#: ../../templates/show_artist.inc:52
-msgid "Album Name"
-msgstr "Album Naam"
+#: ../../templates/show_search.inc:172
+msgid "Reset Form"
+msgstr ""
 
-#: ../../templates/show_artist.inc:53
-msgid "Album Year"
-msgstr "Album Jaar"
+#: ../../templates/show_search.inc:184
+msgid "Save Search As Track on"
+msgstr ""
 
-#: ../../templates/show_artist.inc:54
-msgid "Total Tracks"
-msgstr "Aantal Nummers"
+#: ../../templates/show_search.inc:186
+msgid "Save"
+msgstr ""
 
-#: ../../templates/show_mpdplay.inc:38
+#: ../../templates/show_mpdplay.inc:39
 msgid "MPD Play Control"
 msgstr "MPD Speel Controle"
 
-#: ../../templates/show_mpdplay.inc:71
+#: ../../templates/show_mpdplay.inc:100
 msgid "Loop"
 msgstr "Herhaal"
 
-#: ../../templates/show_mpdplay.inc:78 ../../templates/show_mpdplay.inc:91
+#: ../../templates/show_mpdplay.inc:107 ../../templates/show_mpdplay.inc:120
 msgid "On"
 msgstr "Aan"
 
-#: ../../templates/show_mpdplay.inc:79 ../../templates/show_mpdplay.inc:92
+#: ../../templates/show_mpdplay.inc:108 ../../templates/show_mpdplay.inc:121
 msgid "Off"
 msgstr "Uit"
 
-#: ../../templates/show_mpdplay.inc:114
+#: ../../templates/show_mpdplay.inc:134
 #, fuzzy
 msgid "Now Playing :"
 msgstr "Speelt Nu"
 
-#: ../../templates/show_mpdplay.inc:138
+#: ../../templates/show_mpdplay.inc:163
 msgid "On Deck "
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:138
+#: ../../templates/show_mpdplay.inc:163
 msgid "(in "
 msgstr ""
 
-#: ../../templates/show_mpdpl.inc:45
-#, fuzzy
-msgid "MPD Server Playlist"
-msgstr "Server Speellijst"
+#: ../../templates/show_artist.inc:36
+msgid "Select"
+msgstr "Selecteer"
 
-#: ../../templates/show_mpdpl.inc:46 ../../templates/show_mpdpl.inc:184
-msgid "Refresh the Playlist Window"
-msgstr "Ververs het speellijst venster"
+#: ../../templates/show_artist.inc:38
+msgid "Cover"
+msgstr "Hoesje"
 
-#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:189
-msgid "Click to shuffle (randomize) the playlist"
-msgstr "Klik om de speellijst willekeurig te maken"
+#: ../../templates/show_artist.inc:39
+msgid "Album Name"
+msgstr "Album Naam"
 
-#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:189
-msgid "shuffle"
-msgstr "willekeurig"
+#: ../../templates/show_artist.inc:40
+msgid "Album Year"
+msgstr "Album Jaar"
 
-#: ../../templates/show_mpdpl.inc:49 ../../templates/show_mpdpl.inc:190
+#: ../../templates/show_artist.inc:41
+msgid "Total Tracks"
+msgstr "Aantal Nummers"
+
+#: ../../templates/show_big_art.inc:31
 #, fuzzy
-msgid "Click to the clear the playlist"
-msgstr "Klik om de speellijst leeg te maken"
+msgid "Album Art"
+msgstr "Zoek Album Hoesje"
 
-#: ../../templates/show_mpdpl.inc:53 ../../templates/show_mpdpl.inc:194
-msgid "Click to the remove all except the Now Playing"
+#: ../../templates/show_big_art.inc:35
+msgid "Click to close window"
 msgstr ""
 
-#: ../../templates/show_uploads.inc:33
-#, fuzzy
-msgid "Status"
-msgstr "Statistieken"
+#~ msgid "No Results Found"
+#~ msgstr "Geen Resultaten Gevonden"
 
-#: ../../templates/show_uploads.inc:42
-msgid "User"
-msgstr "Gebruiker"
+#~ msgid "New"
+#~ msgstr "Nieuw"
 
-#: ../../templates/show_uploads.inc:43
-msgid "Date"
-msgstr "Datum"
+#~ msgid "View All"
+#~ msgstr "Bekijk Alles"
 
-#: ../../templates/show_uploads.inc:49
-msgid "Add"
-msgstr "Toevoegen"
+#~ msgid "Import"
+#~ msgstr "Importeren"
 
-#: ../../templates/show_random_play.inc:28
-msgid "Play Random Selection"
-msgstr "Speel Willekeurige Selectie"
+#~ msgid "Public"
+#~ msgstr "Openbaar"
 
-#: ../../templates/show_random_play.inc:34
-msgid "Item count"
-msgstr "Aantal"
+#~ msgid "Your Private"
+#~ msgstr "Jouw Prive"
 
-#: ../../templates/show_random_play.inc:49
-msgid "From genre"
-msgstr "Van genre"
+#~ msgid "Other Private"
+#~ msgstr "Andere Prive"
 
-#: ../../templates/show_random_play.inc:58
-msgid "Standard"
-msgstr ""
+#~ msgid "There are no playlists of this type"
+#~ msgstr "Er zijn geen speellijsten van dit type"
 
-#: ../../templates/show_random_play.inc:59
-msgid "Favor Unplayed"
-msgstr "Voorkeur voor Ongespeelde"
+#~ msgid "All songs by"
+#~ msgstr "Alle liedjes van"
 
-#: ../../templates/show_random_play.inc:60
-msgid "Full Albums"
-msgstr "Volledige Albums"
+#~ msgid "owned by"
+#~ msgstr "eigendom van"
 
-#: ../../templates/show_random_play.inc:61
-msgid "Full Artist"
-msgstr "Volledige Artiest"
+#~ msgid "Edit Playlist"
+#~ msgstr "Bewerk Speellijst"
 
-#: ../../templates/show_random_play.inc:66
-msgid "from catalog"
-msgstr "uit catalogus"
+#~ msgid "Play Random"
+#~ msgstr "Speel Willekeurig"
 
-#: ../../templates/show_random_play.inc:75
-msgid "Play Random Songs"
-msgstr "Speel Willekeurige Liedjes"
+#~ msgid "Welcome to"
+#~ msgstr "Welkom bij"
+
+#~ msgid "Album Art Located"
+#~ msgstr "Album Hoesje Gevonden"
+
+#~ msgid ""
+#~ "Album Art information has been located in Amazon. If incorrect, click "
+#~ "\"Reset Album Art\" below to remove the artwork."
+#~ msgstr ""
+#~ "Album Hoes Informatie is gevonden in Amazon. Als dit niet juist is, klik "
+#~ "\"Herstel Album Hoesje\" hieronder om het plaatje te verwijderen."
 
 #~ msgid "View Limit"
 #~ msgstr "Bekijk Limiet"
@@ -2113,9 +2581,6 @@
 #~ msgid "Successfully-Cataloged"
 #~ msgstr "Succesvol-Gecatalogiseerd"
 
-#~ msgid "Unknown"
-#~ msgstr "Onbekend"
-
 #~ msgid "Quarantined"
 #~ msgstr "Veiliggesteld"
 
diff -urN ampache-3.3.2-alpha4/locale/tr_TR/LC_MESSAGES/messages.po ampache-3.3.2-beta1/locale/tr_TR/LC_MESSAGES/messages.po
--- ampache-3.3.2-alpha4/locale/tr_TR/LC_MESSAGES/messages.po	2005-12-27 01:32:55.000000000 -0800
+++ ampache-3.3.2-beta1/locale/tr_TR/LC_MESSAGES/messages.po	2006-01-08 23:06:12.000000000 -0800
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Ampache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-14 16:23-0700\n"
+"POT-Creation-Date: 2006-01-07 22:47-0800\n"
 "PO-Revision-Date: 2005-04-25 21:14+0100\n"
 "Last-Translator: vireas <vireas at gmail.com>\n"
 "Language-Team: TURKISH <dev@ampache.org>\n"
@@ -22,587 +22,583 @@
 msgid "Session Expired: please log in again at"
 msgstr "Oturumun süresi bitmiþ: lütfen yeniden giriþ yapýn"
 
-#: ../../lib/preferences.php:211 ../../templates/show_users.inc:97
-msgid "Enable"
-msgstr "Etkinleþtir"
-
-#: ../../lib/preferences.php:212 ../../templates/show_users.inc:100
-msgid "Disable"
-msgstr "Edilgenleþtir"
-
-#: ../../lib/preferences.php:224 ../../templates/add_catalog.inc:60
-msgid "Local"
-msgstr "Yerel"
-
-#: ../../lib/preferences.php:227
-msgid "Stream"
-msgstr "Akým"
-
-#: ../../lib/preferences.php:230
-msgid "IceCast"
-msgstr "IceCast"
-
-#: ../../lib/preferences.php:233
-msgid "Downsample"
-msgstr "Kaliteyi düþür (downsample)"
-
-#: ../../lib/preferences.php:236
-msgid "Music Player Daemon"
-msgstr "Music Player Daemon"
-
-#: ../../lib/preferences.php:239
-msgid "SlimServer"
-msgstr ""
-
-#: ../../lib/preferences.php:248
-msgid "M3U"
-msgstr "M3U"
-
-#: ../../lib/preferences.php:249
-msgid "Simple M3U"
-msgstr "Simple M3U"
-
-#: ../../lib/preferences.php:250
-msgid "PLS"
-msgstr "PLS"
-
-#: ../../lib/preferences.php:251
-msgid "Asx"
-msgstr "Asx"
-
-#: ../../lib/preferences.php:258
-msgid "English"
-msgstr "Ýngilizce"
-
-#: ../../lib/preferences.php:259
-#, fuzzy
-msgid "British English"
-msgstr "Ýngilizce"
-
-#: ../../lib/preferences.php:260
-msgid "German"
-msgstr "Almanca"
-
-#: ../../lib/preferences.php:261
-msgid "French"
-msgstr "Fransýzca"
-
-#: ../../lib/preferences.php:262
-msgid "Turkish"
-msgstr ""
-
-#: ../../lib/preferences.php:263
-msgid "Spanish"
-msgstr ""
-
-#: ../../lib/preferences.php:264
-msgid "Norwegian"
-msgstr ""
-
-#: ../../lib/preferences.php:265
-msgid "Simplified Chinese"
-msgstr ""
-
-#: ../../lib/duplicates.php:80
-#, fuzzy
-msgid "Find Duplicates"
-msgstr "Duble þarkýlarý görüntüle"
-
-#: ../../lib/duplicates.php:83 ../../templates/show_search.inc:74
-msgid "Search Type"
-msgstr "Arama türü"
-
-#: ../../lib/duplicates.php:91 ../../lib/class/song.class.php:275
-msgid "Title"
-msgstr "Þarký adý"
-
-#: ../../lib/duplicates.php:97
-msgid "Artist and Title"
-msgstr ""
-
-#: ../../lib/duplicates.php:102
-msgid "Artist, Album and Title"
-msgstr ""
-
-#: ../../lib/duplicates.php:110 ../../templates/menu.inc:39
-#: ../../templates/show_search.inc:37 ../../templates/show_search.inc:83
-#: ../../templates/show_search_bar.inc:71
-msgid "Search"
-msgstr "Ara"
-
-#: ../../lib/general.lib.php:640
-msgid "Not Enough Data"
-msgstr ""
-
-#: ../../lib/search.php:52 ../../lib/search.php:68 ../../lib/search.php:84
-#: ../../lib/search.php:100 ../../lib/search.php:116 ../../lib/search.php:133
-#: ../../lib/search.php:145 ../../lib/search.php:161 ../../lib/search.php:177
-msgid "No Results Found"
-msgstr "Sonuç bulunamadý"
-
-#: ../../lib/class/genre.class.php:278
-#, fuzzy
-msgid "Show Genres starting with"
-msgstr "Ýsmi bu harfle baþlayan sanatçýlarý göster"
-
-#: ../../lib/class/album.class.php:126
-msgid "Various"
-msgstr "Çeþitli"
-
-#: ../../lib/class/album.class.php:241 ../../lib/class/catalog.class.php:275
-#: ../../lib/class/catalog.class.php:560
+#: ../../lib/class/catalog.class.php:281 ../../lib/class/catalog.class.php:566
+#: ../../lib/class/album.class.php:263
 msgid "Error: Unable to open"
 msgstr "Hata: açýlamadý"
 
-#: ../../lib/class/song.class.php:275 ../../lib/class/song.class.php:279
-#: ../../lib/class/song.class.php:283 ../../lib/class/song.class.php:287
-#: ../../lib/class/song.class.php:291 ../../lib/class/song.class.php:295
-#: ../../lib/class/song.class.php:299 ../../lib/class/song.class.php:304
-#: ../../lib/class/song.class.php:309 ../../lib/class/song.class.php:313
-#: ../../lib/class/song.class.php:317 ../../lib/class/song.class.php:322
-msgid "updated to"
-msgstr "güncelleþtirildi"
-
-#: ../../lib/class/song.class.php:279 ../../templates/show_songs.inc:39
-#: ../../templates/show_uploads.inc:39
-msgid "Bitrate"
-msgstr "Ýkil hýzý"
-
-#: ../../lib/class/song.class.php:283
-msgid "Rate"
-msgstr "Oran"
-
-#: ../../lib/class/song.class.php:287
-msgid "Mode"
-msgstr "Kip"
-
-#: ../../lib/class/song.class.php:291 ../../templates/show_songs.inc:37
-#: ../../templates/show_mpdpl.inc:66 ../../templates/show_uploads.inc:38
-msgid "Time"
-msgstr "Süre"
-
-#: ../../lib/class/song.class.php:295 ../../templates/show_songs.inc:32
-#: ../../templates/show_songs.inc:36 ../../templates/show_mpdpl.inc:65
-msgid "Track"
-msgstr "Parça"
-
-#: ../../lib/class/song.class.php:299
-msgid "Filesize"
-msgstr "Dosya boyutu"
-
-#: ../../lib/class/song.class.php:304 ../../templates/show_artists.inc:39
-#: ../../templates/show_artists.inc:62 ../../templates/show_songs.inc:34
-#: ../../templates/show_albums.inc:40 ../../templates/show_albums.inc:70
-#: ../../templates/show_mpdpl.inc:63 ../../templates/show_uploads.inc:35
-msgid "Artist"
-msgstr "Sanatçý"
-
-#: ../../lib/class/song.class.php:309 ../../templates/show_songs.inc:35
-#: ../../templates/show_albums.inc:38 ../../templates/show_albums.inc:68
-#: ../../templates/show_mpdpl.inc:64 ../../templates/show_uploads.inc:36
-msgid "Album"
-msgstr "Albüm"
-
-#: ../../lib/class/song.class.php:313 ../../templates/show_albums.inc:43
-#: ../../templates/show_albums.inc:73
-msgid "Year"
-msgstr "Yýl"
-
-#: ../../lib/class/song.class.php:317 ../../templates/list_flagged.inc:46
-#: ../../templates/flag.inc:66
-msgid "Comment"
-msgstr "Yorum"
-
-#: ../../lib/class/song.class.php:322 ../../templates/show_genres.inc.php:36
-#: ../../templates/show_genre.inc.php:32 ../../templates/show_songs.inc:40
-#: ../../templates/show_browse_menu.inc:37 ../../templates/show_mpdpl.inc:67
-#: ../../templates/show_uploads.inc:37
-msgid "Genre"
-msgstr "Kategori"
-
-#: ../../lib/class/stream.class.php:198
-#, fuzzy
-msgid "Opened for writing"
-msgstr "Yazmak için açýldý"
-
-#: ../../lib/class/stream.class.php:203
-msgid "Error, cannot write"
-msgstr "Hata, yazýlamýyor"
-
-#: ../../lib/class/stream.class.php:214
-msgid "Error, cannot write song in file"
-msgstr "Hata, þarký dosyaya yazýlamadý"
-
-#: ../../lib/class/stream.class.php:220
-msgid "Closed after write"
-msgstr "Yazýldýktan sonra kapatýldý"
-
-#: ../../lib/class/catalog.class.php:298
+#: ../../lib/class/catalog.class.php:304
 msgid "Error: Unable to change to directory"
 msgstr "Hata: klasöre geçiþ yapýlamadý"
 
-#: ../../lib/class/catalog.class.php:321
+#: ../../lib/class/catalog.class.php:330
 msgid "Error: Unable to get filesize for"
 msgstr "Hata: dosya boyutu sorgulanamadý"
 
-#: ../../lib/class/catalog.class.php:340
-#, fuzzy
-msgid "Added Playlist From"
-msgstr "Yeni þarký listesi"
-
-#: ../../lib/class/catalog.class.php:359
+#: ../../lib/class/catalog.class.php:365
 msgid "Added"
 msgstr "Eklendi"
 
-#: ../../lib/class/catalog.class.php:371
+#: ../../lib/class/catalog.class.php:377
 msgid "is not readable by ampache"
 msgstr "Ampache tarafýndan okunamadý"
 
-#: ../../lib/class/catalog.class.php:435
+#: ../../lib/class/catalog.class.php:441
 msgid "Found in ID3"
 msgstr "ID3 içinde bulundu"
 
-#: ../../lib/class/catalog.class.php:439
+#: ../../lib/class/catalog.class.php:445
 msgid "Found on Amazon"
 msgstr "Amazon'da bulundu"
 
-#: ../../lib/class/catalog.class.php:443
+#: ../../lib/class/catalog.class.php:449
 msgid "Found in Folder"
 msgstr "Klasörde bulundu"
 
-#: ../../lib/class/catalog.class.php:447
+#: ../../lib/class/catalog.class.php:453
 msgid "Found"
 msgstr "Bulundu"
 
-#: ../../lib/class/catalog.class.php:450
+#: ../../lib/class/catalog.class.php:456
 msgid "Not Found"
 msgstr "Bulunamadý"
 
-#: ../../lib/class/catalog.class.php:458
+#: ../../lib/class/catalog.class.php:464
 msgid "Searched"
 msgstr "Arandý"
 
-#: ../../lib/class/catalog.class.php:613
+#: ../../lib/class/catalog.class.php:622
 msgid "Starting Dump Album Art"
 msgstr "Albüm kapaðý boþaltmasý baþlýyor"
 
-#: ../../lib/class/catalog.class.php:633
+#: ../../lib/class/catalog.class.php:642
 msgid "Written"
 msgstr "Yazýldý"
 
-#: ../../lib/class/catalog.class.php:642
+#: ../../lib/class/catalog.class.php:651
 msgid "Error unable to open file for writting"
 msgstr "Hata: dosya yazmak için açýlamadý"
 
-#: ../../lib/class/catalog.class.php:649
+#: ../../lib/class/catalog.class.php:658
 msgid "Album Art Dump Complete"
 msgstr "Albüm kapaðý boþaltmasý tamamlandý"
 
-#: ../../lib/class/catalog.class.php:650 ../../artists.php:63
-#: ../../albums.php:112
+#: ../../lib/class/catalog.class.php:659 ../../artists.php:64
+#: ../../albums.php:153
 msgid "Return"
 msgstr "Dön"
 
-#: ../../lib/class/catalog.class.php:719
+#: ../../lib/class/catalog.class.php:728
 msgid "Starting Catalog Build"
 msgstr "Katalog yapýlandýrma baþladý"
 
-#: ../../lib/class/catalog.class.php:724
+#: ../../lib/class/catalog.class.php:733
 msgid "Running Remote Sync"
 msgstr "Uzak anuyum sürüyor"
 
-#: ../../lib/class/catalog.class.php:734 ../../lib/class/catalog.class.php:880
-#: ../../admin/catalog.php:264
+#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:904
+#, fuzzy
+msgid "Added Playlist From"
+msgstr "Yeni þarký listesi"
+
+#: ../../lib/class/catalog.class.php:752 ../../lib/class/catalog.class.php:913
+#: ../../admin/catalog.php:258
 msgid "Starting Album Art Search"
 msgstr "Albüm kapaðý aramasý baþlýyor"
 
-#: ../../lib/class/catalog.class.php:744
+#: ../../lib/class/catalog.class.php:762
 msgid "Catalog Finished"
 msgstr "Katalog tamamlandý"
 
-#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:899
+#: ../../lib/class/catalog.class.php:762 ../../lib/class/catalog.class.php:932
 msgid "Total Time"
 msgstr "Genel Süre"
 
-#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:900
+#: ../../lib/class/catalog.class.php:762 ../../lib/class/catalog.class.php:933
 msgid "Total Songs"
 msgstr "Tüm Þarkýlar"
 
-#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:900
+#: ../../lib/class/catalog.class.php:763 ../../lib/class/catalog.class.php:933
 msgid "Songs Per Seconds"
 msgstr "Þarký/Saniye"
 
-#: ../../lib/class/catalog.class.php:779
-#: ../../lib/class/catalog.class.php:1476
+#: ../../lib/class/catalog.class.php:797
+#: ../../lib/class/catalog.class.php:1512
 msgid "Updated"
 msgstr "Güncelleþtirildi"
 
-#: ../../lib/class/catalog.class.php:786
+#: ../../lib/class/catalog.class.php:804
 msgid "No Update Needed"
 msgstr "Güncelleþtirme gereksiz"
 
-#: ../../lib/class/catalog.class.php:860
+#: ../../lib/class/catalog.class.php:885
 msgid "Starting New Song Search on"
 msgstr "Yeni þarký arama baþladý"
 
-#: ../../lib/class/catalog.class.php:860
+#: ../../lib/class/catalog.class.php:885
 msgid "catalog"
 msgstr "Katalog"
 
-#: ../../lib/class/catalog.class.php:864
+#: ../../lib/class/catalog.class.php:889
 msgid "Running Remote Update"
 msgstr "Uzak güncelleme sürüyor"
 
-#: ../../lib/class/catalog.class.php:899
+#: ../../lib/class/catalog.class.php:932
 msgid "Catalog Update Finished"
 msgstr "Katalog güncelleme tamamlandý"
 
-#: ../../lib/class/catalog.class.php:919 ../../lib/mpd.php:40
-#: ../../lib/mpd.php:49
+#: ../../lib/class/catalog.class.php:952 ../../lib/mpd.php:43
+#: ../../lib/mpd.php:52 ../../albums.php:74
 msgid "Error"
 msgstr "Hata"
 
-#: ../../lib/class/catalog.class.php:919
+#: ../../lib/class/catalog.class.php:952
 msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
 msgstr ""
 "XMLRPC kitaplýðý yüklenemedi, XML-RPC'nin etkinleþtirilmiþ olduðunu kontrol "
 "edin"
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
 msgid "Error connecting to"
 msgstr "Hata, baðlanilamýyor: "
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
 msgid "Code"
 msgstr "Kod"
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
 msgid "Reason"
 msgstr "Neden"
 
-#: ../../lib/class/catalog.class.php:974
+#: ../../lib/class/catalog.class.php:1007
 msgid "Completed updating remote catalog(s)"
 msgstr "Uzak katalog(lar) güncellendi"
 
-#: ../../lib/class/catalog.class.php:1105
+#: ../../lib/class/catalog.class.php:1138
 msgid "Checking"
 msgstr "Saðlama yapýlýyor"
 
-#: ../../lib/class/catalog.class.php:1163
+#: ../../lib/class/catalog.class.php:1196
 msgid "Catalog Clean Done"
 msgstr "Kalalog temizleme tamamlandý"
 
-#: ../../lib/class/catalog.class.php:1163
+#: ../../lib/class/catalog.class.php:1196
 msgid "files removed"
 msgstr "dosya silindi"
 
-#: ../../lib/class/catalog.class.php:1436
+#: ../../lib/class/catalog.class.php:1469
 msgid "Updating the"
 msgstr "Güncelleþtiriliyor"
 
-#: ../../lib/class/catalog.class.php:1436 ../../templates/admin_menu.inc:35
+#: ../../lib/class/catalog.class.php:1469 ../../templates/sidebar.inc.php:31
 msgid "Catalog"
 msgstr "Katalog"
 
-#: ../../lib/class/catalog.class.php:1437
+#: ../../lib/class/catalog.class.php:1470
 msgid "songs found checking tag information."
 msgstr "þarký etiket bilgisi taramasý sonucu bulundu."
 
-#: ../../lib/class/catalog.class.php:1484
+#: ../../lib/class/catalog.class.php:1520
 msgid " FOUND"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1485
+#: ../../lib/class/catalog.class.php:1521
 #, fuzzy
 msgid "Searching for new Album Art"
 msgstr "Albüm kapaðý boþaltmasý baþlýyor"
 
-#: ../../lib/class/catalog.class.php:1489
+#: ../../lib/class/catalog.class.php:1525
 #, fuzzy
 msgid "Album Art Already Found"
 msgstr "Albüm kapaðý silindi"
 
-#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
-msgid "Could not add"
-msgstr "Eklenemedi"
-
-#: ../../lib/Browser.php:867
-msgid "file"
-msgstr "dosya"
+#: ../../lib/class/artist.class.php:223
+msgid "Error: Name Identical"
+msgstr ""
 
-#: ../../lib/Browser.php:871
-msgid "File uploads not supported."
-msgstr "Dosya yükleme desteði verilmiyor."
+#: ../../lib/class/song.class.php:275 ../../lib/duplicates.php:113
+#: ../../templates/show_search.inc:66
+msgid "Title"
+msgstr "Þarký adý"
 
-#: ../../lib/Browser.php:889
-msgid "No file uploaded"
-msgstr "Hicbir dosya yüklenmedi."
+#: ../../lib/class/song.class.php:275 ../../lib/class/song.class.php:279
+#: ../../lib/class/song.class.php:283 ../../lib/class/song.class.php:287
+#: ../../lib/class/song.class.php:291 ../../lib/class/song.class.php:295
+#: ../../lib/class/song.class.php:299 ../../lib/class/song.class.php:304
+#: ../../lib/class/song.class.php:309 ../../lib/class/song.class.php:313
+#: ../../lib/class/song.class.php:317 ../../lib/class/song.class.php:322
+msgid "updated to"
+msgstr "güncelleþtirildi"
 
-#: ../../lib/Browser.php:896
-#, php-format
-msgid "There was a problem with the file upload: No %s was uploaded."
-msgstr "Dosya yüklemede sorun çýktý: %s yüklenemedi"
+#: ../../lib/class/song.class.php:279 ../../templates/show_uploads.inc:39
+#: ../../templates/show_songs.inc:47 ../../templates/list_duplicates.inc:36
+msgid "Bitrate"
+msgstr "Ýkil hýzý"
 
-#: ../../lib/Browser.php:901
-#, php-format
-msgid ""
-"There was a problem with the file upload: The %s was larger than the maximum "
-"allowed size (%d bytes)."
-msgstr ""
-"Dosya yüklemede sorun çýktý: %s müsaade edilen azami boyutu aþýyor (%d byte)"
+#: ../../lib/class/song.class.php:283
+msgid "Rate"
+msgstr "Oran"
 
-#: ../../lib/Browser.php:903
-#, php-format
-msgid ""
-"There was a problem with the file upload: The %s was only partially uploaded."
-msgstr "Gönderilen dosya (%s) yalnýz kýsmen yüklendi."
+#: ../../lib/class/song.class.php:287
+msgid "Mode"
+msgstr "Kip"
 
-#: ../../lib/ui.lib.php:199
-#, fuzzy
-msgid "Playlist Actions"
-msgstr "Þarký listeleri"
+#: ../../lib/class/song.class.php:291 ../../templates/show_uploads.inc:38
+#: ../../templates/show_mpdpl.inc:66 ../../templates/show_songs.inc:45
+msgid "Time"
+msgstr "Süre"
 
-#: ../../lib/ui.lib.php:199
-msgid "New"
-msgstr "Yeni"
+#: ../../lib/class/song.class.php:295 ../../templates/show_mpdpl.inc:65
+#: ../../templates/show_songs.inc:39 ../../templates/show_songs.inc:44
+msgid "Track"
+msgstr "Parça"
 
-#: ../../lib/ui.lib.php:200
-msgid "View All"
-msgstr "Hepsini görüntüle"
+#: ../../lib/class/song.class.php:299
+msgid "Filesize"
+msgstr "Dosya boyutu"
 
-#: ../../lib/ui.lib.php:201
-msgid "Import"
-msgstr ""
+#: ../../lib/class/song.class.php:304
+#: ../../templates/show_get_albumart.inc.php:33
+#: ../../templates/show_uploads.inc:35 ../../templates/show_mpdpl.inc:63
+#: ../../templates/show_songs.inc:42 ../../templates/show_artists.inc:39
+#: ../../templates/show_artists.inc:62 ../../templates/show_albums.inc:40
+#: ../../templates/show_albums.inc:70 ../../templates/list_duplicates.inc:33
+#: ../../templates/show_search.inc:71
+msgid "Artist"
+msgstr "Sanatçý"
 
-#: ../../lib/ui.lib.php:301 ../../templates/menu.inc:35
-msgid "Browse"
-msgstr ""
+#: ../../lib/class/song.class.php:309
+#: ../../templates/show_get_albumart.inc.php:41
+#: ../../templates/show_uploads.inc:36 ../../templates/show_mpdpl.inc:64
+#: ../../templates/show_songs.inc:43 ../../templates/show_albums.inc:38
+#: ../../templates/show_albums.inc:68 ../../templates/list_duplicates.inc:34
+#: ../../templates/show_search.inc:78
+msgid "Album"
+msgstr "Albüm"
 
-#: ../../lib/ui.lib.php:303
-msgid "Show w/o art"
-msgstr "Kapaksýz göster"
+#: ../../lib/class/song.class.php:313 ../../templates/show_albums.inc:43
+#: ../../templates/show_albums.inc:73 ../../templates/show_search.inc:90
+msgid "Year"
+msgstr "Yýl"
 
-#: ../../lib/ui.lib.php:306
-msgid "Show all"
-msgstr "Tümünü görüntüle"
+#: ../../lib/class/song.class.php:317 ../../templates/flag.inc:66
+#: ../../templates/list_flagged.inc:46
+msgid "Comment"
+msgstr "Yorum"
 
-#: ../../lib/ui.lib.php:446
-msgid "No songs in this playlist."
-msgstr "Bu listede þarký bulunamadý."
+#: ../../lib/class/song.class.php:322 ../../templates/show_genre.inc.php:32
+#: ../../templates/show_genres.inc.php:36 ../../templates/sidebar.inc.php:37
+#: ../../templates/show_uploads.inc:37 ../../templates/show_mpdpl.inc:67
+#: ../../templates/show_songs.inc:48 ../../templates/show_browse_menu.inc:37
+#: ../../templates/show_search.inc:83
+msgid "Genre"
+msgstr "Kategori"
 
-#: ../../lib/ui.lib.php:592
+#: ../../lib/class/stream.class.php:198
 #, fuzzy
-msgid "No Catalogs Found!"
-msgstr "Bulunamadý"
-
-#: ../../lib/ui.lib.php:593 ../../templates/add_catalog.inc:28
-msgid "Add a Catalog"
-msgstr "Katalog ekle"
+msgid "Opened for writing"
+msgstr "Yazmak için açýldý"
 
-#: ../../lib/ui.lib.php:594 ../../templates/show_local_catalog_info.inc.php:7
-msgid "Catalog Statistics"
-msgstr "Katalog istatistikleri"
+#: ../../lib/class/stream.class.php:203
+msgid "Error, cannot write"
+msgstr "Hata, yazýlamýyor"
 
-#: ../../lib/ui.lib.php:630
-msgid "day"
+#: ../../lib/class/stream.class.php:214
+msgid "Error, cannot write song in file"
+msgstr "Hata, þarký dosyaya yazýlamadý"
+
+#: ../../lib/class/stream.class.php:220
+msgid "Closed after write"
+msgstr "Yazýldýktan sonra kapatýldý"
+
+#: ../../lib/class/genre.class.php:278
+#, fuzzy
+msgid "Show Genres starting with"
+msgstr "Ýsmi bu harfle baþlayan sanatçýlarý göster"
+
+#: ../../lib/class/album.class.php:151
+msgid "Various"
+msgstr "Çeþitli"
+
+#: ../../lib/duplicates.php:102
+#, fuzzy
+msgid "Find Duplicates"
+msgstr "Duble þarkýlarý görüntüle"
+
+#: ../../lib/duplicates.php:105
+msgid "Search Type"
+msgstr "Arama türü"
+
+#: ../../lib/duplicates.php:119
+msgid "Artist and Title"
+msgstr ""
+
+#: ../../lib/duplicates.php:124
+msgid "Artist, Album and Title"
+msgstr ""
+
+#: ../../lib/duplicates.php:132 ../../templates/sidebar.inc.php:97
+#: ../../templates/sidebar.inc.php:103 ../../templates/show_search_bar.inc:41
+#: ../../templates/menu.inc:39 ../../templates/show_search.inc:171
+msgid "Search"
+msgstr "Ara"
+
+#: ../../lib/preferences.php:252 ../../templates/show_users.inc:118
+msgid "Enable"
+msgstr "Etkinleþtir"
+
+#: ../../lib/preferences.php:253 ../../templates/show_users.inc:121
+#: ../../templates/list_duplicates.inc:31
+msgid "Disable"
+msgstr "Edilgenleþtir"
+
+#: ../../lib/preferences.php:265 ../../templates/add_catalog.inc:61
+msgid "Local"
+msgstr "Yerel"
+
+#: ../../lib/preferences.php:268
+msgid "Stream"
+msgstr "Akým"
+
+#: ../../lib/preferences.php:271
+msgid "IceCast"
+msgstr "IceCast"
+
+#: ../../lib/preferences.php:274
+msgid "Downsample"
+msgstr "Kaliteyi düþür (downsample)"
+
+#: ../../lib/preferences.php:277
+msgid "Music Player Daemon"
+msgstr "Music Player Daemon"
+
+#: ../../lib/preferences.php:280
+msgid "SlimServer"
+msgstr ""
+
+#: ../../lib/preferences.php:289
+msgid "M3U"
+msgstr "M3U"
+
+#: ../../lib/preferences.php:290
+msgid "Simple M3U"
+msgstr "Simple M3U"
+
+#: ../../lib/preferences.php:291
+msgid "PLS"
+msgstr "PLS"
+
+#: ../../lib/preferences.php:292
+msgid "Asx"
+msgstr "Asx"
+
+#: ../../lib/preferences.php:293
+msgid "RAM"
+msgstr ""
+
+#: ../../lib/mpd.php:43 ../../lib/mpd.php:52
+msgid "Could not add"
+msgstr "Eklenemedi"
+
+#: ../../lib/general.lib.php:675
+msgid "Not Enough Data"
+msgstr ""
+
+#: ../../lib/general.lib.php:897 ../../lib/general.lib.php:908
+msgid "English"
+msgstr "Ýngilizce"
+
+#: ../../lib/general.lib.php:907
+msgid "German"
+msgstr "Almanca"
+
+#: ../../lib/general.lib.php:909
+#, fuzzy
+msgid "British English"
+msgstr "Ýngilizce"
+
+#: ../../lib/general.lib.php:910
+msgid "Spanish"
+msgstr ""
+
+#: ../../lib/general.lib.php:911
+msgid "French"
+msgstr "Fransýzca"
+
+#: ../../lib/general.lib.php:912
+msgid "Italian"
+msgstr ""
+
+#: ../../lib/general.lib.php:913
+msgid "Dutch"
+msgstr ""
+
+#: ../../lib/general.lib.php:914
+msgid "Turkish"
+msgstr ""
+
+#: ../../lib/general.lib.php:915
+msgid "Simplified Chinese"
+msgstr ""
+
+#: ../../lib/general.lib.php:916
+msgid "Unknown"
+msgstr "Bilinmeyen"
+
+#: ../../lib/ui.lib.php:222
+#, fuzzy
+msgid "Error Access Denied"
+msgstr "Kullanýcý eriþim düzeyi"
+
+#: ../../lib/ui.lib.php:299 ../../templates/sidebar.inc.php:69
+#: ../../templates/header.inc:51 ../../templates/menu.inc:35
+msgid "Browse"
+msgstr ""
+
+#: ../../lib/ui.lib.php:301
+msgid "Show w/o art"
+msgstr "Kapaksýz göster"
+
+#: ../../lib/ui.lib.php:304
+msgid "Show all"
+msgstr "Tümünü görüntüle"
+
+#: ../../lib/ui.lib.php:721
+#, fuzzy
+msgid "No Catalogs Found!"
+msgstr "Bulunamadý"
+
+#: ../../lib/ui.lib.php:722 ../../templates/add_catalog.inc:29
+msgid "Add a Catalog"
+msgstr "Katalog ekle"
+
+#: ../../lib/ui.lib.php:723 ../../templates/show_local_catalog_info.inc.php:7
+msgid "Catalog Statistics"
+msgstr "Katalog istatistikleri"
+
+#: ../../lib/ui.lib.php:759
+msgid "day"
 msgstr "gün"
 
-#: ../../lib/ui.lib.php:630
+#: ../../lib/ui.lib.php:759
 msgid "days"
 msgstr "gün"
 
-#: ../../lib/ui.lib.php:632
+#: ../../lib/ui.lib.php:761
 msgid "hour"
 msgstr "saat"
 
-#: ../../lib/ui.lib.php:632
+#: ../../lib/ui.lib.php:761
 msgid "hours"
 msgstr "saat"
 
-#: ../../lib/upload.php:225
+#: ../../lib/ui.lib.php:1053 ../../templates/sidebar.inc.php:128
+#: ../../templates/show_random_play_bar.inc.php:45
+#: ../../templates/show_artists.inc:55 ../../templates/show_random_play.inc:46
+#: ../../templates/show_albums.inc:58
+msgid "All"
+msgstr "Hepsi"
+
+#: ../../lib/Browser.php:867
+msgid "file"
+msgstr "dosya"
+
+#: ../../lib/Browser.php:871
+msgid "File uploads not supported."
+msgstr "Dosya yükleme desteði verilmiyor."
+
+#: ../../lib/Browser.php:889
+msgid "No file uploaded"
+msgstr "Hicbir dosya yüklenmedi."
+
+#: ../../lib/Browser.php:896
+#, php-format
+msgid "There was a problem with the file upload: No %s was uploaded."
+msgstr "Dosya yüklemede sorun çýktý: %s yüklenemedi"
+
+#: ../../lib/Browser.php:901
+#, php-format
+msgid ""
+"There was a problem with the file upload: The %s was larger than the maximum "
+"allowed size (%d bytes)."
+msgstr ""
+"Dosya yüklemede sorun çýktý: %s müsaade edilen azami boyutu aþýyor (%d byte)"
+
+#: ../../lib/Browser.php:903
+#, php-format
+msgid ""
+"There was a problem with the file upload: The %s was only partially uploaded."
+msgstr "Gönderilen dosya (%s) yalnýz kýsmen yüklendi."
+
+#: ../../lib/upload.php:228
 #, fuzzy
 msgid "The file uploaded successfully"
 msgstr "Hicbir dosya yüklenmedi."
 
-#: ../../lib/upload.php:226
+#: ../../lib/upload.php:229
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 "Gönderilen dosya daha önce php.ini'de belirlenen upload_max_filesize hattýný "
 "aþýyor."
 
-#: ../../lib/upload.php:227
+#: ../../lib/upload.php:230
 #, fuzzy
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Gönderilen dosya daha önce belirlenen MAX_FILE_SIZE hattýný aþýyor."
 
-#: ../../lib/upload.php:228
+#: ../../lib/upload.php:231
 #, fuzzy
 msgid "The uploaded file was only partially uploaded"
 msgstr "Gönderilen dosya kýsmen yüklendi."
 
-#: ../../lib/upload.php:229
+#: ../../lib/upload.php:232
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "Hicbir dosya yüklenmedi."
 
-#: ../../lib/upload.php:230
+#: ../../lib/upload.php:233
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ../../modules/lib.php:708
-msgid "Public"
-msgstr "Genel"
-
-#: ../../modules/lib.php:709
-msgid "Your Private"
-msgstr "Size özel"
-
-#: ../../modules/lib.php:710
-msgid "Other Private"
-msgstr "Diðerlerine özel"
+#: ../../lib/rating.lib.php:55
+#, fuzzy
+msgid "Don't Play"
+msgstr "Yerel Çalma Düzeni"
 
-#: ../../modules/lib.php:791 ../../templates/show_play_selected.inc.php:72
-msgid "View"
-msgstr "Görüntüle"
+#: ../../lib/rating.lib.php:58
+msgid "It's Pretty Bad"
+msgstr ""
 
-#: ../../modules/lib.php:794 ../../templates/show_play_selected.inc.php:73
-#: ../../templates/show_users.inc:52 ../../templates/show_users.inc:86
-msgid "Edit"
-msgstr "Düzenle"
+#: ../../lib/rating.lib.php:61
+msgid "It's Ok"
+msgstr ""
 
-#: ../../modules/lib.php:795 ../../templates/catalog.inc:60
-#: ../../templates/show_users.inc:61 ../../templates/show_uploads.inc:50
-msgid "Delete"
-msgstr "Sil"
+#: ../../lib/rating.lib.php:64
+msgid "It's Pretty Good"
+msgstr ""
 
-#: ../../modules/lib.php:803 ../../templates/show_genres.inc.php:48
-#: ../../templates/show_localplay.inc:41 ../../templates/show_artists.inc:54
-#: ../../templates/show_albums.inc:57 ../../templates/show_artist.inc:78
-#: ../../templates/show_mpdplay.inc:50
-msgid "Play"
-msgstr "Çal"
+#: ../../lib/rating.lib.php:67
+msgid "I Love It!"
+msgstr ""
 
-#: ../../modules/lib.php:804 ../../templates/show_artists.inc:56
-#: ../../templates/show_albums.inc:59 ../../templates/show_mpdplay.inc:85
-msgid "Random"
-msgstr "Rasgele"
+#: ../../lib/rating.lib.php:70
+msgid "It's Insane"
+msgstr ""
 
-#: ../../modules/lib.php:810 ../../templates/show_songs.inc:110
-#: ../../templates/show_album.inc:61 ../../templates/show_albums.inc:61
-#: ../../templates/show_artist.inc:80
-msgid "Download"
-msgstr "Ýndirme"
+#: ../../lib/rating.lib.php:74
+msgid "Off the Charts!"
+msgstr ""
 
-#: ../../modules/lib.php:821
-msgid "There are no playlists of this type"
-msgstr "Bu çeþit bir þarký listesi bulunamadý"
+#: ../../lib/playlist.lib.php:73
+msgid "No songs in this playlist."
+msgstr "Bu listede þarký bulunamadý."
 
-#: ../../modules/lib.php:856
+#: ../../modules/lib.php:537
 msgid "Create a new playlist"
 msgstr "Þarký listesi oluþtur"
 
@@ -614,182 +610,157 @@
 msgid "Add a new user"
 msgstr "Kullanýcý ekle"
 
-#: ../../admin/catalog.php:55 ../../templates/catalog.inc:66
+#: ../../admin/catalog.php:49 ../../templates/catalog.inc:63
 msgid "Add to Catalog(s)"
 msgstr "Kataloða ekle"
 
-#: ../../admin/catalog.php:66 ../../templates/catalog.inc:67
+#: ../../admin/catalog.php:60 ../../templates/catalog.inc:64
 msgid "Add to all Catalogs"
 msgstr "Tüm kataloglara ekle"
 
-#: ../../admin/catalog.php:75
+#: ../../admin/catalog.php:69
 msgid "Error Connecting"
 msgstr "Baðlantý hatasý"
 
-#: ../../admin/catalog.php:89 ../../templates/catalog.inc:73
+#: ../../admin/catalog.php:83 ../../templates/catalog.inc:70
 msgid "Update Catalog(s)"
 msgstr "Kataloðu güncelleþtir"
 
-#: ../../admin/catalog.php:100 ../../templates/catalog.inc:74
+#: ../../admin/catalog.php:94 ../../templates/catalog.inc:71
 msgid "Update All Catalogs"
 msgstr "Tüm kataloglarý güncelleþtir"
 
-#: ../../admin/catalog.php:132 ../../templates/catalog.inc:80
+#: ../../admin/catalog.php:126 ../../templates/catalog.inc:77
 msgid "Clean Catalog(s)"
 msgstr "Kataloðu temizle"
 
-#: ../../admin/catalog.php:162 ../../templates/catalog.inc:81
+#: ../../admin/catalog.php:156 ../../templates/catalog.inc:78
 msgid "Clean All Catalogs"
 msgstr "Tüm kataloglarý temizle"
 
-#: ../../admin/catalog.php:211
+#: ../../admin/catalog.php:206
 msgid "Now Playing Cleared"
 msgstr "Þu anda çalýnanlar silindi"
 
-#: ../../admin/catalog.php:211
+#: ../../admin/catalog.php:206
 msgid "All now playing data has been cleared"
 msgstr "Tüm þu anda çalýnanlar silindi"
 
-#: ../../admin/catalog.php:216
+#: ../../admin/catalog.php:211
 msgid "Do you really want to clear your catalog?"
 msgstr "Kataloðunuzu gerçekten boþaltmak mý istiyorsunuz?"
 
-#: ../../admin/catalog.php:223
+#: ../../admin/catalog.php:218
 msgid "Do you really want to clear the statistics for this catalog?"
 msgstr "Bu kataloðun istatistik bilgilerini gerçekten silmek mi istiyorsunuz?"
 
-#: ../../admin/catalog.php:241
+#: ../../admin/catalog.php:235
 msgid "Do you really want to delete this catalog?"
 msgstr "Kataloðunuzu gerçekten silmek mi istiyorsunuz?"
 
-#: ../../admin/catalog.php:272
+#: ../../admin/catalog.php:266
 #, fuzzy
 msgid "Album Art Search Finished"
 msgstr "Albüm kapaðý silindi"
 
-#: ../../admin/users.php:76 ../../admin/users.php:122
+#: ../../admin/users.php:72 ../../admin/users.php:119
 msgid "Error Username Required"
 msgstr "Hata, kullanýcý ismi gerekli"
 
-#: ../../admin/users.php:79 ../../admin/users.php:119
+#: ../../admin/users.php:75 ../../admin/users.php:115
 msgid "Error Passwords don't match"
 msgstr "Hata, parolalar uyuþmuyor"
 
-#: ../../admin/users.php:136
+#: ../../admin/users.php:124 ../../register.php:136
+#, fuzzy
+msgid "Error Username already exists"
+msgstr "Hata, kullanýcý ismi gerekli"
+
+#: ../../admin/users.php:145
 msgid "Are you sure you want to permanently delete"
 msgstr "Tamamen silmek istediðinizden emin misiniz: "
 
-#: ../../admin/users.php:143 ../../templates/show_confirm_action.inc.php:29
+#: ../../admin/users.php:152 ../../templates/show_confirm_action.inc.php:29
+#: ../../templates/show_search.inc:107
 msgid "No"
 msgstr "Hayýr"
 
-#: ../../admin/users.php:145
+#: ../../admin/users.php:154
 msgid "User Deleted"
 msgstr "Kullanýcý silindi"
 
-#: ../../admin/users.php:148
+#: ../../admin/users.php:157
 msgid "Delete Error"
 msgstr "Silme hatasý"
 
-#: ../../admin/users.php:148
+#: ../../admin/users.php:157
 msgid "Unable to delete last Admin User"
 msgstr "Son yönetici silinemedi"
 
-#: ../../admin/access.php:43
+#: ../../admin/access.php:40
 msgid "Do you really want to delete this Access Record?"
 msgstr "Bu giriþ izini gerçekten silmek mi istiyorsunuz?"
 
-#: ../../admin/access.php:51
+#: ../../admin/access.php:48
 msgid "Entry Deleted"
 msgstr "Giriþ silindi"
 
-#: ../../admin/access.php:51
+#: ../../admin/access.php:48
 msgid "Your Access List Entry has been removed"
 msgstr "Eriþim listesindeki giriþiniz silindi"
 
-#: ../../admin/access.php:61
+#: ../../admin/access.php:58
 msgid "Entry Added"
 msgstr "Giriþ eklendi"
 
-#: ../../admin/access.php:61
+#: ../../admin/access.php:58
 msgid "Your new Access List Entry has been created"
 msgstr "Eriþim listesine giriþiniz eklendi"
 
-#: ../../admin/mail.php:98
+#: ../../admin/mail.php:94
 #, fuzzy
 msgid "Mail to"
 msgstr "Mesaj"
 
-#: ../../admin/mail.php:109
+#: ../../admin/mail.php:105
 #, fuzzy
 msgid "Subject"
 msgstr "Seçim"
 
-#: ../../admin/mail.php:116
+#: ../../admin/mail.php:112
 msgid "Message"
 msgstr ""
 
-#: ../../admin/mail.php:126
+#: ../../admin/mail.php:122
 #, fuzzy
 msgid "Send Mail"
 msgstr "Mesaj"
 
-#: ../../admin/song.php:68
+#: ../../admin/song.php:65
 msgid "Songs Disabled"
 msgstr "Edilgenleþtirilmiþ Þarkýlar"
 
-#: ../../admin/song.php:68
+#: ../../admin/song.php:65
 msgid "The requested song(s) have been disabled"
 msgstr "Ýstenen þarký(lar) edilgenleþtirildi"
 
-#: ../../admin/song.php:78
+#: ../../admin/song.php:75
 msgid "Songs Enabled"
 msgstr "Etkinlentirilmiþ Þarkýlar"
 
-#: ../../admin/song.php:78
+#: ../../admin/song.php:75
 msgid "The requested song(s) have been enabled"
 msgstr "Ýstenen þarký(lar) etkinleþtirildi"
 
-#: ../../templates/show_user_registration.inc.php:28
-#: ../../templates/show_install_account.inc.php:59
-#: ../../templates/userform.inc:40 ../../templates/show_users.inc:40
-msgid "Username"
-msgstr "Kullanýcý adý"
-
-#: ../../templates/show_user_registration.inc.php:36
-#: ../../templates/userform.inc:48
-msgid "Full Name"
-msgstr "Tam Ýsim"
-
-#: ../../templates/show_user_registration.inc.php:44
-#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:55
-msgid "E-mail"
-msgstr "Elektronik posta"
-
-#: ../../templates/show_user_registration.inc.php:52
-#: ../../templates/show_install_account.inc.php:63
-#: ../../templates/userform.inc:63 ../../templates/show_login_form.inc:53
-msgid "Password"
-msgstr "Parola"
-
-#: ../../templates/show_user_registration.inc.php:60
-#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
-msgid "Confirm Password"
-msgstr "Parola doðrulama"
-
-#: ../../templates/show_user_registration.inc.php:69
-msgid "Register User"
-msgstr "Kullanýcý kaydý"
-
 #: ../../templates/show_install_account.inc.php:35
 #: ../../templates/show_install_config.inc:35
-#: ../../templates/show_install.inc:34
+#: ../../templates/show_install.inc:35
 msgid "Ampache Installation"
 msgstr "Ampache'nin Kuruluþu"
 
 #: ../../templates/show_install_account.inc.php:37
 #: ../../templates/show_install_config.inc:37
-#: ../../templates/show_install.inc:36
+#: ../../templates/show_install.inc:37
 #, fuzzy
 msgid ""
 "This Page handles the installation of the Ampache database and the creation "
@@ -801,7 +772,7 @@
 
 #: ../../templates/show_install_account.inc.php:40
 #: ../../templates/show_install_config.inc:40
-#: ../../templates/show_install.inc:39
+#: ../../templates/show_install.inc:40
 msgid ""
 "A MySQL Server with a username and password that can create/modify databases"
 msgstr ""
@@ -819,7 +790,7 @@
 
 #: ../../templates/show_install_account.inc.php:43
 #: ../../templates/show_install_config.inc:43
-#: ../../templates/show_install.inc:42
+#: ../../templates/show_install.inc:43
 #, fuzzy
 msgid ""
 "Once you have ensured that you have the above requirements please fill out "
@@ -833,7 +804,7 @@
 
 #: ../../templates/show_install_account.inc.php:48
 #: ../../templates/show_install_config.inc:48
-#: ../../templates/show_install.inc:46
+#: ../../templates/show_install.inc:47
 msgid "Step 1 - Creating and Inserting the Ampache Database"
 msgstr "Ýlk Adým - Ampache veritabanýnýn kurulmasý ve doldurulmasý"
 
@@ -844,7 +815,7 @@
 
 #: ../../templates/show_install_account.inc.php:50
 #: ../../templates/show_install_config.inc:53
-#: ../../templates/show_install.inc:51
+#: ../../templates/show_install.inc:52
 msgid "Step 3 - Setup Initial Account"
 msgstr "Üçüncü Adým - Ýlk kullanýcýnýn kurulmasý"
 
@@ -856,11 +827,71 @@
 "Bu adýmda ilk yönetici hesabý oluþturuluyor.  Oluþturulduktan sonra giriþ "
 "sayfasýna yönlendirileceksiniz."
 
-#: ../../templates/show_install_account.inc.php:68
+#: ../../templates/show_install_account.inc.php:55
+#, fuzzy
+msgid "Create Admin Account"
+msgstr "Hesap ekle"
+
+#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/show_user_registration.inc.php:109
+#: ../../templates/userform.inc:40 ../../templates/show_users.inc:43
+msgid "Username"
+msgstr "Kullanýcý adý"
+
+#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/show_user_registration.inc.php:137
+#: ../../templates/userform.inc:63 ../../templates/show_login_form.inc:53
+msgid "Password"
+msgstr "Parola"
+
+#: ../../templates/show_install_account.inc.php:69
 msgid "Create Account"
 msgstr "Hesap ekle"
 
+#: ../../templates/show_user_registration.inc.php:59
+#, fuzzy
+msgid "Ampache New User Registration"
+msgstr "Ampache'nin Kuruluþu"
+
+#: ../../templates/show_user_registration.inc.php:74
+#, fuzzy
+msgid "User Agreement"
+msgstr "Kullanýcý adý"
+
+#: ../../templates/show_user_registration.inc.php:84
+#, fuzzy
+msgid "I Accept"
+msgstr "Kabul"
+
+#: ../../templates/show_user_registration.inc.php:101
+msgid "User Information"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:119
+#: ../../templates/userform.inc:48
+msgid "Full Name"
+msgstr "Tam Ýsim"
+
+#: ../../templates/show_user_registration.inc.php:128
+#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:55
+msgid "E-mail"
+msgstr "Elektronik posta"
+
+#: ../../templates/show_user_registration.inc.php:146
+#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
+msgid "Confirm Password"
+msgstr "Parola doðrulama"
+
+#: ../../templates/show_user_registration.inc.php:166
+msgid "Clear Info"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:167
+msgid "Register User"
+msgstr "Kullanýcý kaydý"
+
 #: ../../templates/show_confirm_action.inc.php:28
+#: ../../templates/show_search.inc:106
 msgid "Yes"
 msgstr "Evet"
 
@@ -869,7 +900,8 @@
 msgstr ""
 
 #: ../../templates/show_import_playlist.inc.php:29
-#: ../../templates/show_uploads.inc:41
+#: ../../templates/show_uploads.inc:41 ../../templates/list_duplicates.inc:38
+#: ../../templates/show_search.inc:95
 msgid "Filename"
 msgstr "Dosya adý"
 
@@ -883,6 +915,36 @@
 msgid "Import Playlist"
 msgstr "Þarký listesi"
 
+#: ../../templates/show_genre.inc.php:32
+#, fuzzy
+msgid "Viewing"
+msgstr "Görüntüle"
+
+#: ../../templates/show_genre.inc.php:36 ../../templates/sidebar.inc.php:35
+#: ../../templates/sidebar.inc.php:136
+#: ../../templates/show_local_catalog_info.inc.php:18
+#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:65
+#: ../../templates/show_browse_menu.inc:36 ../../templates/show_search.inc:136
+msgid "Albums"
+msgstr "Albümler"
+
+#: ../../templates/show_genre.inc.php:41 ../../templates/sidebar.inc.php:36
+#: ../../templates/sidebar.inc.php:135
+#: ../../templates/show_local_catalog_info.inc.php:22
+#: ../../templates/show_browse_menu.inc:35 ../../templates/show_search.inc:137
+msgid "Artists"
+msgstr "Sanatçýlar"
+
+#: ../../templates/show_genre.inc.php:46
+#: ../../templates/show_genres.inc.php:37 ../../templates/sidebar.inc.php:133
+#: ../../templates/show_random_play_bar.inc.php:49
+#: ../../templates/show_local_catalog_info.inc.php:26
+#: ../../templates/show_artists.inc:41 ../../templates/show_artists.inc:64
+#: ../../templates/show_albums.inc:41 ../../templates/show_albums.inc:71
+#: ../../templates/show_search.inc:135
+msgid "Songs"
+msgstr "Þarkýlar"
+
 #: ../../templates/show_user.inc.php:26
 msgid "Changing User Information for"
 msgstr ""
@@ -918,10 +980,144 @@
 msgid "Clear Stats"
 msgstr "Ýstatistikleri sil"
 
+#: ../../templates/show_genres.inc.php:38 ../../templates/show_uploads.inc:32
+#: ../../templates/show_mpdpl.inc:68 ../../templates/show_songs.inc:50
+#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:67
+#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:75
+#: ../../templates/show_access_list.inc:51 ../../templates/show_artist.inc:42
+msgid "Action"
+msgstr "Eylem"
+
+#: ../../templates/show_genres.inc.php:48
+#: ../../templates/show_playlists.inc.php:63
+#: ../../templates/show_localplay.inc:41 ../../templates/show_artists.inc:54
+#: ../../templates/show_albums.inc:57 ../../templates/show_mpdplay.inc:64
+#: ../../templates/show_artist.inc:67
+msgid "Play"
+msgstr "Çal"
+
+#: ../../templates/sidebar.inc.php:29
+msgid "Users"
+msgstr "Kullanýcýlar"
+
+#: ../../templates/sidebar.inc.php:30
+msgid "Mail Users"
+msgstr "Kullanýcýlara mesaj"
+
+#: ../../templates/sidebar.inc.php:32
+#, fuzzy
+msgid "Site Preferences"
+msgstr "Tercihleri güncelle"
+
+#: ../../templates/sidebar.inc.php:33
+#, fuzzy
+msgid "Access List"
+msgstr "Eriþim listesi"
+
+#: ../../templates/sidebar.inc.php:38
+#, fuzzy
+msgid "Lists"
+msgstr "Sanatçýlar"
+
+#: ../../templates/sidebar.inc.php:45 ../../templates/menu.inc:29
+msgid "Home"
+msgstr "Ýlk Sayfa"
+
+#: ../../templates/sidebar.inc.php:49 ../../templates/menu.inc:63
+#: ../../templates/menu.inc:66
+msgid "Admin"
+msgstr "Yönetici"
+
+#: ../../templates/sidebar.inc.php:66 ../../templates/menu.inc:40
+msgid "Preferences"
+msgstr "Tercihler"
+
+#: ../../templates/sidebar.inc.php:85 ../../templates/menu.inc:43
+#: ../../templates/show_upload.inc:73
+msgid "Upload"
+msgstr "Yükleme"
+
+#: ../../templates/sidebar.inc.php:89
+#: ../../templates/show_playlists.inc.php:28 ../../templates/menu.inc:38
+msgid "Playlists"
+msgstr "Þarký listeleri"
+
+#: ../../templates/sidebar.inc.php:93 ../../templates/menu.inc:32
+#, fuzzy
+msgid "Local Play"
+msgstr "Yerel Çalma Düzeni"
+
+#: ../../templates/sidebar.inc.php:112
+#: ../../templates/show_playlists.inc.php:66
+#: ../../templates/show_artists.inc:56 ../../templates/show_albums.inc:59
+#: ../../templates/show_mpdplay.inc:114
+msgid "Random"
+msgstr "Rasgele"
+
+#: ../../templates/sidebar.inc.php:134
+#: ../../templates/show_random_play_bar.inc.php:50
+msgid "Minutes"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:137
+#: ../../templates/show_random_play_bar.inc.php:53
+msgid "Less Played"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:141
+#: ../../templates/show_random_play_bar.inc.php:58
+msgid "Enqueue"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:146 ../../templates/menu.inc:75
+#: ../../templates/menu.inc:81 ../../templates/menu.inc:85
+msgid "Logout"
+msgstr "Oturum Sonu"
+
 #: ../../templates/show_confirmation.inc.php:30
 msgid "Continue"
 msgstr "Devam"
 
+#: ../../templates/show_random_play_bar.inc.php:31
+#: ../../templates/show_random_play.inc:28
+msgid "Play Random Selection"
+msgstr "Rasgele seçilenleri çal"
+
+#: ../../templates/show_random_play_bar.inc.php:51
+#, fuzzy
+msgid "Full Artists"
+msgstr "Tüm Sanatçýlar"
+
+#: ../../templates/show_random_play_bar.inc.php:52
+#: ../../templates/show_random_play.inc:60
+msgid "Full Albums"
+msgstr "Tüm Albümler"
+
+#: ../../templates/show_random_play_bar.inc.php:55
+msgid "from"
+msgstr ""
+
+#: ../../templates/show_random_play_bar.inc.php:59
+#, fuzzy
+msgid "Advanced"
+msgstr "Eklendi"
+
+#: ../../templates/show_local_catalog_info.inc.php:10
+msgid "Total Users"
+msgstr "Tüm Kullanýcýlar"
+
+#: ../../templates/show_local_catalog_info.inc.php:14
+msgid "Connected Users"
+msgstr "Baðlanmýþ Kullanýcýlar"
+
+#: ../../templates/show_local_catalog_info.inc.php:30
+msgid "Catalog Size"
+msgstr "Katalog boyutu"
+
+#: ../../templates/show_local_catalog_info.inc.php:34
+msgid "Catalog Time"
+msgstr "Katalog süresi"
+
 #: ../../templates/show_play_selected.inc.php:49
 msgid "Play Selected"
 msgstr "Seçilmiþleri çal"
@@ -931,35 +1127,54 @@
 msgid "Download Selected"
 msgstr "Seçilmiþleri iþaretle"
 
-#: ../../templates/show_play_selected.inc.php:55 ../../playlist.php:77
+#: ../../templates/show_play_selected.inc.php:55
 msgid "Flag Selected"
 msgstr "Seçilmiþleri iþaretle"
 
-#: ../../templates/show_play_selected.inc.php:56 ../../playlist.php:83
+#: ../../templates/show_play_selected.inc.php:56
 msgid "Edit Selected"
 msgstr "Seçilmiþleri düzenle"
 
-#: ../../templates/show_play_selected.inc.php:63
+#: ../../templates/show_play_selected.inc.php:64
 msgid "Set Track Numbers"
 msgstr "Parça numaralarýný iþle"
 
-#: ../../templates/show_play_selected.inc.php:64
+#: ../../templates/show_play_selected.inc.php:65
 msgid "Remove Selected Tracks"
 msgstr "Seçilmiþ parçalarý sil"
 
-#: ../../templates/show_play_selected.inc.php:70
+#: ../../templates/show_play_selected.inc.php:71
 msgid "Playlist"
 msgstr "Þarký listesi"
 
-#: ../../templates/show_play_selected.inc.php:70
+#: ../../templates/show_play_selected.inc.php:71
 msgid "Add to"
 msgstr "Ekle"
 
-#: ../../templates/show_all_popular.inc.php:27 ../../index.php:98
+#: ../../templates/show_play_selected.inc.php:73
+#: ../../templates/show_playlists.inc.php:51
+msgid "View"
+msgstr "Görüntüle"
+
+#: ../../templates/show_play_selected.inc.php:74
+#: ../../templates/show_playlists.inc.php:55 ../../templates/show_users.inc:58
+#: ../../templates/show_users.inc:102
+msgid "Edit"
+msgstr "Düzenle"
+
+#: ../../templates/show_all_recent.inc.php:27 ../../index.php:99
+msgid "Newest Artist Additions"
+msgstr "Son eklenen sanatçýlar"
+
+#: ../../templates/show_all_recent.inc.php:30 ../../index.php:106
+msgid "Newest Album Additions"
+msgstr "Son eklenen albümler"
+
+#: ../../templates/show_all_popular.inc.php:27 ../../index.php:82
 msgid "Most Popular Artists"
 msgstr "En popüler sanatçýlar"
 
-#: ../../templates/show_all_popular.inc.php:30 ../../index.php:71
+#: ../../templates/show_all_popular.inc.php:30 ../../index.php:61
 #, fuzzy
 msgid "Most Popular Albums"
 msgstr "En popüler sanatçýlar"
@@ -969,124 +1184,233 @@
 msgid "Most Popular Genres"
 msgstr "En popüler þarkýlar"
 
-#: ../../templates/show_all_popular.inc.php:40 ../../index.php:105
+#: ../../templates/show_all_popular.inc.php:40 ../../index.php:89
 msgid "Most Popular Songs"
 msgstr "En popüler þarkýlar"
 
-#: ../../templates/show_local_catalog_info.inc.php:10
-msgid "Total Users"
-msgstr "Tüm Kullanýcýlar"
+#: ../../templates/show_get_albumart.inc.php:28
+msgid "Customize Search"
+msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:14
-msgid "Connected Users"
-msgstr "Baðlanmýþ Kullanýcýlar"
+#: ../../templates/show_get_albumart.inc.php:49
+msgid "Direct URL to Image"
+msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:18
-#: ../../templates/show_genre.inc.php:36 ../../templates/show_artists.inc:42
-#: ../../templates/show_artists.inc:65 ../../templates/show_browse_menu.inc:36
-msgid "Albums"
+#: ../../templates/show_get_albumart.inc.php:59
+msgid "Get Art"
+msgstr "Albüm kapaðý çaðýr"
+
+#: ../../templates/show_rename_artist.inc.php:33
+#: ../../templates/show_rename_artist.inc.php:51
+#, fuzzy
+msgid "Rename"
+msgstr "Kullanýcý adý"
+
+#: ../../templates/show_rename_artist.inc.php:33
+#, fuzzy
+msgid "to"
+msgstr "Dur"
+
+#: ../../templates/show_rename_artist.inc.php:40
+#: ../../templates/show_search.inc:144
+msgid "OR"
+msgstr ""
+
+#: ../../templates/show_rename_artist.inc.php:42
+msgid "Insert current"
+msgstr ""
+
+#: ../../templates/show_rename_artist.inc.php:47
+#, fuzzy
+msgid "Update id3 tags"
+msgstr "Etiketlerden güncelle"
+
+#: ../../templates/show_artist_box.inc.php:26
+msgid "Albums by"
 msgstr "Albümler"
 
-#: ../../templates/show_local_catalog_info.inc.php:22
-#: ../../templates/show_genre.inc.php:41
-#: ../../templates/show_browse_menu.inc:35
-msgid "Artists"
-msgstr "Sanatçýlar"
+#: ../../templates/show_artist_box.inc.php:34
+msgid "Show All Songs By"
+msgstr "Tüm þarkýlarýný görüntüle: "
 
-#: ../../templates/show_local_catalog_info.inc.php:26
-#: ../../templates/show_genres.inc.php:37
-#: ../../templates/show_genre.inc.php:46 ../../templates/show_artists.inc:41
-#: ../../templates/show_artists.inc:64 ../../templates/show_albums.inc:41
-#: ../../templates/show_albums.inc:71
-msgid "Songs"
-msgstr "Þarkýlar"
+#: ../../templates/show_artist_box.inc.php:35
+msgid "Play All Songs By"
+msgstr "Tüm þarkýlarýný çal: "
 
-#: ../../templates/show_local_catalog_info.inc.php:30
-msgid "Catalog Size"
-msgstr "Katalog boyutu"
+#: ../../templates/show_artist_box.inc.php:36
+msgid "Play Random Songs By"
+msgstr "Rasgele þarkýlarýný çal: "
 
-#: ../../templates/show_local_catalog_info.inc.php:34
-msgid "Catalog Time"
-msgstr "Katalog süresi"
+#: ../../templates/show_artist_box.inc.php:38
+#: ../../templates/show_album.inc:72
+msgid "Update from tags"
+msgstr "Etiketlerden güncelle"
 
-#: ../../templates/show_genres.inc.php:38 ../../templates/show_artists.inc:43
-#: ../../templates/show_artists.inc:67 ../../templates/show_songs.inc:42
-#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:75
-#: ../../templates/show_access_list.inc:51 ../../templates/show_artist.inc:55
-#: ../../templates/show_mpdpl.inc:68 ../../templates/show_uploads.inc:32
-msgid "Action"
+#: ../../templates/show_artist_box.inc.php:39
+#, fuzzy
+msgid "Rename Artist"
+msgstr "Sanatçý"
+
+#: ../../templates/show_playlists.inc.php:31
+#, fuzzy
+msgid "Playlist Name"
+msgstr "Þarký listesi"
+
+#: ../../templates/show_playlists.inc.php:32
+#, fuzzy
+msgid "# Songs"
+msgstr "Þarkýlar"
+
+#: ../../templates/show_playlists.inc.php:33
+msgid "Owner"
+msgstr ""
+
+#: ../../templates/show_playlists.inc.php:34
+#, fuzzy
+msgid "Actions"
 msgstr "Eylem"
 
-#: ../../templates/show_genre.inc.php:32
+#: ../../templates/show_playlists.inc.php:58
+#: ../../templates/show_uploads.inc:50 ../../templates/catalog.inc:57
+#: ../../templates/show_users.inc:70
+msgid "Delete"
+msgstr "Sil"
+
+#: ../../templates/show_playlists.inc.php:71
+#: ../../templates/show_songs.inc:140 ../../templates/show_album.inc:75
+#: ../../templates/show_albums.inc:61 ../../templates/show_artist.inc:69
+msgid "Download"
+msgstr "Ýndirme"
+
+#: ../../templates/show_playlist_box.inc.php:33
 #, fuzzy
-msgid "Viewing"
-msgstr "Görüntüle"
+msgid "Playlist Actions"
+msgstr "Þarký listeleri"
 
-#: ../../templates/show_all_recent.inc.php:27 ../../index.php:115
-msgid "Newest Artist Additions"
-msgstr "Son eklenen sanatçýlar"
+#: ../../templates/show_playlist_box.inc.php:34
+#, fuzzy
+msgid "Create New Playlist"
+msgstr "Þarký listesi oluþtur"
 
-#: ../../templates/show_all_recent.inc.php:30 ../../index.php:122
-msgid "Newest Album Additions"
-msgstr "Son eklenen albümler"
+#: ../../templates/show_playlist_box.inc.php:35
+#, fuzzy
+msgid "View All Playlists"
+msgstr "Yeni þarký listesi"
 
-#: ../../localplay.php:79
+#: ../../templates/show_playlist_box.inc.php:36
+msgid "Import From File"
+msgstr ""
+
+#: ../../templates/show_playlist_box.inc.php:38
+#, fuzzy
+msgid "Normalize Tracks"
+msgstr "Tüm parçalar"
+
+#: ../../templates/show_playlist_box.inc.php:39
+#, fuzzy
+msgid "Play This Playlist"
+msgstr "Þarký listesi"
+
+#: ../../templates/show_preference_box.inc.php:44
+msgid "Preference"
+msgstr "Tercih"
+
+#: ../../templates/show_preference_box.inc.php:45
+msgid "Value"
+msgstr "Deðer"
+
+#: ../../templates/show_preference_box.inc.php:47
+msgid "Apply to All"
+msgstr "Hersine uygula"
+
+#: ../../templates/show_preference_box.inc.php:54
+msgid "description"
+msgstr ""
+
+#: ../../templates/show_object_rating.inc.php:25
+#: ../../templates/show_songs.inc:52
+#, fuzzy
+msgid "Rating"
+msgstr "Düzenleme"
+
+#: ../../localplay.php:81
 msgid "Unknown action requested"
 msgstr "Bilinmeyen eylem istendi"
 
-#: ../../artists.php:48
-msgid "All songs by"
-msgstr "Tüm þarkýlarý"
+#: ../../browse.php:48 ../../albums.php:168 ../../albums.php:174
+#: ../../albums.php:181 ../../albums.php:186 ../../albums.php:192
+#, fuzzy
+msgid "Show Albums starting with"
+msgstr "Ýsmi bu harfle baþlayan albümleri göster"
+
+#: ../../browse.php:78 ../../artists.php:128 ../../artists.php:132
+#: ../../artists.php:138 ../../artists.php:151
+#, fuzzy
+msgid "Show Artists starting with"
+msgstr "Ýsmi bu harfle baþlayan sanatçýlarý göster"
+
+#: ../../search.php:45
+msgid "Error: No Keyword Entered"
+msgstr ""
 
-#: ../../artists.php:57 ../../albums.php:106
+#: ../../tv.php:76 ../../templates/show_now_playing.inc:31
+msgid "Now Playing"
+msgstr "Þu anda çalan"
+
+#: ../../artists.php:58 ../../albums.php:147
 msgid "Starting Update from Tags"
 msgstr "Etiketten güncelleþtirme baþlýyor"
 
-#: ../../artists.php:62 ../../albums.php:111
+#: ../../artists.php:63 ../../albums.php:152
+#, fuzzy
+msgid "Update From Tags Complete"
+msgstr "Etiketten güncelleþtirme tamamlandý"
+
+#: ../../amp-mpd.php:171 ../../playlist.php:63
+msgid "New Playlist"
+msgstr "Yeni þarký listesi"
+
+#: ../../playlist.php:46
+#, fuzzy
+msgid "Playlist Deleted"
+msgstr "Seçilmiþleri çal"
+
+#: ../../playlist.php:46
+#, fuzzy
+msgid "The Requested Playlist has been deleted"
+msgstr "Ýstenen þarký(lar) etkinleþtirildi"
+
+#: ../../playlist.php:56
 #, fuzzy
-msgid "Update From Tags Complete"
-msgstr "Etiketten güncelleþtirme tamamlandý"
+msgid "Are you sure you want to delete this playlist"
+msgstr "Tamamen silmek istediðinizden emin misiniz: "
 
-#: ../../artists.php:72 ../../artists.php:76 ../../artists.php:82
-#: ../../artists.php:95
+#: ../../playlist.php:112
 #, fuzzy
-msgid "Show Artists starting with"
-msgstr "Ýsmi bu harfle baþlayan sanatçýlarý göster"
-
-#: ../../amp-mpd.php:176 ../../playlist.php:135
-msgid "New Playlist"
-msgstr "Yeni þarký listesi"
+msgid "Playlist Created"
+msgstr "Þarký listesi güncelendi."
 
-#: ../../playlist.php:115
-msgid "owned by"
+#: ../../playlist.php:112
+msgid " has been created"
 msgstr ""
 
-#: ../../playlist.php:118
-#, fuzzy
-msgid "Edit Playlist"
-msgstr "Þarký listesi"
-
 #: ../../playlist.php:121
 #, fuzzy
-msgid "Play Full Playlist"
-msgstr "Þarký listesi"
+msgid "Remote Selected Tracks"
+msgstr "Seçilmiþ parçalarý sil"
 
-#: ../../playlist.php:122
+#: ../../playlist.php:139
 #, fuzzy
-msgid "Play Random"
-msgstr "Rasgele þarký çal"
-
-#: ../../playlist.php:192
-msgid "Playlist updated."
+msgid "Playlist Updated"
 msgstr "Þarký listesi güncelendi."
 
-#: ../../index.php:41
-msgid "Welcome to"
-msgstr "Hoþgeldiniz"
+#: ../../playlist.php:139
+msgid " has been updated"
+msgstr ""
 
-#: ../../index.php:43
-msgid "you are currently logged in as"
-msgstr "Kullanýcý adýnýz"
+#: ../../flag.php:38
+msgid "Flagging song completed."
+msgstr "Þarký iþaretleme tamamlandý"
 
 #: ../../user.php:45
 #, fuzzy
@@ -1097,10 +1421,6 @@
 msgid "Error: Insufficient Rights"
 msgstr ""
 
-#: ../../flag.php:35
-msgid "Flagging song completed."
-msgstr "Þarký iþaretleme tamamlandý"
-
 #: ../../albums.php:44
 msgid "Album Art Cleared"
 msgstr "Albüm kapaðý silindi"
@@ -1109,27 +1429,15 @@
 msgid "Album Art information has been removed form the database"
 msgstr "Albüm kapaðý ile ilgili bilgiler veritabanýndan silindi"
 
-#: ../../albums.php:78
-msgid "Album Art Located"
-msgstr "Albüm kapaðý bulundu"
-
-#: ../../albums.php:78
-msgid ""
-"Album Art information has been located in Amazon. If incorrect, click "
-"\"Reset Album Art\" below to remove the artwork."
+#: ../../albums.php:74
+msgid "No Amazon Developer Key set, amazon album art searching will not work"
 msgstr ""
-"Albüm kapaðý Amazon'da bulundu. Doðru olmadýðý takdirde \"Albüm kapaðý "
-"silinsin\" i týklayarak bilgileri silin."
-
-#: ../../albums.php:86 ../../albums.php:96
-msgid "Get Art"
-msgstr "Albüm kapaðý çaðýr"
 
-#: ../../albums.php:90
+#: ../../albums.php:104
 msgid "Album Art Not Located"
 msgstr "Albüm kapaðý bulunamadý"
 
-#: ../../albums.php:90
+#: ../../albums.php:104
 msgid ""
 "Album Art could not be located at this time. This may be due to Amazon being "
 "busy, or the album not being present in their collection."
@@ -1137,11 +1445,90 @@
 "Albüm kapaðý bulunamadý. Bu Amazon'un meþgul yada bu albümün orada "
 "olmayýþýndan ileri gelebilir."
 
-#: ../../albums.php:127 ../../albums.php:133 ../../albums.php:140
-#: ../../albums.php:145 ../../albums.php:150
+#: ../../albums.php:137
 #, fuzzy
-msgid "Show Albums starting with"
-msgstr "Ýsmi bu harfle baþlayan albümleri göster"
+msgid "Album Art Inserted"
+msgstr "Albüm kapaðý silindi"
+
+#: ../../ratings.php:33
+#, fuzzy
+msgid "Rating Updated"
+msgstr "Çabuk güncelle"
+
+#: ../../ratings.php:33
+msgid "Your rating for this object has been updated"
+msgstr ""
+
+#: ../../register.php:79
+#, fuzzy
+msgid "Error Captcha Required"
+msgstr "Hata, kullanýcý ismi gerekli"
+
+#: ../../register.php:86
+msgid "Error Captcha Failed"
+msgstr ""
+
+#: ../../register.php:93
+msgid "You <U>must</U> accept the user agreement"
+msgstr ""
+
+#: ../../register.php:98
+msgid "You did not enter a username"
+msgstr ""
+
+#: ../../register.php:102
+msgid "Please fill in your full name (Firstname Lastname)"
+msgstr ""
+
+#: ../../register.php:128
+#, fuzzy
+msgid "You must enter a password"
+msgstr "Parola giriþ"
+
+#: ../../register.php:132
+#, fuzzy
+msgid "Your passwords do not match"
+msgstr "Hata, parolalar uyuþmuyor"
+
+#: ../../register.php:150
+#, fuzzy
+msgid "Error: Insert Failed"
+msgstr "Hata, kullanýcý ismi gerekli"
+
+#: ../../register.php:165
+msgid "Registration Complete"
+msgstr ""
+
+#: ../../activate.php:42
+msgid "No user with this name registered"
+msgstr ""
+
+#: ../../activate.php:46
+msgid "The validation key used isn't correct."
+msgstr ""
+
+#: ../../activate.php:51
+#, fuzzy
+msgid "User activated"
+msgstr "Kullanýcý silindi"
+
+#: ../../activate.php:51
+msgid "This User ID is activated and can be used"
+msgstr ""
+
+#: ../../bin/print_tags.php.inc:42
+msgid ""
+"[print_tags.php.inc]\n"
+"This commandline script will display the tag information for the specified "
+"filename as it will \n"
+"appear to Ampache. \n"
+"        \n"
+msgstr ""
+
+#: ../../bin/print_tags.php.inc:48
+#, fuzzy
+msgid "Filename:"
+msgstr "Dosya adý"
 
 #: ../../bin/quarantine_migration.php.inc:49
 #, fuzzy
@@ -1206,19 +1593,141 @@
 msgid "!\n"
 msgstr ""
 
+#: ../../templates/show_admin_index.inc:27
+#, fuzzy
+msgid "User Management"
+msgstr "Kullanýcý adý"
+
+#: ../../templates/show_admin_index.inc:28
+msgid "E-mail Management"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:29
+#, fuzzy
+msgid "Catalog Managment"
+msgstr "Kalalog Ýsmi"
+
+#: ../../templates/show_admin_index.inc:30
+msgid "Admin Preferences"
+msgstr "Yönetici tercihleri"
+
+#: ../../templates/show_admin_index.inc:31 ../../templates/catalog.inc:95
+msgid "Access Lists"
+msgstr "Eriþim listesi"
+
+#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:94
+msgid "Add a catalog"
+msgstr "Katalog ekle"
+
+#: ../../templates/show_admin_index.inc:35 ../../templates/catalog.inc:99
+msgid "Clear Now Playing"
+msgstr "Þu anda çalanlarý sil"
+
+#: ../../templates/show_admin_index.inc:36
+#, fuzzy
+msgid "Add Access List Entry"
+msgstr "Eriþim listesi"
+
+#: ../../templates/show_admin_index.inc:40
+#, fuzzy
+msgid "Common Functions"
+msgstr "Veritabaný baðlantýsý"
+
+#: ../../templates/show_admin_index.inc:43
+#, fuzzy
+msgid "Admin Sections"
+msgstr "Yönetici Kýsmý"
+
+#: ../../templates/show_uploads.inc:33
+#, fuzzy
+msgid "Status"
+msgstr "Ýstatistikler"
+
+#: ../../templates/show_uploads.inc:34 ../../templates/flag.inc:58
+#: ../../templates/list_flagged.inc:41 ../../templates/list_duplicates.inc:32
+msgid "Song"
+msgstr "Þarký"
+
+#: ../../templates/show_uploads.inc:40 ../../templates/show_songs.inc:46
+#: ../../templates/list_duplicates.inc:37
+msgid "Size"
+msgstr "Boyut"
+
+#: ../../templates/show_uploads.inc:42
+msgid "User"
+msgstr "Kullanýcý"
+
+#: ../../templates/show_uploads.inc:43
+msgid "Date"
+msgstr "Tarih"
+
+#: ../../templates/show_uploads.inc:49
+msgid "Add"
+msgstr "Ekle"
+
+#: ../../templates/show_mpdpl.inc:43
+#, fuzzy
+msgid "MPD Server Playlist"
+msgstr "Sunucu þarký listesi"
+
+#: ../../templates/show_mpdpl.inc:45 ../../templates/show_mpdpl.inc:175
+msgid "Refresh the Playlist Window"
+msgstr "Þarký Listesi görüntüsünü yenile"
+
+#: ../../templates/show_mpdpl.inc:47 ../../templates/show_mpdpl.inc:177
+msgid "Click to shuffle (randomize) the playlist"
+msgstr "Þarký Listesini karýþtýrmak (rasgele) icin týkla"
+
+#: ../../templates/show_mpdpl.inc:47 ../../templates/show_mpdpl.inc:177
+msgid "shuffle"
+msgstr "rasgele"
+
+#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:178
+#, fuzzy
+msgid "Click to the clear the playlist"
+msgstr "Þarký listesini silmek için týkla"
+
+#: ../../templates/show_mpdpl.inc:52 ../../templates/show_mpdpl.inc:182
+msgid "Click to the remove all except the Now Playing"
+msgstr ""
+
+#: ../../templates/show_mpdpl.inc:62 ../../templates/show_songs.inc:41
+msgid "Song title"
+msgstr "þarký adý"
+
+#: ../../templates/flag.inc:43
+msgid "Flag song"
+msgstr "Þarkýyý iþaretle"
+
+#: ../../templates/flag.inc:45
+msgid ""
+"Flag the following song as having one of the problems listed below.  Site "
+"admins will then take the appropriate action for the flagged files."
+msgstr ""
+"Þarkýyý aþaðýda gösterilen sorunlardan biriyle iliþkili olarak iþaretle. "
+"Site yöneticileri bu iþaretli dosyalar hakkýnda gereken iþlemleri yaparlar."
+
+#: ../../templates/flag.inc:62
+msgid "Reason to flag"
+msgstr "Ýþaretleme nedeni"
+
+#: ../../templates/flag.inc:73
+msgid "Flag Song"
+msgstr "Þarkýyý iþaretle"
+
 #: ../../templates/customize_catalog.inc:24
 msgid "Settings for catalog in"
 msgstr "Katalog ayarlarý:"
 
-#: ../../templates/customize_catalog.inc:32 ../../templates/add_catalog.inc:39
+#: ../../templates/customize_catalog.inc:32 ../../templates/add_catalog.inc:40
 msgid "Auto-inserted Fields"
 msgstr "Özdevimli Alanlar"
 
-#: ../../templates/customize_catalog.inc:33 ../../templates/add_catalog.inc:40
+#: ../../templates/customize_catalog.inc:33 ../../templates/add_catalog.inc:41
 msgid "album name"
 msgstr "albüm ismi"
 
-#: ../../templates/customize_catalog.inc:34 ../../templates/add_catalog.inc:41
+#: ../../templates/customize_catalog.inc:34 ../../templates/add_catalog.inc:42
 msgid "artist name"
 msgstr "sanatçý ismi"
 
@@ -1226,27 +1735,27 @@
 msgid "catalog path"
 msgstr "katalog yolu"
 
-#: ../../templates/customize_catalog.inc:36 ../../templates/add_catalog.inc:42
+#: ../../templates/customize_catalog.inc:36 ../../templates/add_catalog.inc:43
 msgid "id3 comment"
 msgstr "id3 açýklamasý"
 
-#: ../../templates/customize_catalog.inc:37 ../../templates/add_catalog.inc:43
+#: ../../templates/customize_catalog.inc:37 ../../templates/add_catalog.inc:44
 msgid "genre"
 msgstr "kategori"
 
-#: ../../templates/customize_catalog.inc:38 ../../templates/add_catalog.inc:44
+#: ../../templates/customize_catalog.inc:38 ../../templates/add_catalog.inc:45
 msgid "track number (padded with leading 0)"
 msgstr "þarký numarasý (0 ile baþlar)"
 
-#: ../../templates/customize_catalog.inc:39 ../../templates/add_catalog.inc:45
+#: ../../templates/customize_catalog.inc:39 ../../templates/add_catalog.inc:46
 msgid "song title"
 msgstr "þarký adý"
 
-#: ../../templates/customize_catalog.inc:40 ../../templates/add_catalog.inc:46
+#: ../../templates/customize_catalog.inc:40 ../../templates/add_catalog.inc:47
 msgid "year"
 msgstr "yýl"
 
-#: ../../templates/customize_catalog.inc:41 ../../templates/add_catalog.inc:47
+#: ../../templates/customize_catalog.inc:41 ../../templates/add_catalog.inc:48
 msgid "other"
 msgstr "baþka"
 
@@ -1258,11 +1767,11 @@
 msgid "Filename pattern"
 msgstr "Dosya adý deseni"
 
-#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:75
 msgid "Folder Pattern"
 msgstr "Klasör adý deseni"
 
-#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:75
 msgid "(no leading or ending '/')"
 msgstr "(baþýnda yada sonuna '/' olmaksýzýn)"
 
@@ -1270,52 +1779,6 @@
 msgid "Save Catalog Settings"
 msgstr "Katalog ayarlarýný kaydet"
 
-#: ../../templates/show_admin_index.inc:27
-#, fuzzy
-msgid "User Management"
-msgstr "Kullanýcý adý"
-
-#: ../../templates/show_admin_index.inc:28
-msgid "E-mail Management"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:29
-#, fuzzy
-msgid "Catalog Managment"
-msgstr "Kalalog Ýsmi"
-
-#: ../../templates/show_admin_index.inc:30 ../../templates/admin_menu.inc:36
-msgid "Admin Preferences"
-msgstr "Yönetici tercihleri"
-
-#: ../../templates/show_admin_index.inc:31 ../../templates/catalog.inc:98
-#: ../../templates/admin_menu.inc:37
-msgid "Access Lists"
-msgstr "Eriþim listesi"
-
-#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:97
-msgid "Add a catalog"
-msgstr "Katalog ekle"
-
-#: ../../templates/show_admin_index.inc:35 ../../templates/catalog.inc:102
-msgid "Clear Now Playing"
-msgstr "Þu anda çalanlarý sil"
-
-#: ../../templates/show_admin_index.inc:36
-#, fuzzy
-msgid "Add Access List Entry"
-msgstr "Eriþim listesi"
-
-#: ../../templates/show_admin_index.inc:40
-#, fuzzy
-msgid "Common Functions"
-msgstr "Veritabaný baðlantýsý"
-
-#: ../../templates/show_admin_index.inc:43
-#, fuzzy
-msgid "Admin Sections"
-msgstr "Yönetici Kýsmý"
-
 #: ../../templates/show_test.inc:29
 msgid "Ampache Debug"
 msgstr "Ampache Hata Ayýklamasý"
@@ -1389,7 +1852,7 @@
 "Ampache'nin çalýþmasý icin gerekli olmasada tavsiyemizdir"
 
 #: ../../templates/show_test.inc:116
-#: ../../templates/show_install_config.inc:87
+#: ../../templates/show_install_config.inc:88
 #, fuzzy
 msgid "Ampache.cfg.php Exists"
 msgstr "Ampache.cfg bulundu"
@@ -1405,7 +1868,7 @@
 "yerde deðildir yada  web sunucunuz tarafýndan okunamýyordur."
 
 #: ../../templates/show_test.inc:137
-#: ../../templates/show_install_config.inc:104
+#: ../../templates/show_install_config.inc:105
 #, fuzzy
 msgid "Ampache.cfg.php Configured?"
 msgstr "Ampache.cfg'yi yapýlandýrdýnýzmý ?"
@@ -1457,20 +1920,20 @@
 msgstr "Çal"
 
 #: ../../templates/show_localplay.inc:39 ../../templates/list_header.inc:71
-#: ../../templates/show_mpdplay.inc:48
+#: ../../templates/show_mpdplay.inc:62
 msgid "Prev"
 msgstr "Önceki"
 
-#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:49
+#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:63
 msgid "Stop"
 msgstr "Dur"
 
-#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:51
+#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:65
 msgid "Pause"
 msgstr "Durakla"
 
 #: ../../templates/show_localplay.inc:43 ../../templates/list_header.inc:94
-#: ../../templates/show_mpdplay.inc:52
+#: ../../templates/show_mpdplay.inc:66
 msgid "Next"
 msgstr "Sonraki"
 
@@ -1490,7 +1953,7 @@
 msgid "Clear queue"
 msgstr "Kuyruðu sil"
 
-#: ../../templates/add_catalog.inc:30
+#: ../../templates/add_catalog.inc:31
 msgid ""
 "In the form below enter either a local path (i.e. /data/music) or the URL to "
 "a remote Ampache installation (i.e http://theotherampache.com)"
@@ -1498,60 +1961,55 @@
 "Aþaðidaki forma ya yerel bir yol girin (örn. /data/muzik) yada uzak bir "
 "Ampache Sunucusunun adresini (örn. http://benimampachem.com)"
 
-#: ../../templates/add_catalog.inc:36
+#: ../../templates/add_catalog.inc:37
 msgid "Catalog Name"
 msgstr "Kalalog Ýsmi"
 
-#: ../../templates/add_catalog.inc:53
+#: ../../templates/add_catalog.inc:54
 msgid "Path"
 msgstr "Yol"
 
-#: ../../templates/add_catalog.inc:57
+#: ../../templates/add_catalog.inc:58
 msgid "Catalog Type"
 msgstr "Katalog türü"
 
-#: ../../templates/add_catalog.inc:61
+#: ../../templates/add_catalog.inc:62
 msgid "Remote"
 msgstr "uzaktan"
 
-#: ../../templates/add_catalog.inc:66
+#: ../../templates/add_catalog.inc:67
 msgid "ID3 Set Command"
 msgstr "ID3 ayarlama komutu"
 
-#: ../../templates/add_catalog.inc:70
+#: ../../templates/add_catalog.inc:71
 msgid "Filename Pattern"
 msgstr "Dosya adý deseni"
 
-#: ../../templates/add_catalog.inc:78 ../../templates/catalog.inc:104
+#: ../../templates/add_catalog.inc:79 ../../templates/catalog.inc:101
 msgid "Gather Album Art"
 msgstr "Albüm kapaklarýný topla"
 
-#: ../../templates/add_catalog.inc:82
+#: ../../templates/add_catalog.inc:83
 msgid "ID3V2 Tags"
 msgstr "ID3V2 Etiketleri"
 
-#: ../../templates/add_catalog.inc:85
+#: ../../templates/add_catalog.inc:86
 msgid "Amazon"
 msgstr "Amazon"
 
-#: ../../templates/add_catalog.inc:88
+#: ../../templates/add_catalog.inc:89
 msgid "File Folder"
 msgstr "Dosya klasörü"
 
-#: ../../templates/add_catalog.inc:95
+#: ../../templates/add_catalog.inc:96
 msgid "Build Playlists from m3u Files"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:102
+#: ../../templates/add_catalog.inc:103
 msgid "Add Catalog"
 msgstr "Kataloðu ekle"
 
-#: ../../templates/list_flagged.inc:41 ../../templates/flag.inc:58
-#: ../../templates/show_uploads.inc:34
-msgid "Song"
-msgstr "Þarký"
-
-#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:41
+#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:49
 msgid "Flag"
 msgstr "Ýþaret"
 
@@ -1575,29 +2033,29 @@
 msgid "Reject"
 msgstr "Red"
 
-#: ../../templates/show_artists.inc:55 ../../templates/show_albums.inc:58
-#: ../../templates/show_random_play.inc:46
-msgid "All"
-msgstr "Hepsi"
-
-#: ../../templates/show_songs.inc:33 ../../templates/show_mpdpl.inc:62
-msgid "Song title"
-msgstr "þarký adý"
+#: ../../templates/header.inc:49
+#, fuzzy
+msgid "You are currently logged in as"
+msgstr "Kullanýcý adýnýz"
 
-#: ../../templates/show_songs.inc:38 ../../templates/show_uploads.inc:40
-msgid "Size"
-msgstr "Boyut"
+#: ../../templates/header.inc:58
+msgid "Go!"
+msgstr ""
 
-#: ../../templates/show_songs.inc:113
+#: ../../templates/show_songs.inc:143
 msgid "Direct Link"
 msgstr "Doðrudan Eriþim"
 
-#: ../../templates/show_songs.inc:131
+#: ../../templates/show_songs.inc:166
 msgid "Total"
 msgstr "Tüm"
 
+#: ../../templates/show_search_bar.inc:36 ../../templates/show_search.inc:54
+msgid "Search Ampache"
+msgstr "Ampache içinde ara"
+
 #: ../../templates/show_install_config.inc:41
-#: ../../templates/show_install.inc:40
+#: ../../templates/show_install.inc:41
 #, fuzzy
 msgid ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
@@ -1607,7 +2065,7 @@
 "okuyabilmeli "
 
 #: ../../templates/show_install_config.inc:49
-#: ../../templates/show_install.inc:50
+#: ../../templates/show_install.inc:51
 #, fuzzy
 msgid "Step 2 - Creating the Ampache.cfg.php file"
 msgstr "Ýkinci Adým - amapche.cfg'nin kurulmasý"
@@ -1622,89 +2080,69 @@
 "yapýlacaktýr. Eðer baþarýsýz olunursa size sunulacak olan yapýlandýrma "
 "dosyasýný /config klasörüne kaydedin. "
 
-#: ../../templates/show_install_config.inc:59
+#: ../../templates/show_install_config.inc:60
 msgid "Web Path"
 msgstr "Web Yolu"
 
-#: ../../templates/show_install_config.inc:63
-#: ../../templates/show_install.inc:57
+#: ../../templates/show_install_config.inc:64
+#: ../../templates/show_install.inc:59
 msgid "Desired Database Name"
 msgstr "Düþünülen Veritabaný ismi"
 
-#: ../../templates/show_install_config.inc:67
-#: ../../templates/show_install.inc:61
+#: ../../templates/show_install_config.inc:68
+#: ../../templates/show_install.inc:63
 msgid "MySQL Hostname"
 msgstr "MySQL makine ismi"
 
-#: ../../templates/show_install_config.inc:71
+#: ../../templates/show_install_config.inc:72
 msgid "MySQL Username"
 msgstr "MySQL kullanýcý adý"
 
-#: ../../templates/show_install_config.inc:75
+#: ../../templates/show_install_config.inc:76
 msgid "MySQL Password"
 msgstr "MySQL parolasý"
 
-#: ../../templates/show_install_config.inc:80
+#: ../../templates/show_install_config.inc:81
 msgid "Write Config"
 msgstr "Yapýlandýrmayý kaydet"
 
-#: ../../templates/show_install_config.inc:124
+#: ../../templates/show_install_config.inc:125
 msgid "Check for Config"
 msgstr "Yapýlandýrma doðrula"
 
-#: ../../templates/show_album.inc:53
+#: ../../templates/show_album.inc:67
 msgid "Play Album"
 msgstr "Albümü çal"
 
-#: ../../templates/show_album.inc:54
+#: ../../templates/show_album.inc:68
 msgid "Play Random from Album"
 msgstr "Albümden rasgele çal"
 
-#: ../../templates/show_album.inc:55
+#: ../../templates/show_album.inc:69
 msgid "Reset Album Art"
 msgstr "Albüm kapaðý silinsin"
 
-#: ../../templates/show_album.inc:56
+#: ../../templates/show_album.inc:70
 msgid "Find Album Art"
 msgstr "Albüm kapaðý ara"
 
-#: ../../templates/show_album.inc:58 ../../templates/show_artist.inc:37
-msgid "Update from tags"
-msgstr "Etiketlerden güncelle"
-
-#: ../../templates/show_preferences.inc:31
-msgid "Editing"
-msgstr "Düzenleme"
-
-#: ../../templates/show_preferences.inc:31
-msgid "preferences"
-msgstr "tercihler"
-
-#: ../../templates/show_preferences.inc:33
-msgid "Rebuild Preferences"
-msgstr "Tercihleri yeniden yapýlandýr"
-
-#: ../../templates/show_preferences.inc:39
-msgid "Preference"
-msgstr "Tercih"
-
-#: ../../templates/show_preferences.inc:40
-msgid "Value"
-msgstr "Deðer"
+#: ../../templates/show_preferences.inc:42
+msgid "Editing"
+msgstr "Düzenleme"
 
 #: ../../templates/show_preferences.inc:42
-msgid "Type"
-msgstr "Türü"
+msgid "preferences"
+msgstr "tercihler"
 
-#: ../../templates/show_preferences.inc:43
-msgid "Apply to All"
-msgstr "Hersine uygula"
+#: ../../templates/show_preferences.inc:44
+msgid "Rebuild Preferences"
+msgstr "Tercihleri yeniden yapýlandýr"
 
-#: ../../templates/show_preferences.inc:83
+#: ../../templates/show_preferences.inc:73
 msgid "Update Preferences"
 msgstr "Tercihleri güncelle"
 
-#: ../../templates/show_preferences.inc:87
+#: ../../templates/show_preferences.inc:77
 msgid "Cancel"
 msgstr "Ýptal"
 
@@ -1728,7 +2166,35 @@
 msgid "Update User"
 msgstr "Kullanýcý güncelle"
 
-#: ../../templates/show_install.inc:48
+#: ../../templates/show_random_play.inc:34
+msgid "Item count"
+msgstr "Öðe sayýsý"
+
+#: ../../templates/show_random_play.inc:49
+msgid "From genre"
+msgstr "Kategoriden"
+
+#: ../../templates/show_random_play.inc:58
+msgid "Standard"
+msgstr ""
+
+#: ../../templates/show_random_play.inc:59
+msgid "Favor Unplayed"
+msgstr "Çalýnmamýþlardan"
+
+#: ../../templates/show_random_play.inc:61
+msgid "Full Artist"
+msgstr "Tüm Sanatçýlar"
+
+#: ../../templates/show_random_play.inc:66
+msgid "from catalog"
+msgstr "Katalogdan"
+
+#: ../../templates/show_random_play.inc:75
+msgid "Play Random Songs"
+msgstr "Rasgele þarký çal"
+
+#: ../../templates/show_install.inc:49
 msgid ""
 "This step creates and inserts the Ampache database, as such please provide a "
 "mysql account with database creation rights. This step may take a while "
@@ -1738,37 +2204,30 @@
 "olan bir mysql giriþi gerekli. Bu adýmýn süresi bilgisayarýnýzýn hýzýna "
 "baðlýdýr "
 
-#: ../../templates/show_install.inc:65
+#: ../../templates/show_install.inc:67
 msgid "MySQL Administrative Username"
 msgstr "MySQL yönetici ismi"
 
-#: ../../templates/show_install.inc:69
+#: ../../templates/show_install.inc:71
 msgid "MySQL Administrative Password"
 msgstr "MySQL yönetici parolasý"
 
-#: ../../templates/show_install.inc:74
-msgid "Insert Database"
-msgstr "Veritabanýný ekle"
+#: ../../templates/show_install.inc:75
+msgid "Create Database User for New Database"
+msgstr ""
 
-#: ../../templates/flag.inc:43
-msgid "Flag song"
-msgstr "Þarkýyý iþaretle"
+#: ../../templates/show_install.inc:80
+#, fuzzy
+msgid "Ampache Database Username"
+msgstr "Düþünülen Veritabaný ismi"
 
-#: ../../templates/flag.inc:45
-msgid ""
-"Flag the following song as having one of the problems listed below.  Site "
-"admins will then take the appropriate action for the flagged files."
+#: ../../templates/show_install.inc:84
+msgid "Ampache Database User Password"
 msgstr ""
-"Þarkýyý aþaðýda gösterilen sorunlardan biriyle iliþkili olarak iþaretle. "
-"Site yöneticileri bu iþaretli dosyalar hakkýnda gereken iþlemleri yaparlar."
-
-#: ../../templates/flag.inc:62
-msgid "Reason to flag"
-msgstr "Ýþaretleme nedeni"
 
-#: ../../templates/flag.inc:73
-msgid "Flag Song"
-msgstr "Þarkýyý iþaretle"
+#: ../../templates/show_install.inc:89
+msgid "Insert Database"
+msgstr "Veritabanýný ekle"
 
 #: ../../templates/show_add_access.inc:31
 msgid "Add Access for a Host"
@@ -1799,7 +2258,7 @@
 msgid "Add Host"
 msgstr "Makine ekle"
 
-#: ../../templates/catalog.inc:33
+#: ../../templates/catalog.inc:30
 msgid ""
 "Error: ICONV not found, ID3V2 Tags will not import correctly. See <a href="
 "\"http://php.oregonstate.edu/iconv\">Iconv</a> for information on getting "
@@ -1809,92 +2268,55 @@
 "Bu adresten <a href=\"http://php.oregonstate.edu/iconv\">Iconv</a> ICONV "
 "hakkýnda bilgi alabilirsiniz."
 
-#: ../../templates/catalog.inc:42
+#: ../../templates/catalog.inc:39
 msgid "Update Catalogs"
 msgstr "Kataloglarý güncelle"
 
-#: ../../templates/catalog.inc:68
+#: ../../templates/catalog.inc:65
 msgid "Fast Add"
 msgstr "Çabuk ekle"
 
-#: ../../templates/catalog.inc:75
+#: ../../templates/catalog.inc:72
 msgid "Fast Update"
 msgstr "Çabuk güncelle"
 
-#: ../../templates/catalog.inc:88
+#: ../../templates/catalog.inc:85
 msgid "You don't have any catalogs."
 msgstr "Sizin hiç kataloðunuz yok."
 
-#: ../../templates/catalog.inc:99
+#: ../../templates/catalog.inc:96
 msgid "Show Duplicate Songs"
 msgstr "Duble þarkýlarý görüntüle"
 
-#: ../../templates/catalog.inc:100
+#: ../../templates/catalog.inc:97
 msgid "Show Disabled Songs"
 msgstr "Edilgenleþtirilmiþ þarkýlarý görüntüle"
 
-#: ../../templates/catalog.inc:101
+#: ../../templates/catalog.inc:98
 msgid "Clear Catalog Stats"
 msgstr "Katalog istatistiklerini sil"
 
-#: ../../templates/catalog.inc:103
+#: ../../templates/catalog.inc:100
 msgid "Dump Album Art"
 msgstr "Albüm kapaðý boþalt"
 
-#: ../../templates/catalog.inc:105
+#: ../../templates/catalog.inc:102
 msgid "View flagged songs"
 msgstr "Ýþaretlenmiþ þarkýlarý görüntüle"
 
-#: ../../templates/catalog.inc:106
+#: ../../templates/catalog.inc:103
 msgid "Catalog Tools"
 msgstr "Katalog araçlarý"
 
-#: ../../templates/admin_menu.inc:33
-msgid "Users"
-msgstr "Kullanýcýlar"
-
-#: ../../templates/admin_menu.inc:34
-msgid "Mail Users"
-msgstr "Kullanýcýlara mesaj"
-
-#: ../../templates/menu.inc:29
-msgid "Home"
-msgstr "Ýlk Sayfa"
-
-#: ../../templates/menu.inc:32
-#, fuzzy
-msgid "Local Play"
-msgstr "Yerel Çalma Düzeni"
-
-#: ../../templates/menu.inc:38
-msgid "Playlists"
-msgstr "Þarký listeleri"
-
-#: ../../templates/menu.inc:40
-msgid "Preferences"
-msgstr "Tercihler"
-
-#: ../../templates/menu.inc:43 ../../templates/show_upload.inc:73
-msgid "Upload"
-msgstr "Yükleme"
-
-#: ../../templates/menu.inc:63 ../../templates/menu.inc:66
-msgid "Admin"
-msgstr "Yönetici"
-
 #: ../../templates/menu.inc:73 ../../templates/menu.inc:79
 msgid "Account"
 msgstr "Hesap"
 
 #: ../../templates/menu.inc:74 ../../templates/menu.inc:80
+#: ../../templates/show_users.inc:64 ../../templates/show_users.inc:112
 msgid "Stats"
 msgstr "Ýstatistikler"
 
-#: ../../templates/menu.inc:75 ../../templates/menu.inc:81
-#: ../../templates/menu.inc:85
-msgid "Logout"
-msgstr "Oturum Sonu"
-
 #: ../../templates/show_upload.inc:30
 msgid "Uploading Music to Ampache"
 msgstr ""
@@ -1907,9 +2329,55 @@
 msgid "max_upload_size"
 msgstr "max_upload_size (azami_yükleme_hacmi)"
 
-#: ../../templates/show_now_playing.inc:31
-msgid "Now Playing"
-msgstr "Þu anda çalan"
+#: ../../templates/show_users.inc:40
+msgid "Fullname"
+msgstr "Tam Ýsim"
+
+#: ../../templates/show_users.inc:48
+msgid "Last Seen"
+msgstr "Son giriþ"
+
+#: ../../templates/show_users.inc:53
+#, fuzzy
+msgid "Registration Date"
+msgstr "Kullanýcý kaydý"
+
+#: ../../templates/show_users.inc:61 ../../templates/show_users.inc:107
+msgid "Prefs"
+msgstr "Tercihler"
+
+#: ../../templates/show_users.inc:67
+#, fuzzy
+msgid "Access"
+msgstr "Eriþim Ayarý"
+
+#: ../../templates/show_users.inc:73
+msgid "On-line"
+msgstr "Çevrimiçi"
+
+#: ../../templates/show_users.inc:126
+msgid "delete"
+msgstr "sil"
+
+#: ../../templates/list_duplicates.inc:28
+#, fuzzy
+msgid "Duplicate Songs"
+msgstr "Duble þarkýlarý görüntüle"
+
+#: ../../templates/list_duplicates.inc:35
+msgid "Length"
+msgstr ""
+
+#: ../../templates/list_duplicates.inc:74
+msgid "You don"
+msgstr ""
+
+#: ../../templates/list_duplicates.inc:74
+msgid ""
+"); ?></p>\n"
+"<?php  } ?>\n"
+"</form>\n"
+msgstr ""
 
 #: ../../templates/show_login_form.inc:49
 #: ../../templates/show_login_form.inc:63
@@ -1920,6 +2388,11 @@
 msgid "Remember Me"
 msgstr "Beni hatýrla"
 
+#: ../../templates/show_login_form.inc:72
+#, fuzzy
+msgid "Register"
+msgstr "Kullanýcý kaydý"
+
 #: ../../templates/show_access_list.inc:34
 msgid "Host Access to Your Catalog"
 msgstr "Kataloða makine eriþimi"
@@ -1940,182 +2413,175 @@
 msgid "Revoke"
 msgstr "Ýptal"
 
-#: ../../templates/show_users.inc:43
-msgid "Fullname"
-msgstr "Tam Ýsim"
-
-#: ../../templates/show_users.inc:48
-msgid "Last Seen"
-msgstr "Son giriþ"
-
-#: ../../templates/show_users.inc:55 ../../templates/show_users.inc:91
-msgid "Prefs"
-msgstr "Tercihler"
+#: ../../templates/show_search.inc:57
+msgid "Keywords"
+msgstr ""
 
-#: ../../templates/show_users.inc:58
+#: ../../templates/show_search.inc:102
 #, fuzzy
-msgid "Access"
-msgstr "Eriþim Ayarý"
-
-#: ../../templates/show_users.inc:64
-msgid "On-line"
-msgstr "Çevrimiçi"
-
-#: ../../templates/show_users.inc:105
-msgid "delete"
-msgstr "sil"
+msgid "Played"
+msgstr "Çal"
 
-#: ../../templates/show_search.inc:34 ../../templates/show_search_bar.inc:36
-msgid "Search Ampache"
-msgstr "Ampache içinde ara"
+#: ../../templates/show_search.inc:110
+#, fuzzy
+msgid "Min Bitrate"
+msgstr "Ýkil hýzý"
 
-#: ../../templates/show_search.inc:41
+#: ../../templates/show_search.inc:132
 msgid "Object Type"
 msgstr "Nesne türü"
 
-#: ../../templates/show_artist.inc:31
-msgid "Albums by"
-msgstr "Albümler"
+#: ../../templates/show_search.inc:138
+#, fuzzy
+msgid "Genres"
+msgstr "Kategori"
 
-#: ../../templates/show_artist.inc:33
-msgid "Show All Songs By"
-msgstr "Tüm þarkýlarýný görüntüle: "
+#: ../../templates/show_search.inc:141
+msgid "Operator"
+msgstr ""
 
-#: ../../templates/show_artist.inc:34
-msgid "Play All Songs By"
-msgstr "Tüm þarkýlarýný çal: "
+#: ../../templates/show_search.inc:145
+msgid "AND"
+msgstr ""
 
-#: ../../templates/show_artist.inc:35
-msgid "Play Random Songs By"
-msgstr "Rasgele þarkýlarýný çal: "
+#: ../../templates/show_search.inc:150
+#, fuzzy
+msgid "Method"
+msgstr "Kip"
 
-#: ../../templates/show_artist.inc:49
-msgid "Select"
-msgstr "Seçim"
+#: ../../templates/show_search.inc:153
+msgid "Fuzzy"
+msgstr ""
 
-#: ../../templates/show_artist.inc:51
-msgid "Cover"
-msgstr "Kapak"
+#: ../../templates/show_search.inc:154
+msgid "Exact"
+msgstr ""
 
-#: ../../templates/show_artist.inc:52
-msgid "Album Name"
-msgstr "Albüm adý"
+#: ../../templates/show_search.inc:157
+msgid "Maxium Results"
+msgstr ""
 
-#: ../../templates/show_artist.inc:53
-msgid "Album Year"
-msgstr "Albüm yýlý"
+#: ../../templates/show_search.inc:160
+msgid "Unlimited"
+msgstr ""
 
-#: ../../templates/show_artist.inc:54
-msgid "Total Tracks"
-msgstr "Tüm parçalar"
+#: ../../templates/show_search.inc:172
+msgid "Reset Form"
+msgstr ""
+
+#: ../../templates/show_search.inc:184
+msgid "Save Search As Track on"
+msgstr ""
+
+#: ../../templates/show_search.inc:186
+msgid "Save"
+msgstr ""
 
-#: ../../templates/show_mpdplay.inc:38
+#: ../../templates/show_mpdplay.inc:39
 msgid "MPD Play Control"
 msgstr "MPD Kontrol"
 
-#: ../../templates/show_mpdplay.inc:71
+#: ../../templates/show_mpdplay.inc:100
 msgid "Loop"
 msgstr "Döngü"
 
-#: ../../templates/show_mpdplay.inc:78 ../../templates/show_mpdplay.inc:91
+#: ../../templates/show_mpdplay.inc:107 ../../templates/show_mpdplay.inc:120
 msgid "On"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:79 ../../templates/show_mpdplay.inc:92
+#: ../../templates/show_mpdplay.inc:108 ../../templates/show_mpdplay.inc:121
 msgid "Off"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:114
+#: ../../templates/show_mpdplay.inc:134
 #, fuzzy
 msgid "Now Playing :"
 msgstr "Þu anda çalan"
 
-#: ../../templates/show_mpdplay.inc:138
+#: ../../templates/show_mpdplay.inc:163
 msgid "On Deck "
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:138
+#: ../../templates/show_mpdplay.inc:163
 msgid "(in "
 msgstr ""
 
-#: ../../templates/show_mpdpl.inc:45
-#, fuzzy
-msgid "MPD Server Playlist"
-msgstr "Sunucu þarký listesi"
+#: ../../templates/show_artist.inc:36
+msgid "Select"
+msgstr "Seçim"
 
-#: ../../templates/show_mpdpl.inc:46 ../../templates/show_mpdpl.inc:184
-msgid "Refresh the Playlist Window"
-msgstr "Þarký Listesi görüntüsünü yenile"
+#: ../../templates/show_artist.inc:38
+msgid "Cover"
+msgstr "Kapak"
 
-#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:189
-msgid "Click to shuffle (randomize) the playlist"
-msgstr "Þarký Listesini karýþtýrmak (rasgele) icin týkla"
+#: ../../templates/show_artist.inc:39
+msgid "Album Name"
+msgstr "Albüm adý"
 
-#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:189
-msgid "shuffle"
-msgstr "rasgele"
+#: ../../templates/show_artist.inc:40
+msgid "Album Year"
+msgstr "Albüm yýlý"
+
+#: ../../templates/show_artist.inc:41
+msgid "Total Tracks"
+msgstr "Tüm parçalar"
 
-#: ../../templates/show_mpdpl.inc:49 ../../templates/show_mpdpl.inc:190
+#: ../../templates/show_big_art.inc:31
 #, fuzzy
-msgid "Click to the clear the playlist"
-msgstr "Þarký listesini silmek için týkla"
+msgid "Album Art"
+msgstr "Albüm kapaðý ara"
 
-#: ../../templates/show_mpdpl.inc:53 ../../templates/show_mpdpl.inc:194
-msgid "Click to the remove all except the Now Playing"
+#: ../../templates/show_big_art.inc:35
+msgid "Click to close window"
 msgstr ""
 
-#: ../../templates/show_uploads.inc:33
-#, fuzzy
-msgid "Status"
-msgstr "Ýstatistikler"
+#~ msgid "No Results Found"
+#~ msgstr "Sonuç bulunamadý"
 
-#: ../../templates/show_uploads.inc:42
-msgid "User"
-msgstr "Kullanýcý"
+#~ msgid "New"
+#~ msgstr "Yeni"
 
-#: ../../templates/show_uploads.inc:43
-msgid "Date"
-msgstr "Tarih"
+#~ msgid "View All"
+#~ msgstr "Hepsini görüntüle"
 
-#: ../../templates/show_uploads.inc:49
-msgid "Add"
-msgstr "Ekle"
+#~ msgid "Public"
+#~ msgstr "Genel"
 
-#: ../../templates/show_random_play.inc:28
-msgid "Play Random Selection"
-msgstr "Rasgele seçilenleri çal"
+#~ msgid "Your Private"
+#~ msgstr "Size özel"
 
-#: ../../templates/show_random_play.inc:34
-msgid "Item count"
-msgstr "Öðe sayýsý"
+#~ msgid "Other Private"
+#~ msgstr "Diðerlerine özel"
 
-#: ../../templates/show_random_play.inc:49
-msgid "From genre"
-msgstr "Kategoriden"
+#~ msgid "There are no playlists of this type"
+#~ msgstr "Bu çeþit bir þarký listesi bulunamadý"
 
-#: ../../templates/show_random_play.inc:58
-msgid "Standard"
-msgstr ""
+#~ msgid "All songs by"
+#~ msgstr "Tüm þarkýlarý"
 
-#: ../../templates/show_random_play.inc:59
-msgid "Favor Unplayed"
-msgstr "Çalýnmamýþlardan"
+#, fuzzy
+#~ msgid "Edit Playlist"
+#~ msgstr "Þarký listesi"
 
-#: ../../templates/show_random_play.inc:60
-msgid "Full Albums"
-msgstr "Tüm Albümler"
+#, fuzzy
+#~ msgid "Play Random"
+#~ msgstr "Rasgele þarký çal"
 
-#: ../../templates/show_random_play.inc:61
-msgid "Full Artist"
-msgstr "Tüm Sanatçýlar"
+#~ msgid "Welcome to"
+#~ msgstr "Hoþgeldiniz"
 
-#: ../../templates/show_random_play.inc:66
-msgid "from catalog"
-msgstr "Katalogdan"
+#~ msgid "Album Art Located"
+#~ msgstr "Albüm kapaðý bulundu"
 
-#: ../../templates/show_random_play.inc:75
-msgid "Play Random Songs"
-msgstr "Rasgele þarký çal"
+#~ msgid ""
+#~ "Album Art information has been located in Amazon. If incorrect, click "
+#~ "\"Reset Album Art\" below to remove the artwork."
+#~ msgstr ""
+#~ "Albüm kapaðý Amazon'da bulundu. Doðru olmadýðý takdirde \"Albüm kapaðý "
+#~ "silinsin\" i týklayarak bilgileri silin."
+
+#~ msgid "Type"
+#~ msgstr "Türü"
 
 #~ msgid "An Unknown Error has occured."
 #~ msgstr "Bilinmeyen bir hata oluþtu."
@@ -2126,9 +2592,6 @@
 #~ msgid "Successfully-Cataloged"
 #~ msgstr "Baþarýyla kataloglaþtýrýldý"
 
-#~ msgid "Unknown"
-#~ msgstr "Bilinmeyen"
-
 #~ msgid "Quarantined"
 #~ msgstr "Karantinaya alýnmýþ"
 
diff -urN ampache-3.3.2-alpha4/locale/zh_CN/LC_MESSAGES/messages.po ampache-3.3.2-beta1/locale/zh_CN/LC_MESSAGES/messages.po
--- ampache-3.3.2-alpha4/locale/zh_CN/LC_MESSAGES/messages.po	2005-12-27 01:32:54.000000000 -0800
+++ ampache-3.3.2-beta1/locale/zh_CN/LC_MESSAGES/messages.po	2006-01-08 23:06:12.000000000 -0800
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: v1.0a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-14 16:23-0700\n"
+"POT-Creation-Date: 2006-01-07 22:47-0800\n"
 "PO-Revision-Date: 2005-07-11 09:08-0600\n"
 "Last-Translator: Hongyi_Gao <hongyi_gao@hotmail.com>\n"
 "Language-Team: CHINESE <hongyi_gao@hotmail.com>\n"
@@ -20,577 +20,574 @@
 msgid "Session Expired: please log in again at"
 msgstr "»á»°¹ýÆÚ£ºÇëÖØÐÂµÇÂ¼"
 
-#: ../../lib/preferences.php:211 ../../templates/show_users.inc:97
-msgid "Enable"
-msgstr "ÔÊÐí"
-
-#: ../../lib/preferences.php:212 ../../templates/show_users.inc:100
-msgid "Disable"
-msgstr "½ûÖ¹"
-
-#: ../../lib/preferences.php:224 ../../templates/add_catalog.inc:60
-msgid "Local"
-msgstr ""
-
-#: ../../lib/preferences.php:227
-msgid "Stream"
-msgstr ""
-
-#: ../../lib/preferences.php:230
-msgid "IceCast"
-msgstr ""
-
-#: ../../lib/preferences.php:233
-msgid "Downsample"
-msgstr ""
-
-#: ../../lib/preferences.php:236
-msgid "Music Player Daemon"
-msgstr ""
-
-#: ../../lib/preferences.php:239
-msgid "SlimServer"
-msgstr ""
-
-#: ../../lib/preferences.php:248
-msgid "M3U"
-msgstr ""
-
-#: ../../lib/preferences.php:249
-msgid "Simple M3U"
-msgstr ""
-
-#: ../../lib/preferences.php:250
-msgid "PLS"
-msgstr ""
-
-#: ../../lib/preferences.php:251
-msgid "Asx"
-msgstr ""
-
-#: ../../lib/preferences.php:258
-msgid "English"
-msgstr "Ó¢ÎÄ"
-
-#: ../../lib/preferences.php:259
-#, fuzzy
-msgid "British English"
-msgstr "Ó¢ÎÄ"
-
-#: ../../lib/preferences.php:260
-msgid "German"
-msgstr "µÂÎÄ"
-
-#: ../../lib/preferences.php:261
-msgid "French"
-msgstr "·¨ÎÄ"
-
-#: ../../lib/preferences.php:262
-msgid "Turkish"
-msgstr "ÍÁ¶úÆäÓï"
-
-#: ../../lib/preferences.php:263
-msgid "Spanish"
-msgstr ""
-
-#: ../../lib/preferences.php:264
-msgid "Norwegian"
-msgstr ""
-
-#: ../../lib/preferences.php:265
-msgid "Simplified Chinese"
-msgstr ""
-
-#: ../../lib/duplicates.php:80
-msgid "Find Duplicates"
-msgstr "²éÕÒÖØ¸´ÎÄ¼þ"
-
-#: ../../lib/duplicates.php:83 ../../templates/show_search.inc:74
-msgid "Search Type"
-msgstr "ËÑË÷·½Ê½"
-
-#: ../../lib/duplicates.php:91 ../../lib/class/song.class.php:275
-msgid "Title"
-msgstr "¸èÃû"
-
-#: ../../lib/duplicates.php:97
-msgid "Artist and Title"
-msgstr "¸èÊÖºÍ¸èÃû"
-
-#: ../../lib/duplicates.php:102
-msgid "Artist, Album and Title"
-msgstr "¸èÊÖ£¬¸èÃûºÍ×¨¼­"
-
-#: ../../lib/duplicates.php:110 ../../templates/menu.inc:39
-#: ../../templates/show_search.inc:37 ../../templates/show_search.inc:83
-#: ../../templates/show_search_bar.inc:71
-msgid "Search"
-msgstr "ËÑË÷"
-
-#: ../../lib/general.lib.php:640
-msgid "Not Enough Data"
-msgstr ""
-
-#: ../../lib/search.php:52 ../../lib/search.php:68 ../../lib/search.php:84
-#: ../../lib/search.php:100 ../../lib/search.php:116 ../../lib/search.php:133
-#: ../../lib/search.php:145 ../../lib/search.php:161 ../../lib/search.php:177
-msgid "No Results Found"
-msgstr "Ã»ÓÐÕÒµ½"
-
-#: ../../lib/class/genre.class.php:278
-#, fuzzy
-msgid "Show Genres starting with"
-msgstr "<u>S</u>ÏÔÊ¾¸èÊÖÃû×ÖÇ°¼¸Î»×Ö·ûÊÇ"
-
-#: ../../lib/class/album.class.php:126
-msgid "Various"
-msgstr "ÈºÐÇ"
-
-#: ../../lib/class/album.class.php:241 ../../lib/class/catalog.class.php:275
-#: ../../lib/class/catalog.class.php:560
+#: ../../lib/class/catalog.class.php:281 ../../lib/class/catalog.class.php:566
+#: ../../lib/class/album.class.php:263
 msgid "Error: Unable to open"
 msgstr "´íÎó£ºÎÞ·¨´ò¿ª"
 
-#: ../../lib/class/song.class.php:275 ../../lib/class/song.class.php:279
-#: ../../lib/class/song.class.php:283 ../../lib/class/song.class.php:287
-#: ../../lib/class/song.class.php:291 ../../lib/class/song.class.php:295
-#: ../../lib/class/song.class.php:299 ../../lib/class/song.class.php:304
-#: ../../lib/class/song.class.php:309 ../../lib/class/song.class.php:313
-#: ../../lib/class/song.class.php:317 ../../lib/class/song.class.php:322
-msgid "updated to"
-msgstr "¸üÐÂ"
-
-#: ../../lib/class/song.class.php:279 ../../templates/show_songs.inc:39
-#: ../../templates/show_uploads.inc:39
-msgid "Bitrate"
-msgstr "ÂëÂÊ"
-
-#: ../../lib/class/song.class.php:283
-msgid "Rate"
-msgstr "¼¶±ð"
-
-#: ../../lib/class/song.class.php:287
-msgid "Mode"
-msgstr "Ä£Ê½"
-
-#: ../../lib/class/song.class.php:291 ../../templates/show_songs.inc:37
-#: ../../templates/show_mpdpl.inc:66 ../../templates/show_uploads.inc:38
-msgid "Time"
-msgstr "Ê±¼ä"
-
-#: ../../lib/class/song.class.php:295 ../../templates/show_songs.inc:32
-#: ../../templates/show_songs.inc:36 ../../templates/show_mpdpl.inc:65
-msgid "Track"
-msgstr "Òô¹ì"
-
-#: ../../lib/class/song.class.php:299
-msgid "Filesize"
-msgstr "ÎÄ¼þ´óÐ¡"
-
-#: ../../lib/class/song.class.php:304 ../../templates/show_artists.inc:39
-#: ../../templates/show_artists.inc:62 ../../templates/show_songs.inc:34
-#: ../../templates/show_albums.inc:40 ../../templates/show_albums.inc:70
-#: ../../templates/show_mpdpl.inc:63 ../../templates/show_uploads.inc:35
-msgid "Artist"
-msgstr "¸èÊÖ"
-
-#: ../../lib/class/song.class.php:309 ../../templates/show_songs.inc:35
-#: ../../templates/show_albums.inc:38 ../../templates/show_albums.inc:68
-#: ../../templates/show_mpdpl.inc:64 ../../templates/show_uploads.inc:36
-msgid "Album"
-msgstr "×¨¼­"
-
-#: ../../lib/class/song.class.php:313 ../../templates/show_albums.inc:43
-#: ../../templates/show_albums.inc:73
-msgid "Year"
-msgstr "Äê´ú"
-
-#: ../../lib/class/song.class.php:317 ../../templates/list_flagged.inc:46
-#: ../../templates/flag.inc:66
-msgid "Comment"
-msgstr "ËµÃ÷"
-
-#: ../../lib/class/song.class.php:322 ../../templates/show_genres.inc.php:36
-#: ../../templates/show_genre.inc.php:32 ../../templates/show_songs.inc:40
-#: ../../templates/show_browse_menu.inc:37 ../../templates/show_mpdpl.inc:67
-#: ../../templates/show_uploads.inc:37
-msgid "Genre"
-msgstr "Àà±ð"
-
-#: ../../lib/class/stream.class.php:198
-#, fuzzy
-msgid "Opened for writing"
-msgstr "×¼±¸Ð´Èë"
-
-#: ../../lib/class/stream.class.php:203
-msgid "Error, cannot write"
-msgstr "´íÎó£ºÎÞ·¨Ð´Èë"
-
-#: ../../lib/class/stream.class.php:214
-msgid "Error, cannot write song in file"
-msgstr "´íÎó£ºÎÞ·¨Ð´ÈëÎÄ¼þ"
-
-#: ../../lib/class/stream.class.php:220
-msgid "Closed after write"
-msgstr "¹Ø±Õ"
-
-#: ../../lib/class/catalog.class.php:298
+#: ../../lib/class/catalog.class.php:304
 msgid "Error: Unable to change to directory"
 msgstr "´íÎó£ºÎÞ·¨²Ù×÷Ä¿Â¼"
 
-#: ../../lib/class/catalog.class.php:321
+#: ../../lib/class/catalog.class.php:330
 msgid "Error: Unable to get filesize for"
 msgstr "´íÎó£ºÎÞ·¨»ñµÃÎÄ¼þ´óÐ¡"
 
-#: ../../lib/class/catalog.class.php:340
-msgid "Added Playlist From"
-msgstr "Ìí¼Ó×Ô¶¨Òå¸èÇúÁÐ±í"
-
-#: ../../lib/class/catalog.class.php:359
+#: ../../lib/class/catalog.class.php:365
 msgid "Added"
 msgstr "ÒÑÌí¼Ó"
 
-#: ../../lib/class/catalog.class.php:371
+#: ../../lib/class/catalog.class.php:377
 msgid "is not readable by ampache"
 msgstr "ÎÞ·¨¶ÁÈ¡"
 
-#: ../../lib/class/catalog.class.php:435
+#: ../../lib/class/catalog.class.php:441
 msgid "Found in ID3"
 msgstr "ÔÚID3ÖÐÕÒµ½"
 
-#: ../../lib/class/catalog.class.php:439
+#: ../../lib/class/catalog.class.php:445
 msgid "Found on Amazon"
 msgstr "ÔÚAmazonÕÒµ½"
 
-#: ../../lib/class/catalog.class.php:443
+#: ../../lib/class/catalog.class.php:449
 msgid "Found in Folder"
 msgstr "ÔÚÄ¿Â¼ÀïÕÒµ½"
 
-#: ../../lib/class/catalog.class.php:447
+#: ../../lib/class/catalog.class.php:453
 msgid "Found"
 msgstr "ÕÒµ½"
 
-#: ../../lib/class/catalog.class.php:450
+#: ../../lib/class/catalog.class.php:456
 msgid "Not Found"
 msgstr "Ã»ÓÐÕÒµ½"
 
-#: ../../lib/class/catalog.class.php:458
+#: ../../lib/class/catalog.class.php:464
 msgid "Searched"
 msgstr "ÒÑËÑË÷"
 
-#: ../../lib/class/catalog.class.php:613
+#: ../../lib/class/catalog.class.php:622
 msgid "Starting Dump Album Art"
 msgstr "¿ªÊ¼µ¼³ö¸èÇú¸èÊÖ"
 
-#: ../../lib/class/catalog.class.php:633
+#: ../../lib/class/catalog.class.php:642
 msgid "Written"
 msgstr "ÒÑÐ´Èë"
 
-#: ../../lib/class/catalog.class.php:642
+#: ../../lib/class/catalog.class.php:651
 msgid "Error unable to open file for writting"
 msgstr "´íÎó£ºÎÞ·¨Ð´ÈëÎÄ¼þ"
 
-#: ../../lib/class/catalog.class.php:649
+#: ../../lib/class/catalog.class.php:658
 msgid "Album Art Dump Complete"
 msgstr "¸èÇú¸èÊÖµ¼³ö½áÊø"
 
-#: ../../lib/class/catalog.class.php:650 ../../artists.php:63
-#: ../../albums.php:112
+#: ../../lib/class/catalog.class.php:659 ../../artists.php:64
+#: ../../albums.php:153
 msgid "Return"
 msgstr "·µ»Ø"
 
-#: ../../lib/class/catalog.class.php:719
+#: ../../lib/class/catalog.class.php:728
 msgid "Starting Catalog Build"
 msgstr "¿ªÊ¼ÖØ½¨Çú¿â"
 
-#: ../../lib/class/catalog.class.php:724
+#: ../../lib/class/catalog.class.php:733
 msgid "Running Remote Sync"
 msgstr "ÔËÐÐÔ¶³ÌÍ¬²½"
 
-#: ../../lib/class/catalog.class.php:734 ../../lib/class/catalog.class.php:880
-#: ../../admin/catalog.php:264
+#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:904
+msgid "Added Playlist From"
+msgstr "Ìí¼Ó×Ô¶¨Òå¸èÇúÁÐ±í"
+
+#: ../../lib/class/catalog.class.php:752 ../../lib/class/catalog.class.php:913
+#: ../../admin/catalog.php:258
 msgid "Starting Album Art Search"
 msgstr "¿ªÊ¼ËÑË÷¸èÇú¸èÊÖ"
 
-#: ../../lib/class/catalog.class.php:744
+#: ../../lib/class/catalog.class.php:762
 msgid "Catalog Finished"
 msgstr "Çú¿â½¨Á¢½áÊø"
 
-#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:899
+#: ../../lib/class/catalog.class.php:762 ../../lib/class/catalog.class.php:932
 msgid "Total Time"
 msgstr "×ÜÊ±¼ä"
 
-#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:900
+#: ../../lib/class/catalog.class.php:762 ../../lib/class/catalog.class.php:933
 msgid "Total Songs"
 msgstr "È«²¿¸èÇú"
 
-#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:900
+#: ../../lib/class/catalog.class.php:763 ../../lib/class/catalog.class.php:933
 msgid "Songs Per Seconds"
 msgstr "Ê×¸è£¯Ãë"
 
-#: ../../lib/class/catalog.class.php:779
-#: ../../lib/class/catalog.class.php:1476
+#: ../../lib/class/catalog.class.php:797
+#: ../../lib/class/catalog.class.php:1512
 msgid "Updated"
 msgstr "ÒÑ¸üÐÂ"
 
-#: ../../lib/class/catalog.class.php:786
+#: ../../lib/class/catalog.class.php:804
 msgid "No Update Needed"
 msgstr "²»ÓÃ¸üÐÂ"
 
-#: ../../lib/class/catalog.class.php:860
+#: ../../lib/class/catalog.class.php:885
 msgid "Starting New Song Search on"
 msgstr "¿ªÊ¼ËÑË÷ÐÂ¸èÇú"
 
-#: ../../lib/class/catalog.class.php:860
+#: ../../lib/class/catalog.class.php:885
 msgid "catalog"
 msgstr "Çú¿â"
 
-#: ../../lib/class/catalog.class.php:864
+#: ../../lib/class/catalog.class.php:889
 msgid "Running Remote Update"
 msgstr "ÔËÐÐÔ¶³Ì¸üÐÂ"
 
-#: ../../lib/class/catalog.class.php:899
+#: ../../lib/class/catalog.class.php:932
 msgid "Catalog Update Finished"
 msgstr "Çú¿â¸üÐÂ½áÊø"
 
-#: ../../lib/class/catalog.class.php:919 ../../lib/mpd.php:40
-#: ../../lib/mpd.php:49
+#: ../../lib/class/catalog.class.php:952 ../../lib/mpd.php:43
+#: ../../lib/mpd.php:52 ../../albums.php:74
 msgid "Error"
 msgstr "´íÎó"
 
-#: ../../lib/class/catalog.class.php:919
+#: ../../lib/class/catalog.class.php:952
 msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
 msgstr "ÎÞ·¨ÔØÈëXMLRPC¿â£¬ÇëÈ·ÈÏÊÇ·ñÔÊÐíXML-RPC"
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
 msgid "Error connecting to"
 msgstr "´íÎó£ºÁ¬½Ó"
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
 msgid "Code"
 msgstr "´úÂë"
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
 msgid "Reason"
 msgstr "Ô­Òò"
 
-#: ../../lib/class/catalog.class.php:974
+#: ../../lib/class/catalog.class.php:1007
 msgid "Completed updating remote catalog(s)"
 msgstr "Ô¶³ÌÇú¿â¸üÐÂ½áÊø"
 
-#: ../../lib/class/catalog.class.php:1105
+#: ../../lib/class/catalog.class.php:1138
 msgid "Checking"
 msgstr "¼ì²é"
 
-#: ../../lib/class/catalog.class.php:1163
+#: ../../lib/class/catalog.class.php:1196
 msgid "Catalog Clean Done"
 msgstr "Çú¿â±»Çå¿Õ"
 
-#: ../../lib/class/catalog.class.php:1163
+#: ../../lib/class/catalog.class.php:1196
 msgid "files removed"
 msgstr "ÎÄ¼þ±»É¾³ý"
 
-#: ../../lib/class/catalog.class.php:1436
+#: ../../lib/class/catalog.class.php:1469
 msgid "Updating the"
 msgstr "¸üÐÂ"
 
-#: ../../lib/class/catalog.class.php:1436 ../../templates/admin_menu.inc:35
+#: ../../lib/class/catalog.class.php:1469 ../../templates/sidebar.inc.php:31
 msgid "Catalog"
 msgstr "Çú¿â"
 
-#: ../../lib/class/catalog.class.php:1437
+#: ../../lib/class/catalog.class.php:1470
 msgid "songs found checking tag information."
 msgstr "ÕÒµ½¸èÇú¼ì²é±ê¼ÇÐÅÏ¢"
 
-#: ../../lib/class/catalog.class.php:1484
+#: ../../lib/class/catalog.class.php:1520
 msgid " FOUND"
 msgstr "ÕÒµ½"
 
-#: ../../lib/class/catalog.class.php:1485
+#: ../../lib/class/catalog.class.php:1521
 msgid "Searching for new Album Art"
 msgstr "²éÕÒÐÂ¸èÇú¸èÊÖ"
 
-#: ../../lib/class/catalog.class.php:1489
+#: ../../lib/class/catalog.class.php:1525
 msgid "Album Art Already Found"
 msgstr "ÒÑÕÒµ½¸èÇú¸èÊÖ"
 
-#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
-msgid "Could not add"
-msgstr "ÎÞ·¨Ìí¼Ó"
-
-#: ../../lib/Browser.php:867
-msgid "file"
-msgstr "ÎÄ¼þ"
+#: ../../lib/class/artist.class.php:223
+msgid "Error: Name Identical"
+msgstr ""
 
-#: ../../lib/Browser.php:871
-msgid "File uploads not supported."
-msgstr "²»Ö§³ÖÎÄ¼þÉÏ´«"
+#: ../../lib/class/song.class.php:275 ../../lib/duplicates.php:113
+#: ../../templates/show_search.inc:66
+msgid "Title"
+msgstr "¸èÃû"
 
-#: ../../lib/Browser.php:889
-msgid "No file uploaded"
-msgstr "Ã»ÓÐÉÏ´«ÎÄ¼þ"
+#: ../../lib/class/song.class.php:275 ../../lib/class/song.class.php:279
+#: ../../lib/class/song.class.php:283 ../../lib/class/song.class.php:287
+#: ../../lib/class/song.class.php:291 ../../lib/class/song.class.php:295
+#: ../../lib/class/song.class.php:299 ../../lib/class/song.class.php:304
+#: ../../lib/class/song.class.php:309 ../../lib/class/song.class.php:313
+#: ../../lib/class/song.class.php:317 ../../lib/class/song.class.php:322
+msgid "updated to"
+msgstr "¸üÐÂ"
 
-#: ../../lib/Browser.php:896
-#, php-format
-msgid "There was a problem with the file upload: No %s was uploaded."
-msgstr "ÎÄ¼þÉÏ´«´íÎó£ºÃ»ÓÐÉÏ´« %s"
+#: ../../lib/class/song.class.php:279 ../../templates/show_uploads.inc:39
+#: ../../templates/show_songs.inc:47 ../../templates/list_duplicates.inc:36
+msgid "Bitrate"
+msgstr "ÂëÂÊ"
 
-#: ../../lib/Browser.php:901
-#, php-format
-msgid ""
-"There was a problem with the file upload: The %s was larger than the maximum "
-"allowed size (%d bytes)."
-msgstr "ÎÄ¼þÉÏ´«´íÎó£º%s ´óÓÚ×î´óÔÊÐíÉÏ´«´óÐ¡£¨%d ×Ö½Ú£©"
+#: ../../lib/class/song.class.php:283
+msgid "Rate"
+msgstr "¼¶±ð"
 
-#: ../../lib/Browser.php:903
-#, php-format
-msgid ""
-"There was a problem with the file upload: The %s was only partially uploaded."
-msgstr "ÎÄ¼þÉÏ´«´íÎó£º%s Ö»ÉÏ´«ÁË²¿·ÖÎÄ¼þ"
+#: ../../lib/class/song.class.php:287
+msgid "Mode"
+msgstr "Ä£Ê½"
 
-#: ../../lib/ui.lib.php:199
-msgid "Playlist Actions"
-msgstr "×ÔÑ¡¸èÇúÁÐ±í²Ù×÷"
+#: ../../lib/class/song.class.php:291 ../../templates/show_uploads.inc:38
+#: ../../templates/show_mpdpl.inc:66 ../../templates/show_songs.inc:45
+msgid "Time"
+msgstr "Ê±¼ä"
 
-#: ../../lib/ui.lib.php:199
-msgid "New"
-msgstr "ÐÂ½¨"
+#: ../../lib/class/song.class.php:295 ../../templates/show_mpdpl.inc:65
+#: ../../templates/show_songs.inc:39 ../../templates/show_songs.inc:44
+msgid "Track"
+msgstr "Òô¹ì"
 
-#: ../../lib/ui.lib.php:200
-msgid "View All"
-msgstr "È«²¿ÏÔÊ¾"
+#: ../../lib/class/song.class.php:299
+msgid "Filesize"
+msgstr "ÎÄ¼þ´óÐ¡"
 
-#: ../../lib/ui.lib.php:201
-msgid "Import"
-msgstr "µ¼Èë"
+#: ../../lib/class/song.class.php:304
+#: ../../templates/show_get_albumart.inc.php:33
+#: ../../templates/show_uploads.inc:35 ../../templates/show_mpdpl.inc:63
+#: ../../templates/show_songs.inc:42 ../../templates/show_artists.inc:39
+#: ../../templates/show_artists.inc:62 ../../templates/show_albums.inc:40
+#: ../../templates/show_albums.inc:70 ../../templates/list_duplicates.inc:33
+#: ../../templates/show_search.inc:71
+msgid "Artist"
+msgstr "¸èÊÖ"
 
-#: ../../lib/ui.lib.php:301 ../../templates/menu.inc:35
-msgid "Browse"
-msgstr "ä¯ÀÀ"
+#: ../../lib/class/song.class.php:309
+#: ../../templates/show_get_albumart.inc.php:41
+#: ../../templates/show_uploads.inc:36 ../../templates/show_mpdpl.inc:64
+#: ../../templates/show_songs.inc:43 ../../templates/show_albums.inc:38
+#: ../../templates/show_albums.inc:68 ../../templates/list_duplicates.inc:34
+#: ../../templates/show_search.inc:78
+msgid "Album"
+msgstr "×¨¼­"
 
-#: ../../lib/ui.lib.php:303
-msgid "Show w/o art"
-msgstr "²»ÏÔÊ¾¸èÊÖ"
+#: ../../lib/class/song.class.php:313 ../../templates/show_albums.inc:43
+#: ../../templates/show_albums.inc:73 ../../templates/show_search.inc:90
+msgid "Year"
+msgstr "Äê´ú"
 
-#: ../../lib/ui.lib.php:306
-msgid "Show all"
-msgstr "È«²¿ÏÔÊ¾"
+#: ../../lib/class/song.class.php:317 ../../templates/flag.inc:66
+#: ../../templates/list_flagged.inc:46
+msgid "Comment"
+msgstr "ËµÃ÷"
 
-#: ../../lib/ui.lib.php:446
-msgid "No songs in this playlist."
-msgstr "´Ë×ÔÑ¡ÁÐ±íÃ»ÓÐ¸èÇú"
+#: ../../lib/class/song.class.php:322 ../../templates/show_genre.inc.php:32
+#: ../../templates/show_genres.inc.php:36 ../../templates/sidebar.inc.php:37
+#: ../../templates/show_uploads.inc:37 ../../templates/show_mpdpl.inc:67
+#: ../../templates/show_songs.inc:48 ../../templates/show_browse_menu.inc:37
+#: ../../templates/show_search.inc:83
+msgid "Genre"
+msgstr "Àà±ð"
 
-#: ../../lib/ui.lib.php:592
+#: ../../lib/class/stream.class.php:198
 #, fuzzy
-msgid "No Catalogs Found!"
-msgstr "Ã»ÓÐÕÒµ½"
-
-#: ../../lib/ui.lib.php:593 ../../templates/add_catalog.inc:28
-msgid "Add a Catalog"
-msgstr "Ìí¼ÓÇú¿â"
+msgid "Opened for writing"
+msgstr "×¼±¸Ð´Èë"
 
-#: ../../lib/ui.lib.php:594 ../../templates/show_local_catalog_info.inc.php:7
-msgid "Catalog Statistics"
-msgstr "Çú¿âÍ³¼ÆÐÅÏ¢"
+#: ../../lib/class/stream.class.php:203
+msgid "Error, cannot write"
+msgstr "´íÎó£ºÎÞ·¨Ð´Èë"
 
-#: ../../lib/ui.lib.php:630
-msgid "day"
-msgstr "Ìì"
+#: ../../lib/class/stream.class.php:214
+msgid "Error, cannot write song in file"
+msgstr "´íÎó£ºÎÞ·¨Ð´ÈëÎÄ¼þ"
 
-#: ../../lib/ui.lib.php:630
+#: ../../lib/class/stream.class.php:220
+msgid "Closed after write"
+msgstr "¹Ø±Õ"
+
+#: ../../lib/class/genre.class.php:278
+#, fuzzy
+msgid "Show Genres starting with"
+msgstr "<u>S</u>ÏÔÊ¾¸èÊÖÃû×ÖÇ°¼¸Î»×Ö·ûÊÇ"
+
+#: ../../lib/class/album.class.php:151
+msgid "Various"
+msgstr "ÈºÐÇ"
+
+#: ../../lib/duplicates.php:102
+msgid "Find Duplicates"
+msgstr "²éÕÒÖØ¸´ÎÄ¼þ"
+
+#: ../../lib/duplicates.php:105
+msgid "Search Type"
+msgstr "ËÑË÷·½Ê½"
+
+#: ../../lib/duplicates.php:119
+msgid "Artist and Title"
+msgstr "¸èÊÖºÍ¸èÃû"
+
+#: ../../lib/duplicates.php:124
+msgid "Artist, Album and Title"
+msgstr "¸èÊÖ£¬¸èÃûºÍ×¨¼­"
+
+#: ../../lib/duplicates.php:132 ../../templates/sidebar.inc.php:97
+#: ../../templates/sidebar.inc.php:103 ../../templates/show_search_bar.inc:41
+#: ../../templates/menu.inc:39 ../../templates/show_search.inc:171
+msgid "Search"
+msgstr "ËÑË÷"
+
+#: ../../lib/preferences.php:252 ../../templates/show_users.inc:118
+msgid "Enable"
+msgstr "ÔÊÐí"
+
+#: ../../lib/preferences.php:253 ../../templates/show_users.inc:121
+#: ../../templates/list_duplicates.inc:31
+msgid "Disable"
+msgstr "½ûÖ¹"
+
+#: ../../lib/preferences.php:265 ../../templates/add_catalog.inc:61
+msgid "Local"
+msgstr ""
+
+#: ../../lib/preferences.php:268
+msgid "Stream"
+msgstr ""
+
+#: ../../lib/preferences.php:271
+msgid "IceCast"
+msgstr ""
+
+#: ../../lib/preferences.php:274
+msgid "Downsample"
+msgstr ""
+
+#: ../../lib/preferences.php:277
+msgid "Music Player Daemon"
+msgstr ""
+
+#: ../../lib/preferences.php:280
+msgid "SlimServer"
+msgstr ""
+
+#: ../../lib/preferences.php:289
+msgid "M3U"
+msgstr ""
+
+#: ../../lib/preferences.php:290
+msgid "Simple M3U"
+msgstr ""
+
+#: ../../lib/preferences.php:291
+msgid "PLS"
+msgstr ""
+
+#: ../../lib/preferences.php:292
+msgid "Asx"
+msgstr ""
+
+#: ../../lib/preferences.php:293
+msgid "RAM"
+msgstr ""
+
+#: ../../lib/mpd.php:43 ../../lib/mpd.php:52
+msgid "Could not add"
+msgstr "ÎÞ·¨Ìí¼Ó"
+
+#: ../../lib/general.lib.php:675
+msgid "Not Enough Data"
+msgstr ""
+
+#: ../../lib/general.lib.php:897 ../../lib/general.lib.php:908
+msgid "English"
+msgstr "Ó¢ÎÄ"
+
+#: ../../lib/general.lib.php:907
+msgid "German"
+msgstr "µÂÎÄ"
+
+#: ../../lib/general.lib.php:909
+#, fuzzy
+msgid "British English"
+msgstr "Ó¢ÎÄ"
+
+#: ../../lib/general.lib.php:910
+msgid "Spanish"
+msgstr ""
+
+#: ../../lib/general.lib.php:911
+msgid "French"
+msgstr "·¨ÎÄ"
+
+#: ../../lib/general.lib.php:912
+msgid "Italian"
+msgstr ""
+
+#: ../../lib/general.lib.php:913
+msgid "Dutch"
+msgstr ""
+
+#: ../../lib/general.lib.php:914
+msgid "Turkish"
+msgstr "ÍÁ¶úÆäÓï"
+
+#: ../../lib/general.lib.php:915
+msgid "Simplified Chinese"
+msgstr ""
+
+#: ../../lib/general.lib.php:916
+msgid "Unknown"
+msgstr "Î´Öª"
+
+#: ../../lib/ui.lib.php:222
+#, fuzzy
+msgid "Error Access Denied"
+msgstr "ÓÃ»§·ÃÎÊ¿ØÖÆ¼¶±ð"
+
+#: ../../lib/ui.lib.php:299 ../../templates/sidebar.inc.php:69
+#: ../../templates/header.inc:51 ../../templates/menu.inc:35
+msgid "Browse"
+msgstr "ä¯ÀÀ"
+
+#: ../../lib/ui.lib.php:301
+msgid "Show w/o art"
+msgstr "²»ÏÔÊ¾¸èÊÖ"
+
+#: ../../lib/ui.lib.php:304
+msgid "Show all"
+msgstr "È«²¿ÏÔÊ¾"
+
+#: ../../lib/ui.lib.php:721
+#, fuzzy
+msgid "No Catalogs Found!"
+msgstr "Ã»ÓÐÕÒµ½"
+
+#: ../../lib/ui.lib.php:722 ../../templates/add_catalog.inc:29
+msgid "Add a Catalog"
+msgstr "Ìí¼ÓÇú¿â"
+
+#: ../../lib/ui.lib.php:723 ../../templates/show_local_catalog_info.inc.php:7
+msgid "Catalog Statistics"
+msgstr "Çú¿âÍ³¼ÆÐÅÏ¢"
+
+#: ../../lib/ui.lib.php:759
+msgid "day"
+msgstr "Ìì"
+
+#: ../../lib/ui.lib.php:759
 msgid "days"
 msgstr "Ìì"
 
-#: ../../lib/ui.lib.php:632
+#: ../../lib/ui.lib.php:761
 msgid "hour"
 msgstr "Ð¡Ê±"
 
-#: ../../lib/ui.lib.php:632
+#: ../../lib/ui.lib.php:761
 msgid "hours"
 msgstr "Ð¡Ê±"
 
-#: ../../lib/upload.php:225
+#: ../../lib/ui.lib.php:1053 ../../templates/sidebar.inc.php:128
+#: ../../templates/show_random_play_bar.inc.php:45
+#: ../../templates/show_artists.inc:55 ../../templates/show_random_play.inc:46
+#: ../../templates/show_albums.inc:58
+msgid "All"
+msgstr "È«²¿"
+
+#: ../../lib/Browser.php:867
+msgid "file"
+msgstr "ÎÄ¼þ"
+
+#: ../../lib/Browser.php:871
+msgid "File uploads not supported."
+msgstr "²»Ö§³ÖÎÄ¼þÉÏ´«"
+
+#: ../../lib/Browser.php:889
+msgid "No file uploaded"
+msgstr "Ã»ÓÐÉÏ´«ÎÄ¼þ"
+
+#: ../../lib/Browser.php:896
+#, php-format
+msgid "There was a problem with the file upload: No %s was uploaded."
+msgstr "ÎÄ¼þÉÏ´«´íÎó£ºÃ»ÓÐÉÏ´« %s"
+
+#: ../../lib/Browser.php:901
+#, php-format
+msgid ""
+"There was a problem with the file upload: The %s was larger than the maximum "
+"allowed size (%d bytes)."
+msgstr "ÎÄ¼þÉÏ´«´íÎó£º%s ´óÓÚ×î´óÔÊÐíÉÏ´«´óÐ¡£¨%d ×Ö½Ú£©"
+
+#: ../../lib/Browser.php:903
+#, php-format
+msgid ""
+"There was a problem with the file upload: The %s was only partially uploaded."
+msgstr "ÎÄ¼þÉÏ´«´íÎó£º%s Ö»ÉÏ´«ÁË²¿·ÖÎÄ¼þ"
+
+#: ../../lib/upload.php:228
 #, fuzzy
 msgid "The file uploaded successfully"
 msgstr "Ã»ÓÐÉÏ´«ÎÄ¼þ"
 
-#: ../../lib/upload.php:226
+#: ../../lib/upload.php:229
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "ÉÏ´«ÎÄ¼þ´óÐ¡³¬¹ýphp.iniÀïÃæmax_filesizeµÄÏÞÖÆ"
 
-#: ../../lib/upload.php:227
+#: ../../lib/upload.php:230
 #, fuzzy
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "ÉÏ´«ÎÄ¼þ´óÐ¡³¬¹ýHTML±íµ¥ÀïÃæMAX_FILE_SIZEµÄÏÞÖÆ"
 
-#: ../../lib/upload.php:228
+#: ../../lib/upload.php:231
 #, fuzzy
 msgid "The uploaded file was only partially uploaded"
 msgstr "Ö»ÉÏ´«ÁËÎÄ¼þµÄ²¿·ÖÄÚÈÝ"
 
-#: ../../lib/upload.php:229
+#: ../../lib/upload.php:232
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "ÎÄ¼þÃ»ÓÐÉÏ´«"
 
-#: ../../lib/upload.php:230
+#: ../../lib/upload.php:233
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ../../modules/lib.php:708
-msgid "Public"
-msgstr "¹«¿ª"
-
-#: ../../modules/lib.php:709
-msgid "Your Private"
-msgstr "Ë½ÈË"
-
-#: ../../modules/lib.php:710
-msgid "Other Private"
-msgstr "ÆäËû"
+#: ../../lib/rating.lib.php:55
+#, fuzzy
+msgid "Don't Play"
+msgstr "±¾µØ²¥·Å"
 
-#: ../../modules/lib.php:791 ../../templates/show_play_selected.inc.php:72
-msgid "View"
-msgstr "ÏÔÊ¾"
+#: ../../lib/rating.lib.php:58
+msgid "It's Pretty Bad"
+msgstr ""
 
-#: ../../modules/lib.php:794 ../../templates/show_play_selected.inc.php:73
-#: ../../templates/show_users.inc:52 ../../templates/show_users.inc:86
-msgid "Edit"
-msgstr "±à¼­"
+#: ../../lib/rating.lib.php:61
+msgid "It's Ok"
+msgstr ""
 
-#: ../../modules/lib.php:795 ../../templates/catalog.inc:60
-#: ../../templates/show_users.inc:61 ../../templates/show_uploads.inc:50
-msgid "Delete"
-msgstr "É¾³ý"
+#: ../../lib/rating.lib.php:64
+msgid "It's Pretty Good"
+msgstr ""
 
-#: ../../modules/lib.php:803 ../../templates/show_genres.inc.php:48
-#: ../../templates/show_localplay.inc:41 ../../templates/show_artists.inc:54
-#: ../../templates/show_albums.inc:57 ../../templates/show_artist.inc:78
-#: ../../templates/show_mpdplay.inc:50
-msgid "Play"
-msgstr "²¥·Å"
+#: ../../lib/rating.lib.php:67
+msgid "I Love It!"
+msgstr ""
 
-#: ../../modules/lib.php:804 ../../templates/show_artists.inc:56
-#: ../../templates/show_albums.inc:59 ../../templates/show_mpdplay.inc:85
-msgid "Random"
-msgstr "Ëæ»ú"
+#: ../../lib/rating.lib.php:70
+msgid "It's Insane"
+msgstr ""
 
-#: ../../modules/lib.php:810 ../../templates/show_songs.inc:110
-#: ../../templates/show_album.inc:61 ../../templates/show_albums.inc:61
-#: ../../templates/show_artist.inc:80
-msgid "Download"
-msgstr "ÏÂÔØ"
+#: ../../lib/rating.lib.php:74
+msgid "Off the Charts!"
+msgstr ""
 
-#: ../../modules/lib.php:821
-msgid "There are no playlists of this type"
-msgstr "Ã»ÓÐ×Ô¶¨Òå²¥·ÅÁÐ±í"
+#: ../../lib/playlist.lib.php:73
+msgid "No songs in this playlist."
+msgstr "´Ë×ÔÑ¡ÁÐ±íÃ»ÓÐ¸èÇú"
 
-#: ../../modules/lib.php:856
+#: ../../modules/lib.php:537
 msgid "Create a new playlist"
 msgstr "ÐÂ½¨×Ô¶¨Òå²¥·ÅÁÐ±í"
 
@@ -602,178 +599,153 @@
 msgid "Add a new user"
 msgstr "Ìí¼ÓÐÂÓÃ»§"
 
-#: ../../admin/catalog.php:55 ../../templates/catalog.inc:66
+#: ../../admin/catalog.php:49 ../../templates/catalog.inc:63
 msgid "Add to Catalog(s)"
 msgstr "Ìí¼Óµ½Çú¿â"
 
-#: ../../admin/catalog.php:66 ../../templates/catalog.inc:67
+#: ../../admin/catalog.php:60 ../../templates/catalog.inc:64
 msgid "Add to all Catalogs"
 msgstr "Ìí¼ÓËùÓÐµ½Çú¿â"
 
-#: ../../admin/catalog.php:75
+#: ../../admin/catalog.php:69
 msgid "Error Connecting"
 msgstr "Á¬½Ó´íÎó"
 
-#: ../../admin/catalog.php:89 ../../templates/catalog.inc:73
+#: ../../admin/catalog.php:83 ../../templates/catalog.inc:70
 msgid "Update Catalog(s)"
 msgstr "¸üÐÂÇú¿â"
 
-#: ../../admin/catalog.php:100 ../../templates/catalog.inc:74
+#: ../../admin/catalog.php:94 ../../templates/catalog.inc:71
 msgid "Update All Catalogs"
 msgstr "¸üÐÂËùÓÐÇú¿â"
 
-#: ../../admin/catalog.php:132 ../../templates/catalog.inc:80
+#: ../../admin/catalog.php:126 ../../templates/catalog.inc:77
 msgid "Clean Catalog(s)"
 msgstr "Çå³ýÇú¿â"
 
-#: ../../admin/catalog.php:162 ../../templates/catalog.inc:81
+#: ../../admin/catalog.php:156 ../../templates/catalog.inc:78
 msgid "Clean All Catalogs"
 msgstr "Çå³ýËùÓÐÇú¿â"
 
-#: ../../admin/catalog.php:211
+#: ../../admin/catalog.php:206
 msgid "Now Playing Cleared"
 msgstr "ÕýÔÚ²¥·Å±»È¡Ïû"
 
-#: ../../admin/catalog.php:211
+#: ../../admin/catalog.php:206
 msgid "All now playing data has been cleared"
 msgstr "ËùÓÐÕýÔÚ²¥·ÅµÄÊý¾Ý±»È¡Ïû"
 
-#: ../../admin/catalog.php:216
+#: ../../admin/catalog.php:211
 msgid "Do you really want to clear your catalog?"
 msgstr "ÕæµÄÒªÇå³ýÇú¿âÂð£¿"
 
-#: ../../admin/catalog.php:223
+#: ../../admin/catalog.php:218
 msgid "Do you really want to clear the statistics for this catalog?"
 msgstr "ÕæµÄÒªÇå³ýÕâ¸öÇú¿âµÄÍ³¼ÆÐÅÏ¢Âð£¿"
 
-#: ../../admin/catalog.php:241
+#: ../../admin/catalog.php:235
 msgid "Do you really want to delete this catalog?"
 msgstr "ÕæµÄÒªÉ¾³ýÇú¿âÂð£¿"
 
-#: ../../admin/catalog.php:272
+#: ../../admin/catalog.php:266
 msgid "Album Art Search Finished"
 msgstr "¸èÇú¸èÊÖËÑË÷½áÊø"
 
-#: ../../admin/users.php:76 ../../admin/users.php:122
+#: ../../admin/users.php:72 ../../admin/users.php:119
 msgid "Error Username Required"
 msgstr "´íÎó£ºÇëÊäÈëÓÃ»§Ãû"
 
-#: ../../admin/users.php:79 ../../admin/users.php:119
+#: ../../admin/users.php:75 ../../admin/users.php:115
 msgid "Error Passwords don't match"
 msgstr "´íÎó£ºÃÜÂë²»Æ¥Åä"
 
-#: ../../admin/users.php:136
+#: ../../admin/users.php:124 ../../register.php:136
+#, fuzzy
+msgid "Error Username already exists"
+msgstr "´íÎó£ºÇëÊäÈëÓÃ»§Ãû"
+
+#: ../../admin/users.php:145
 msgid "Are you sure you want to permanently delete"
 msgstr "È·¶¨ÒªÓÀ¾ÃÉ¾³ý£¿"
 
-#: ../../admin/users.php:143 ../../templates/show_confirm_action.inc.php:29
+#: ../../admin/users.php:152 ../../templates/show_confirm_action.inc.php:29
+#: ../../templates/show_search.inc:107
 msgid "No"
 msgstr "·ñ"
 
-#: ../../admin/users.php:145
+#: ../../admin/users.php:154
 msgid "User Deleted"
 msgstr "ÓÃ»§ÒÑÉ¾³ý"
 
-#: ../../admin/users.php:148
+#: ../../admin/users.php:157
 msgid "Delete Error"
 msgstr "É¾³ý´íÎó"
 
-#: ../../admin/users.php:148
+#: ../../admin/users.php:157
 msgid "Unable to delete last Admin User"
 msgstr "²»ÄÜÉ¾³ýÎ¨Ò»µÄ¹ÜÀíÔ±"
 
-#: ../../admin/access.php:43
+#: ../../admin/access.php:40
 msgid "Do you really want to delete this Access Record?"
 msgstr "ÕæµÄÒªÉ¾³ýÕâ¸ö·ÃÎÊÐí¿ÉÂð£¿"
 
-#: ../../admin/access.php:51
+#: ../../admin/access.php:48
 msgid "Entry Deleted"
 msgstr "Êý¾Ý±»É¾³ý"
 
-#: ../../admin/access.php:51
+#: ../../admin/access.php:48
 msgid "Your Access List Entry has been removed"
 msgstr "·ÃÎÊÐí¿É±»É¾³ý"
 
-#: ../../admin/access.php:61
+#: ../../admin/access.php:58
 msgid "Entry Added"
 msgstr "¼ÇÂ¼±»Ìí¼Ó"
 
-#: ../../admin/access.php:61
+#: ../../admin/access.php:58
 msgid "Your new Access List Entry has been created"
 msgstr "ÐÂ·ÃÎÊÐí¿É±»Ìí¼Ó"
 
-#: ../../admin/mail.php:98
+#: ../../admin/mail.php:94
 msgid "Mail to"
 msgstr "·¢µç×ÓÓÊ¼þ¸ø"
 
-#: ../../admin/mail.php:109
+#: ../../admin/mail.php:105
 msgid "Subject"
 msgstr "±êÌâ"
 
-#: ../../admin/mail.php:116
+#: ../../admin/mail.php:112
 msgid "Message"
 msgstr "ÕýÎÄ"
 
-#: ../../admin/mail.php:126
+#: ../../admin/mail.php:122
 msgid "Send Mail"
 msgstr "·¢ËÍ"
 
-#: ../../admin/song.php:68
+#: ../../admin/song.php:65
 msgid "Songs Disabled"
 msgstr "¸èÇú±»½ûÖ¹²¥·Å"
 
-#: ../../admin/song.php:68
+#: ../../admin/song.php:65
 msgid "The requested song(s) have been disabled"
 msgstr "ÇëÇóµÄ¸èÇú±»½ûÖ¹²¥·Å"
 
-#: ../../admin/song.php:78
+#: ../../admin/song.php:75
 msgid "Songs Enabled"
 msgstr "¸èÇú±»ÔÊÐí²¥·Å"
 
-#: ../../admin/song.php:78
+#: ../../admin/song.php:75
 msgid "The requested song(s) have been enabled"
 msgstr "ÇëÇóµÄ¸èÇú±»ÔÊÐí²¥·Å"
 
-#: ../../templates/show_user_registration.inc.php:28
-#: ../../templates/show_install_account.inc.php:59
-#: ../../templates/userform.inc:40 ../../templates/show_users.inc:40
-msgid "Username"
-msgstr "ÓÃ»§Ãû"
-
-#: ../../templates/show_user_registration.inc.php:36
-#: ../../templates/userform.inc:48
-msgid "Full Name"
-msgstr "È«Ãû"
-
-#: ../../templates/show_user_registration.inc.php:44
-#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:55
-msgid "E-mail"
-msgstr "µç×ÓÓÊ¼þ"
-
-#: ../../templates/show_user_registration.inc.php:52
-#: ../../templates/show_install_account.inc.php:63
-#: ../../templates/userform.inc:63 ../../templates/show_login_form.inc:53
-msgid "Password"
-msgstr "ÃÜÂë"
-
-#: ../../templates/show_user_registration.inc.php:60
-#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
-msgid "Confirm Password"
-msgstr "È·ÈÏÃÜÂë"
-
-#: ../../templates/show_user_registration.inc.php:69
-msgid "Register User"
-msgstr "×¢²áÓÃ»§"
-
 #: ../../templates/show_install_account.inc.php:35
 #: ../../templates/show_install_config.inc:35
-#: ../../templates/show_install.inc:34
+#: ../../templates/show_install.inc:35
 msgid "Ampache Installation"
 msgstr "Ampache °²×°"
 
 #: ../../templates/show_install_account.inc.php:37
 #: ../../templates/show_install_config.inc:37
-#: ../../templates/show_install.inc:36
+#: ../../templates/show_install.inc:37
 #, fuzzy
 msgid ""
 "This Page handles the installation of the Ampache database and the creation "
@@ -785,7 +757,7 @@
 
 #: ../../templates/show_install_account.inc.php:40
 #: ../../templates/show_install_config.inc:40
-#: ../../templates/show_install.inc:39
+#: ../../templates/show_install.inc:40
 msgid ""
 "A MySQL Server with a username and password that can create/modify databases"
 msgstr "ÒÑ°²×°MySQLÊý¾Ý¿â£¬ÓÐÄÜ´´½¨ºÍ¸ü¸ÄÊý¾Ý¿âµÄÓÃ»§ÕÊºÅ"
@@ -800,7 +772,7 @@
 
 #: ../../templates/show_install_account.inc.php:43
 #: ../../templates/show_install_config.inc:43
-#: ../../templates/show_install.inc:42
+#: ../../templates/show_install.inc:43
 msgid ""
 "Once you have ensured that you have the above requirements please fill out "
 "the information below. You will only be asked for the required config "
@@ -812,7 +784,7 @@
 
 #: ../../templates/show_install_account.inc.php:48
 #: ../../templates/show_install_config.inc:48
-#: ../../templates/show_install.inc:46
+#: ../../templates/show_install.inc:47
 msgid "Step 1 - Creating and Inserting the Ampache Database"
 msgstr "µÚÒ»²½ - ´´½¨AmpacheÊý¾Ý¿â²¢Ìí¼ÓÏµÍ³Êý¾Ý"
 
@@ -822,7 +794,7 @@
 
 #: ../../templates/show_install_account.inc.php:50
 #: ../../templates/show_install_config.inc:53
-#: ../../templates/show_install.inc:51
+#: ../../templates/show_install.inc:52
 msgid "Step 3 - Setup Initial Account"
 msgstr "µÚÈý²½ - ³õÊ¼»¯ÕÊºÅ"
 
@@ -832,11 +804,71 @@
 "account has been created you will be directed to the login page"
 msgstr "ÕâÒ»²½´´½¨³õÊ¼¹ÜÀíÔ±ÕÊºÅ¡£ÕÊºÅ´´½¨Íê±Ï»á×ªµ½µÇÂ¼Ò³"
 
-#: ../../templates/show_install_account.inc.php:68
+#: ../../templates/show_install_account.inc.php:55
+#, fuzzy
+msgid "Create Admin Account"
+msgstr "ÐÂ½¨ÕÊºÅ"
+
+#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/show_user_registration.inc.php:109
+#: ../../templates/userform.inc:40 ../../templates/show_users.inc:43
+msgid "Username"
+msgstr "ÓÃ»§Ãû"
+
+#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/show_user_registration.inc.php:137
+#: ../../templates/userform.inc:63 ../../templates/show_login_form.inc:53
+msgid "Password"
+msgstr "ÃÜÂë"
+
+#: ../../templates/show_install_account.inc.php:69
 msgid "Create Account"
 msgstr "ÐÂ½¨ÕÊºÅ"
 
+#: ../../templates/show_user_registration.inc.php:59
+#, fuzzy
+msgid "Ampache New User Registration"
+msgstr "Ampache °²×°"
+
+#: ../../templates/show_user_registration.inc.php:74
+#, fuzzy
+msgid "User Agreement"
+msgstr "ÓÃ»§Ãû"
+
+#: ../../templates/show_user_registration.inc.php:84
+#, fuzzy
+msgid "I Accept"
+msgstr "½ÓÊÜ"
+
+#: ../../templates/show_user_registration.inc.php:101
+msgid "User Information"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:119
+#: ../../templates/userform.inc:48
+msgid "Full Name"
+msgstr "È«Ãû"
+
+#: ../../templates/show_user_registration.inc.php:128
+#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:55
+msgid "E-mail"
+msgstr "µç×ÓÓÊ¼þ"
+
+#: ../../templates/show_user_registration.inc.php:146
+#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
+msgid "Confirm Password"
+msgstr "È·ÈÏÃÜÂë"
+
+#: ../../templates/show_user_registration.inc.php:166
+msgid "Clear Info"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:167
+msgid "Register User"
+msgstr "×¢²áÓÃ»§"
+
 #: ../../templates/show_confirm_action.inc.php:28
+#: ../../templates/show_search.inc:106
 msgid "Yes"
 msgstr "ÊÇ"
 
@@ -845,7 +877,8 @@
 msgstr "´ÓÎÄ¼þµ¼Èë×Ô¶¨Òå²¥·ÅÁÐ±í"
 
 #: ../../templates/show_import_playlist.inc.php:29
-#: ../../templates/show_uploads.inc:41
+#: ../../templates/show_uploads.inc:41 ../../templates/list_duplicates.inc:38
+#: ../../templates/show_search.inc:95
 msgid "Filename"
 msgstr "ÎÄ¼þÃû"
 
@@ -857,6 +890,36 @@
 msgid "Import Playlist"
 msgstr "µ¼Èë²¥·ÅÁÐ±í"
 
+#: ../../templates/show_genre.inc.php:32
+#, fuzzy
+msgid "Viewing"
+msgstr "ÏÔÊ¾"
+
+#: ../../templates/show_genre.inc.php:36 ../../templates/sidebar.inc.php:35
+#: ../../templates/sidebar.inc.php:136
+#: ../../templates/show_local_catalog_info.inc.php:18
+#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:65
+#: ../../templates/show_browse_menu.inc:36 ../../templates/show_search.inc:136
+msgid "Albums"
+msgstr "×¨¼­"
+
+#: ../../templates/show_genre.inc.php:41 ../../templates/sidebar.inc.php:36
+#: ../../templates/sidebar.inc.php:135
+#: ../../templates/show_local_catalog_info.inc.php:22
+#: ../../templates/show_browse_menu.inc:35 ../../templates/show_search.inc:137
+msgid "Artists"
+msgstr "¸èÊÖ"
+
+#: ../../templates/show_genre.inc.php:46
+#: ../../templates/show_genres.inc.php:37 ../../templates/sidebar.inc.php:133
+#: ../../templates/show_random_play_bar.inc.php:49
+#: ../../templates/show_local_catalog_info.inc.php:26
+#: ../../templates/show_artists.inc:41 ../../templates/show_artists.inc:64
+#: ../../templates/show_albums.inc:41 ../../templates/show_albums.inc:71
+#: ../../templates/show_search.inc:135
+msgid "Songs"
+msgstr "¸èÇú"
+
 #: ../../templates/show_user.inc.php:26
 msgid "Changing User Information for"
 msgstr ""
@@ -892,10 +955,143 @@
 msgid "Clear Stats"
 msgstr "Çå³ý×´Ì¬"
 
+#: ../../templates/show_genres.inc.php:38 ../../templates/show_uploads.inc:32
+#: ../../templates/show_mpdpl.inc:68 ../../templates/show_songs.inc:50
+#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:67
+#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:75
+#: ../../templates/show_access_list.inc:51 ../../templates/show_artist.inc:42
+msgid "Action"
+msgstr "²Ù×÷"
+
+#: ../../templates/show_genres.inc.php:48
+#: ../../templates/show_playlists.inc.php:63
+#: ../../templates/show_localplay.inc:41 ../../templates/show_artists.inc:54
+#: ../../templates/show_albums.inc:57 ../../templates/show_mpdplay.inc:64
+#: ../../templates/show_artist.inc:67
+msgid "Play"
+msgstr "²¥·Å"
+
+#: ../../templates/sidebar.inc.php:29
+msgid "Users"
+msgstr "ÓÃ»§"
+
+#: ../../templates/sidebar.inc.php:30
+msgid "Mail Users"
+msgstr "ÏòÓÃ»§·¢ËÍÓÊ¼þ"
+
+#: ../../templates/sidebar.inc.php:32
+#, fuzzy
+msgid "Site Preferences"
+msgstr "¸üÐÂÉèÖÃ"
+
+#: ../../templates/sidebar.inc.php:33
+#, fuzzy
+msgid "Access List"
+msgstr "·ÃÎÊ¿ØÖÆÁÐ±í"
+
+#: ../../templates/sidebar.inc.php:38
+#, fuzzy
+msgid "Lists"
+msgstr "¸èÊÖ"
+
+#: ../../templates/sidebar.inc.php:45 ../../templates/menu.inc:29
+msgid "Home"
+msgstr "Ê×Ò³"
+
+#: ../../templates/sidebar.inc.php:49 ../../templates/menu.inc:63
+#: ../../templates/menu.inc:66
+msgid "Admin"
+msgstr "¹ÜÀí"
+
+#: ../../templates/sidebar.inc.php:66 ../../templates/menu.inc:40
+msgid "Preferences"
+msgstr "ÉèÖÃ"
+
+#: ../../templates/sidebar.inc.php:85 ../../templates/menu.inc:43
+#: ../../templates/show_upload.inc:73
+msgid "Upload"
+msgstr "ÉÏ´«"
+
+#: ../../templates/sidebar.inc.php:89
+#: ../../templates/show_playlists.inc.php:28 ../../templates/menu.inc:38
+msgid "Playlists"
+msgstr "×Ô¶¨ÒåÎÄ¼þÁÐ±í"
+
+#: ../../templates/sidebar.inc.php:93 ../../templates/menu.inc:32
+msgid "Local Play"
+msgstr "±¾µØ²¥·Å"
+
+#: ../../templates/sidebar.inc.php:112
+#: ../../templates/show_playlists.inc.php:66
+#: ../../templates/show_artists.inc:56 ../../templates/show_albums.inc:59
+#: ../../templates/show_mpdplay.inc:114
+msgid "Random"
+msgstr "Ëæ»ú"
+
+#: ../../templates/sidebar.inc.php:134
+#: ../../templates/show_random_play_bar.inc.php:50
+msgid "Minutes"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:137
+#: ../../templates/show_random_play_bar.inc.php:53
+msgid "Less Played"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:141
+#: ../../templates/show_random_play_bar.inc.php:58
+msgid "Enqueue"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:146 ../../templates/menu.inc:75
+#: ../../templates/menu.inc:81 ../../templates/menu.inc:85
+msgid "Logout"
+msgstr "ÍË³ö"
+
 #: ../../templates/show_confirmation.inc.php:30
 msgid "Continue"
 msgstr "¼ÌÐø"
 
+#: ../../templates/show_random_play_bar.inc.php:31
+#: ../../templates/show_random_play.inc:28
+msgid "Play Random Selection"
+msgstr "Ëæ»ú²¥·Å"
+
+#: ../../templates/show_random_play_bar.inc.php:51
+#, fuzzy
+msgid "Full Artists"
+msgstr "È«²¿¸èÊÖ"
+
+#: ../../templates/show_random_play_bar.inc.php:52
+#: ../../templates/show_random_play.inc:60
+msgid "Full Albums"
+msgstr "È«²¿×¨¼­"
+
+#: ../../templates/show_random_play_bar.inc.php:55
+msgid "from"
+msgstr ""
+
+#: ../../templates/show_random_play_bar.inc.php:59
+#, fuzzy
+msgid "Advanced"
+msgstr "ÒÑÌí¼Ó"
+
+#: ../../templates/show_local_catalog_info.inc.php:10
+msgid "Total Users"
+msgstr "ÓÃ»§×ÜÊý"
+
+#: ../../templates/show_local_catalog_info.inc.php:14
+msgid "Connected Users"
+msgstr "ÔÚÏßÓÃ»§"
+
+#: ../../templates/show_local_catalog_info.inc.php:30
+msgid "Catalog Size"
+msgstr "Çú¿â´óÐ¡"
+
+#: ../../templates/show_local_catalog_info.inc.php:34
+msgid "Catalog Time"
+msgstr "Çú¿âÊ±¼ä"
+
 #: ../../templates/show_play_selected.inc.php:49
 msgid "Play Selected"
 msgstr "²¥·ÅÑ¡ÔñµÄ¸èÇú"
@@ -905,35 +1101,54 @@
 msgid "Download Selected"
 msgstr "²¥·ÅÑ¡ÔñµÄ¸èÇú"
 
-#: ../../templates/show_play_selected.inc.php:55 ../../playlist.php:77
+#: ../../templates/show_play_selected.inc.php:55
 msgid "Flag Selected"
 msgstr "±ê¼ÇÑ¡Ôñ"
 
-#: ../../templates/show_play_selected.inc.php:56 ../../playlist.php:83
+#: ../../templates/show_play_selected.inc.php:56
 msgid "Edit Selected"
 msgstr "±à¼­Ñ¡Ôñ"
 
-#: ../../templates/show_play_selected.inc.php:63
+#: ../../templates/show_play_selected.inc.php:64
 msgid "Set Track Numbers"
 msgstr "ÉèÖÃÒô¹ìºÅ"
 
-#: ../../templates/show_play_selected.inc.php:64
+#: ../../templates/show_play_selected.inc.php:65
 msgid "Remove Selected Tracks"
 msgstr "Çå³ýÒô¹ìºÅ"
 
-#: ../../templates/show_play_selected.inc.php:70
+#: ../../templates/show_play_selected.inc.php:71
 msgid "Playlist"
 msgstr "²¥·ÅÁÐ±í"
 
-#: ../../templates/show_play_selected.inc.php:70
+#: ../../templates/show_play_selected.inc.php:71
 msgid "Add to"
 msgstr "Ìí¼Óµ½"
 
-#: ../../templates/show_all_popular.inc.php:27 ../../index.php:98
+#: ../../templates/show_play_selected.inc.php:73
+#: ../../templates/show_playlists.inc.php:51
+msgid "View"
+msgstr "ÏÔÊ¾"
+
+#: ../../templates/show_play_selected.inc.php:74
+#: ../../templates/show_playlists.inc.php:55 ../../templates/show_users.inc:58
+#: ../../templates/show_users.inc:102
+msgid "Edit"
+msgstr "±à¼­"
+
+#: ../../templates/show_all_recent.inc.php:27 ../../index.php:99
+msgid "Newest Artist Additions"
+msgstr "×îÐÂÌí¼ÓµÄ¸èÊÖ"
+
+#: ../../templates/show_all_recent.inc.php:30 ../../index.php:106
+msgid "Newest Album Additions"
+msgstr "×îÐÂÌí¼ÓµÄ×¨¼­"
+
+#: ../../templates/show_all_popular.inc.php:27 ../../index.php:82
 msgid "Most Popular Artists"
 msgstr "×îÁ÷ÐÐµÄ¸èÊÖ"
 
-#: ../../templates/show_all_popular.inc.php:30 ../../index.php:71
+#: ../../templates/show_all_popular.inc.php:30 ../../index.php:61
 msgid "Most Popular Albums"
 msgstr "×îÁ÷ÐÐµÄ×¨¼­"
 
@@ -942,120 +1157,232 @@
 msgid "Most Popular Genres"
 msgstr "×îÁ÷ÐÐµÄ¸èÇú"
 
-#: ../../templates/show_all_popular.inc.php:40 ../../index.php:105
+#: ../../templates/show_all_popular.inc.php:40 ../../index.php:89
 msgid "Most Popular Songs"
 msgstr "×îÁ÷ÐÐµÄ¸èÇú"
 
-#: ../../templates/show_local_catalog_info.inc.php:10
-msgid "Total Users"
-msgstr "ÓÃ»§×ÜÊý"
+#: ../../templates/show_get_albumart.inc.php:28
+msgid "Customize Search"
+msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:14
-msgid "Connected Users"
-msgstr "ÔÚÏßÓÃ»§"
+#: ../../templates/show_get_albumart.inc.php:49
+msgid "Direct URL to Image"
+msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:18
-#: ../../templates/show_genre.inc.php:36 ../../templates/show_artists.inc:42
-#: ../../templates/show_artists.inc:65 ../../templates/show_browse_menu.inc:36
-msgid "Albums"
+#: ../../templates/show_get_albumart.inc.php:59
+msgid "Get Art"
+msgstr "»ñÈ¡¸èÊÖÐÅÏ¢"
+
+#: ../../templates/show_rename_artist.inc.php:33
+#: ../../templates/show_rename_artist.inc.php:51
+#, fuzzy
+msgid "Rename"
+msgstr "ÓÃ»§Ãû"
+
+#: ../../templates/show_rename_artist.inc.php:33
+#, fuzzy
+msgid "to"
+msgstr "Í£Ö¹"
+
+#: ../../templates/show_rename_artist.inc.php:40
+#: ../../templates/show_search.inc:144
+msgid "OR"
+msgstr ""
+
+#: ../../templates/show_rename_artist.inc.php:42
+msgid "Insert current"
+msgstr ""
+
+#: ../../templates/show_rename_artist.inc.php:47
+#, fuzzy
+msgid "Update id3 tags"
+msgstr "´Ó±ê¼Ç¸üÐÂ"
+
+#: ../../templates/show_artist_box.inc.php:26
+msgid "Albums by"
 msgstr "×¨¼­"
 
-#: ../../templates/show_local_catalog_info.inc.php:22
-#: ../../templates/show_genre.inc.php:41
-#: ../../templates/show_browse_menu.inc:35
-msgid "Artists"
+#: ../../templates/show_artist_box.inc.php:34
+msgid "Show All Songs By"
+msgstr "ÏÔÊ¾ËùÓÐ¸èÇú"
+
+#: ../../templates/show_artist_box.inc.php:35
+msgid "Play All Songs By"
+msgstr "²¥·ÅËùÓÐ¸èÇú"
+
+#: ../../templates/show_artist_box.inc.php:36
+msgid "Play Random Songs By"
+msgstr "Ëæ»ú²¥·Å¸èÇú"
+
+#: ../../templates/show_artist_box.inc.php:38
+#: ../../templates/show_album.inc:72
+msgid "Update from tags"
+msgstr "´Ó±ê¼Ç¸üÐÂ"
+
+#: ../../templates/show_artist_box.inc.php:39
+#, fuzzy
+msgid "Rename Artist"
 msgstr "¸èÊÖ"
 
-#: ../../templates/show_local_catalog_info.inc.php:26
-#: ../../templates/show_genres.inc.php:37
-#: ../../templates/show_genre.inc.php:46 ../../templates/show_artists.inc:41
-#: ../../templates/show_artists.inc:64 ../../templates/show_albums.inc:41
-#: ../../templates/show_albums.inc:71
-msgid "Songs"
-msgstr "¸èÇú"
+#: ../../templates/show_playlists.inc.php:31
+#, fuzzy
+msgid "Playlist Name"
+msgstr "×Ô¶¨Òå²¥·ÅÁÐ±íÀàÐÍ"
 
-#: ../../templates/show_local_catalog_info.inc.php:30
-msgid "Catalog Size"
-msgstr "Çú¿â´óÐ¡"
+#: ../../templates/show_playlists.inc.php:32
+#, fuzzy
+msgid "# Songs"
+msgstr "¸èÇú"
 
-#: ../../templates/show_local_catalog_info.inc.php:34
-msgid "Catalog Time"
-msgstr "Çú¿âÊ±¼ä"
+#: ../../templates/show_playlists.inc.php:33
+msgid "Owner"
+msgstr ""
 
-#: ../../templates/show_genres.inc.php:38 ../../templates/show_artists.inc:43
-#: ../../templates/show_artists.inc:67 ../../templates/show_songs.inc:42
-#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:75
-#: ../../templates/show_access_list.inc:51 ../../templates/show_artist.inc:55
-#: ../../templates/show_mpdpl.inc:68 ../../templates/show_uploads.inc:32
-msgid "Action"
+#: ../../templates/show_playlists.inc.php:34
+#, fuzzy
+msgid "Actions"
 msgstr "²Ù×÷"
 
-#: ../../templates/show_genre.inc.php:32
+#: ../../templates/show_playlists.inc.php:58
+#: ../../templates/show_uploads.inc:50 ../../templates/catalog.inc:57
+#: ../../templates/show_users.inc:70
+msgid "Delete"
+msgstr "É¾³ý"
+
+#: ../../templates/show_playlists.inc.php:71
+#: ../../templates/show_songs.inc:140 ../../templates/show_album.inc:75
+#: ../../templates/show_albums.inc:61 ../../templates/show_artist.inc:69
+msgid "Download"
+msgstr "ÏÂÔØ"
+
+#: ../../templates/show_playlist_box.inc.php:33
+msgid "Playlist Actions"
+msgstr "×ÔÑ¡¸èÇúÁÐ±í²Ù×÷"
+
+#: ../../templates/show_playlist_box.inc.php:34
 #, fuzzy
-msgid "Viewing"
-msgstr "ÏÔÊ¾"
+msgid "Create New Playlist"
+msgstr "ÐÂ½¨×Ô¶¨Òå²¥·ÅÁÐ±í"
 
-#: ../../templates/show_all_recent.inc.php:27 ../../index.php:115
-msgid "Newest Artist Additions"
-msgstr "×îÐÂÌí¼ÓµÄ¸èÊÖ"
+#: ../../templates/show_playlist_box.inc.php:35
+#, fuzzy
+msgid "View All Playlists"
+msgstr "ÐÂ½¨×Ô¶¨Òå²¥·ÅÁÐ±í"
 
-#: ../../templates/show_all_recent.inc.php:30 ../../index.php:122
-msgid "Newest Album Additions"
-msgstr "×îÐÂÌí¼ÓµÄ×¨¼­"
+#: ../../templates/show_playlist_box.inc.php:36
+#, fuzzy
+msgid "Import From File"
+msgstr "´ÓÎÄ¼þµ¼Èë×Ô¶¨Òå²¥·ÅÁÐ±í"
+
+#: ../../templates/show_playlist_box.inc.php:38
+#, fuzzy
+msgid "Normalize Tracks"
+msgstr "×ÜÒô¹ìÊý"
+
+#: ../../templates/show_playlist_box.inc.php:39
+#, fuzzy
+msgid "Play This Playlist"
+msgstr "²¥·Å×Ô¶¨ÒåÁÐ±í"
+
+#: ../../templates/show_preference_box.inc.php:44
+msgid "Preference"
+msgstr "ÉèÖÃ"
+
+#: ../../templates/show_preference_box.inc.php:45
+msgid "Value"
+msgstr "Öµ"
+
+#: ../../templates/show_preference_box.inc.php:47
+msgid "Apply to All"
+msgstr "È«²¿Ó¦ÓÃ"
+
+#: ../../templates/show_preference_box.inc.php:54
+msgid "description"
+msgstr ""
+
+#: ../../templates/show_object_rating.inc.php:25
+#: ../../templates/show_songs.inc:52
+#, fuzzy
+msgid "Rating"
+msgstr "±à¼­ÖÐ"
 
-#: ../../localplay.php:79
+#: ../../localplay.php:81
 msgid "Unknown action requested"
 msgstr "Î´Öª²Ù×÷"
 
-#: ../../artists.php:48
-msgid "All songs by"
-msgstr "È«²¿¸èÇú"
+#: ../../browse.php:48 ../../albums.php:168 ../../albums.php:174
+#: ../../albums.php:181 ../../albums.php:186 ../../albums.php:192
+#, fuzzy
+msgid "Show Albums starting with"
+msgstr "<u>S</u>Ö»ÏÔÊ¾ÈçÏÂ¿ªÍ·µÄ×¨¼­£º"
 
-#: ../../artists.php:57 ../../albums.php:106
+#: ../../browse.php:78 ../../artists.php:128 ../../artists.php:132
+#: ../../artists.php:138 ../../artists.php:151
+#, fuzzy
+msgid "Show Artists starting with"
+msgstr "<u>S</u>ÏÔÊ¾¸èÊÖÃû×ÖÇ°¼¸Î»×Ö·ûÊÇ"
+
+#: ../../search.php:45
+msgid "Error: No Keyword Entered"
+msgstr ""
+
+#: ../../tv.php:76 ../../templates/show_now_playing.inc:31
+msgid "Now Playing"
+msgstr "ÕýÔÚ²¥·Å"
+
+#: ../../artists.php:58 ../../albums.php:147
 msgid "Starting Update from Tags"
 msgstr "¿ªÊ¼´ÓÎÄ¼þ±ê¼Ç»ñÈ¡ÐÅÏ¢"
 
-#: ../../artists.php:62 ../../albums.php:111
-msgid "Update From Tags Complete"
-msgstr "´Ó±ê¼ÇÐÅÏ¢¸üÐÂ½áÊø"
+#: ../../artists.php:63 ../../albums.php:152
+msgid "Update From Tags Complete"
+msgstr "´Ó±ê¼ÇÐÅÏ¢¸üÐÂ½áÊø"
+
+#: ../../amp-mpd.php:171 ../../playlist.php:63
+msgid "New Playlist"
+msgstr "ÐÂ½¨×Ô¶¨Òå²¥·ÅÁÐ±í"
+
+#: ../../playlist.php:46
+#, fuzzy
+msgid "Playlist Deleted"
+msgstr "²¥·ÅÑ¡ÔñµÄ¸èÇú"
+
+#: ../../playlist.php:46
+#, fuzzy
+msgid "The Requested Playlist has been deleted"
+msgstr "ÇëÇóµÄ¸èÇú±»ÔÊÐí²¥·Å"
 
-#: ../../artists.php:72 ../../artists.php:76 ../../artists.php:82
-#: ../../artists.php:95
+#: ../../playlist.php:56
 #, fuzzy
-msgid "Show Artists starting with"
-msgstr "<u>S</u>ÏÔÊ¾¸èÊÖÃû×ÖÇ°¼¸Î»×Ö·ûÊÇ"
+msgid "Are you sure you want to delete this playlist"
+msgstr "È·¶¨ÒªÓÀ¾ÃÉ¾³ý£¿"
 
-#: ../../amp-mpd.php:176 ../../playlist.php:135
-msgid "New Playlist"
-msgstr "ÐÂ½¨×Ô¶¨Òå²¥·ÅÁÐ±í"
+#: ../../playlist.php:112
+#, fuzzy
+msgid "Playlist Created"
+msgstr "×Ô¶¨Òå²¥·ÅÁÐ±íÒÑ¸üÐÂ"
 
-#: ../../playlist.php:115
-msgid "owned by"
-msgstr "ËùÓÐÕß "
-
-#: ../../playlist.php:118
-msgid "Edit Playlist"
-msgstr "±à¼­×Ô¶¨Òå²¥·ÅÁÐ±í"
+#: ../../playlist.php:112
+msgid " has been created"
+msgstr ""
 
 #: ../../playlist.php:121
-msgid "Play Full Playlist"
-msgstr "²¥·Å×Ô¶¨ÒåÁÐ±í"
-
-#: ../../playlist.php:122
-msgid "Play Random"
-msgstr "Ëæ»ú²¥·Å"
+#, fuzzy
+msgid "Remote Selected Tracks"
+msgstr "Çå³ýÒô¹ìºÅ"
 
-#: ../../playlist.php:192
-msgid "Playlist updated."
+#: ../../playlist.php:139
+#, fuzzy
+msgid "Playlist Updated"
 msgstr "×Ô¶¨Òå²¥·ÅÁÐ±íÒÑ¸üÐÂ"
 
-#: ../../index.php:41
-msgid "Welcome to"
-msgstr "»¶Ó­À´µ½"
+#: ../../playlist.php:139
+msgid " has been updated"
+msgstr ""
 
-#: ../../index.php:43
-msgid "you are currently logged in as"
-msgstr "ÄãµÇÂ¼ÎªÓÃ»§"
+#: ../../flag.php:38
+msgid "Flagging song completed."
+msgstr "±ê¼ÇÍê³É"
 
 #: ../../user.php:45
 msgid "Error: Password Does Not Match or Empty"
@@ -1065,10 +1392,6 @@
 msgid "Error: Insufficient Rights"
 msgstr "´íÎó£ºÃ»ÓÐ×ã¹»È¨ÏÞ"
 
-#: ../../flag.php:35
-msgid "Flagging song completed."
-msgstr "±ê¼ÇÍê³É"
-
 #: ../../albums.php:44
 msgid "Album Art Cleared"
 msgstr "¸èÇú¸èÊÖ±»É¾³ý"
@@ -1077,35 +1400,104 @@
 msgid "Album Art information has been removed form the database"
 msgstr "¸èÇú¸èÊÖÐÅÏ¢±»´ÓÊý¾Ý¿âÏû³ý"
 
-#: ../../albums.php:78
-msgid "Album Art Located"
-msgstr "ÕÒµ½¸èÇú¸èÊÖÐÅÏ¢"
-
-#: ../../albums.php:78
-msgid ""
-"Album Art information has been located in Amazon. If incorrect, click "
-"\"Reset Album Art\" below to remove the artwork."
-msgstr "ÔÚAmazonÕÒµ½¸èÇú¸èÊÖÐÅÏ¢¡£Èç¹ûÕýÈ·£¬Çë°´ÏÂÃæµÄ\"ÖØÖÃ¸èÇú¸èÊÖ\""
-
-#: ../../albums.php:86 ../../albums.php:96
-msgid "Get Art"
-msgstr "»ñÈ¡¸èÊÖÐÅÏ¢"
+#: ../../albums.php:74
+msgid "No Amazon Developer Key set, amazon album art searching will not work"
+msgstr ""
 
-#: ../../albums.php:90
+#: ../../albums.php:104
 msgid "Album Art Not Located"
 msgstr "ÕÒ²»µ½¸èÇú¸èÊÖÐÅÏ¢"
 
-#: ../../albums.php:90
+#: ../../albums.php:104
 msgid ""
 "Album Art could not be located at this time. This may be due to Amazon being "
 "busy, or the album not being present in their collection."
 msgstr "ÏÖÔÚÎÞ·¨ÕÒµ½¸èÇú¸èÊÖÐÅÏ¢¡£"
 
-#: ../../albums.php:127 ../../albums.php:133 ../../albums.php:140
-#: ../../albums.php:145 ../../albums.php:150
+#: ../../albums.php:137
 #, fuzzy
-msgid "Show Albums starting with"
-msgstr "<u>S</u>Ö»ÏÔÊ¾ÈçÏÂ¿ªÍ·µÄ×¨¼­£º"
+msgid "Album Art Inserted"
+msgstr "¸èÇú¸èÊÖ±»É¾³ý"
+
+#: ../../ratings.php:33
+#, fuzzy
+msgid "Rating Updated"
+msgstr "¿ìËÙ¸üÐÂ"
+
+#: ../../ratings.php:33
+msgid "Your rating for this object has been updated"
+msgstr ""
+
+#: ../../register.php:79
+#, fuzzy
+msgid "Error Captcha Required"
+msgstr "´íÎó£ºÇëÊäÈëÓÃ»§Ãû"
+
+#: ../../register.php:86
+msgid "Error Captcha Failed"
+msgstr ""
+
+#: ../../register.php:93
+msgid "You <U>must</U> accept the user agreement"
+msgstr ""
+
+#: ../../register.php:98
+msgid "You did not enter a username"
+msgstr ""
+
+#: ../../register.php:102
+msgid "Please fill in your full name (Firstname Lastname)"
+msgstr ""
+
+#: ../../register.php:128
+#, fuzzy
+msgid "You must enter a password"
+msgstr "ÊäÈëÃÜÂë"
+
+#: ../../register.php:132
+#, fuzzy
+msgid "Your passwords do not match"
+msgstr "´íÎó£ºÃÜÂë²»Æ¥Åä"
+
+#: ../../register.php:150
+#, fuzzy
+msgid "Error: Insert Failed"
+msgstr "´íÎó£ºÃ»ÓÐ×ã¹»È¨ÏÞ"
+
+#: ../../register.php:165
+msgid "Registration Complete"
+msgstr ""
+
+#: ../../activate.php:42
+msgid "No user with this name registered"
+msgstr ""
+
+#: ../../activate.php:46
+msgid "The validation key used isn't correct."
+msgstr ""
+
+#: ../../activate.php:51
+#, fuzzy
+msgid "User activated"
+msgstr "ÓÃ»§ÒÑÉ¾³ý"
+
+#: ../../activate.php:51
+msgid "This User ID is activated and can be used"
+msgstr ""
+
+#: ../../bin/print_tags.php.inc:42
+msgid ""
+"[print_tags.php.inc]\n"
+"This commandline script will display the tag information for the specified "
+"filename as it will \n"
+"appear to Ampache. \n"
+"        \n"
+msgstr ""
+
+#: ../../bin/print_tags.php.inc:48
+#, fuzzy
+msgid "Filename:"
+msgstr "ÎÄ¼þÃû"
 
 #: ../../bin/quarantine_migration.php.inc:49
 #, fuzzy
@@ -1170,19 +1562,138 @@
 msgid "!\n"
 msgstr ""
 
+#: ../../templates/show_admin_index.inc:27
+#, fuzzy
+msgid "User Management"
+msgstr "ÓÃ»§Ãû"
+
+#: ../../templates/show_admin_index.inc:28
+msgid "E-mail Management"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:29
+#, fuzzy
+msgid "Catalog Managment"
+msgstr "Çú¿âÃû"
+
+#: ../../templates/show_admin_index.inc:30
+msgid "Admin Preferences"
+msgstr "¹ÜÀíÔ±ÉèÖÃ"
+
+#: ../../templates/show_admin_index.inc:31 ../../templates/catalog.inc:95
+msgid "Access Lists"
+msgstr "·ÃÎÊ¿ØÖÆÁÐ±í"
+
+#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:94
+msgid "Add a catalog"
+msgstr "Ìí¼ÓÇú¿â"
+
+#: ../../templates/show_admin_index.inc:35 ../../templates/catalog.inc:99
+msgid "Clear Now Playing"
+msgstr "Çå³ýÕýÔÚ²¥·ÅÐÅÏ¢"
+
+#: ../../templates/show_admin_index.inc:36
+#, fuzzy
+msgid "Add Access List Entry"
+msgstr "·ÃÎÊ¿ØÖÆÁÐ±í"
+
+#: ../../templates/show_admin_index.inc:40
+msgid "Common Functions"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:43
+#, fuzzy
+msgid "Admin Sections"
+msgstr "¹ÜÀíÇø"
+
+#: ../../templates/show_uploads.inc:33
+#, fuzzy
+msgid "Status"
+msgstr "×´Ì¬"
+
+#: ../../templates/show_uploads.inc:34 ../../templates/flag.inc:58
+#: ../../templates/list_flagged.inc:41 ../../templates/list_duplicates.inc:32
+msgid "Song"
+msgstr "¸èÇú"
+
+#: ../../templates/show_uploads.inc:40 ../../templates/show_songs.inc:46
+#: ../../templates/list_duplicates.inc:37
+msgid "Size"
+msgstr "´óÐ¡"
+
+#: ../../templates/show_uploads.inc:42
+msgid "User"
+msgstr "ÓÃ»§"
+
+#: ../../templates/show_uploads.inc:43
+msgid "Date"
+msgstr "ÈÕÆÚ"
+
+#: ../../templates/show_uploads.inc:49
+msgid "Add"
+msgstr "Ìí¼Ó"
+
+#: ../../templates/show_mpdpl.inc:43
+#, fuzzy
+msgid "MPD Server Playlist"
+msgstr "·þÎñÆ÷²¥·ÅÁÐ±í"
+
+#: ../../templates/show_mpdpl.inc:45 ../../templates/show_mpdpl.inc:175
+msgid "Refresh the Playlist Window"
+msgstr "Ë¢ÐÂÁÐ±í´°¿Ú"
+
+#: ../../templates/show_mpdpl.inc:47 ../../templates/show_mpdpl.inc:177
+msgid "Click to shuffle (randomize) the playlist"
+msgstr "µã»÷Ëæ»ú£¨ÂÒÐò£©²¥·ÅÁÐ±í"
+
+#: ../../templates/show_mpdpl.inc:47 ../../templates/show_mpdpl.inc:177
+msgid "shuffle"
+msgstr "ÂÒÐò"
+
+#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:178
+#, fuzzy
+msgid "Click to the clear the playlist"
+msgstr "µã»÷Çå³ý²¥·ÅÁÐ±í"
+
+#: ../../templates/show_mpdpl.inc:52 ../../templates/show_mpdpl.inc:182
+msgid "Click to the remove all except the Now Playing"
+msgstr ""
+
+#: ../../templates/show_mpdpl.inc:62 ../../templates/show_songs.inc:41
+msgid "Song title"
+msgstr "¸èÇúÃû"
+
+#: ../../templates/flag.inc:43
+msgid "Flag song"
+msgstr "±ê¼Ç¸èÇú"
+
+#: ../../templates/flag.inc:45
+msgid ""
+"Flag the following song as having one of the problems listed below.  Site "
+"admins will then take the appropriate action for the flagged files."
+msgstr "°ÑÏÂÃæµÄ¸èÇú±ê¼Ç³ÉÄ³¸öÈçÏÂÁÐ±íÏÔÊ¾µÄÎÊÌâÖ®Ò»£¬ÒÔ±ã¹ÜÀíÔ±²ÉÈ¡ÏàÓ¦¶¯×÷¡£"
+
+#: ../../templates/flag.inc:62
+msgid "Reason to flag"
+msgstr "±ê¼ÇÔ­Òò"
+
+#: ../../templates/flag.inc:73
+msgid "Flag Song"
+msgstr "±ê¼Ç¸èÇú"
+
 #: ../../templates/customize_catalog.inc:24
 msgid "Settings for catalog in"
 msgstr "Çú¿âÉèÖÃÔÚ"
 
-#: ../../templates/customize_catalog.inc:32 ../../templates/add_catalog.inc:39
+#: ../../templates/customize_catalog.inc:32 ../../templates/add_catalog.inc:40
 msgid "Auto-inserted Fields"
 msgstr "×Ô¶¯Ìí¼ÓµÄ×Ö¶Î"
 
-#: ../../templates/customize_catalog.inc:33 ../../templates/add_catalog.inc:40
+#: ../../templates/customize_catalog.inc:33 ../../templates/add_catalog.inc:41
 msgid "album name"
 msgstr "×¨¼­Ãû"
 
-#: ../../templates/customize_catalog.inc:34 ../../templates/add_catalog.inc:41
+#: ../../templates/customize_catalog.inc:34 ../../templates/add_catalog.inc:42
 msgid "artist name"
 msgstr "¸èÊÖÃû"
 
@@ -1190,27 +1701,27 @@
 msgid "catalog path"
 msgstr "Çú¿âÂ·¾¶"
 
-#: ../../templates/customize_catalog.inc:36 ../../templates/add_catalog.inc:42
+#: ../../templates/customize_catalog.inc:36 ../../templates/add_catalog.inc:43
 msgid "id3 comment"
 msgstr "id3 ËµÃ÷"
 
-#: ../../templates/customize_catalog.inc:37 ../../templates/add_catalog.inc:43
+#: ../../templates/customize_catalog.inc:37 ../../templates/add_catalog.inc:44
 msgid "genre"
 msgstr "ÀàÐÍ"
 
-#: ../../templates/customize_catalog.inc:38 ../../templates/add_catalog.inc:44
+#: ../../templates/customize_catalog.inc:38 ../../templates/add_catalog.inc:45
 msgid "track number (padded with leading 0)"
 msgstr "Òô¹ìºÅ£¨Ç°ÃæÓÃ0²¹×ã£©"
 
-#: ../../templates/customize_catalog.inc:39 ../../templates/add_catalog.inc:45
+#: ../../templates/customize_catalog.inc:39 ../../templates/add_catalog.inc:46
 msgid "song title"
 msgstr "¸èÇúÃû"
 
-#: ../../templates/customize_catalog.inc:40 ../../templates/add_catalog.inc:46
+#: ../../templates/customize_catalog.inc:40 ../../templates/add_catalog.inc:47
 msgid "year"
 msgstr "Äê´ú"
 
-#: ../../templates/customize_catalog.inc:41 ../../templates/add_catalog.inc:47
+#: ../../templates/customize_catalog.inc:41 ../../templates/add_catalog.inc:48
 msgid "other"
 msgstr "ÆäËû"
 
@@ -1222,11 +1733,11 @@
 msgid "Filename pattern"
 msgstr "ÎÄ¼þÄ£°å"
 
-#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:75
 msgid "Folder Pattern"
 msgstr "Ä¿Â¼Ä£°å"
 
-#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:75
 msgid "(no leading or ending '/')"
 msgstr "(¿ªÍ·ºÍ½áÊø²»Òª´ø'/')"
 
@@ -1234,51 +1745,6 @@
 msgid "Save Catalog Settings"
 msgstr "±£´æÇú¿âÉèÖÃÐÅÏ¢"
 
-#: ../../templates/show_admin_index.inc:27
-#, fuzzy
-msgid "User Management"
-msgstr "ÓÃ»§Ãû"
-
-#: ../../templates/show_admin_index.inc:28
-msgid "E-mail Management"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:29
-#, fuzzy
-msgid "Catalog Managment"
-msgstr "Çú¿âÃû"
-
-#: ../../templates/show_admin_index.inc:30 ../../templates/admin_menu.inc:36
-msgid "Admin Preferences"
-msgstr "¹ÜÀíÔ±ÉèÖÃ"
-
-#: ../../templates/show_admin_index.inc:31 ../../templates/catalog.inc:98
-#: ../../templates/admin_menu.inc:37
-msgid "Access Lists"
-msgstr "·ÃÎÊ¿ØÖÆÁÐ±í"
-
-#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:97
-msgid "Add a catalog"
-msgstr "Ìí¼ÓÇú¿â"
-
-#: ../../templates/show_admin_index.inc:35 ../../templates/catalog.inc:102
-msgid "Clear Now Playing"
-msgstr "Çå³ýÕýÔÚ²¥·ÅÐÅÏ¢"
-
-#: ../../templates/show_admin_index.inc:36
-#, fuzzy
-msgid "Add Access List Entry"
-msgstr "·ÃÎÊ¿ØÖÆÁÐ±í"
-
-#: ../../templates/show_admin_index.inc:40
-msgid "Common Functions"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:43
-#, fuzzy
-msgid "Admin Sections"
-msgstr "¹ÜÀíÇø"
-
 #: ../../templates/show_test.inc:29
 msgid "Ampache Debug"
 msgstr ""
@@ -1342,7 +1808,7 @@
 msgstr ""
 
 #: ../../templates/show_test.inc:116
-#: ../../templates/show_install_config.inc:87
+#: ../../templates/show_install_config.inc:88
 msgid "Ampache.cfg.php Exists"
 msgstr "Ampache.cfg.phpÒÑ´æÔÚ"
 
@@ -1354,7 +1820,7 @@
 msgstr ""
 
 #: ../../templates/show_test.inc:137
-#: ../../templates/show_install_config.inc:104
+#: ../../templates/show_install_config.inc:105
 msgid "Ampache.cfg.php Configured?"
 msgstr "Ampache.cfg.phpÒÑÅäÖÃ£¿"
 
@@ -1400,20 +1866,20 @@
 msgstr "²¥·Å"
 
 #: ../../templates/show_localplay.inc:39 ../../templates/list_header.inc:71
-#: ../../templates/show_mpdplay.inc:48
+#: ../../templates/show_mpdplay.inc:62
 msgid "Prev"
 msgstr "ºóÍË"
 
-#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:49
+#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:63
 msgid "Stop"
 msgstr "Í£Ö¹"
 
-#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:51
+#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:65
 msgid "Pause"
 msgstr "ÔÝÍ£"
 
 #: ../../templates/show_localplay.inc:43 ../../templates/list_header.inc:94
-#: ../../templates/show_mpdplay.inc:52
+#: ../../templates/show_mpdplay.inc:66
 msgid "Next"
 msgstr "Ç°½ø"
 
@@ -1433,7 +1899,7 @@
 msgid "Clear queue"
 msgstr "Çå³ý¶ÓÁÐ"
 
-#: ../../templates/add_catalog.inc:30
+#: ../../templates/add_catalog.inc:31
 msgid ""
 "In the form below enter either a local path (i.e. /data/music) or the URL to "
 "a remote Ampache installation (i.e http://theotherampache.com)"
@@ -1441,60 +1907,55 @@
 "ÇëÔÚÈçÏÂ±íµ¥ÀïÃæÌîÈë±¾µØÂ·¾¶£¨ÀýÈç /data/music£©£¬»òÕßÖ¸ÏòÔ¶³ÌAmpacheµÄÒ»¸ö"
 "URL£¨ÀýÈç http://theotherampache.com£©"
 
-#: ../../templates/add_catalog.inc:36
+#: ../../templates/add_catalog.inc:37
 msgid "Catalog Name"
 msgstr "Çú¿âÃû"
 
-#: ../../templates/add_catalog.inc:53
+#: ../../templates/add_catalog.inc:54
 msgid "Path"
 msgstr "Â·¾¶"
 
-#: ../../templates/add_catalog.inc:57
+#: ../../templates/add_catalog.inc:58
 msgid "Catalog Type"
 msgstr "Çú¿âÀàÐÍ"
 
-#: ../../templates/add_catalog.inc:61
+#: ../../templates/add_catalog.inc:62
 msgid "Remote"
 msgstr "Ô¶³Ì"
 
-#: ../../templates/add_catalog.inc:66
+#: ../../templates/add_catalog.inc:67
 msgid "ID3 Set Command"
 msgstr "ID3 ÉèÖÃÃüÁî"
 
-#: ../../templates/add_catalog.inc:70
+#: ../../templates/add_catalog.inc:71
 msgid "Filename Pattern"
 msgstr "ÎÄ¼þÄ£°å"
 
-#: ../../templates/add_catalog.inc:78 ../../templates/catalog.inc:104
+#: ../../templates/add_catalog.inc:79 ../../templates/catalog.inc:101
 msgid "Gather Album Art"
 msgstr "ËÑ¼¯¸èÇú¸èÊÖ"
 
-#: ../../templates/add_catalog.inc:82
+#: ../../templates/add_catalog.inc:83
 msgid "ID3V2 Tags"
 msgstr "ID3V2 ±ê¼Ç"
 
-#: ../../templates/add_catalog.inc:85
+#: ../../templates/add_catalog.inc:86
 msgid "Amazon"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:88
+#: ../../templates/add_catalog.inc:89
 msgid "File Folder"
 msgstr "ÎÄ¼þÄ¿Â¼"
 
-#: ../../templates/add_catalog.inc:95
+#: ../../templates/add_catalog.inc:96
 msgid "Build Playlists from m3u Files"
 msgstr "´Óm3uÎÄ¼þ½¨Á¢×Ô¶¨Òå²¥·ÅÁÐ±í"
 
-#: ../../templates/add_catalog.inc:102
+#: ../../templates/add_catalog.inc:103
 msgid "Add Catalog"
 msgstr "Ìí¼ÓÇú¿â"
 
-#: ../../templates/list_flagged.inc:41 ../../templates/flag.inc:58
-#: ../../templates/show_uploads.inc:34
-msgid "Song"
-msgstr "¸èÇú"
-
-#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:41
+#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:49
 msgid "Flag"
 msgstr "±ê¼Ç"
 
@@ -1518,29 +1979,29 @@
 msgid "Reject"
 msgstr "¾Ü¾ø"
 
-#: ../../templates/show_artists.inc:55 ../../templates/show_albums.inc:58
-#: ../../templates/show_random_play.inc:46
-msgid "All"
-msgstr "È«²¿"
-
-#: ../../templates/show_songs.inc:33 ../../templates/show_mpdpl.inc:62
-msgid "Song title"
-msgstr "¸èÇúÃû"
+#: ../../templates/header.inc:49
+#, fuzzy
+msgid "You are currently logged in as"
+msgstr "ÄãµÇÂ¼ÎªÓÃ»§"
 
-#: ../../templates/show_songs.inc:38 ../../templates/show_uploads.inc:40
-msgid "Size"
-msgstr "´óÐ¡"
+#: ../../templates/header.inc:58
+msgid "Go!"
+msgstr ""
 
-#: ../../templates/show_songs.inc:113
+#: ../../templates/show_songs.inc:143
 msgid "Direct Link"
 msgstr "Ö±½ÓÏÂÔØ"
 
-#: ../../templates/show_songs.inc:131
+#: ../../templates/show_songs.inc:166
 msgid "Total"
 msgstr "×Ü¹²"
 
+#: ../../templates/show_search_bar.inc:36 ../../templates/show_search.inc:54
+msgid "Search Ampache"
+msgstr "ËÑË÷"
+
 #: ../../templates/show_install_config.inc:41
-#: ../../templates/show_install.inc:40
+#: ../../templates/show_install.inc:41
 msgid ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
 "ampache.cfg.php.dist file"
@@ -1548,7 +2009,7 @@
 "ÄãµÄWWW·þÎñÆ÷ÄÜ¶ÁÈ¡/sql/ampache.sqlÎÄ¼þ£¬ÒÔ¼°/config/ampache.cfg.php.distÎÄ¼þ"
 
 #: ../../templates/show_install_config.inc:49
-#: ../../templates/show_install.inc:50
+#: ../../templates/show_install.inc:51
 msgid "Step 2 - Creating the Ampache.cfg.php file"
 msgstr "µÚ¶þ²½ - ´´½¨ampache.cfg.phpÅäÖÃÎÄ¼þ"
 
@@ -1561,89 +2022,69 @@
 "ÕâÒ»²½´´½¨»ù±¾ÅäÖÃÐÅÏ¢¡£»áÊ×ÏÈ³¢ÊÔÖ±½ÓÐ´µ½ÄãµÄWWW·þÎñÆ÷ÉÏ¡£Èç¹û·ÃÎÊ¾Ü¾ø£¬»áÌá"
 "Ê¾ÄãÏÂÔØÕâ¸öÅäÖÃÎÄ¼þ±£´æµ½/configÄ¿Â¼È¥¡£"
 
-#: ../../templates/show_install_config.inc:59
+#: ../../templates/show_install_config.inc:60
 msgid "Web Path"
 msgstr "ÍøÒ³Â·¾¶"
 
-#: ../../templates/show_install_config.inc:63
-#: ../../templates/show_install.inc:57
+#: ../../templates/show_install_config.inc:64
+#: ../../templates/show_install.inc:59
 msgid "Desired Database Name"
 msgstr "Êý¾Ý¿âÃû"
 
-#: ../../templates/show_install_config.inc:67
-#: ../../templates/show_install.inc:61
+#: ../../templates/show_install_config.inc:68
+#: ../../templates/show_install.inc:63
 msgid "MySQL Hostname"
 msgstr "MySQLÖ÷»ú"
 
-#: ../../templates/show_install_config.inc:71
+#: ../../templates/show_install_config.inc:72
 msgid "MySQL Username"
 msgstr "MySQLÓÃ»§"
 
-#: ../../templates/show_install_config.inc:75
+#: ../../templates/show_install_config.inc:76
 msgid "MySQL Password"
 msgstr "MySQLÃÜÂë"
 
-#: ../../templates/show_install_config.inc:80
+#: ../../templates/show_install_config.inc:81
 msgid "Write Config"
 msgstr "Ð´ÈëÅäÖÃ"
 
-#: ../../templates/show_install_config.inc:124
+#: ../../templates/show_install_config.inc:125
 msgid "Check for Config"
 msgstr "¼ì²éÅäÖÃ"
 
-#: ../../templates/show_album.inc:53
+#: ../../templates/show_album.inc:67
 msgid "Play Album"
 msgstr "²¥·Å×¨¼­"
 
-#: ../../templates/show_album.inc:54
+#: ../../templates/show_album.inc:68
 msgid "Play Random from Album"
 msgstr "Ëæ»ú´Ó×¨¼­²¥·Å"
 
-#: ../../templates/show_album.inc:55
+#: ../../templates/show_album.inc:69
 msgid "Reset Album Art"
 msgstr "ÖØÖÃ¸èÇú¸èÊÖ"
 
-#: ../../templates/show_album.inc:56
+#: ../../templates/show_album.inc:70
 msgid "Find Album Art"
 msgstr "²éÕÒ¸èÇú¸èÊÖ"
 
-#: ../../templates/show_album.inc:58 ../../templates/show_artist.inc:37
-msgid "Update from tags"
-msgstr "´Ó±ê¼Ç¸üÐÂ"
-
-#: ../../templates/show_preferences.inc:31
-msgid "Editing"
-msgstr "±à¼­ÖÐ"
-
-#: ../../templates/show_preferences.inc:31
-msgid "preferences"
-msgstr "ÉèÖÃ"
-
-#: ../../templates/show_preferences.inc:33
-msgid "Rebuild Preferences"
-msgstr "ÖØ½¨ÉèÖÃ"
-
-#: ../../templates/show_preferences.inc:39
-msgid "Preference"
-msgstr "ÉèÖÃ"
-
-#: ../../templates/show_preferences.inc:40
-msgid "Value"
-msgstr "Öµ"
-
 #: ../../templates/show_preferences.inc:42
-msgid "Type"
-msgstr "ÀàÐÍ"
+msgid "Editing"
+msgstr "±à¼­ÖÐ"
 
-#: ../../templates/show_preferences.inc:43
-msgid "Apply to All"
-msgstr "È«²¿Ó¦ÓÃ"
+#: ../../templates/show_preferences.inc:42
+msgid "preferences"
+msgstr "ÉèÖÃ"
 
-#: ../../templates/show_preferences.inc:83
+#: ../../templates/show_preferences.inc:44
+msgid "Rebuild Preferences"
+msgstr "ÖØ½¨ÉèÖÃ"
+
+#: ../../templates/show_preferences.inc:73
 msgid "Update Preferences"
 msgstr "¸üÐÂÉèÖÃ"
 
-#: ../../templates/show_preferences.inc:87
+#: ../../templates/show_preferences.inc:77
 msgid "Cancel"
 msgstr "È¡Ïû"
 
@@ -1667,7 +2108,35 @@
 msgid "Update User"
 msgstr "¸üÐÂÓÃ»§"
 
-#: ../../templates/show_install.inc:48
+#: ../../templates/show_random_play.inc:34
+msgid "Item count"
+msgstr "ÊýÁ¿"
+
+#: ../../templates/show_random_play.inc:49
+msgid "From genre"
+msgstr "ÀàÐÍ"
+
+#: ../../templates/show_random_play.inc:58
+msgid "Standard"
+msgstr ""
+
+#: ../../templates/show_random_play.inc:59
+msgid "Favor Unplayed"
+msgstr "Ã»²¥·Å¹ýµÄÓÅÏÈ"
+
+#: ../../templates/show_random_play.inc:61
+msgid "Full Artist"
+msgstr "È«²¿¸èÊÖ"
+
+#: ../../templates/show_random_play.inc:66
+msgid "from catalog"
+msgstr "Çú¿â"
+
+#: ../../templates/show_random_play.inc:75
+msgid "Play Random Songs"
+msgstr "Ëæ»ú²¥·Å"
+
+#: ../../templates/show_install.inc:49
 msgid ""
 "This step creates and inserts the Ampache database, as such please provide a "
 "mysql account with database creation rights. This step may take a while "
@@ -1676,35 +2145,30 @@
 "ÕâÒ»²½´´½¨AmpacheÊý¾Ý¿â²¢³õÊ¼»¯Êý¾Ý¡£ÇëÌá¹©Ò»¸öÓÐ½¨Á¢Êý¾Ý¿âÈ¨ÏÞµÄMySQLÕÊºÅ¡£"
 "ÕâÒ»²½¿ÉÄÜ»áÐèÒª±È½Ï³¤Ò»¶ÎÊ±¼ä£¬¾Í¿´Äã»úÆ÷¿ì²»¿ìÁË"
 
-#: ../../templates/show_install.inc:65
+#: ../../templates/show_install.inc:67
 msgid "MySQL Administrative Username"
 msgstr "MySQL¹ÜÀíÓÃ»§Ãû"
 
-#: ../../templates/show_install.inc:69
+#: ../../templates/show_install.inc:71
 msgid "MySQL Administrative Password"
 msgstr "MySQL¹ÜÀíÓÃ»§ÃÜÂë"
 
-#: ../../templates/show_install.inc:74
-msgid "Insert Database"
-msgstr "Ìí¼ÓÊý¾Ý¿â"
-
-#: ../../templates/flag.inc:43
-msgid "Flag song"
-msgstr "±ê¼Ç¸èÇú"
+#: ../../templates/show_install.inc:75
+msgid "Create Database User for New Database"
+msgstr ""
 
-#: ../../templates/flag.inc:45
-msgid ""
-"Flag the following song as having one of the problems listed below.  Site "
-"admins will then take the appropriate action for the flagged files."
-msgstr "°ÑÏÂÃæµÄ¸èÇú±ê¼Ç³ÉÄ³¸öÈçÏÂÁÐ±íÏÔÊ¾µÄÎÊÌâÖ®Ò»£¬ÒÔ±ã¹ÜÀíÔ±²ÉÈ¡ÏàÓ¦¶¯×÷¡£"
+#: ../../templates/show_install.inc:80
+#, fuzzy
+msgid "Ampache Database Username"
+msgstr "Êý¾Ý¿âÃû"
 
-#: ../../templates/flag.inc:62
-msgid "Reason to flag"
-msgstr "±ê¼ÇÔ­Òò"
+#: ../../templates/show_install.inc:84
+msgid "Ampache Database User Password"
+msgstr ""
 
-#: ../../templates/flag.inc:73
-msgid "Flag Song"
-msgstr "±ê¼Ç¸èÇú"
+#: ../../templates/show_install.inc:89
+msgid "Insert Database"
+msgstr "Ìí¼ÓÊý¾Ý¿â"
 
 #: ../../templates/show_add_access.inc:31
 msgid "Add Access for a Host"
@@ -1733,98 +2197,62 @@
 msgid "Add Host"
 msgstr "Ìí¼ÓÖ÷»ú"
 
-#: ../../templates/catalog.inc:33
+#: ../../templates/catalog.inc:30
 msgid ""
 "Error: ICONV not found, ID3V2 Tags will not import correctly. See <a href="
 "\"http://php.oregonstate.edu/iconv\">Iconv</a> for information on getting "
 "ICONV"
 msgstr ""
 
-#: ../../templates/catalog.inc:42
+#: ../../templates/catalog.inc:39
 msgid "Update Catalogs"
 msgstr "¸üÐÂÇú¿â"
 
-#: ../../templates/catalog.inc:68
+#: ../../templates/catalog.inc:65
 msgid "Fast Add"
 msgstr "¿ìËÙÌí¼Ó"
 
-#: ../../templates/catalog.inc:75
+#: ../../templates/catalog.inc:72
 msgid "Fast Update"
 msgstr "¿ìËÙ¸üÐÂ"
 
-#: ../../templates/catalog.inc:88
+#: ../../templates/catalog.inc:85
 msgid "You don't have any catalogs."
 msgstr "ÄãÃ»ÓÐÈÎºÎÇú¿â"
 
-#: ../../templates/catalog.inc:99
+#: ../../templates/catalog.inc:96
 msgid "Show Duplicate Songs"
 msgstr "ÏÔÊ¾ÖØ¸´µÄ¸èÇú"
 
-#: ../../templates/catalog.inc:100
+#: ../../templates/catalog.inc:97
 msgid "Show Disabled Songs"
 msgstr "ÏÔÊ¾±»½ûÖ¹µÄ¸èÇú"
 
-#: ../../templates/catalog.inc:101
+#: ../../templates/catalog.inc:98
 msgid "Clear Catalog Stats"
 msgstr "Çå³ýÇú¿âÍ³¼ÆÐÅÏ¢"
 
-#: ../../templates/catalog.inc:103
+#: ../../templates/catalog.inc:100
 msgid "Dump Album Art"
 msgstr "É¾³ý¸èÇú¸èÊÖ"
 
-#: ../../templates/catalog.inc:105
+#: ../../templates/catalog.inc:102
 msgid "View flagged songs"
 msgstr "ÏÔÊ¾ÒÑ±ê¼ÇµÄ¸èÇú"
 
-#: ../../templates/catalog.inc:106
+#: ../../templates/catalog.inc:103
 msgid "Catalog Tools"
 msgstr "Çú¿â¹¤¾ß"
 
-#: ../../templates/admin_menu.inc:33
-msgid "Users"
-msgstr "ÓÃ»§"
-
-#: ../../templates/admin_menu.inc:34
-msgid "Mail Users"
-msgstr "ÏòÓÃ»§·¢ËÍÓÊ¼þ"
-
-#: ../../templates/menu.inc:29
-msgid "Home"
-msgstr "Ê×Ò³"
-
-#: ../../templates/menu.inc:32
-msgid "Local Play"
-msgstr "±¾µØ²¥·Å"
-
-#: ../../templates/menu.inc:38
-msgid "Playlists"
-msgstr "×Ô¶¨ÒåÎÄ¼þÁÐ±í"
-
-#: ../../templates/menu.inc:40
-msgid "Preferences"
-msgstr "ÉèÖÃ"
-
-#: ../../templates/menu.inc:43 ../../templates/show_upload.inc:73
-msgid "Upload"
-msgstr "ÉÏ´«"
-
-#: ../../templates/menu.inc:63 ../../templates/menu.inc:66
-msgid "Admin"
-msgstr "¹ÜÀí"
-
 #: ../../templates/menu.inc:73 ../../templates/menu.inc:79
 msgid "Account"
 msgstr "ÕÊºÅ"
 
 #: ../../templates/menu.inc:74 ../../templates/menu.inc:80
+#: ../../templates/show_users.inc:64 ../../templates/show_users.inc:112
 msgid "Stats"
 msgstr "×´Ì¬"
 
-#: ../../templates/menu.inc:75 ../../templates/menu.inc:81
-#: ../../templates/menu.inc:85
-msgid "Logout"
-msgstr "ÍË³ö"
-
 #: ../../templates/show_upload.inc:30
 msgid "Uploading Music to Ampache"
 msgstr ""
@@ -1837,9 +2265,54 @@
 msgid "max_upload_size"
 msgstr ""
 
-#: ../../templates/show_now_playing.inc:31
-msgid "Now Playing"
-msgstr "ÕýÔÚ²¥·Å"
+#: ../../templates/show_users.inc:40
+msgid "Fullname"
+msgstr "È«Ãû"
+
+#: ../../templates/show_users.inc:48
+msgid "Last Seen"
+msgstr "×îºóÒ»´Î"
+
+#: ../../templates/show_users.inc:53
+#, fuzzy
+msgid "Registration Date"
+msgstr "×¢²áÓÃ»§"
+
+#: ../../templates/show_users.inc:61 ../../templates/show_users.inc:107
+msgid "Prefs"
+msgstr "ÉèÖÃ"
+
+#: ../../templates/show_users.inc:67
+msgid "Access"
+msgstr "È¨ÏÞ"
+
+#: ../../templates/show_users.inc:73
+msgid "On-line"
+msgstr "ÔÚÏß"
+
+#: ../../templates/show_users.inc:126
+msgid "delete"
+msgstr "É¾³ý"
+
+#: ../../templates/list_duplicates.inc:28
+#, fuzzy
+msgid "Duplicate Songs"
+msgstr "ÏÔÊ¾ÖØ¸´µÄ¸èÇú"
+
+#: ../../templates/list_duplicates.inc:35
+msgid "Length"
+msgstr ""
+
+#: ../../templates/list_duplicates.inc:74
+msgid "You don"
+msgstr ""
+
+#: ../../templates/list_duplicates.inc:74
+msgid ""
+"); ?></p>\n"
+"<?php  } ?>\n"
+"</form>\n"
+msgstr ""
 
 #: ../../templates/show_login_form.inc:49
 #: ../../templates/show_login_form.inc:63
@@ -1850,6 +2323,11 @@
 msgid "Remember Me"
 msgstr "µÇÂ¼±£ÁôÖ±µ½¹Ø±Õ"
 
+#: ../../templates/show_login_form.inc:72
+#, fuzzy
+msgid "Register"
+msgstr "×¢²áÓÃ»§"
+
 #: ../../templates/show_access_list.inc:34
 msgid "Host Access to Your Catalog"
 msgstr "Çú¿â·ÃÎÊÈ¨ÏÞ"
@@ -1870,181 +2348,177 @@
 msgid "Revoke"
 msgstr "ÊÕ»Ø"
 
-#: ../../templates/show_users.inc:43
-msgid "Fullname"
-msgstr "È«Ãû"
-
-#: ../../templates/show_users.inc:48
-msgid "Last Seen"
-msgstr "×îºóÒ»´Î"
-
-#: ../../templates/show_users.inc:55 ../../templates/show_users.inc:91
-msgid "Prefs"
-msgstr "ÉèÖÃ"
-
-#: ../../templates/show_users.inc:58
-msgid "Access"
-msgstr "È¨ÏÞ"
-
-#: ../../templates/show_users.inc:64
-msgid "On-line"
-msgstr "ÔÚÏß"
+#: ../../templates/show_search.inc:57
+msgid "Keywords"
+msgstr ""
 
-#: ../../templates/show_users.inc:105
-msgid "delete"
-msgstr "É¾³ý"
+#: ../../templates/show_search.inc:102
+#, fuzzy
+msgid "Played"
+msgstr "²¥·Å"
 
-#: ../../templates/show_search.inc:34 ../../templates/show_search_bar.inc:36
-msgid "Search Ampache"
-msgstr "ËÑË÷"
+#: ../../templates/show_search.inc:110
+#, fuzzy
+msgid "Min Bitrate"
+msgstr "ÂëÂÊ"
 
-#: ../../templates/show_search.inc:41
+#: ../../templates/show_search.inc:132
 msgid "Object Type"
 msgstr "Ä¿±êÀàÐÍ"
 
-#: ../../templates/show_artist.inc:31
-msgid "Albums by"
-msgstr "×¨¼­"
+#: ../../templates/show_search.inc:138
+#, fuzzy
+msgid "Genres"
+msgstr "Àà±ð"
 
-#: ../../templates/show_artist.inc:33
-msgid "Show All Songs By"
-msgstr "ÏÔÊ¾ËùÓÐ¸èÇú"
+#: ../../templates/show_search.inc:141
+msgid "Operator"
+msgstr ""
 
-#: ../../templates/show_artist.inc:34
-msgid "Play All Songs By"
-msgstr "²¥·ÅËùÓÐ¸èÇú"
+#: ../../templates/show_search.inc:145
+msgid "AND"
+msgstr ""
 
-#: ../../templates/show_artist.inc:35
-msgid "Play Random Songs By"
-msgstr "Ëæ»ú²¥·Å¸èÇú"
+#: ../../templates/show_search.inc:150
+#, fuzzy
+msgid "Method"
+msgstr "Ä£Ê½"
 
-#: ../../templates/show_artist.inc:49
-msgid "Select"
-msgstr "Ñ¡Ôñ"
+#: ../../templates/show_search.inc:153
+msgid "Fuzzy"
+msgstr ""
 
-#: ../../templates/show_artist.inc:51
-msgid "Cover"
-msgstr "·âÃæ"
+#: ../../templates/show_search.inc:154
+msgid "Exact"
+msgstr ""
 
-#: ../../templates/show_artist.inc:52
-msgid "Album Name"
-msgstr "×¨¼­Ãû"
+#: ../../templates/show_search.inc:157
+msgid "Maxium Results"
+msgstr ""
 
-#: ../../templates/show_artist.inc:53
-msgid "Album Year"
-msgstr "×¨¼­Äê´ú"
+#: ../../templates/show_search.inc:160
+msgid "Unlimited"
+msgstr ""
 
-#: ../../templates/show_artist.inc:54
-msgid "Total Tracks"
-msgstr "×ÜÒô¹ìÊý"
+#: ../../templates/show_search.inc:172
+msgid "Reset Form"
+msgstr ""
+
+#: ../../templates/show_search.inc:184
+msgid "Save Search As Track on"
+msgstr ""
 
-#: ../../templates/show_mpdplay.inc:38
+#: ../../templates/show_search.inc:186
+msgid "Save"
+msgstr ""
+
+#: ../../templates/show_mpdplay.inc:39
 msgid "MPD Play Control"
 msgstr "MPD²¥·Å¿ØÖÆ"
 
-#: ../../templates/show_mpdplay.inc:71
+#: ../../templates/show_mpdplay.inc:100
 msgid "Loop"
 msgstr "Ñ­»·"
 
-#: ../../templates/show_mpdplay.inc:78 ../../templates/show_mpdplay.inc:91
+#: ../../templates/show_mpdplay.inc:107 ../../templates/show_mpdplay.inc:120
 msgid "On"
 msgstr "¿ª"
 
-#: ../../templates/show_mpdplay.inc:79 ../../templates/show_mpdplay.inc:92
+#: ../../templates/show_mpdplay.inc:108 ../../templates/show_mpdplay.inc:121
 msgid "Off"
 msgstr "¹Ø"
 
-#: ../../templates/show_mpdplay.inc:114
+#: ../../templates/show_mpdplay.inc:134
 #, fuzzy
 msgid "Now Playing :"
 msgstr "ÕýÔÚ²¥·Å"
 
-#: ../../templates/show_mpdplay.inc:138
+#: ../../templates/show_mpdplay.inc:163
 msgid "On Deck "
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:138
+#: ../../templates/show_mpdplay.inc:163
 msgid "(in "
 msgstr ""
 
-#: ../../templates/show_mpdpl.inc:45
-#, fuzzy
-msgid "MPD Server Playlist"
-msgstr "·þÎñÆ÷²¥·ÅÁÐ±í"
+#: ../../templates/show_artist.inc:36
+msgid "Select"
+msgstr "Ñ¡Ôñ"
 
-#: ../../templates/show_mpdpl.inc:46 ../../templates/show_mpdpl.inc:184
-msgid "Refresh the Playlist Window"
-msgstr "Ë¢ÐÂÁÐ±í´°¿Ú"
+#: ../../templates/show_artist.inc:38
+msgid "Cover"
+msgstr "·âÃæ"
 
-#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:189
-msgid "Click to shuffle (randomize) the playlist"
-msgstr "µã»÷Ëæ»ú£¨ÂÒÐò£©²¥·ÅÁÐ±í"
+#: ../../templates/show_artist.inc:39
+msgid "Album Name"
+msgstr "×¨¼­Ãû"
 
-#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:189
-msgid "shuffle"
-msgstr "ÂÒÐò"
+#: ../../templates/show_artist.inc:40
+msgid "Album Year"
+msgstr "×¨¼­Äê´ú"
 
-#: ../../templates/show_mpdpl.inc:49 ../../templates/show_mpdpl.inc:190
+#: ../../templates/show_artist.inc:41
+msgid "Total Tracks"
+msgstr "×ÜÒô¹ìÊý"
+
+#: ../../templates/show_big_art.inc:31
 #, fuzzy
-msgid "Click to the clear the playlist"
-msgstr "µã»÷Çå³ý²¥·ÅÁÐ±í"
+msgid "Album Art"
+msgstr "²éÕÒ¸èÇú¸èÊÖ"
 
-#: ../../templates/show_mpdpl.inc:53 ../../templates/show_mpdpl.inc:194
-msgid "Click to the remove all except the Now Playing"
+#: ../../templates/show_big_art.inc:35
+msgid "Click to close window"
 msgstr ""
 
-#: ../../templates/show_uploads.inc:33
-#, fuzzy
-msgid "Status"
-msgstr "×´Ì¬"
+#~ msgid "No Results Found"
+#~ msgstr "Ã»ÓÐÕÒµ½"
 
-#: ../../templates/show_uploads.inc:42
-msgid "User"
-msgstr "ÓÃ»§"
+#~ msgid "New"
+#~ msgstr "ÐÂ½¨"
 
-#: ../../templates/show_uploads.inc:43
-msgid "Date"
-msgstr "ÈÕÆÚ"
+#~ msgid "View All"
+#~ msgstr "È«²¿ÏÔÊ¾"
 
-#: ../../templates/show_uploads.inc:49
-msgid "Add"
-msgstr "Ìí¼Ó"
+#~ msgid "Import"
+#~ msgstr "µ¼Èë"
 
-#: ../../templates/show_random_play.inc:28
-msgid "Play Random Selection"
-msgstr "Ëæ»ú²¥·Å"
+#~ msgid "Public"
+#~ msgstr "¹«¿ª"
 
-#: ../../templates/show_random_play.inc:34
-msgid "Item count"
-msgstr "ÊýÁ¿"
+#~ msgid "Your Private"
+#~ msgstr "Ë½ÈË"
 
-#: ../../templates/show_random_play.inc:49
-msgid "From genre"
-msgstr "ÀàÐÍ"
+#~ msgid "Other Private"
+#~ msgstr "ÆäËû"
 
-#: ../../templates/show_random_play.inc:58
-msgid "Standard"
-msgstr ""
+#~ msgid "There are no playlists of this type"
+#~ msgstr "Ã»ÓÐ×Ô¶¨Òå²¥·ÅÁÐ±í"
 
-#: ../../templates/show_random_play.inc:59
-msgid "Favor Unplayed"
-msgstr "Ã»²¥·Å¹ýµÄÓÅÏÈ"
+#~ msgid "All songs by"
+#~ msgstr "È«²¿¸èÇú"
 
-#: ../../templates/show_random_play.inc:60
-msgid "Full Albums"
-msgstr "È«²¿×¨¼­"
+#~ msgid "owned by"
+#~ msgstr "ËùÓÐÕß "
 
-#: ../../templates/show_random_play.inc:61
-msgid "Full Artist"
-msgstr "È«²¿¸èÊÖ"
+#~ msgid "Edit Playlist"
+#~ msgstr "±à¼­×Ô¶¨Òå²¥·ÅÁÐ±í"
 
-#: ../../templates/show_random_play.inc:66
-msgid "from catalog"
-msgstr "Çú¿â"
+#~ msgid "Play Random"
+#~ msgstr "Ëæ»ú²¥·Å"
 
-#: ../../templates/show_random_play.inc:75
-msgid "Play Random Songs"
-msgstr "Ëæ»ú²¥·Å"
+#~ msgid "Welcome to"
+#~ msgstr "»¶Ó­À´µ½"
+
+#~ msgid "Album Art Located"
+#~ msgstr "ÕÒµ½¸èÇú¸èÊÖÐÅÏ¢"
+
+#~ msgid ""
+#~ "Album Art information has been located in Amazon. If incorrect, click "
+#~ "\"Reset Album Art\" below to remove the artwork."
+#~ msgstr "ÔÚAmazonÕÒµ½¸èÇú¸èÊÖÐÅÏ¢¡£Èç¹ûÕýÈ·£¬Çë°´ÏÂÃæµÄ\"ÖØÖÃ¸èÇú¸èÊÖ\""
+
+#~ msgid "Type"
+#~ msgstr "ÀàÐÍ"
 
 #~ msgid "<u>S</u>how all albums"
 #~ msgstr "<u>S</u>ÏÔÊ¾ËùÓÐ×¨¼­"
@@ -2061,9 +2535,6 @@
 #~ msgid "Successfully-Cataloged"
 #~ msgstr "³É¹¦£­¼ÓÈëÇú¿â"
 
-#~ msgid "Unknown"
-#~ msgstr "Î´Öª"
-
 #~ msgid "Quarantined"
 #~ msgstr "¸ôÀë"
 
diff -urN ampache-3.3.2-alpha4/localplay.php ampache-3.3.2-beta1/localplay.php
--- ampache-3.3.2-alpha4/localplay.php	2005-12-27 01:33:03.000000000 -0800
+++ ampache-3.3.2-beta1/localplay.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2004 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/login.php ampache-3.3.2-beta1/login.php
--- ampache-3.3.2-alpha4/login.php	2005-12-27 01:33:03.000000000 -0800
+++ ampache-3.3.2-beta1/login.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,6 +1,9 @@
 <?php
 /*
 
+ Copyright (c) 2001 - 2006 Ampache.org
+ All Rights Reserved
+
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
  as published by the Free Software Foundation; either version 2
@@ -77,6 +80,7 @@
 		!strstr($_POST['referrer'],"install.php") AND 
 		!strstr($_POST['referrer'],"login.php") AND 
 		!strstr($_POST['referrer'],"update.php") AND
+		!strstr($_POST['referrer'],"activate.php") AND
 		!strstr($_POST['referrer'],"admin")) { 
 		
 			header("Location: " . $_POST['referrer']);
diff -urN ampache-3.3.2-alpha4/logout.php ampache-3.3.2-beta1/logout.php
--- ampache-3.3.2-alpha4/logout.php	2005-12-27 01:33:03.000000000 -0800
+++ ampache-3.3.2-beta1/logout.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,16 +1,32 @@
 <?php 
+/*
+
+ Copyright (c) 2001 - 2006 Ampache.org
+ All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+/**
+ * Logout
+ * This is the logout page, it kills any cookies you have in your browser kills
+ * your session in the database and then redirects you to the login page
+ */
+
 require_once("modules/init.php");
 // To end a legitimate session, just call logout.
 setcookie("amp_longsess","",null); 
 logout();
 ?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<title>Sample logout page</title>
-</head>
-<body>
-Congrats, you are logged out.
-<br /><a href="./login.php">login</a>
-</body></html>
diff -urN ampache-3.3.2-alpha4/modules/captcha/captcha.php ampache-3.3.2-beta1/modules/captcha/captcha.php
--- ampache-3.3.2-alpha4/modules/captcha/captcha.php	1969-12-31 16:00:00.000000000 -0800
+++ ampache-3.3.2-beta1/modules/captcha/captcha.php	2006-01-08 23:06:18.000000000 -0800
@@ -0,0 +1,303 @@
+<?php
+/*
+   Does emit a CAPTCHA graphic and form fields, which allows to tell real
+   people from bots.
+   Though a textual description is generated as well, this sort of access
+   restriction will knock out visually impaired users, and frustrate all
+   others anyhow. Therefore this should only be used as last resort for
+   defending against spambots. Because of the readable text and the used
+   colorspaces this is a weak implementation, not completely OCR-secure.
+
+   captcha::form() will return a html string to be inserted into textarea/
+   [save] <forms> and alike. User input is veryfied with captcha::check().
+   You should leave the sample COLLEGE.ttf next to this script, else you
+   have to define the _FONT_DIR constant correctly. Use only one type.
+
+   Includes a sluggish workaround for Internet Explorer; but this script
+   must reside in a www-accessible directory then.
+   Public Domain, available via http://freshmeat.net/p/captchaphp
+*/
+
+
+#-- config
+define("EWIKI_FONT_DIR", dirname(__FILE__));  // which fonts to use
+define("CAPTCHA_INVERSE", 0);                 // white or black(=1)
+define("CAPTCHA_TIMEOUT", 5000);              // in seconds (=max 4 hours)
+
+
+/* static - (you could instantiate it, but...) */
+class captcha {
+
+
+   /* gets parameter from $_REQUEST[] array (POST vars) and so can
+      verify input, @returns boolean
+   */
+   function check() {
+      if (($hash = $_REQUEST["captcha_hash"])
+      and ($pw = trim($_REQUEST["captcha_input"]))) {
+         return((captcha::hash($pw)==$hash) || (captcha::hash($pw,-1)==$hash));
+      }
+   }
+
+   
+   /* yields <input> fields html string (no complete form), with captcha
+      image already embedded as data:-URI
+   */
+   function form($title="&rarr; retype that here", $more="<small><br>Enter the correct letters and numbers from the image into the text box. <br>This small test serves as access restriction against malicious bots. <br>Simply reload the page if this graphic is too hard to read.</small>") {
+      $pw = captcha::mkpass();
+      $hash = captcha::hash($pw);
+//      $maxsize = (strpos("MSIE", $_SERVER["HTTP_USER_AGENT"]) ? 1000 : 6000);
+      $maxsize = 100;
+      @header("Vary: User-Agent");
+      $img = "data:image/jpeg;base64,"
+           . base64_encode(captcha::image($pw, 200, 60, CAPTCHA_INVERSE, $maxsize));
+      $alt = htmlentities(captcha::textual_riddle($pw));
+      $test = substr($img,22);
+      $html = 
+        '<table border="0" summary="captcha input"><tr>'
+      . '<td><img name="captcha_image" id="captcha_image" src="'.$img. '" height="60" width="200" alt="'.$alt. '" /></td>'
+      . '<td>'.$title. '<br/><input name="captcha_hash" type="hidden" value="'.$hash. '" />'
+      . '<font color="red">*</font><input name="captcha_input" type="text" size="7" maxlength="16" style="height:23px; font-size:16px; font-weight:450;" />'
+      . '</td><td>'.$more.'</td>'
+      . '</tr></table>';
+
+//        '<table border="0" summary="captcha input"><tr>'
+//       '<img name="captcha_image" id="captcha_image" src="'.$img. '" height="60" width="200" alt="'.$alt. '" /></td>'
+//      . '<td><img name="captcha_image" id="captcha_image" src="'.$img.'" height="60" width="200" alt="'.$alt. '" /></td>'
+//      . '<td>'.$title. '<br/><input name="captcha_hash" type="hidden" value="'.$hash. '" />'
+//       ''.$title. '<br/><input name="captcha_hash" type="hidden" value="'.$hash. '" />'
+//      . '<input name="captcha_input" type="text" size="7" maxlength="16" style="height:23px; font-size:16px; font-weight:450;" />'
+//      . '<td width="80%">'.$more.'</td>'
+//      . '</tr></table>';
+
+      #-- js/html fix if ("MSIE")
+      {
+         $base = "http://$_SERVER[SERVER_NAME]:$_SERVER[SERVER_PORT]/ampache/captcha.php";
+//	          $base = "http://10.60.60.16/ampache/captcha.php";
+//               . substr(realpath(__FILE__), strlen($_SERVER["DOCUMENT_ROOT"]));
+         $html .= <<<END
+<script language="Javascript"><!--
+if (/Microsoft/.test(navigator.appName)) {
+//    var msg= "You are using IE Please download firefox in order to register. http://www.mozilla.org/products/firefox";
+//    alert(msg);
+   var img = document.captcha_image;
+  img.src = "$base?_ddu=$test"; 
+  //alert (img.src);
+    }
+--></script>
+END;
+      }
+      $html = "<div class=\"captcha\">$html</div>";
+      return($html);
+   }
+/*<script language="Javascript"><!--
+if (/Microsoft/.test(navigator.appName)) {
+   var img = document.captcha_image;
+  img.src = "$base?_ddu=" + img.src.substr(23); 
+    }
+--></script>/*
+
+
+   /* generates alternative (non-graphic), human-understandable
+      representation of the passphrase
+   */
+   function textual_riddle($phrase) {
+      $symbols0 = '"\'-/_:';
+      $symbols1 = array("\n,", "\n;", ";", "\n&", "\n-", ",", ",", "\nand then", "\nfollowed by", "\nand", "\nand not a\n\"".chr(65+rand(0,26))."\",\nbut");
+      $s = "Guess the letters and numbers\n(passphrase riddle)\n--\n";
+      for ($p=0; $p<strlen($phrase); $p++) {
+         $c = $phrase[$p];
+         $add = "";
+         #-- asis
+         if (!rand(0,3)) {
+            $i = $symbols0[rand(0,strlen($symbols0)-1)];
+            $add = "$i$c$i";
+         }
+         #-- letter
+         elseif ($c >= 'A') {
+            $type = ($c >= 'a' ? "small " : "");
+            do {
+               $n = rand(-3,3);
+               $c2 = chr((ord($c) & 0x5F) + $n);
+            }
+            while (($c2 < 'A') || ($c2 > 'Z'));
+            if ($n < 0) {
+               $n = -$n;
+               $add .= "$type'$c2' +$n letters";
+            }
+            else {
+               $add .= "$n chars before $type$c2";
+            }
+         }
+         #-- number
+         else {
+            $add = "???";
+            $n = (int) $c;
+            do {
+               do { $x = rand(1, 10); } while (!$x);
+               $op = rand(0,11);
+               if ($op <= 2) {
+                  $add = "($add * $x)"; $n *= $x;
+               }
+               elseif ($op == 3) {
+                  $x = 2 * rand(1,2);
+                  $add = "($add / $x)"; $n /= $x;
+               }
+               elseif ($sel % 2) {
+                  $add = "($add + $x)"; $n += $x;
+               }
+               else {
+                  $add = "($add - $x)"; $n -= $x;
+               }
+            }
+            while (rand(0,1));
+            $add .= " = $n";
+         }
+         $s .= "$add";
+         $s .= $symbols1[rand(0,count($symbols1)-1)] . "\n";
+      }
+      return($s);
+   }
+
+
+   /* returns jpeg file stream with unscannable letters encoded
+      in front of colorful disturbing background
+   */
+   function image($phrase, $width=200, $height=60, $inverse=0, $maxsize=0xFFFFF) {
+   
+      #-- initialize in-memory image with gd library
+      srand(microtime()*21017);
+      $img = imagecreatetruecolor($width, $height);
+      $R = $inverse ? 0xFF : 0x00;
+      imagefilledrectangle($img, 0,0, $width,$height, captcha::random_color($img, 222^$R, 255^$R));
+      $c1 = rand(150^$R, 185^$R);
+      $c2 = rand(195^$R, 230^$R);
+      
+      #-- configuration
+      $fonts = array(
+        // "COLLEGE.ttf",
+      );
+      $fonts += glob(EWIKI_FONT_DIR."/*.ttf");
+      
+      #-- encolour bg
+      $wd = 20;
+      $x = 0;
+      while ($x < $width) {
+         imagefilledrectangle($img, $x, 0, $x+=$wd, $height, captcha::random_color($img, 222^$R, 255^$R));
+         $wd += max(10, rand(0, 20) - 10);
+      }
+
+      #-- make interesting background I, lines
+      $wd = 4;
+      $w1 = 0;
+      $w2 = 0;
+      for ($x=0; $x<$width; $x+=(int)$wd) {
+         if ($x < $width) {   // verical
+            imageline($img, $x+$w1, 0, $x+$w2, $height-1, captcha::random_color($img,$c1,$c2));
+         }
+         if ($x < $height) {  // horizontally ("y")
+            imageline($img, 0, $x-$w2, $width-1, $x-$w1, captcha::random_color($img,$c1,$c2));
+         }
+         $wd += rand(0,8) - 4;
+         if ($wd < 1) { $wd = 2; }
+         $w1 += rand(0,8) - 4;
+         $w2 += rand(0,8) - 4;
+         if (($x > $height) && ($y > $height)) {
+            break;
+         }
+      }
+      
+      #-- more disturbing II, random letters
+      $limit = rand(30,90);
+      for ($n=0; $n<$limit; $n++) {
+         $letter = "";
+         do {
+            $letter .= chr(rand(31,125)); // random symbol
+         } while (rand(0,1));
+         $size = rand(5, $height/2);
+         $half = (int) ($size / 2);
+         $x = rand(-$half, $width+$half);
+         $y = rand(+$half, $height);
+         $rotation = rand(60, 300);
+         $c1  = captcha::random_color($img, 130^$R, 240^$R);
+         $font = $fonts[rand(0, count($fonts)-1)];
+         imagettftext($img, $size, $rotation, $x, $y, $c1, $font, $letter);
+      }
+
+      #-- add the real text to it
+      $len = strlen($phrase);
+      $w1 = 10;
+      $w2 = $width / ($len+1);
+      for ($p=0; $p<$len; $p++) {
+         $letter = $phrase[$p];
+         $size = rand(18, $height/2.2);
+         $half = (int) $size / 2;
+         $rotation = rand(-33, 33);
+         $y = rand($size+3, $height-3);
+         $x = $w1 + $w2*$p;
+         $w1 += rand(-$width/90, $width/40);  // @BUG: last char could be +30 pixel outside of image
+         $font = $fonts[rand(0, count($fonts)-1)];
+         $r=rand(30,99); $g=rand(30,99); $b=rand(30,99); // two colors for shadow
+         $c1  = imagecolorallocate($img, $r*1^$R, $g*1^$R, $b*1^$R);
+         $c2  = imagecolorallocate($img, $r*2^$R, $g*2^$R, $b*2^$R);
+         imagettftext($img, $size, $rotation, $x+1, $y, $c2, $font, $letter);
+         imagettftext($img, $size, $rotation, $x, $y-1, $c1, $font, $letter);
+      }
+
+      #-- let JFIF stream be generated
+//      $quality = 67;
+      $quality = 8;
+      $s = array();
+      do {
+         ob_start(); ob_implicit_flush(0);
+         imagejpeg($img, "", (int)$quality);
+         $jpeg = ob_get_contents(); ob_end_clean();
+         $size = strlen($jpeg);
+         $s_debug[] = ((int)($quality*10)/10) . "%=$size";
+         $quality = $quality * ($maxsize/$size) * 0.93 - 1.7;  // -($quality/7.222)*
+      }
+      while (($size > $maxsize) && ($quality >= 16));
+      imagedestroy($img);
+#print_r($s_debug);
+      return($jpeg);
+   }
+
+
+   /* helper code */
+   function random_color($img, $a,$b) {
+      return imagecolorallocate($img, rand($a,$b), rand($a,$b), rand($a,$b));
+   }
+
+
+   /* unreversable hash from passphrase, with time() slice encoded */
+   function hash($text, $dtime=0) {
+      $text = strtolower($text);
+      $pfix = (int) (time() / CAPTCHA_TIMEOUT) + $dtime;
+      return md5("captcha::$pfix:$text::".__FILE__.":$_SERVER[SERVER_NAME]:80");
+   }
+
+
+   /* makes string of random letters for embedding into image and for
+      encoding as hash, later verification
+   */
+   function mkpass() {
+      $s = "";
+      for ($n=0; $n<10; $n++) {
+         $s .= chr(rand(0, 255));
+      }
+      $s = base64_encode($s);   // base64-set, but filter out unwanted chars
+      $s = preg_replace("/[+\/=IG0ODQR]/i", "", $s);  // (depends on YOUR font)
+      $s = substr($s, 0, rand(5,7));
+      return($s);
+   }
+}
+
+
+#-- IE workaround
+if (isset($_REQUEST["_ddu"])) {
+   header("Content-Type: image/jpeg");
+   die(base64_decode(substr($_REQUEST["_ddu"], 0)));
+}
+
+
+?>
Binary files ampache-3.3.2-alpha4/modules/captcha/COLLEGE.ttf and ampache-3.3.2-beta1/modules/captcha/COLLEGE.ttf differ
diff -urN ampache-3.3.2-alpha4/modules/id3/getid3/getid3.php ampache-3.3.2-beta1/modules/id3/getid3/getid3.php
--- ampache-3.3.2-alpha4/modules/id3/getid3/getid3.php	2005-12-27 01:32:57.000000000 -0800
+++ ampache-3.3.2-beta1/modules/id3/getid3/getid3.php	2006-01-08 23:06:15.000000000 -0800
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////
 
 // Defines
-define('GETID3_VERSION', '1.7.4');
+define('GETID3_VERSION', '1.7.5-200512251515');
 define('GETID3_FREAD_BUFFER_SIZE', 16384); // read buffer size in bytes
 
 
@@ -111,26 +111,40 @@
 		//   ie for "C:/Program Files/Apache/" put "C:/PROGRA~1/APACHE/"
 		// IMPORTANT: This path must include the trailing slash
 		if (GETID3_OS_ISWINDOWS && !defined('GETID3_HELPERAPPSDIR')) {
-
 			$helperappsdir = GETID3_INCLUDEPATH.'..'.GETID3_OS_DIRSLASH.'helperapps'; // must not have any space in this path
 
 			if (!is_dir($helperappsdir)) {
+
 				$this->startup_error .= '"'.$helperappsdir.'" cannot be defined as GETID3_HELPERAPPSDIR because it does not exist';
+
 			} elseif (strpos(realpath($helperappsdir), ' ') !== false) {
+
 				$DirPieces = explode(GETID3_OS_DIRSLASH, realpath($helperappsdir));
-				foreach ($DirPieces as $key => $value) {
-					if ((strpos($value, '.') !== false) && (strpos($value, ' ') === false)) {
-						if (strpos($value, '.') > 8) {
-							$value = substr($value, 0, 6).'~1';
-						}
-					} elseif ((strpos($value, ' ') !== false) || strlen($value) > 8) {
-						$value = substr($value, 0, 6).'~1';
-					}
-					$DirPieces[$key] = strtoupper($value);
-				}
-				$this->startup_error .= 'GETID3_HELPERAPPSDIR must not have any spaces in it - use 8dot3 naming convention if neccesary (on this server that would be something like "'.implode(GETID3_OS_DIRSLASH, $DirPieces).'" - NOTE: this may or may not be the actual 8.3 equivalent of "'.$helperappsdir.'", please double-check). You can run "dir /x" from the commandline to see the correct 8.3-style names. You need to edit the file "'.GETID3_INCLUDEPATH.'/getid3.php" around line '.(__LINE__ - 16);
+				$DirPieces8 = $DirPieces;
+				
+				$CLIdir = $DirPieces[0].' && cd \\';
+				for ($i = 1; $i < count($DirPieces); $i++) {
+				  if (strpos($DirPieces[$i], ' ') === false) {
+				    $CLIdir .= ' && cd '.$DirPieces[$i];
+				  } else {
+				    ob_start();
+				    system($CLIdir.' && dir /ad /x');
+				    $subdirsraw = explode("\n", ob_get_contents());
+				    ob_end_clean();
+				    foreach ($subdirsraw as $line) {
+				      if (eregi('^[0-9]{4}/[0-9]{2}/[0-9]{2}  [0-9]{2}:[0-9]{2} [AP]M    <DIR>          ([^ ]{8})     '.preg_quote($DirPieces[$i]).'$', trim($line), $matches)) {
+				        $CLIdir .= ' && cd '.$matches[1];
+				        break;
+				      }
+				    }
+				    $DirPieces8[$i] = $matches[1];
+				  }
+				}
+				$helperappsdir = implode(GETID3_OS_DIRSLASH, $DirPieces8);
+
 			}
 			define('GETID3_HELPERAPPSDIR', realpath($helperappsdir).GETID3_OS_DIRSLASH);
+
 		}
 
 	}
@@ -436,7 +450,7 @@
 							'group'     => 'audio',
 							'module'    => 'ac3',
 							'mime_type' => 'audio/ac3',
-						  ),
+						),
 
 				// AAC  - audio       - Advanced Audio Coding (AAC) - ADIF format
 				'adif' => array(
@@ -446,7 +460,7 @@
 							'option'    => 'adif',
 							'mime_type' => 'application/octet-stream',
 							'fail_ape'  => 'WARNING',
-						  ),
+						),
 
 
 				// AAC  - audio       - Advanced Audio Coding (AAC) - ADTS format (very similar to MP3)
@@ -457,7 +471,7 @@
 							'option'    => 'adts',
 							'mime_type' => 'application/octet-stream',
 							'fail_ape'  => 'WARNING',
-						  ),
+						),
 
 
 				// AU   - audio       - NeXT/Sun AUdio (AU)
@@ -466,7 +480,7 @@
 							'group'     => 'audio',
 							'module'    => 'au',
 							'mime_type' => 'audio/basic',
-						  ),
+						),
 
 				// AVR  - audio       - Audio Visual Research
 				'avr'  => array(
@@ -474,7 +488,7 @@
 							'group'     => 'audio',
 							'module'    => 'avr',
 							'mime_type' => 'application/octet-stream',
-						  ),
+						),
 
 				// BONK - audio       - Bonk v0.9+
 				'bonk' => array(
@@ -482,7 +496,7 @@
 							'group'     => 'audio',
 							'module'    => 'bonk',
 							'mime_type' => 'audio/xmms-bonk',
-						  ),
+						),
 
 				// FLAC - audio       - Free Lossless Audio Codec
 				'flac' => array(
@@ -490,7 +504,7 @@
 							'group'     => 'audio',
 							'module'    => 'flac',
 							'mime_type' => 'audio/x-flac',
-						  ),
+						),
 
 				// LA   - audio       - Lossless Audio (LA)
 				'la'   => array(
@@ -498,7 +512,7 @@
 							'group'     => 'audio',
 							'module'    => 'la',
 							'mime_type' => 'application/octet-stream',
-						  ),
+						),
 
 				// LPAC - audio       - Lossless Predictive Audio Compression (LPAC)
 				'lpac' => array(
@@ -506,7 +520,7 @@
 							'group'     => 'audio',
 							'module'    => 'lpac',
 							'mime_type' => 'application/octet-stream',
-						  ),
+						),
 
 				// MIDI - audio       - MIDI (Musical Instrument Digital Interface)
 				'midi' => array(
@@ -514,7 +528,7 @@
 							'group'     => 'audio',
 							'module'    => 'midi',
 							'mime_type' => 'audio/midi',
-						  ),
+						),
 
 				// MAC  - audio       - Monkey's Audio Compressor
 				'mac'  => array(
@@ -522,7 +536,7 @@
 							'group'     => 'audio',
 							'module'    => 'monkey',
 							'mime_type' => 'application/octet-stream',
-						  ),
+						),
 
 				// MOD  - audio       - MODule (assorted sub-formats)
 				'mod'  => array(
@@ -531,7 +545,7 @@
 							'module'    => 'mod',
 							'option'    => 'mod',
 							'mime_type' => 'audio/mod',
-						  ),
+						),
 
 				// MOD  - audio       - MODule (Impulse Tracker)
 				'it'   => array(
@@ -540,7 +554,7 @@
 							'module'    => 'mod',
 							'option'    => 'it',
 							'mime_type' => 'audio/it',
-						  ),
+						),
 
 				// MOD  - audio       - MODule (eXtended Module, various sub-formats)
 				'xm'   => array(
@@ -549,7 +563,7 @@
 							'module'    => 'mod',
 							'option'    => 'xm',
 							'mime_type' => 'audio/xm',
-						  ),
+						),
 
 				// MOD  - audio       - MODule (ScreamTracker)
 				's3m'  => array(
@@ -558,7 +572,7 @@
 							'module'    => 'mod',
 							'option'    => 's3m',
 							'mime_type' => 'audio/s3m',
-						  ),
+						),
 
 				// MPC  - audio       - Musepack / MPEGplus
 				'mpc'  => array(
@@ -566,7 +580,7 @@
 							'group'     => 'audio',
 							'module'    => 'mpc',
 							'mime_type' => 'application/octet-stream',
-						  ),
+						),
 
 				// MP3  - audio       - MPEG-audio Layer 3 (very similar to AAC-ADTS)
 				'mp3'  => array(
@@ -574,7 +588,7 @@
 							'group'     => 'audio',
 							'module'    => 'mp3',
 							'mime_type' => 'audio/mpeg',
-						  ),
+						),
 
 				// OFR  - audio       - OptimFROG
 				'ofr'  => array(
@@ -582,7 +596,7 @@
 							'group'     => 'audio',
 							'module'    => 'optimfrog',
 							'mime_type' => 'application/octet-stream',
-						  ),
+						),
 
 				// RKAU - audio       - RKive AUdio compressor
 				'rkau' => array(
@@ -590,7 +604,7 @@
 							'group'     => 'audio',
 							'module'    => 'rkau',
 							'mime_type' => 'application/octet-stream',
-						  ),
+						),
 
 				// SHN  - audio       - Shorten
 				'shn'  => array(
@@ -600,7 +614,7 @@
 							'mime_type' => 'audio/xmms-shn',
 							'fail_id3'  => 'ERROR',
 							'fail_ape'  => 'ERROR',
-						  ),
+						),
 
 				// TTA  - audio       - TTA Lossless Audio Compressor (http://tta.corecodec.org)
 				'tta'  => array(
@@ -608,7 +622,7 @@
 							'group'     => 'audio',
 							'module'    => 'tta',
 							'mime_type' => 'application/octet-stream',
-						  ),
+						),
 
 				// VOC  - audio       - Creative Voice (VOC)
 				'voc'  => array(
@@ -616,7 +630,7 @@
 							'group'     => 'audio',
 							'module'    => 'voc',
 							'mime_type' => 'audio/voc',
-						  ),
+						),
 
 				// VQF  - audio       - transform-domain weighted interleave Vector Quantization Format (VQF)
 				'vqf'  => array(
@@ -624,7 +638,7 @@
 							'group'     => 'audio',
 							'module'    => 'vqf',
 							'mime_type' => 'application/octet-stream',
-						  ),
+						),
 
 				// WV  - audio        - WavPack (v4.0+)
 				'wv'   => array(
@@ -632,7 +646,7 @@
 							'group'     => 'audio',
 							'module'    => 'wavpack',
 							'mime_type' => 'application/octet-stream',
-						  ),
+						),
 
 
 				// Audio-Video formats
@@ -644,15 +658,23 @@
 							'module'    => 'asf',
 							'mime_type' => 'video/x-ms-asf',
 							'iconv_req' => false,
-						  ),
+						),
 
-				// BINK  - audio/video - Bink / Smacker
+				// BINK - audio/video - Bink / Smacker
 				'bink' => array(
 							'pattern'   => '^(BIK|SMK)',
 							'group'     => 'audio-video',
 							'module'    => 'bink',
 							'mime_type' => 'application/octet-stream',
-						  ),
+						),
+
+				// FLV  - audio/video - FLash Video
+				'flv' => array(
+							'pattern'   => '^FLV\x01',
+							'group'     => 'audio-video',
+							'module'    => 'flv',
+							'mime_type' => 'video/x-flv',
+						),
 
 				// MKAV - audio/video - Mastroka
 				'matroska' => array(
@@ -660,7 +682,7 @@
 							'group'     => 'audio-video',
 							'module'    => 'matroska',
 							'mime_type' => 'application/octet-stream',
-						  ),
+						),
 
 				// MPEG - audio/video - MPEG (Moving Pictures Experts Group)
 				'mpeg' => array(
@@ -668,7 +690,7 @@
 							'group'     => 'audio-video',
 							'module'    => 'mpeg',
 							'mime_type' => 'video/mpeg',
-						  ),
+						),
 
 				// NSV  - audio/video - Nullsoft Streaming Video (NSV)
 				'nsv'  => array(
@@ -676,7 +698,7 @@
 							'group'     => 'audio-video',
 							'module'    => 'nsv',
 							'mime_type' => 'application/octet-stream',
-						  ),
+						),
 
 				// Ogg  - audio/video - Ogg (Ogg-Vorbis, Ogg-FLAC, Speex, Ogg-Theora(*), Ogg-Tarkin(*))
 				'ogg'  => array(
@@ -686,7 +708,7 @@
 							'mime_type' => 'application/ogg',
 							'fail_id3'  => 'WARNING',
 							'fail_ape'  => 'WARNING',
-						  ),
+						),
 
 				// QT   - audio/video - Quicktime
 				'quicktime' => array(
@@ -694,7 +716,7 @@
 							'group'     => 'audio-video',
 							'module'    => 'quicktime',
 							'mime_type' => 'video/quicktime',
-						  ),
+						),
 
 				// RIFF - audio/video - Resource Interchange File Format (RIFF) / WAV / AVI / CD-audio / SDSS = renamed variant used by SmartSound QuickTracks (www.smartsound.com) / FORM = Audio Interchange File Format (AIFF)
 				'riff' => array(
@@ -703,7 +725,7 @@
 							'module'    => 'riff',
 							'mime_type' => 'audio/x-wave',
 							'fail_ape'  => 'WARNING',
-						  ),
+						),
 
 				// Real - audio/video - RealAudio, RealVideo
 				'real' => array(
@@ -711,7 +733,7 @@
 							'group'     => 'audio-video',
 							'module'    => 'real',
 							'mime_type' => 'audio/x-realaudio',
-						  ),
+						),
 
 				// SWF - audio/video - ShockWave Flash
 				'swf' => array(
@@ -719,7 +741,7 @@
 							'group'     => 'audio-video',
 							'module'    => 'swf',
 							'mime_type' => 'application/x-shockwave-flash',
-						  ),
+						),
 
 
 				// Still-Image formats
@@ -732,7 +754,7 @@
 							'mime_type' => 'image/bmp',
 							'fail_id3'  => 'ERROR',
 							'fail_ape'  => 'ERROR',
-						  ),
+						),
 
 				// GIF  - still image - Graphics Interchange Format
 				'gif'  => array(
@@ -742,7 +764,7 @@
 							'mime_type' => 'image/gif',
 							'fail_id3'  => 'ERROR',
 							'fail_ape'  => 'ERROR',
-						  ),
+						),
 
 				// JPEG - still image - Joint Photographic Experts Group (JPEG)
 				'jpg'  => array(
@@ -752,7 +774,7 @@
 							'mime_type' => 'image/jpeg',
 							'fail_id3'  => 'ERROR',
 							'fail_ape'  => 'ERROR',
-						  ),
+						),
 
 				// PCD  - still image - Kodak Photo CD
 				'pcd'  => array(
@@ -762,7 +784,7 @@
 							'mime_type' => 'image/x-photo-cd',
 							'fail_id3'  => 'ERROR',
 							'fail_ape'  => 'ERROR',
-						  ),
+						),
 
 
 				// PNG  - still image - Portable Network Graphics (PNG)
@@ -773,7 +795,7 @@
 							'mime_type' => 'image/png',
 							'fail_id3'  => 'ERROR',
 							'fail_ape'  => 'ERROR',
-						  ),
+						),
 
 
 				// TIFF  - still image - Tagged Information File Format (TIFF)
@@ -784,7 +806,7 @@
 							'mime_type' => 'image/tiff',
 							'fail_id3'  => 'ERROR',
 							'fail_ape'  => 'ERROR',
-						  ),
+						),
 
 
 				// Data formats
@@ -798,7 +820,7 @@
 							'fail_id3'  => 'ERROR',
 							'fail_ape'  => 'ERROR',
 							'iconv_req' => false,
-						  ),
+						),
 
 				// RAR  - data        - RAR compressed data
 				'rar'  => array(
@@ -808,7 +830,7 @@
 							'mime_type' => 'application/octet-stream',
 							'fail_id3'  => 'ERROR',
 							'fail_ape'  => 'ERROR',
-						  ),
+						),
 
 				// SZIP - audio       - SZIP compressed data
 				'szip' => array(
@@ -818,7 +840,7 @@
 							'mime_type' => 'application/octet-stream',
 							'fail_id3'  => 'ERROR',
 							'fail_ape'  => 'ERROR',
-						  ),
+						),
 
 				// TAR  - data        - TAR compressed data
 				'tar'  => array(
@@ -828,7 +850,7 @@
 							'mime_type' => 'application/x-tar',
 							'fail_id3'  => 'ERROR',
 							'fail_ape'  => 'ERROR',
-						  ),
+						),
 
 				// GZIP  - data        - GZIP compressed data
 				'gz'  => array(
@@ -838,7 +860,7 @@
 							'mime_type' => 'application/x-gzip',
 							'fail_id3'  => 'ERROR',
 							'fail_ape'  => 'ERROR',
-						  ),
+						),
 
 				// ZIP  - data        - ZIP compressed data
 				'zip'  => array(
diff -urN ampache-3.3.2-alpha4/modules/id3/getid3/module.audio.mp3.php ampache-3.3.2-beta1/modules/id3/getid3/module.audio.mp3.php
--- ampache-3.3.2-alpha4/modules/id3/getid3/module.audio.mp3.php	2005-12-27 01:32:57.000000000 -0800
+++ ampache-3.3.2-beta1/modules/id3/getid3/module.audio.mp3.php	2006-01-08 23:06:15.000000000 -0800
@@ -320,8 +320,9 @@
 									'fast standard|19000' => 19000,
 									'r3mix|19500'         => 19500,  // 3.90,   3.90.1, 3.92
 									'r3mix|19600'         => 19600,  // 3.90.2, 3.90.3, 3.91
-									'r3mix|18000'         => 18000); // 3.94,   3.95
-							if (!isset($ExpectedLowpass[$ExplodedOptions[1].'|'.$thisfile_mpeg_audio_lame['lowpass_frequency']])) {
+									'r3mix|18000'         => 18000,  // 3.94,   3.95
+								);
+							if (!isset($ExpectedLowpass[$ExplodedOptions[1].'|'.$thisfile_mpeg_audio_lame['lowpass_frequency']]) && ($thisfile_mpeg_audio_lame['lowpass_frequency'] < 22050) && (round($thisfile_mpeg_audio_lame['lowpass_frequency'] / 1000) < round($thisfile_mpeg_audio['sample_rate'] / 2000))) {
 								$encoder_options .= ' --lowpass '.$thisfile_mpeg_audio_lame['lowpass_frequency'];
 							}
 							break;
@@ -1636,23 +1637,17 @@
 		if (isset($MPEGaudioVersionLookup[$rawarray['version']])) {
 			$decodedVersion = $MPEGaudioVersionLookup[$rawarray['version']];
 		} else {
-			if ($echoerrors) {
-				echo "\n".'invalid Version ('.$rawarray['version'].')';
-			}
+			echo ($echoerrors ? "\n".'invalid Version ('.$rawarray['version'].')' : '');
 			return false;
 		}
 		if (isset($MPEGaudioLayerLookup[$rawarray['layer']])) {
 			$decodedLayer = $MPEGaudioLayerLookup[$rawarray['layer']];
 		} else {
-			if ($echoerrors) {
-				echo "\n".'invalid Layer ('.$rawarray['layer'].')';
-			}
+			echo ($echoerrors ? "\n".'invalid Layer ('.$rawarray['layer'].')' : '');
 			return false;
 		}
 		if (!isset($MPEGaudioBitrateLookup[$decodedVersion][$decodedLayer][$rawarray['bitrate']])) {
-			if ($echoerrors) {
-				echo "\n".'invalid Bitrate ('.$rawarray['bitrate'].')';
-			}
+			echo ($echoerrors ? "\n".'invalid Bitrate ('.$rawarray['bitrate'].')' : '');
 			if ($rawarray['bitrate'] == 15) {
 				// known issue in LAME 3.90 - 3.93.1 where free-format has bitrate ID of 15 instead of 0
 				// let it go through here otherwise file will not be identified
@@ -1664,27 +1659,19 @@
 			}
 		}
 		if (!isset($MPEGaudioFrequencyLookup[$decodedVersion][$rawarray['sample_rate']])) {
-			if ($echoerrors) {
-				echo "\n".'invalid Frequency ('.$rawarray['sample_rate'].')';
-			}
+			echo ($echoerrors ? "\n".'invalid Frequency ('.$rawarray['sample_rate'].')' : '');
 			return false;
 		}
 		if (!isset($MPEGaudioChannelModeLookup[$rawarray['channelmode']])) {
-			if ($echoerrors) {
-				echo "\n".'invalid ChannelMode ('.$rawarray['channelmode'].')';
-			}
+			echo ($echoerrors ? "\n".'invalid ChannelMode ('.$rawarray['channelmode'].')' : '');
 			return false;
 		}
 		if (!isset($MPEGaudioModeExtensionLookup[$decodedLayer][$rawarray['modeextension']])) {
-			if ($echoerrors) {
-				echo "\n".'invalid Mode Extension ('.$rawarray['modeextension'].')';
-			}
+			echo ($echoerrors ? "\n".'invalid Mode Extension ('.$rawarray['modeextension'].')' : '');
 			return false;
 		}
 		if (!isset($MPEGaudioEmphasisLookup[$rawarray['emphasis']])) {
-			if ($echoerrors) {
-				echo "\n".'invalid Emphasis ('.$rawarray['emphasis'].')';
-			}
+			echo ($echoerrors ? "\n".'invalid Emphasis ('.$rawarray['emphasis'].')' : '');
 			return false;
 		}
 		// These are just either set or not set, you can't mess that up :)
diff -urN ampache-3.3.2-alpha4/modules/id3/getid3/module.audio-video.asf.php ampache-3.3.2-beta1/modules/id3/getid3/module.audio-video.asf.php
--- ampache-3.3.2-alpha4/modules/id3/getid3/module.audio-video.asf.php	2005-12-27 01:32:57.000000000 -0800
+++ ampache-3.3.2-beta1/modules/id3/getid3/module.audio-video.asf.php	2006-01-08 23:06:15.000000000 -0800
@@ -754,6 +754,11 @@
 								$thisfile_asf_comments['year'] = array( $this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
 								break;
 
+							case 'wm/lyrics':
+							case 'lyrics':
+								$thisfile_asf_comments['lyrics'] = array($this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
+								break;
+
 							case 'isvbr':
 								if ($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']) {
 									$thisfile_audio['bitrate_mode'] = 'vbr';
@@ -769,12 +774,12 @@
 									$tempThisfileInfo = array('encoding'=>$ThisFileInfo['encoding']);
 									fwrite($tempfilehandle, $thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']);
 									fclose($tempfilehandle);
-									
+
 									$tempfilehandle = fopen($tempfile, "rb");
 									$id3 = new getid3_id3v2($tempfilehandle, $tempThisfileInfo);
 									fclose($tempfilehandle);
 									unlink($tempfile);
-									
+
 									$ThisFileInfo['id3v2'] = $tempThisfileInfo['id3v2'];
 								}
 								break;
diff -urN ampache-3.3.2-alpha4/modules/id3/getid3/module.audio-video.flv.php ampache-3.3.2-beta1/modules/id3/getid3/module.audio-video.flv.php
--- ampache-3.3.2-alpha4/modules/id3/getid3/module.audio-video.flv.php	1969-12-31 16:00:00.000000000 -0800
+++ ampache-3.3.2-beta1/modules/id3/getid3/module.audio-video.flv.php	2006-01-08 23:06:15.000000000 -0800
@@ -0,0 +1,210 @@
+<?php
+/////////////////////////////////////////////////////////////////
+/// getID3() by James Heinrich <info@getid3.org>               //
+//  available at http://getid3.sourceforge.net                 //
+//            or http://www.getid3.org                         //
+//                                                             //
+//  FLV module by Seth Kaufman <seth@whirl-i-gig.com>          //
+//  * version 0.1 (26 June 2005)                               //
+//  minor modifications by James Heinrich <info@getid3.org>    //
+//  * version 0.1.1 (15 July 2005)                             //
+/////////////////////////////////////////////////////////////////
+//                                                             //
+// module.audio-video.flv.php                                  //
+// module for analyzing Shockwave Flash Video files            //
+// dependencies: NONE                                          //
+//                                                            ///
+/////////////////////////////////////////////////////////////////
+
+
+class getid3_flv
+{
+
+	function getid3_flv(&$fd, &$ThisFileInfo, $ReturnAllTagData=false) {
+		fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
+
+		$FLVfileData = fread($fd, $ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']);
+
+		$FLVmagic = substr($FLVfileData, 0, 3);
+		if ($FLVmagic != 'FLV') {
+			$ThisFileInfo['error'][] = 'Expecting "FLV" at offset '.$ThisFileInfo['avdataoffset'].', found "'.$ThisFileInfo['flv']['header']['signature'].'"';
+			unset($ThisFileInfo['flv']);
+			unset($ThisFileInfo['fileformat']);
+			return false;
+		}
+		$ThisFileInfo['flv']['header']['signature'] = $FLVmagic;
+		$ThisFileInfo['flv']['header']['version']   = ord($FLVfileData{3});
+		$ThisFileInfo['fileformat'] = 'flv';
+
+		$TypeFlags = ord($FLVfileData{4});
+		$ThisFileInfo['flv']['header']['hasAudio'] = (bool) ($TypeFlags & 4);
+		$ThisFileInfo['flv']['header']['hasVideo'] = (bool) ($TypeFlags & 1);
+
+		$FrameSizeDataLength = getid3_lib::BigEndian2Int(substr($FLVfileData, 5, 4));
+
+		// FLV tags
+		$CurrentOffset = $FrameSizeDataLength;
+		$FLVdataLength = strlen($FLVfileData);
+
+		$Duration = 0;
+
+		$SoundFormat = null;
+		$VideoFormat = null;
+		while ($CurrentOffset < $FLVdataLength) {
+			// previous tag size
+			$PreviousTagLength = getid3_lib::BigEndian2Int(substr($FLVfileData, $CurrentOffset, 4));
+			$CurrentOffset += 4;
+
+			$TagType = ord(substr($FLVfileData, $CurrentOffset, 1));
+			$DataLength = getid3_lib::BigEndian2Int(substr($FLVfileData, $CurrentOffset + 1, 3));
+			$Timestamp  = getid3_lib::BigEndian2Int(substr($FLVfileData, $CurrentOffset + 4, 3));
+
+			switch ($TagType) {
+				case 8:
+					if (is_null($SoundFormat)) {
+						$SoundInfo = ord(substr($FLVfileData, $CurrentOffset + 11, 1));
+						$SoundFormat = $SoundInfo & 0x07;
+						$ThisFileInfo['flv']['audio']['audioFormat']     = $SoundFormat;
+						$ThisFileInfo['flv']['audio']['audioRate']       = ($SoundInfo & 0x30) / 0x10;
+						$ThisFileInfo['flv']['audio']['audioSampleSize'] = ($SoundInfo & 0x40) / 0x40;
+						$ThisFileInfo['flv']['audio']['audioType']       = ($SoundInfo & 0x80) / 0x80;
+					}
+					break;
+
+				case 9:
+					if (is_null($VideoFormat)) {
+						$VideoInfo = ord(substr($FLVfileData, $CurrentOffset + 11, 1));
+						$VideoFormat = $VideoInfo & 0x07;
+						$ThisFileInfo['flv']['video']['videoCodec'] = $VideoFormat;
+
+						$PictureSizeType = (getid3_lib::BigEndian2Int(substr($FLVfileData, $CurrentOffset + 15, 2))) >> 7;
+						$PictureSizeType = $PictureSizeType & 0x0007;
+						$ThisFileInfo['flv']['header']['videoSizeType'] = $PictureSizeType;
+						switch ($PictureSizeType) {
+							case 0:
+								$PictureSizeEnc = getid3_lib::BigEndian2Int(substr($FLVfileData, $CurrentOffset + 16, 2));
+								$PictureSizeEnc <<= 1;
+								$ThisFileInfo['video']['resolution_x'] = ($PictureSizeEnc & 0xFF00) >> 8;
+								$PictureSizeEnc = getid3_lib::BigEndian2Int(substr($FLVfileData, $CurrentOffset + 17, 2));
+								$PictureSizeEnc <<= 1;
+								$ThisFileInfo['video']['resolution_y'] = ($PictureSizeEnc & 0xFF00) >> 8;
+								break;
+
+							case 1:
+								$PictureSizeEnc = getid3_lib::BigEndian2Int(substr($FLVfileData, $CurrentOffset + 16, 4));
+								$PictureSizeEnc <<= 1;
+								$ThisFileInfo['video']['resolution_x'] = ($PictureSizeEnc & 0xFFFF0000) >> 16;
+
+								$PictureSizeEnc = getid3_lib::BigEndian2Int(substr($FLVfileData, $CurrentOffset + 18, 4));
+								$PictureSizeEnc <<= 1;
+								$ThisFileInfo['video']['resolution_y'] = ($PictureSizeEnc & 0xFFFF0000) >> 16;
+								break;
+
+							case 2:
+								$ThisFileInfo['video']['resolution_x'] = 352;
+								$ThisFileInfo['video']['resolution_y'] = 288;
+								break;
+
+							case 3:
+								$ThisFileInfo['video']['resolution_x'] = 176;
+								$ThisFileInfo['video']['resolution_y'] = 144;
+								break;
+
+							case 4:
+								$ThisFileInfo['video']['resolution_x'] = 128;
+								$ThisFileInfo['video']['resolution_y'] = 96;
+								break;
+
+							case 5:
+								$ThisFileInfo['video']['resolution_x'] = 320;
+								$ThisFileInfo['video']['resolution_y'] = 240;
+								break;
+
+							case 6:
+								$ThisFileInfo['video']['resolution_x'] = 160;
+								$ThisFileInfo['video']['resolution_y'] = 120;
+								break;
+
+							default:
+								$ThisFileInfo['video']['resolution_x'] = 0;
+								$ThisFileInfo['video']['resolution_y'] = 0;
+								break;
+
+						}
+					}
+					break;
+
+				default:
+					// noop
+					break;
+			}
+
+			if ($Timestamp > $Duration) {
+				$Duration = $Timestamp;
+			}
+
+			$CurrentOffset += ($DataLength + 11);
+		}
+
+		$ThisFileInfo['playtime_seconds'] = $Duration / 1000;
+		$ThisFileInfo['bitrate'] = ($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) / $ThisFileInfo['playtime_seconds'];
+
+		if ($ThisFileInfo['flv']['header']['hasAudio']) {
+			$ThisFileInfo['audio']['codec']           =   $this->FLVaudioFormat($ThisFileInfo['flv']['audio']['audioFormat']);
+			$ThisFileInfo['audio']['sample_rate']     =     $this->FLVaudioRate($ThisFileInfo['flv']['audio']['audioRate']);
+			$ThisFileInfo['audio']['bits_per_sample'] = $this->FLVaudioBitDepth($ThisFileInfo['flv']['audio']['audioSampleSize']);
+
+			$ThisFileInfo['audio']['channels']   = $ThisFileInfo['flv']['audio']['audioType'] + 1; // 0=mono,1=stereo
+			$ThisFileInfo['audio']['lossless']   = ($ThisFileInfo['flv']['audio']['audioFormat'] ? false : true); // 0=uncompressed
+			$ThisFileInfo['audio']['dataformat'] = 'flv';
+		}
+		if (@$ThisFileInfo['flv']['header']['hasVideo']) {
+			$ThisFileInfo['video']['codec']      =   $this->FLVvideoCodec($ThisFileInfo['flv']['video']['videoCodec']);
+			$ThisFileInfo['video']['dataformat'] = 'flv';
+			$ThisFileInfo['video']['lossless']   = false;
+		}
+
+		return true;
+	}
+
+
+	function FLVaudioFormat($id) {
+		$FLVaudioFormat = array(
+			0 => 'uncompressed',
+			1 => 'ADPCM',
+			2 => 'mp3',
+			5 => 'Nellymoser 8kHz mono',
+			6 => 'Nellymoser',
+		);
+		return (@$FLVaudioFormat[$id] ? @$FLVaudioFormat[$id] : false);
+	}
+
+	function FLVaudioRate($id) {
+		$FLVaudioRate = array(
+			0 => 5500,
+			1 => 11025,
+			2 => 22050,
+			3 => 44100,
+		);
+		return (@$FLVaudioRate[$id] ? @$FLVaudioRate[$id] : false);
+	}
+
+	function FLVaudioBitDepth($id) {
+		$FLVaudioBitDepth = array(
+			0 => 8,
+			1 => 16,
+		);
+		return (@$FLVaudioBitDepth[$id] ? @$FLVaudioBitDepth[$id] : false);
+	}
+
+	function FLVvideoCodec($id) {
+		$FLVaudioBitDepth = array(
+			2 => 'Sorenson H.263',
+			3 => 'Screen video',
+		);
+		return (@$FLVaudioBitDepth[$id] ? @$FLVaudioBitDepth[$id] : false);
+	}
+
+}
+
+?>
\ No newline at end of file
diff -urN ampache-3.3.2-alpha4/modules/id3/getid3/module.audio-video.riff.php ampache-3.3.2-beta1/modules/id3/getid3/module.audio-video.riff.php
--- ampache-3.3.2-alpha4/modules/id3/getid3/module.audio-video.riff.php	2005-12-27 01:32:57.000000000 -0800
+++ ampache-3.3.2-beta1/modules/id3/getid3/module.audio-video.riff.php	2006-01-08 23:06:15.000000000 -0800
@@ -1953,8 +1953,6 @@
 			XMPG	Xing MPEG (I-Frame only)
 			XVID	XviD MPEG-4 (www.xvid.org)
 			XXAN	?XXAN?
-			Y422	ADS Technologies Copy of UYVY used in Pyro WebCam firewire camera
-			Y800	Simple, single Y plane for monochrome images
 			YU92	Intel YUV (YU92)
 			YUNV	Nvidia Uncompressed YUV 4:2:2
 			YUVP	Extended PAL format YUV palette (www.riff.org)
@@ -1965,6 +1963,8 @@
 			Y41T	Brooktree PC1 YUV 4:1:1 with transparency
 			Y42B	Weitek YUV 4:2:2 Planar
 			Y42T	Brooktree UYUV 4:2:2 with transparency
+			Y422	ADS Technologies Copy of UYVY used in Pyro WebCam firewire camera
+			Y800	Simple, single Y plane for monochrome images
 			Y8  	Grayscale video
 			YC12	Intel YUV 12 codec
 			YUV8	Winnov Caviar YUV8
diff -urN ampache-3.3.2-alpha4/modules/id3/getid3/module.tag.id3v2.php ampache-3.3.2-beta1/modules/id3/getid3/module.tag.id3v2.php
--- ampache-3.3.2-alpha4/modules/id3/getid3/module.tag.id3v2.php	2005-12-27 01:32:57.000000000 -0800
+++ ampache-3.3.2-beta1/modules/id3/getid3/module.tag.id3v2.php	2006-01-08 23:06:15.000000000 -0800
@@ -101,47 +101,51 @@
 		$thisfile_id3v2['tag_offset_start'] = $StartingOffset;
 		$thisfile_id3v2['tag_offset_end']   = $thisfile_id3v2['tag_offset_start'] + $thisfile_id3v2['headerlength'];
 
-	//    Extended Header
+		//    Extended Header
 		if (isset($thisfile_id3v2_flags['exthead']) && $thisfile_id3v2_flags['exthead']) {
-	//            Extended header size   4 * %0xxxxxxx
-	//            Number of flag bytes       $01
-	//            Extended Flags             $xx
-	//            Where the 'Extended header size' is the size of the whole extended header, stored as a 32 bit synchsafe integer.
-			$extheader = fread ($fd, 4);
-			$thisfile_id3v2['extheaderlength'] = getid3_lib::BigEndian2Int($extheader, 1);
-
-	//            The extended flags field, with its size described by 'number of flag  bytes', is defined as:
-	//                %0bcd0000
-	//            b - Tag is an update
-	//                Flag data length       $00
-	//            c - CRC data present
-	//                Flag data length       $05
-	//                Total frame CRC    5 * %0xxxxxxx
-	//            d - Tag restrictions
-	//                Flag data length       $01
-			$extheaderflagbytes = fread ($fd, 1);
-			$extheaderflags     = fread ($fd, $extheaderflagbytes);
-			$id3_exthead_flags = getid3_lib::BigEndian2Bin(substr($header, 5, 1));
-			$thisfile_id3v2['exthead_flags']['update']       = substr($id3_exthead_flags, 1, 1);
-			$thisfile_id3v2['exthead_flags']['CRC']          = substr($id3_exthead_flags, 2, 1);
-			if ($thisfile_id3v2['exthead_flags']['CRC']) {
-				$extheaderrawCRC = fread ($fd, 5);
-				$thisfile_id3v2['exthead_flags']['CRC'] = getid3_lib::BigEndian2Int($extheaderrawCRC, 1);
-			}
-			$thisfile_id3v2['exthead_flags']['restrictions'] = substr($id3_exthead_flags, 3, 1);
-			if ($thisfile_id3v2['exthead_flags']['restrictions']) {
-				// Restrictions           %ppqrrstt
-				$extheaderrawrestrictions = fread ($fd, 1);
-				$thisfile_id3v2['exthead_flags']['restrictions_tagsize']  = (bindec('11000000') & ord($extheaderrawrestrictions)) >> 6; // p - Tag size restrictions
-				$thisfile_id3v2['exthead_flags']['restrictions_textenc']  = (bindec('00100000') & ord($extheaderrawrestrictions)) >> 5; // q - Text encoding restrictions
-				$thisfile_id3v2['exthead_flags']['restrictions_textsize'] = (bindec('00011000') & ord($extheaderrawrestrictions)) >> 3; // r - Text fields size restrictions
-				$thisfile_id3v2['exthead_flags']['restrictions_imgenc']   = (bindec('00000100') & ord($extheaderrawrestrictions)) >> 2; // s - Image encoding restrictions
-				$thisfile_id3v2['exthead_flags']['restrictions_imgsize']  = (bindec('00000011') & ord($extheaderrawrestrictions)) >> 0; // t - Image size restrictions
+			// Extended header size   4 * %0xxxxxxx
+			// Number of flag bytes       $01
+			// Extended Flags             $xx
+			// Where the 'Extended header size' is the size of the whole extended header, stored as a 32 bit synchsafe integer.
+			$thisfile_id3v2['exthead_length'] = getid3_lib::BigEndian2Int(fread($fd, 4), 1);
+
+			$thisfile_id3v2['exthead_flag_bytes'] = ord(fread($fd, 1));
+			if ($thisfile_id3v2['exthead_flag_bytes'] == 1) {
+				// The extended flags field, with its size described by 'number of flag  bytes', is defined as:
+				//     %0bcd0000
+				// b - Tag is an update
+				//     Flag data length       $00
+				// c - CRC data present
+				//     Flag data length       $05
+				//     Total frame CRC    5 * %0xxxxxxx
+				// d - Tag restrictions
+				//     Flag data length       $01
+				$extheaderflags    = fread($fd, $thisfile_id3v2['exthead_flag_bytes']);
+				$id3_exthead_flags = getid3_lib::BigEndian2Bin(substr($header, 5, 1));
+				$thisfile_id3v2['exthead_flags']['update']       = substr($id3_exthead_flags, 1, 1);
+				$thisfile_id3v2['exthead_flags']['CRC']          = substr($id3_exthead_flags, 2, 1);
+				if ($thisfile_id3v2['exthead_flags']['CRC']) {
+					$extheaderrawCRC = fread($fd, 5);
+					$thisfile_id3v2['exthead_flags']['CRC'] = getid3_lib::BigEndian2Int($extheaderrawCRC, 1);
+				}
+				$thisfile_id3v2['exthead_flags']['restrictions'] = substr($id3_exthead_flags, 3, 1);
+				if ($thisfile_id3v2['exthead_flags']['restrictions']) {
+					// Restrictions           %ppqrrstt
+					$extheaderrawrestrictions = fread($fd, 1);
+					$thisfile_id3v2['exthead_flags']['restrictions_tagsize']  = (bindec('11000000') & ord($extheaderrawrestrictions)) >> 6; // p - Tag size restrictions
+					$thisfile_id3v2['exthead_flags']['restrictions_textenc']  = (bindec('00100000') & ord($extheaderrawrestrictions)) >> 5; // q - Text encoding restrictions
+					$thisfile_id3v2['exthead_flags']['restrictions_textsize'] = (bindec('00011000') & ord($extheaderrawrestrictions)) >> 3; // r - Text fields size restrictions
+					$thisfile_id3v2['exthead_flags']['restrictions_imgenc']   = (bindec('00000100') & ord($extheaderrawrestrictions)) >> 2; // s - Image encoding restrictions
+					$thisfile_id3v2['exthead_flags']['restrictions_imgsize']  = (bindec('00000011') & ord($extheaderrawrestrictions)) >> 0; // t - Image size restrictions
+				}
+			} else {
+				$ThisFileInfo['warning'][] = '$thisfile_id3v2[exthead_flag_bytes] = "'.$thisfile_id3v2['exthead_flag_bytes'].'" (expecting "1")';
+				fseek($fd, $thisfile_id3v2['exthead_length'] - 1, SEEK_CUR);
+				//return false;
 			}
 		} // end extended header
 
 
-
 		// create 'encoding' key - used by getid3::HandleAllTags()
 		// in ID3v2 every field can have it's own encoding type
 		// so force everything to UTF-8 so it can be handled consistantly
@@ -159,10 +163,10 @@
 	//        Flags         $xx xx
 
 		$sizeofframes = $thisfile_id3v2['headerlength'] - 10; // not including 10-byte initial header
-		if (isset($thisfile_id3v2['extheaderlength'])) {
-			$sizeofframes -= $thisfile_id3v2['extheaderlength'];
+		if (@$thisfile_id3v2['exthead_length']) {
+			$sizeofframes -= ($thisfile_id3v2['exthead_length'] + 4);
 		}
-		if (isset($thisfile_id3v2_flags['isfooter']) && $thisfile_id3v2_flags['isfooter']) {
+		if (@$thisfile_id3v2_flags['isfooter']) {
 			$sizeofframes -= 10; // footer takes last 10 bytes of ID3v2 header, after frame data, before audio
 		}
 		if ($sizeofframes > 0) {
@@ -170,7 +174,7 @@
 			$framedata = fread($fd, $sizeofframes); // read all frames from file into $framedata variable
 
 			//    if entire frame data is unsynched, de-unsynch it now (ID3v2.3.x)
-			if (isset($thisfile_id3v2_flags['unsynch']) && $thisfile_id3v2_flags['unsynch'] && ($id3v2_majorversion <= 3)) {
+			if (@$thisfile_id3v2_flags['unsynch'] && ($id3v2_majorversion <= 3)) {
 				$framedata = $this->DeUnsynchronise($framedata);
 			}
 			//        [in ID3v2.4.0] Unsynchronisation [S:6.1] is done on frame level, instead
@@ -179,7 +183,7 @@
 			//        there exists an unsynchronised frame, while the new unsynchronisation flag in
 			//        the frame header [S:4.1.2] indicates unsynchronisation.
 
-			$framedataoffset = 10; // how many bytes into the stream - start from after the 10-byte header
+			$framedataoffset = 10 + (@$thisfile_id3v2['exthead_length'] ? $thisfile_id3v2['exthead_length'] + 4 : 0); // how many bytes into the stream - start from after the 10-byte header (and extended header length+4, if present)
 			while (isset($framedata) && (strlen($framedata) > 0)) { // cycle through until no more frame data is left to parse
 				if (strlen($framedata) <= $this->ID3v2HeaderLength($id3v2_majorversion)) {
 					// insufficient room left in ID3v2 header for actual data - must be padding
@@ -350,7 +354,7 @@
 	//        ID3v2 size             4 * %0xxxxxxx
 
 		if (isset($thisfile_id3v2_flags['isfooter']) && $thisfile_id3v2_flags['isfooter']) {
-			$footer = fread ($fd, 10);
+			$footer = fread($fd, 10);
 			if (substr($footer, 0, 3) == '3DI') {
 				$thisfile_id3v2['footer'] = true;
 				$thisfile_id3v2['majorversion_footer'] = ord($footer{3});
diff -urN ampache-3.3.2-alpha4/modules/id3/getid3/write.id3v2.php ampache-3.3.2-beta1/modules/id3/getid3/write.id3v2.php
--- ampache-3.3.2-alpha4/modules/id3/getid3/write.id3v2.php	2005-12-27 01:32:57.000000000 -0800
+++ ampache-3.3.2-beta1/modules/id3/getid3/write.id3v2.php	2006-01-08 23:06:15.000000000 -0800
@@ -101,6 +101,7 @@
 								fclose($fp_source);
 								copy($tempfilename, $this->filename);
 								unlink($tempfilename);
+								ob_end_clean();
 								return true;
 
 							} else {
diff -urN ampache-3.3.2-alpha4/modules/id3/getid3/write.php ampache-3.3.2-beta1/modules/id3/getid3/write.php
--- ampache-3.3.2-alpha4/modules/id3/getid3/write.php	2005-12-27 01:32:57.000000000 -0800
+++ ampache-3.3.2-beta1/modules/id3/getid3/write.php	2006-01-08 23:06:15.000000000 -0800
@@ -394,6 +394,14 @@
 					}
 					break;
 
+				case 'real':
+					$real_writer = new getid3_write_real;
+					$real_writer->filename = $this->filename;
+					if (($success = $real_writer->RemoveReal()) === false) {
+						$this->errors[] = 'RemoveReal() failed with message(s):<PRE><UL><LI>'.trim(implode('</LI><LI>', $real_writer->errors)).'</LI></UL></PRE>';
+					}
+					break;
+
 				default:
 					$this->errors[] = 'Invalid tag format to delete: "'.$tagformat.'"';
 					return false;
diff -urN ampache-3.3.2-alpha4/modules/id3/getid3/write.real.php ampache-3.3.2-beta1/modules/id3/getid3/write.real.php
--- ampache-3.3.2-alpha4/modules/id3/getid3/write.real.php	2005-12-27 01:32:57.000000000 -0800
+++ ampache-3.3.2-beta1/modules/id3/getid3/write.real.php	2006-01-08 23:06:15.000000000 -0800
@@ -16,7 +16,7 @@
 class getid3_write_real
 {
 	var $filename;
-	var $tag_data;
+	var $tag_data     = array();
 	var $warnings     = array(); // any non-critical errors will be stored here
 	var $errors       = array(); // any critical errors will be stored here
 	var $paddedlength = 512;     // minimum length of CONT tag in bytes
@@ -33,50 +33,98 @@
 				// Initialize getID3 engine
 				$getID3 = new getID3;
 				$OldThisFileInfo = $getID3->analyze($this->filename);
-				if (empty($OldThisFileInfo['chunks']) && !empty($OldThisFileInfo['old_ra_header'])) {
+				if (empty($OldThisFileInfo['real']['chunks']) && !empty($OldThisFileInfo['real']['old_ra_header'])) {
 					$this->errors[] = 'Cannot write Real tags on old-style file format';
+					fclose($fp_source);
 					return false;
 				}
 
-				$OldPROPinfo = false;
-				$StartOfDATA = false;
-				foreach ($OldThisFileInfo['chunks'] as $chunknumber => $chunkarray) {
-					if ($chunkarray['name'] == 'PROP') {
-						$OldPROPinfo = $chunkarray;
-					} elseif ($chunkarray['name'] = 'DATA') {
-						$StartOfDATA = $chunkarray['offset'];
-					}
+				if (empty($OldThisFileInfo['real']['chunks'])) {
+					$this->errors[] = 'Cannot write Real tags because cannot find DATA chunk in file';
+					fclose($fp_source);
+					return false;
+				}
+				foreach ($OldThisFileInfo['real']['chunks'] as $chunknumber => $chunkarray) {
+					$oldChunkInfo[$chunkarray['name']] = $chunkarray;
+				}
+				if (!empty($oldChunkInfo['CONT']['length'])) {
+					$this->paddedlength = max($oldChunkInfo['CONT']['length'], $this->paddedlength);
 				}
 
-				if (!empty($OldPROPinfo['length'])) {
-					$this->paddedlength = max($OldPROPinfo['length'], $this->paddedlength);
+				$new_CONT_tag_data = $this->GenerateCONTchunk();
+				$new_PROP_tag_data = $this->GeneratePROPchunk($OldThisFileInfo['real']['chunks'], $new_CONT_tag_data);
+				$new__RMF_tag_data = $this->GenerateRMFchunk($OldThisFileInfo['real']['chunks']);
+
+				if (@$oldChunkInfo['.RMF']['length'] == strlen($new__RMF_tag_data)) {
+					fseek($fp_source, $oldChunkInfo['.RMF']['offset'], SEEK_SET);
+					fwrite($fp_source, $new__RMF_tag_data);
+				} else {
+					$this->errors[] = 'new .RMF tag ('.strlen($new__RMF_tag_data).' bytes) different length than old .RMF tag ('.$oldChunkInfo['.RMF']['length'].' bytes)';
+					fclose($fp_source);
+					return false;
 				}
 
-				$new_real_tag_data = GenerateRealTag();
+				if (@$oldChunkInfo['PROP']['length'] == strlen($new_PROP_tag_data)) {
+					fseek($fp_source, $oldChunkInfo['PROP']['offset'], SEEK_SET);
+					fwrite($fp_source, $new_PROP_tag_data);
+				} else {
+					$this->errors[] = 'new PROP tag ('.strlen($new_PROP_tag_data).' bytes) different length than old PROP tag ('.$oldChunkInfo['PROP']['length'].' bytes)';
+					fclose($fp_source);
+					return false;
+				}
 
-				if (@$OldPROPinfo['length'] == $new_real_tag_data) {
+				if (@$oldChunkInfo['CONT']['length'] == strlen($new_CONT_tag_data)) {
 
 					// new data length is same as old data length - just overwrite
-					fseek($fp_source, $OldPROPinfo['offset'], SEEK_SET);
-					fwrite($fp_source, $new_real_tag_data);
+					fseek($fp_source, $oldChunkInfo['CONT']['offset'], SEEK_SET);
+					fwrite($fp_source, $new_CONT_tag_data);
+					fclose($fp_source);
+					return true;
 
 				} else {
 
-					if (empty($OldPROPinfo)) {
-						// no existing PROP chunk
-						$BeforeOffset = $StartOfDATA;
-						$AfterOffset  = $StartOfDATA;
+					if (empty($oldChunkInfo['CONT'])) {
+						// no existing CONT chunk
+						$BeforeOffset = $oldChunkInfo['DATA']['offset'];
+						$AfterOffset  = $oldChunkInfo['DATA']['offset'];
 					} else {
 						// new data is longer than old data
-						$BeforeOffset = $OldPROPinfo['offset'];
-						$AfterOffset  = $OldPROPinfo['offset'] + $OldPROPinfo['length'];
+						$BeforeOffset = $oldChunkInfo['CONT']['offset'];
+						$AfterOffset  = $oldChunkInfo['CONT']['offset'] + $oldChunkInfo['CONT']['length'];
 					}
+					if ($tempfilename = tempnam('*', 'getID3')) {
+						ob_start();
+						if ($fp_temp = fopen($tempfilename, 'wb')) {
+
+							rewind($fp_source);
+							fwrite($fp_temp, fread($fp_source, $BeforeOffset));
+							fwrite($fp_temp, $new_CONT_tag_data);
+							fseek($fp_source, $AfterOffset, SEEK_SET);
+							while ($buffer = fread($fp_source, GETID3_FREAD_BUFFER_SIZE)) {
+								fwrite($fp_temp, $buffer, strlen($buffer));
+							}
+							fclose($fp_temp);
+
+							if (copy($tempfilename, $this->filename)) {
+								unlink($tempfilename);
+								fclose($fp_source);
+								return true;
+							}
+							unlink($tempfilename);
+							$this->errors[] = 'FAILED: copy('.$tempfilename.', '.$this->filename.') - '.strip_tags(ob_get_contents());
+
+						} else {
 
+							$this->errors[] = 'Could not open '.$tempfilename.' mode "wb" - '.strip_tags(ob_get_contents());
+
+						}
+						ob_end_clean();
+					}
+					fclose($fp_source);
+					return false;
 
 				}
 
-				fclose($fp_source);
-				return true;
 
 			} else {
 				$this->errors[] = 'Could not open '.$this->filename.' mode "r+b"';
@@ -87,28 +135,88 @@
 		return false;
 	}
 
-	function GenerateRealTag() {
-		$RealCONT  = "\x00\x00"; // object version
+	function GenerateRMFchunk(&$chunks) {
+		$oldCONTexists = false;
+		foreach ($chunks as $key => $chunk) {
+			$chunkNameKeys[$chunk['name']] = $key;
+			if ($chunk['name'] == 'CONT') {
+				$oldCONTexists = true;
+			}
+		}
+		$newHeadersCount = $chunks[$chunkNameKeys['.RMF']]['headers_count'] + ($oldCONTexists ? 0 : 1);
+
+		$RMFchunk  = "\x00\x00"; // object version
+		$RMFchunk .= getid3_lib::BigEndian2String($chunks[$chunkNameKeys['.RMF']]['file_version'], 4);
+		$RMFchunk .= getid3_lib::BigEndian2String($newHeadersCount,                                4);
+
+		$RMFchunk  = '.RMF'.getid3_lib::BigEndian2String(strlen($RMFchunk) + 8, 4).$RMFchunk; // .RMF chunk identifier + chunk length
+		return $RMFchunk;
+	}
+
+	function GeneratePROPchunk(&$chunks, &$new_CONT_tag_data) {
+		$old_CONT_length = 0;
+		$old_DATA_offset = 0;
+		$old_INDX_offset = 0;
+		foreach ($chunks as $key => $chunk) {
+			$chunkNameKeys[$chunk['name']] = $key;
+			if ($chunk['name'] == 'CONT') {
+				$old_CONT_length = $chunk['length'];
+			} elseif ($chunk['name'] == 'DATA') {
+				if (!$old_DATA_offset) {
+					$old_DATA_offset = $chunk['offset'];
+				}
+			} elseif ($chunk['name'] == 'INDX') {
+				if (!$old_INDX_offset) {
+					$old_INDX_offset = $chunk['offset'];
+				}
+			}
+		}
+		$CONTdelta = strlen($new_CONT_tag_data) - $old_CONT_length;
+
+		$PROPchunk  = "\x00\x00"; // object version
+		$PROPchunk .= getid3_lib::BigEndian2String($chunks[$chunkNameKeys['PROP']]['max_bit_rate'],    4);
+		$PROPchunk .= getid3_lib::BigEndian2String($chunks[$chunkNameKeys['PROP']]['avg_bit_rate'],    4);
+		$PROPchunk .= getid3_lib::BigEndian2String($chunks[$chunkNameKeys['PROP']]['max_packet_size'], 4);
+		$PROPchunk .= getid3_lib::BigEndian2String($chunks[$chunkNameKeys['PROP']]['avg_packet_size'], 4);
+		$PROPchunk .= getid3_lib::BigEndian2String($chunks[$chunkNameKeys['PROP']]['num_packets'],     4);
+		$PROPchunk .= getid3_lib::BigEndian2String($chunks[$chunkNameKeys['PROP']]['duration'],        4);
+		$PROPchunk .= getid3_lib::BigEndian2String($chunks[$chunkNameKeys['PROP']]['preroll'],         4);
+		$PROPchunk .= getid3_lib::BigEndian2String(max(0, $old_INDX_offset + $CONTdelta),              4);
+		$PROPchunk .= getid3_lib::BigEndian2String(max(0, $old_DATA_offset + $CONTdelta),              4);
+		$PROPchunk .= getid3_lib::BigEndian2String($chunks[$chunkNameKeys['PROP']]['num_streams'],     2);
+		$PROPchunk .= getid3_lib::BigEndian2String($chunks[$chunkNameKeys['PROP']]['flags_raw'],       2);
+
+		$PROPchunk  = 'PROP'.getid3_lib::BigEndian2String(strlen($PROPchunk) + 8, 4).$PROPchunk; // PROP chunk identifier + chunk length
+		return $PROPchunk;
+	}
+
+	function GenerateCONTchunk() {
+		foreach ($this->tag_data as $key => $value) {
+			// limit each value to 0xFFFF bytes
+			$this->tag_data[$key] = substr($value, 0, 65535);
+		}
+
+		$CONTchunk  = "\x00\x00"; // object version
 
-		$RealCONT .= BigEndian2String(strlen(@$this->tag_data['title']), 4);
-		$RealCONT .= @$this->tag_data['title'];
+		$CONTchunk .= getid3_lib::BigEndian2String(strlen(@$this->tag_data['title']), 2);
+		$CONTchunk .= @$this->tag_data['title'];
 
-		$RealCONT .= BigEndian2String(strlen(@$this->tag_data['artist']), 4);
-		$RealCONT .= @$this->tag_data['artist'];
+		$CONTchunk .= getid3_lib::BigEndian2String(strlen(@$this->tag_data['artist']), 2);
+		$CONTchunk .= @$this->tag_data['artist'];
 
-		$RealCONT .= BigEndian2String(strlen(@$this->tag_data['copyright']), 4);
-		$RealCONT .= @$this->tag_data['copyright'];
+		$CONTchunk .= getid3_lib::BigEndian2String(strlen(@$this->tag_data['copyright']), 2);
+		$CONTchunk .= @$this->tag_data['copyright'];
 
-		$RealCONT .= BigEndian2String(strlen(@$this->tag_data['comment']), 4);
-		$RealCONT .= @$this->tag_data['comment'];
+		$CONTchunk .= getid3_lib::BigEndian2String(strlen(@$this->tag_data['comment']), 2);
+		$CONTchunk .= @$this->tag_data['comment'];
 
-		if ($this->paddedlength > (strlen($RealCONT) + 8)) {
-			$RealCONT .= str_repeat("\x00", $this->paddedlength - strlen($RealCONT) - 8);
+		if ($this->paddedlength > (strlen($CONTchunk) + 8)) {
+			$CONTchunk .= str_repeat("\x00", $this->paddedlength - strlen($CONTchunk) - 8);
 		}
 
-		$RealCONT  = 'CONT'.BigEndian2String(strlen($RealCONT) + 8, 4).$RealCONT; // CONT chunk identifier + chunk length
+		$CONTchunk  = 'CONT'.getid3_lib::BigEndian2String(strlen($CONTchunk) + 8, 4).$CONTchunk; // CONT chunk identifier + chunk length
 
-		return $RealCONT;
+		return $CONTchunk;
 	}
 
 	function RemoveReal() {
@@ -116,22 +224,69 @@
 		if (is_writeable($this->filename)) {
 			if ($fp_source = @fopen($this->filename, 'r+b')) {
 
-return false;
-				//fseek($fp_source, -128, SEEK_END);
-				//if (fread($fp_source, 3) == 'TAG') {
-				//	ftruncate($fp_source, filesize($this->filename) - 128);
-				//} else {
-				//	// no real tag to begin with - do nothing
-				//}
+				// Initialize getID3 engine
+				$getID3 = new getID3;
+				$OldThisFileInfo = $getID3->analyze($this->filename);
+				if (empty($OldThisFileInfo['real']['chunks']) && !empty($OldThisFileInfo['real']['old_ra_header'])) {
+					$this->errors[] = 'Cannot remove Real tags from old-style file format';
+					fclose($fp_source);
+					return false;
+				}
+
+				if (empty($OldThisFileInfo['real']['chunks'])) {
+					$this->errors[] = 'Cannot remove Real tags because cannot find DATA chunk in file';
+					fclose($fp_source);
+					return false;
+				}
+				foreach ($OldThisFileInfo['real']['chunks'] as $chunknumber => $chunkarray) {
+					$oldChunkInfo[$chunkarray['name']] = $chunkarray;
+				}
+
+				if (empty($oldChunkInfo['CONT'])) {
+					// no existing CONT chunk
+					fclose($fp_source);
+					return true;
+				}
+
+				$BeforeOffset = $oldChunkInfo['CONT']['offset'];
+				$AfterOffset  = $oldChunkInfo['CONT']['offset'] + $oldChunkInfo['CONT']['length'];
+				if ($tempfilename = tempnam('*', 'getID3')) {
+					ob_start();
+					if ($fp_temp = fopen($tempfilename, 'wb')) {
+
+						rewind($fp_source);
+						fwrite($fp_temp, fread($fp_source, $BeforeOffset));
+						fseek($fp_source, $AfterOffset, SEEK_SET);
+						while ($buffer = fread($fp_source, GETID3_FREAD_BUFFER_SIZE)) {
+							fwrite($fp_temp, $buffer, strlen($buffer));
+						}
+						fclose($fp_temp);
+
+						if (copy($tempfilename, $this->filename)) {
+							unlink($tempfilename);
+							fclose($fp_source);
+							return true;
+						}
+						unlink($tempfilename);
+						$this->errors[] = 'FAILED: copy('.$tempfilename.', '.$this->filename.') - '.strip_tags(ob_get_contents());
+
+					} else {
+
+						$this->errors[] = 'Could not open '.$tempfilename.' mode "wb" - '.strip_tags(ob_get_contents());
+
+					}
+					ob_end_clean();
+				}
 				fclose($fp_source);
-				return true;
+				return false;
+
 
 			} else {
 				$this->errors[] = 'Could not open '.$this->filename.' mode "r+b"';
+				return false;
 			}
-		} else {
-			$this->errors[] = $this->filename.' is not writeable';
 		}
+		$this->errors[] = 'File is not writeable: '.$this->filename;
 		return false;
 	}
 
diff -urN ampache-3.3.2-alpha4/modules/init.php ampache-3.3.2-beta1/modules/init.php
--- ampache-3.3.2-alpha4/modules/init.php	2005-12-27 01:33:01.000000000 -0800
+++ ampache-3.3.2-beta1/modules/init.php	2006-01-08 23:06:19.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -37,7 +37,6 @@
 $configfile = "$prefix/config/ampache.cfg.php";
 require_once($prefix . "/lib/general.lib.php");
 
-
 /*********************STOP EDITING*********************************/
 
 /*
@@ -82,8 +81,9 @@
 	$results['conf']['allow_stream_playback'] = "true";
 }
 
+$results['conf']['raw_web_path']	= $results['conf']['web_path'];
 $results['conf']['web_path']		= $http_type . $_SERVER['HTTP_HOST'] . $results['conf']['web_path'];
-$results['conf']['version']		= '3.3.2-Alpha4';
+$results['conf']['version']		= '3.3.2-Beta1';
 $results['conf']['catalog_file_pattern']= 'mp3|mpc|m4p|m4a|mp4|aac|ogg|rm|wma|asf|flac|spx';
 $results['libglue']['local_table']	= 'session';
 $results['libglue']['local_sid']	= 'id';
@@ -152,23 +152,24 @@
 require_once(libglue_param('libglue_path') . "/dbh.php");
 
 // Librarys
-require_once(conf('prefix') . "/lib/album.lib.php");
-require_once(conf('prefix') . "/lib/artist.lib.php");
-require_once(conf('prefix') . "/lib/song.php");
-require_once(conf('prefix') . "/lib/search.php");
-require_once(conf('prefix') . "/lib/preferences.php");
-require_once(conf('prefix') . "/lib/rss.php");
-require_once(conf('prefix') . "/lib/log.lib.php");
-require_once(conf('prefix') . "/lib/mpd.php");
-require_once(conf('prefix') . "/lib/ui.lib.php");
-require_once(conf('prefix') . "/lib/gettext.php");
-require_once(conf('prefix') . "/lib/batch.lib.php");
-require_once(conf('prefix') . "/lib/themes.php");
-require_once(conf('prefix') . "/lib/stream.lib.php");
-require_once(conf('prefix') . "/modules/lib.php");
-require_once(conf('prefix') . "/modules/admin.php");
-require_once(conf('prefix') . "/modules/catalog.php");
-require_once(conf('prefix') . "/lib/upload.php");
+require_once(conf('prefix') . '/lib/album.lib.php');
+require_once(conf('prefix') . '/lib/artist.lib.php');
+require_once(conf('prefix') . '/lib/song.php');
+require_once(conf('prefix') . '/lib/search.php');
+require_once(conf('prefix') . '/lib/preferences.php');
+require_once(conf('prefix') . '/lib/rss.php');
+require_once(conf('prefix') . '/lib/log.lib.php');
+require_once(conf('prefix') . '/lib/mpd.php');
+require_once(conf('prefix') . '/lib/ui.lib.php');
+require_once(conf('prefix') . '/lib/gettext.php');
+require_once(conf('prefix') . '/lib/batch.lib.php');
+require_once(conf('prefix') . '/lib/themes.php');
+require_once(conf('prefix') . '/lib/stream.lib.php');
+require_once(conf('prefix') . '/lib/playlist.lib.php');
+require_once(conf('prefix') . '/modules/lib.php');
+require_once(conf('prefix') . '/modules/admin.php');
+require_once(conf('prefix') . '/modules/catalog.php');
+require_once(conf('prefix') . '/lib/upload.php');
 
 // Modules (These are conditionaly included depending upon config values)
 require_once(conf('prefix') . "/modules/id3/audioinfo.class.php");
@@ -208,15 +209,16 @@
 require_once(conf('prefix') . "/lib/class/error.class.php");
 require_once(conf('prefix') . "/lib/class/genre.class.php");
 
+
+/* Set a new Error Handler */
+$old_error_handler = set_error_handler("ampache_error_handler");
+
 /* Some Libglue Hacks */
 $array['dbh_name'] = 'stupid_pos';
 $array['stupid_pos'] = check_sess_db('local');
 libglue_param($array);
 /*  End Libglue Hacks */
 
-/* Set a new Error Handler */
-$old_error_handler = set_error_handler("ampache_error_handler");
-
 
 
 /* Check their PHP Vars to make sure we're cool here */
@@ -262,7 +264,7 @@
 	$user->set_preferences();
 	$user->update_last_seen();
 }
-if (!conf('use_auth')) { 
+elseif (!conf('use_auth')) { 
 	$auth['success'] = 1;
 	$auth['info']['username'] = '-1';
 	$auth['info']['fullname'] = "Ampache User";
@@ -282,6 +284,9 @@
 	init_preferences();
 	set_theme();
 }
+else { 
+	$user = new user();
+}
 
 // Load gettext mojo
 load_gettext();
@@ -308,6 +313,5 @@
 	}
 }
 
-
 unset($update);
 ?>
diff -urN ampache-3.3.2-alpha4/modules/libglue/dbh.php ampache-3.3.2-beta1/modules/libglue/dbh.php
--- ampache-3.3.2-alpha4/modules/libglue/dbh.php	2005-12-27 01:33:01.000000000 -0800
+++ ampache-3.3.2-beta1/modules/libglue/dbh.php	2006-01-08 23:06:18.000000000 -0800
@@ -27,7 +27,7 @@
 
 function setup_sess_db($name, $host, $db, $username, $password) 
 {
-	$dbh = @mysql_connect($host, $username, $password) or header("Location:" . conf('web_path') . "/test.php");
+	$dbh = mysql_connect($host, $username, $password) or header("Location:" . conf('web_path') . "/test.php");
 	if ( !is_resource($dbh) )
 	{
 		echo "Unable to connect to \"". $host ."\" in order to \n" .   
diff -urN ampache-3.3.2-alpha4/modules/libglue/session.php ampache-3.3.2-beta1/modules/libglue/session.php
--- ampache-3.3.2-alpha4/modules/libglue/session.php	2005-12-27 01:33:01.000000000 -0800
+++ ampache-3.3.2-beta1/modules/libglue/session.php	2006-01-08 23:06:18.000000000 -0800
@@ -14,10 +14,9 @@
  */
 
 
-function check_sess_db($dbtype = 'local')
-{
-    if($dbtype === 'sso')
-    {
+function check_sess_db($dbtype = 'local') {
+
+    if($dbtype === 'sso') {
         $dbh = libglue_param(libglue_param('sso_dbh_name'));
         if(is_resource($dbh)) return $dbh;
         $dbh_name = libglue_param('sso_dbh_name');
@@ -148,8 +147,8 @@
     $local_expirecol = libglue_param('local_expirecol');
     $local_typecol = libglue_param('local_typecol');
     $sql= "INSERT INTO $local_table ".
-          " ($local_sid,$local_usercol,$local_typecol)".
-          " VALUES ('$id','$username','$type')";
+          " ($local_sid,$local_usercol,$local_typecol,value)".
+          " VALUES ('$id','$username','$type','')";
     $db_result = mysql_query($sql, $local_dbh);
 
     if($db_result) return TRUE;
diff -urN ampache-3.3.2-alpha4/modules/lib.php ampache-3.3.2-beta1/modules/lib.php
--- ampache-3.3.2-alpha4/modules/lib.php	2005-12-27 01:33:01.000000000 -0800
+++ ampache-3.3.2-beta1/modules/lib.php	2006-01-08 23:06:19.000000000 -0800
@@ -102,7 +102,7 @@
 
 function insert_flagged_song($song, $reason, $comment) {
 
-	$user = $_SESSION['userdata']['id'];
+	$user = $_SESSION['userdata']['username'];
 	$time = time();
 	$sql = "INSERT INTO flagged (user,song,type,comment,date)" .
 		" VALUES ('$user','$song', '$reason', '$comment', '$time')";
@@ -228,28 +228,6 @@
 }
 
 
-function get_song_ids_from_artist ($artist) {
-
-	global $settings;
-	$dbh = dbh();
-
-	$song_ids = array();
-	$artist = sql_escape($artist);
-
-	$query = "SELECT id FROM song" .
-		" WHERE artist = '$artist'" .
-		" ORDER BY album, track";
-
-	$db_result = mysql_query($query, $dbh);
-
-	while ( $r = mysql_fetch_object($db_result) ) {
-		$song_ids[] = $r->id;
-	}
-
-	return $song_ids;
-}
-
-
 /*
  * get_song_ids_from_artist_and_album();
  *
@@ -313,21 +291,12 @@
 /* Lets tie it to album too, so we can show art ;)       */
 /*********************************************************/
 /* One symbol, m(__)m */
-function show_songs ($song_ids, $playlist_id=0, $album=0) {
+function show_songs ($song_ids, $playlist, $album=0) {
 
 	$dbh = dbh();
 
 	// Get info about current user
-	$user = new User($_SESSION['userdata']['username']);
-
-	// Get info about playlist owner
-	if (isset($playlist_id) && $playlist_id != 0) {
-		$sql = "SELECT user FROM playlist WHERE id = '$playlist_id'";
-		$db_result = mysql_query($sql, $dbh);
-		if ($r = mysql_fetch_array($db_result)) {
-			$pluser = get_user_byid($r[0]);
-		}
-	}
+	$user = $GLOBALS['user'];
 
 	$totaltime = 0;
 	$totalsize = 0;
@@ -336,7 +305,7 @@
 
 	return true;
 
-}// function show_songs
+} // function show_songs
 
 
 
@@ -539,141 +508,6 @@
 
 } // show_albums
 
-
-// Had to tweak this so it would show both public and private playlists
-//  Defaults to showing both although you could pass type=private|adminprivate|public
-//  to see only those
-function show_playlists ($type = 'all') {
-
-	$dbh = dbh();
-
-	$user = $GLOBALS['user'];
-
-	$web_path = conf('web_path');
-
-	// mapping of types to pretty names
-	$typemap = array( "public" => _("Public"),
-			"private" => _("Your Private"),
-			"adminprivate" => _("Other Private")
-			);
-
-	if ($type == 'all') {
-		show_playlists('private');
-		if ( $user->access === 'admin' ) {
-			show_playlists('adminprivate');
-		}
-		show_playlists('public');
-		return true;
-	}
-	elseif ($type == 'public') {
-		$sql = "SELECT id,name,user,date ".
-			" FROM playlist ".
-			" WHERE type='public'".
-			" ORDER BY name";
-	}
-	elseif ($type == 'private') {
-		$sql = "SELECT id,name,user,date ".
-			" FROM playlist ".
-			" WHERE type='private'" .
-			" AND user = '$user->username'" .
-			" AND name <> 'Temporary'".
-			" ORDER BY name";
-	}
-	elseif ($type == 'adminprivate') {
-		if ( $user->access === 'admin' ) {
-			$sql = "SELECT id,name,user,date ".
-				" FROM playlist ".
-				" WHERE type='private'" .
-				" AND username != '$user->username'" .
-				" AND name <> 'Temporary'".
-				" ORDER BY name";
-		}
-		else {
-			// No admin access
-			$sql = 'SELECT 1+1';
-		}
-	}
-	else {
- 		echo "** Error ** Call to show_playlists with unknown type $type ".
- 			 "in file ".$_SERVER['PHP_SELF']." ** <br />\n";
-		$sql = 'SELECT 1+1';
-	}
-
-	$db_result = mysql_query($sql, $dbh);
-
-	print <<<ECHO
-<h3>$typemap[$type] Playlists</h3>
-
-<table class="tabledata" cellspacing="0" cellpadding="0" border="0">
-  <tr class="table-header">
-    <th>Playlist Name</th>
-    <th># Songs</th>
-    <th>Owner</th>
-    <th colspan="6">Actions</th>
-  </tr>
-
-ECHO;
-
-	flip_class(array('even','odd'));
-
-	if ( mysql_num_rows($db_result) ) {
-		while ( $r = mysql_fetch_array($db_result) ) {
-			$plname = $r['name'];
-			$plid = $r['id'];
-			$pluser = new User($r['user']);
-			$plfullname = $pluser->fullname;
-			$plowner = $pluser->username;
-
-			// find out how many songs in this playlist
-			$count_query = "SELECT count(*) ".
-					   " FROM playlist_data ".
-					   " WHERE playlist = '$plid'";
-			$count_result = mysql_query($count_query, $dbh);
-			list($count) = mysql_fetch_row($count_result);
-			$class = flip_class();
-			echo "  <tr class=\"$class\">\n";
-			echo "    <td><a href=\"$web_path/playlist.php?playlist_id=$plid&amp;action=view_list\">$plname</a></td>\n";
-			echo "    <td>$count</td>\n";
-			echo "    <td>$plfullname</td>\n"; 
-			echo "    <td><a href=\"$web_path/playlist.php?playlist_id=$plid&amp;action=view_list\">" . _("View") . "</a></td>\n"; 
-
-			if ($user->username == $pluser->username || $user->has_access(100)) {
-				echo "    <td><a href=\"$web_path/playlist.php?playlist_id=$plid&amp;action=edit\">" . _("Edit") . "</a></td>\n";
-				echo "    <td><a href=\"$web_path/playlist.php?playlist_id=$plid&amp;action=delete_playlist\">" . _("Delete") . "</a></td>\n";
-			}
-			else {
-				echo "    <td>&nbsp;</td>\n";
-				echo "    <td>&nbsp;</td>\n";
-			}
-			
-			if ( $count[0] ) {
-				echo "    <td><a href=\"$web_path/song.php?action=m3u&amp;playlist_id=$plid\">" . _("Play") . "</a> | " .
-				     "<a href=\"$web_path/song.php?action=random&amp;playlist_id=$plid\">" . _("Random") . "</a></td>\n";				
-			}
-			else {
-				echo "    <td>&nbsp;</td>\n";
-			}                       
-                        if( batch_ok() ) { 
-                                echo"   <td><a href=\"$web_path/batch.php?action=pl&amp;id=$plid\">" . _("Download") . "</a></td>\n";
-                        } else {
-                                echo"   <td>&nbsp;</td>\n";
-                        }                         
-
-			echo "  </tr>\n";
-		}
-		echo "\n";
-	} //if rows in result
-	else { 
-		echo "  <tr class=\"even\">\n";
-	        echo "    <td colspan=\"7\">" . _("There are no playlists of this type") . "</td>\n"; 
-		echo "  </tr>\n";
-	}
-
-	echo "</table>\n";
-	echo "<br />\n";
-
-}
-
 function get_playlist_track_from_song ( $playlist_id, $song_id ) {
 
 	$dbh = dbh();
@@ -825,8 +659,11 @@
 
 }
 
-
-function show_playlist_dropdown ($playlist_id=0) {
+/**
+ * show_playlist_dropdown
+ * Hacking this for now... will fix tomorrow evening 
+ */
+function show_playlist_dropdown ($playlist_id=0,$no_new=false) {
 
 	global $settings;
 	$dbh = dbh();
@@ -838,11 +675,8 @@
 		" ORDER BY name";
 	$db_result = @mysql_query($sql, $dbh);
 
-	print <<<ECHO
-<select name="playlist_id">
-<option value="0"> -New Playlist- </option>
-
-ECHO;
+	echo "<select name=\"playlist_id\">\n";
+	if (!$no_new) { echo "<option value=\"0\"> -New Playlist- </option>\n"; }
 
 	while ( $r = @mysql_fetch_object($db_result) ) {
 		if ( $playlist_id == $r->id ) {
diff -urN ampache-3.3.2-alpha4/modules/validatemail/validateEmailFormat.php ampache-3.3.2-beta1/modules/validatemail/validateEmailFormat.php
--- ampache-3.3.2-alpha4/modules/validatemail/validateEmailFormat.php	1969-12-31 16:00:00.000000000 -0800
+++ ampache-3.3.2-beta1/modules/validatemail/validateEmailFormat.php	2006-01-08 23:06:19.000000000 -0800
@@ -0,0 +1,219 @@
+<?php
+////////////////////////////////////////////////////////////////////////
+//
+// validateEmailFormat.php - v 1.0
+//
+// PHP translation of Email Regex Program (optimized)
+// Derived from:
+//   Appendix B - Email Regex Program
+//   _Mastering Regular Expressions_ (First Edition, May 1997 revision)
+//     by Jeffrey E.F. Friedl
+//     Copyright 1997 O'Reilly & Associates
+//     ISBN: 1-56592-257-3
+//   For more info on this title, see:
+//     http://www.oreilly.com/catalog/regex/
+//   For original perl version, see:
+//     http://examples.oreilly.com/regex/
+//
+// Follows RFC 822 about as close as is possible.
+// http://www.faqs.org/rfcs/rfc822.html
+//
+//
+// DESCRIPTION:
+//  bool validateEmailFormat ( string string )
+//
+//  Returns TRUE if the email address passed is in a valid format
+//  according to RFC 822, returns FALSE if email address passed
+//  is not in a valid format.
+//
+// EXAMPLES:
+//  Example #1:
+//  $email = "Jeffy <\"That Tall Guy\"@foo.com (blah blah blah)";
+//  $isValid = validateEmailFormat($email);
+//  if($isValid) {
+//    ...  // Yes, the above address is a valid format!
+//  } else {
+//    echo "sorry, that address isn't formatted properly.";
+//  }
+//
+//  Example #2:
+//  $email = "foo@bar.co.il";
+//  $isValid = validateEmailFormat($email);
+//  if($isValid) {
+//    ...
+//  } else {
+//    echo "sorry ...";
+//  }
+//
+// Translated by Clay Loveless <clay@killersoft.com> on March 11, 2002
+// ... in hopes that the "here's how to check an e-mail address!"
+// discussion can finally end. After all ...
+//
+//       Friedl is the master -- Hail to the King, baby!
+//
+////////////////////////////////////////////////////////////////////////
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+//
+// Hell, it might not even work for you.
+//
+// By using this code you agree to indemnify Clay Loveless,
+// KillerSoft, and Crawlspace, Inc. from any liability that might
+// arise from its use.
+//
+// Have fun!
+//
+////////////////////////////////////////////////////////////////////////
+function validateEmailFormat ( $email ) {
+
+    // Some shortcuts for avoiding backslashitis
+    $esc        = '\\\\';               $Period      = '\.';
+    $space      = '\040';               $tab         = '\t';
+    $OpenBR     = '\[';                 $CloseBR     = '\]';
+    $OpenParen  = '\(';                 $CloseParen  = '\)';
+    $NonASCII   = '\x80-\xff';          $ctrl        = '\000-\037';
+    $CRlist     = '\n\015';  // note: this should really be only \015.
+
+    // Items 19, 20, 21 -- see table on page 295 of 'Mastering Regular Expressions'
+    $qtext = "[^$esc$NonASCII$CRlist\"]";                // for within "..."
+    $dtext = "[^$esc$NonASCII$CRlist$OpenBR$CloseBR]";    // for within [...]
+    $quoted_pair = " $esc [^$NonASCII] ";    // an escaped character
+
+    // *********************************************
+    // Items 22 and 23, comment.
+    // Impossible to do properly with a regex, I make do by allowing at most
+    // one level of nesting.
+    $ctext = " [^$esc$NonASCII$CRlist()] ";
+    
+    // $Cnested matches one non-nested comment.
+    // It is unrolled, with normal of $ctext, special of $quoted_pair.
+    $Cnested = "";
+        $Cnested .= "$OpenParen";                    // (
+        $Cnested .= "$ctext*";                        //       normal*
+        $Cnested .= "(?: $quoted_pair $ctext* )*";    //       (special normal*)*
+        $Cnested .= "$CloseParen";                    //                         )
+    
+    // $comment allows one level of nested parentheses
+    // It is unrolled, with normal of $ctext, special of ($quoted_pair|$Cnested)
+    $comment = "";
+        $comment .= "$OpenParen";                        //  (
+        $comment .= "$ctext*";                            //     normal*
+        $comment .= "(?:";                                //       (
+        $comment .= "(?: $quoted_pair | $Cnested )";    //         special
+        $comment .= "$ctext*";                            //         normal*
+        $comment .= ")*";                                //            )*
+        $comment .= "$CloseParen";                        //                )
+        
+    // *********************************************
+    // $X is optional whitespace/comments
+    $X = "";
+        $X .= "[$space$tab]*";                    // Nab whitespace
+        $X .= "(?: $comment [$space$tab]* )*";    // If comment found, allow more spaces
+        
+        
+    // Item 10: atom
+    $atom_char = "[^($space)<>\@,;:\".$esc$OpenBR$CloseBR$ctrl$NonASCII]";
+    $atom = "";
+        $atom .= "$atom_char+";        // some number of atom characters ...
+        $atom .= "(?!$atom_char)";    // ... not followed by something that
+                                    //     could be part of an atom
+                                    
+    // Item 11: doublequoted string, unrolled.
+    $quoted_str = "";
+        $quoted_str .= "\"";                            // "
+        $quoted_str .= "$qtext *";                        //   normal
+        $quoted_str .= "(?: $quoted_pair $qtext * )*";    //   ( special normal* )*
+        $quoted_str .= "\"";                            //        "
+    
+    
+    // Item 7: word is an atom or quoted string
+    $word = "";
+        $word .= "(?:";
+        $word .= "$atom";        // Atom
+        $word .= "|";            // or
+        $word .= "$quoted_str";    // Quoted string
+        $word .= ")";
+        
+    // Item 12: domain-ref is just an atom
+    $domain_ref = $atom;
+    
+    // Item 13: domain-literal is like a quoted string, but [...] instead of "..."
+    $domain_lit = "";
+        $domain_lit .= "$OpenBR";                        // [
+        $domain_lit .= "(?: $dtext | $quoted_pair )*";    //   stuff
+        $domain_lit .= "$CloseBR";                        //         ]
+
+    // Item 9: sub-domain is a domain-ref or a domain-literal
+    $sub_domain = "";
+        $sub_domain .= "(?:";
+        $sub_domain .= "$domain_ref";
+        $sub_domain .= "|";
+        $sub_domain .= "$domain_lit";
+        $sub_domain .= ")";
+        $sub_domain .= "$X"; // optional trailing comments
+        
+    // Item 6: domain is a list of subdomains separated by dots
+    $domain = "";
+        $domain .= "$sub_domain";
+        $domain .= "(?:";
+        $domain .= "$Period $X $sub_domain";
+        $domain .= ")*";
+        
+    // Item 8: a route. A bunch of "@ $domain" separated by commas, followed by a colon.
+    $route = "";
+        $route .= "\@ $X $domain";
+        $route .= "(?: , $X \@ $X $domain )*"; // additional domains
+        $route .= ":";
+        $route .= "$X"; // optional trailing comments
+        
+    // Item 5: local-part is a bunch of $word separated by periods
+    $local_part = "";
+        $local_part .= "$word $X";
+        $local_part .= "(?:";
+        $local_part .= "$Period $X $word $X"; // additional words
+        $local_part .= ")*";
+        
+    // Item 2: addr-spec is local@domain
+    $addr_spec = "$local_part \@ $X $domain";
+
+    // Item 4: route-addr is <route? addr-spec>
+    $route_addr = "";
+        $route_addr .= "< $X";
+        $route_addr .= "(?: $route )?"; // optional route
+        $route_addr .= "$addr_spec";    // address spec
+        $route_addr .= ">";
+        
+    // Item 3: phrase........
+    $phrase_ctrl = '\000-\010\012-\037'; // like ctrl, but without tab
+    
+    // Like atom-char, but without listing space, and uses phrase_ctrl.
+    // Since the class is negated, this matches the same as atom-char plus space and tab
+    $phrase_char = "[^()<>\@,;:\".$esc$OpenBR$CloseBR$NonASCII$phrase_ctrl]";
+
+    // We've worked it so that $word, $comment, and $quoted_str to not consume trailing $X
+    // because we take care of it manually.
+    $phrase = "";
+        $phrase .= "$word";                            // leading word
+        $phrase .= "$phrase_char *";                   // "normal" atoms and/or spaces
+        $phrase .= "(?:";
+        $phrase .= "(?: $comment | $quoted_str )";     // "special" comment or quoted string
+        $phrase .= "$phrase_char *";                //  more "normal"
+        $phrase .= ")*";
+
+    // Item 1: mailbox is an addr_spec or a phrase/route_addr
+    $mailbox = "";
+        $mailbox .= "$X";                    // optional leading comment
+        $mailbox .= "(?:";
+        $mailbox .= "$addr_spec";            // address
+        $mailbox .= "|";                    // or
+        $mailbox .= "$phrase  $route_addr";    // name and address
+        $mailbox .= ")";
+
+    // test it and return results
+    $isValid = preg_match("/^$mailbox$/xS",$email);
+    
+    return($isValid);
+} // END validateEmailFormat
+?>
diff -urN ampache-3.3.2-alpha4/modules/validatemail/validateEmail.php ampache-3.3.2-beta1/modules/validatemail/validateEmail.php
--- ampache-3.3.2-alpha4/modules/validatemail/validateEmail.php	1969-12-31 16:00:00.000000000 -0800
+++ ampache-3.3.2-beta1/modules/validatemail/validateEmail.php	2006-01-08 23:06:19.000000000 -0800
@@ -0,0 +1,638 @@
+<?php
+/*
+validateEmail.php
+version 2.0
+by Clay Loveless <clay@killersoft.com>
+
+
+Originally
+By: Jon S. Stevens jon@clearink.com
+Copyright 1998 Jon S. Stevens, Clear Ink
+This code has all the normal disclaimers.
+It is free for any use, just keep the credits intact.
+
+Enhancements and modifications:
+
+           By:  Shane Y. Gibson  shane@tuna.org
+Organization:  The Unix Network Archives (http://www.tuna.org/)
+         Date:  November 16th, 1998
+      Changes:  - Added **all** comments, as original code lacked them.
+                - Added some return codes to include a bit more description
+                  for useability.
+
+           By:  berber
+Organization:  webdev.berber.co.il
+         Date:  April 10th, 1999
+      Changes:  - The script now handles all kinds of domains (not only @xxx.yyy) as before.
+                - Added a debugging mode which also works as a verbose mode.
+                
+           By:    Frank Vogel vogel@simec.com
+Organization:  Simec Corp. (http://www.simec.com)
+         Date:  June 13th, 2000
+      Changes:  - Check for MX records for each qualification step of  the domain name
+                - Use nobody@$SERVER_NAME as MAIL FROM: argument
+  Disclaimers:  I disclaim nothing...nor do I claim anything...but
+                it would be nice if you included this disclaimer...
+
+
+         NOTE:  berber and Frank Vogel made some of the same changes regarding
+                domain name checking to seperate versions of Shane Gibson's validateEmail variant.
+                Their changes have been merged into version 2.0.
+
+
+           By:    Clay Loveless <clay@killersoft.com>
+Organization:  KillerSoft < http://www.killersoft.com/ >
+         Date:  March 12th, 2002
+      Changes:  - Added 'Preferences' section, enabling several variables to be easily set
+                - Changed "nobody@$SERVER_NAME" for MAIL FROM: argument to be
+                  "$from@$serverName" - set via Preferences section
+                - Signifcantly enhanced berber's 'debug' mode. It has become 'Verbose' mode
+                  to ease debugging.
+                - Made 'Verbose' mode a function argument. Call validateEmail($email,1) to enable.
+                - Added environment detection - 'Verbose' output is adaptable to command-line
+                  execution and embedded web execution.
+                - Added $socketTimeout Preferences variable for controlling how long we'll wait
+                  during fsockopen() to any given host.
+                - Added $waitTimeout Preferences variable to control how long we'll wait for
+                  a server we've successfully connected with to actually respond with an SMTP greeting.
+                  Note -- this is a complete replacement of the previous "wait" method of simply
+                  increasing a counter, which proved extremely inadequate in testing on sluggish hosts.
+                - Added $mxcutoff Preferences variable to control how many MX hosts we're willing to
+                  talk to before calling it quits. (So we're not required to hear "no" from 14
+                  hotmail.com mail servers if we don't want to.)
+                - Added routine to check SMTP server greeting line for ESTMP, and respond accordingly
+                  with EHLO.
+                - Added routines to listen for multi-line output from servers.
+                - Fixed all commands ending in "\n" to end in "\r\n" as specified by accurate SMTP
+                  communication. THIS FIXES THE "HANG" PROBLEM EXPERIENCED WITH MANY MAIL SERVERS,  
+                  INCLUDING AOL.COM. (See Disclaimers about AOL.com connections, though ...)
+                - Added support for Jeffrey E.F. Friedl's definitive email format regex, translated
+                  from perl into PHP. Will reject email addresses with invalid formatting before  
+                  opening any server connections.
+                - Changed initial "listening" routine to listen for one of two SMTP greeting responses
+                  (220 or 421) instead of just listening for anything. validateEmail is now well-behaved
+                  if a 421 "temporary rejection" code is received.
+                - Assorted optimizations -- using explode() instead of split(), preg_match()
+                  instead of ereg(), etc.
+                - Improved error reporting on failures.
+                - Fixed typos in comments. : )
+                - Modified comments where Shane Gibson's were no longer needed or accurate (due to changes).
+                  Added the comments for features that didn't exist in Shane's version.
+                - Incremented version number.
+                  
+  Disclaimers:  - All additions and modifications Copyright 2002 KillerSoft.com.
+                - Program is free for any use as long as these notes & credits remain intact.
+                - Yes, I know there is no foolproof way to validate an e-mail address. But this is better than
+                  nothing.
+                - Yes, I know that fewer and fewer mail servers are supporting the type of connection
+                  and validation that this script performs. There are still a hell of a lot more of them
+                  that DO support it than those that DON'T. Yes, this may change over time.
+                - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+                  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+                - By using this code you agree to indemnify Clay Loveless, KillerSoft, and Crawlspace, Inc.
+                  from any liability that might arise from its use.
+                - Use at your own risk. This may not work for you. It may produce results other than what you'd expect,
+                  or even prefer.
+                - AOL.COM Disclaimer: As of this release, mail servers operated by AOL.com (netscape.com,
+                  aol.com, cs.com, anything with aoltw.net, just to name a few) return "250" (recipient OK) codes for
+                  _any_ address you throw at them. Bounces for invalid recipients are handled and sent out
+                  through alternate means. So -- this script won't help you in validating AOL.com (and affiliated)
+                  e-mail addresses. BUT ... at least it won't choke/hang on them either, as previous versions
+                  of this script would.
+                  
+                - Please send bugs, comments or suggestions to info@killersoft.com!
+*/
+
+/*  This function takes in an email address (say 'shane@tuna.org')
+*  and tests to see if it's a valid email address.
+*
+*  An array with the results is passed back to the caller.
+*
+*  Possible result codes for the array items are:
+*
+*  Item 0:  [true|false]        true for valid email address
+*                    false for NON-valid email address
+*
+*  Item 1:  [SMTP Code]        if a valid MX mail server found, then
+*                    fill this array in with failed SMTP
+*                    reply codes
+*                  IF no MX mail server found or connected to,
+*                  errors will be explained in this response.
+*
+*                  Possible Internal error messages:
+*                     Invalid email address (bad domain name) [ default message from the old days ]
+*                     fsockopen error $errno: $errstr
+*                     554 No MX records found for $domain
+*                     554 No DNS reverse record found for $domain
+*
+*                     (554 Response code borrowed from ESMTP's "Transaction failed" response)
+*
+*  Item 2:  [true|false]        true for valid mail server found for
+*                    host/domain
+*                    false if no valid mail server found
+*
+*  Item 3:  [MX server]        if a valid MX host was found and
+*                    connected to then fill in this item
+*                    with the MX server hostname
+*
+*  EXAMPLE CODE for use is available at:
+*      http://www.killersoft.com/contrib/
+*/
+
+function validateEmail ( $email, $verbose=0 ) {
+    global $SERVER_NAME;
+
+    // DEFINE PREFERENCES
+    
+    // Passed along with the HELO/EHLO statement.
+    // Leave blank to use $SERVER_NAME.
+    // Note that most modern MTAs will ignore (but require) whatever you say here ...
+    // the server will determine your domain via other means.
+    if (conf('mail_domain')){
+    $serverName = conf('mail_domain');
+    } else {
+    $serverName = "domain.tld";
+    }
+    // MAIL FROM -- who's asking?
+    // Good values: nobody, postmaster, info, buckwheat, gumby
+    $from = "info";
+        
+    // fsockopen() timeout - in seconds
+    $socketTimeout = 15;
+    
+    // waitTimeout - how long we'll wait for a server to respond after
+    // a successful connection. In seconds.
+    // Recommended to keep this above 35 seconds - some servers are really slow.
+    $waitTimeout = 50;
+    
+    // MX Server cutoff
+    // Some hosts (like hotmail.com) have MANY MX hosts -- 12 or more.
+    // Set this to a number where you'd like to say "I get the picture"
+    // ... so you don't wind up having to hit EVERY MX host.
+    $mxcutoff = 15;
+    
+    // END OF PREFERENCES
+    
+    ///////////////////////////////////////////////////////////////////////////////
+    // DO NOT EDIT BELOW THIS LINE
+    ///////////////////////////////////////////////////////////////////////////////
+
+
+    // Default initiation statement
+    $send = "HELO";
+
+    // Let's give good commands
+    $CRLF = "\r\n";
+    
+    // Make a few adjustments for verbose mode
+    if ( $verbose ) {
+
+        // Version
+        $version = "validateEmail 2.0 - http://killersoft.com/contrib/";
+    
+        // Start stopwatch
+        list ( $msecStart, $secStart ) = explode ( " ", microtime() );
+    
+        // Adjust verbose output format
+        // for php.cgi or webserver interface
+        $sapi_type = php_sapi_name();
+        if ( $sapi_type == "cgi" ) {
+            // format < >
+            $leftCarrot = "<";
+            $rightCarrot = ">";
+            // set type of "new line"
+            $vNL = "echo \"\n\";";
+            // verbose Flush Only
+            $vFlush = "";
+            // output for debugging
+            eval("echo \"Internal: $version - running as ".AddSlashes($sapi_type)."\"; $vNL");
+        } else {
+            // format < >
+            $leftCarrot = "&lt;";
+            $rightCarrot = "&gt;";
+            // set type of "new line" ... flush output for web browsing
+            echo "<pre>";
+            $vNL = "echo \"\n\"; flush();";
+            // verbose Flush Only
+            $vFlush = "flush();";
+            // output for debugging
+            eval("echo \"Internal: $version - running as ".AddSlashes($sapi_type)."\"; $vNL");
+        }
+    }
+        
+    // How we'll identify ourselves in SMTP HELO/EHLO argument
+    if ( $serverName == "" ) $serverName = "$SERVER_NAME";
+    if ( $serverName == "" ) $serverName = "localhost";
+    
+    // Initialize return values with default
+    $return[0] = false;
+    $return[1] = "Invalid email address (bad domain name)";
+    $return[2] = false;
+    $return[3] = "";
+    
+    // make sure that we're dealing with a valid email address format
+    $isValid = true; // just in case validateEmailFormat is not available
+    if ( function_exists('validateEmailFormat') ) $isValid = validateEmailFormat ( $email );
+    
+    // abort if necessary
+    if ( !$isValid ) {
+        if ( $verbose ) eval("echo \"Internal: $email format is invalid! Quitting ...\"; $vNL");
+        return $return;
+        
+    } else {
+        if ( $verbose ) eval("echo \"Internal: $email is a valid RFC 822 formatted address\"; $vNL");
+    
+        // assign our user part and domain parts respectively to seperate
+        // variables
+        list ( $user, $domain ) = explode ( "@", $email );
+        if ( $verbose ) {
+            eval("echo \"Internal: user ..... $user\"; $vNL");
+            eval("echo \"Internal: domain ... $domain\"; $vNL");
+        }
+        
+        // split up the domain into sub-parts
+        $arr = explode ( ".", $domain );
+        
+        // figure out how many parts there are in the host/domain name portion
+        $count = count ( $arr );
+        
+        // flag to indicate success
+        $bSuccess = false;
+        
+        // we try this for each qualification step of domain name
+        // (from full qualified to TopLevel)
+        for ( $i = 0; $i < $count - 1 && !$bSuccess; $i = $i + 1 ) {
+        
+            // create the domain name
+            $domain = "";
+            for ( $j = $i; $j < $count; $j = $j + 1 ) {
+                $domain = $domain . $arr[$j];
+                if ( $j < $count - 1 )
+                    // tack on the last dot
+                    $domain = $domain . ".";
+            }
+            if ( $verbose ) eval("echo \"Internal: checking DNS for $domain ... \"; $vNL");
+            
+            // check that an MX record exists for Top-Level domain
+            // If it exists, start our email address checking
+            if ( checkdnsrr ( $domain, "MX" ) ) {
+                
+                // Okay -- we've got a valid DNS reverse record.
+                if ( $verbose ) eval("echo \"Internal: ... Check DNS RR OK!\"; $vNL");
+                // Test that MX record for host exists,
+                // then fill 'mxhosts' and 'weight' arrays with correct info
+                if ( getmxrr ( $domain, $mxhosts, $weight ) ) {
+                    
+                    // Now we've got MX records
+                    if ( $verbose ) {
+                        eval("echo \"Internal: MX LOOKUP RESULTS:\"; $vNL");
+                        for ( $i = 0; $i < count ( $mxhosts ); $i++) {
+                            eval("echo \"     $mxhosts[$i]\"; $vNL");
+                        }
+                    }
+                    // sift through the 'mxhosts', connecting to each one
+                    // ONLY until we get a good match
+                    $mxcount = count( $mxhosts );
+                    // determine our MX host cutoff
+                    $mxstop = ($mxcount > $mxcutoff) ? $mxcutoff : $mxcount;
+                    for ( $i = 0; $i < $mxstop ; $i++ ) {
+                    
+                        // open socket on port 25 to mxhost, setting
+                        // returned socket pointer to $sp
+                        if( $verbose ) eval("echo \"Internal: attempting to open $mxhosts[$i] ...\"; $vNL");
+                        $sp = fsockopen ( $mxhosts[$i], 25, $errno, $errstr, $socketTimeout);
+                        
+                        // Greeting Code default
+                        // Sets default greeting code to 421, just in case we
+                        // don't ever hear ANYTHING from this host.
+                        // If we hear nothing, we'll want to skip it.
+                        $greetCode = "421";
+                        
+                        // if $sp connection is good, let's rock on
+                        if ( $sp ) {
+                            if ( $verbose ) {
+                                eval("echo \"* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\"; $vNL");
+                                eval("echo \"Internal: socket open to $mxhosts[$i]\"; $vNL");
+                            }
+                            // work variables
+                            $waitMarker = 0;
+                            $msec = 0; // milisec count
+                            $tsec = 0; // tensec count
+                            $out = "";
+                            
+                            // set our created socket for $sp to
+                            // non-blocking mode so that our fgets()
+                            // calls will return with a quickness
+                            set_socket_blocking ( $sp, false );
+                            
+                            // as long as our 'out' variable does not begin
+                            // with a valid SMTP greeting (220 or 421),
+                            // keep looping (do) until we get something
+                            do {
+                            
+                                // prepare for clean debug output if necessary
+                                // (puts a line break after the waitMarkers)
+                                if ( $verbose && $msec > 0 ) {
+                                    $elapsed = $tsec + ($msec/4);
+                                    $clean = "echo \"($elapsed seconds)\"; $vNL";
+                                }
+                                // output of the stream assigned to
+                                // 'out' variable
+                                $out = fgets ( $sp, 2500 );
+                                
+                                // Check for multi-line output (###-)
+                                if ( preg_match ( "/^2..-/", $out ) ) {
+                                    $end = false;
+                                    while ( !$end ) {
+                                        // keep listening
+                                        $line = fgets ( $sp, 2500 );
+                                        $out .= $line;
+                                        if ( preg_match ( "/^2.. /", $line ) ) {
+                                            // the last line of output shouldn't
+                                            // have a dash after the response code
+                                            $end = true;
+                                        }
+                                    }
+                                }
+                                
+                                if ( $verbose && $out != "" ) eval("$clean echo \"Server: ".AddSlashes($out)."\"; $vNL");
+                                
+                                // if we get a "220" code (service ready),
+                                // we're ready to rock on
+                                if ( substr ( $out, 0, 3 ) == "220" ) {
+                                    if ( $verbose ) eval("echo \"Internal: service ready on $mxhosts[$i] ... moving on\"; $vNL");
+                                    $return[2] = true;
+                                    $return[3] = "$mxhosts[$i]";
+                                    // determine if we should speak in terms of HELO or EHLO
+                                    if ( preg_match ( "/ESMTP/", $out ) ) {
+                                        $send = "HELO";
+                                    } else {
+                                        $send = "HELO";
+                                    }
+                                    
+                                    // Set Greeting Code
+                                    $greetCode = "220";
+                                    
+                                }
+                                
+                                // else if ...
+                                // Perhaps we've gotten a 421 Temporarily Refused error
+                                else if ( substr ( $out, 0, 3 ) == "421" ) {
+                                
+                                    //if ( $verbose ) echo " ... moving on\n";
+                                    if ( $verbose ) eval("echo \"Internal: $mxhosts[$i] temporarily rejected connection. (421 response)\"; $vNL");
+                                    $return[2] = false;
+                                    // Set Greeting Code
+                                    $greetCode = "421";
+                                    break; // get out of this loop
+                                    
+                                }
+                                
+                                // increase our waitTimeout counters
+                                // if we still haven't heard anything ...
+                                // Note that the time looping isn't an exact science
+                                // with usleep or the Windows hack ... but
+                                // it's in the ballpark. Close enough.
+                                if ( $out == "" && $msec < $waitTimeout ) {
+
+                                    // wait for a quarter of a second
+                                    if ( $verbose ) {
+                                        if ( $msec == 0 ) {
+                                            eval("echo \"Internal: Waiting: one '.' ~ 0.25 seconds of waiting\"; $vNL");
+                                        }
+                                        eval("echo \".\"; $vFlush");
+                                        $waitMarker++;
+                                        if ( $waitMarker == 40 ) {
+                                            // ten seconds
+                                            $tsec += 10;
+                                            eval("echo \" ($tsec seconds)\"; $vNL");
+                                            $waitMarker = 0;
+                                        }
+                                    }
+                                    $msec = $msec + 0.25;
+                                    usleep(250000);
+                                    
+                                } elseif ( $msec == $waitTimeout ) {
+                                    
+                                    // let's get out of here. Toooo sloooooww ...
+                                    if ( $verbose ) eval("$clean echo \"Internal: !! we've waited $waitTimeout seconds !!\nbreaking ...\"; $vNL");
+                                    break;
+
+                                }
+                                
+                                                            
+                                // end of 'do' loop
+                            } while ( substr ( $out, 0, 3 ) != "220" );
+                            
+                            // Make sure we got a "220" greetCode
+                            // before we start shoveling requests
+                            // at this server.
+                            if ( $greetCode == "220" ) {
+                            
+                                // reset our file pointer to blocking mode,
+                                // so we can wait for communication to finish
+                                // before moving on ...
+                                set_socket_blocking ( $sp, true );
+                                
+                                // talk to the MX mail server, attempt to validate
+                                // ourself. Use "HELO" or "EHLO", as determined above
+                                fputs ( $sp, "$send $serverName"."$CRLF" );
+                                if ( $verbose ) eval("echo \"Client: $send $serverName\"; $vNL");
+                                
+                                // get the mail server's reply, check it
+                                //
+                                $originalOutput = fgets ( $sp, 2500 );
+                                // Check for multi-line positive output
+                                if ( preg_match ( "/^...-/", $originalOutput ) ) {
+                                    $end = false;
+                                    while ( !$end ) {
+                                        // keep listening
+                                        $line = fgets ( $sp, 2500 );
+                                        $originalOutput .= $line;
+                                        if ( preg_match ( "/^... /", $line ) ) {
+                                            // the last line of output shouldn't
+                                            // have a dash after the response code
+                                            $end = true;
+                                        }
+                                    }
+                                }
+                                if ( $verbose ) eval("echo \"Server: ".AddSlashes($originalOutput)."\"; $vNL");
+                                
+                                
+                                // if there's a HELP option, let's see it
+                                if ( $verbose ) {
+                                    if( preg_match( "/250.HELP/m", $originalOutput ) && $verbose == true ) {
+                                        
+                                        eval("echo \"Internal: VERBOSE-MODE ONLY: Getting the HELP output\"; $vNL");
+                                        // Get the output of the HELP command
+                                        fputs ( $sp, "HELP"."$CRLF" );
+                                        if ( $verbose ) eval("echo \"Client: HELP\"; $vNL");
+                                        // Get output again
+                                        $output = fgets ( $sp, 2500 );
+                                        // Check for multi-line positive output
+                                        if ( preg_match ( "/^...-/", $output ) ) {
+                                            $end = false;
+                                            while ( !$end ) {
+                                                // keep listening
+                                                $line = fgets ( $sp, 2500 );
+                                                $output .= $line;
+                                                if ( preg_match ( "/^... /", $line ) ) {
+                                                    // the last line of output shouldn't
+                                                    // have a dash after the response code
+                                                    $end = true;
+                                                }
+                                            }
+                                        }
+                                        if ( $verbose ) eval("echo \"Server: ".AddSlashes($output)."\"; $vNL");
+                                                            
+                                    }
+                                }
+                                
+                                // Give the MAIL FROM: header to the server
+                                fputs ( $sp, "MAIL FROM: <$from" . "@" . "$serverName" . ">"."$CRLF");
+                                if ( $verbose ) eval("echo \"Client: MAIL FROM: $leftCarrot"."$from" . "@" . "$serverName" . "$rightCarrot\"; $vNL");
+                                
+                                // Get output again
+                                $output = fgets ( $sp, 2500 );
+                                // Check for multi-line positive output
+                                if ( preg_match ( "/^...-/", $output ) ) {
+                                    $end = false;
+                                    while ( !$end ) {
+                                        // keep listening
+                                        $line = fgets ( $sp, 2500 );
+                                        $output .= $line;
+                                        if ( preg_match ( "/^... /", $line ) ) {
+                                            // the last line of output shouldn't
+                                            // have a dash after the response code
+                                            $end = true;
+                                        }
+                                    }
+                                }
+                                if ( $verbose ) eval("echo \"Server: ".AddSlashes($output)."\"; $vNL");
+                                
+                                // Give the RCPT TO: header for the email address we're testing
+                                fputs ( $sp, "RCPT TO: <$email>"."$CRLF" );
+                                if ( $verbose ) eval("echo \"Client: RCPT TO: $leftCarrot"."$email"."$rightCarrot\"; $vNL");
+                                
+                                // Get output again
+                                // This will be the one we check for validity
+                                $output = fgets ( $sp, 2500 );
+                                // Check for multi-line positive output
+                                if ( preg_match ( "/^...-/", $output ) ) {
+                                    $end = false;
+                                    while ( !$end ) {
+                                        // keep listening
+                                        $line = fgets ( $sp, 2500 );
+                                        $output .= $line;
+                                        if ( preg_match ( "/^... /", $line ) ) {
+                                            // the last line of output shouldn't
+                                            // have a dash after the response code
+                                            $end = true;
+                                        }
+                                    }
+                                }
+                                if ( $verbose ) eval("echo \"Server: ".AddSlashes($output)."\"; $vNL");
+                                
+                                // test the last reply code from the mail server
+                                // for the 250 (okay) response
+                                if ( substr ( $output, 0, 3 ) == "250" ) {
+                                    
+                                    // set our true/false(ness)
+                                    // array item for testing
+                                    $return[0] = true;
+                                    $return[1] = $output;
+                                    if ( $verbose ) eval("echo \"Internal: Check for 250 ... Recipient OK\"; $vNL");
+                                    
+                                } else {
+                                
+                                    // we didn't get a 250
+                                    // may be a bogus address
+                                    if ( $verbose ) eval("echo \"Internal: Check for 250 ... Response did not begin with 250!\"; $vNL");
+                                    // fill in 2nd array item with mail server's
+                                    // reply for user to test if they want
+                                    $return[0] = false;
+                                    $return[1] = $output;
+                                    
+                                }
+                                
+                                // tell the mail server we're done
+                                fputs ( $sp, "QUIT"."$CRLF" );
+                                if ( $verbose ) {
+                                    eval("echo \"Client: QUIT\"; $vNL");
+                                    eval("echo \"* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\"; $vNL $vNL");                            
+                                }
+                                
+                                // close the socket/file pointer
+                                fclose ( $sp );
+                                
+                                // If we got a good response back on RCPT TO,
+                                // break here
+                                // Otherwise, keep trying MX servers until we
+                                // get a good response or run out of MX servers
+                                // to try.
+                                if ( $return[0] == true ) {
+                                    if ( $verbose ) {
+                                        eval("echo \"Internal: Recipient is OK - thanks, $mxhosts[$i]!\"; $vNL");
+                                        eval("echo \"Internal: Stop checking MX hosts ...\"; $vNL");                                        
+                                    }
+                                    $bSuccess = true;
+                                    break;
+                                }
+                            
+                            } else {
+                                
+                                // greetCode wasn't "220"
+                                // we better skip this one and move on
+                                if ( $verbose ) eval("echo \"Internal: SKIPPING $mxhosts[$i] -- never got 220 welcome\"; $vNL");
+                                // close out this connection
+                                fclose ( $sp );
+                                
+                            } // end of greetCode check
+                        
+                        } else {
+                            // $sp socket pointer was false -- couldn't open it
+                            if ( $verbose ) {
+                                eval("echo \"* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\"; $vNL");                            
+                                eval("echo \"Internal: could not open socket to $mxhosts[$i]!\"; $vNL");
+                                eval("echo \"fsockopen error $errno: $errstr\"; $vNL");
+                                eval("echo \"* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\"; $vNL $vNL");                            
+                            }
+                            $return[0] = false;
+                            $return[1] = "fsockopen error $errno: $errstr";
+                        } // end of $sp check
+                    
+                    } // end for $mxhosts
+                    
+                } //  getmxrr test
+                  else {
+                    // getmxrr failed
+                    if ( $verbose ) eval("echo \"Internal: No MX reverse records found for $domain\"; $vNL");
+                    $return[0] = false;
+                    $return[1] = "554 No MX records found for $domain";
+                } // end getmxrr test
+            
+            } // continue checkdnsrr test
+                else {
+                if ( $verbose ) eval("echo \"Internal: No DNS Reverse Record available!\"; $vNL");
+                $return[0] = false;
+                $return[1] = "554 No DNS reverse record found for $domain";
+            } // end checkdnsrr test
+            
+        } // end walking through each domain possibility
+    
+    } // end isValid
+    
+    // output elapsed time if Verbose
+    if ( $verbose ) {
+        list ( $msecStop, $secStop ) = explode ( " ", microtime() );
+        $elapsedTime = (double)($secStop + $msecStop) - ($secStart + $msecStart);
+        $elapsedTime = number_format($elapsedTime,3);
+        eval("echo \"Internal: VERBOSE-MODE execution time: $elapsedTime seconds (silent mode somewhat faster)\"; $vNL");
+        if ( $sapi_type != "cgi" ) echo "</pre>";
+    }
+    
+    // return the array for the user to test against
+    return $return;
+
+} // END validateEmail-2.0
+?>
diff -urN ampache-3.3.2-alpha4/mpd.php ampache-3.3.2-beta1/mpd.php
--- ampache-3.3.2-alpha4/mpd.php	2005-12-27 01:33:03.000000000 -0800
+++ ampache-3.3.2-beta1/mpd.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -26,6 +26,7 @@
 
 */
 require_once("modules/init.php");
+$myMpd = init_mpd();
 show_template('header');
 if (conf('refresh_limit') > 0) { show_template('javascript_refresh'); }
 
diff -urN ampache-3.3.2-alpha4/play/index.php ampache-3.3.2-beta1/play/index.php
--- ampache-3.3.2-alpha4/play/index.php	2005-12-27 01:32:55.000000000 -0800
+++ ampache-3.3.2-beta1/play/index.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.  
 
  This program is free software; you can redistribute it and/or
@@ -32,10 +32,10 @@
 require_once(conf('prefix') . '/lib/Browser.php');
 
 
-/* These parameters has better come on the url. */
-$uid = htmlspecialchars($_REQUEST['uid']);
-$song_id = htmlspecialchars($_REQUEST['song']);
-$sid = htmlspecialchars($_REQUEST['sid']);
+/* These parameters had better come in on the url. */
+$uid = scrub_out($_REQUEST['uid']);
+$song_id = scrub_out($_REQUEST['song']);
+$sid = scrub_out($_REQUEST['sid']);
 
 /* Misc Housework */
 $dbh = dbh();
diff -urN ampache-3.3.2-alpha4/play/pupload.php ampache-3.3.2-beta1/play/pupload.php
--- ampache-3.3.2-alpha4/play/pupload.php	2005-12-27 01:32:55.000000000 -0800
+++ ampache-3.3.2-beta1/play/pupload.php	2006-01-08 23:06:13.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/playlist.php ampache-3.3.2-beta1/playlist.php
--- ampache-3.3.2-alpha4/playlist.php	2005-12-27 01:33:03.000000000 -0800
+++ ampache-3.3.2-beta1/playlist.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,8 +1,8 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
- All Rights Reserved
+ Copyright (c) 2001 - 2006 Ampache.org
+ All rights reserved.
 
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
@@ -19,269 +19,164 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
+/**
+ * Playlist Document
+ * This is the playlist document, it handles all things playlist.
+ */
 
-/*
-
- Playlist mojo for adding, viewing, deleting, etc.
+require_once("modules/init.php");
 
-*/
 
-require_once("modules/init.php");
+show_template('header');
 
-// Get user object for later
+/* Get the Vars we need for later cleaned up */
+$action 	= strtolower(scrub_in($_REQUEST['action']));
+$playlist	= new Playlist(scrub_in($_REQUEST['playlist_id']));
 
-if (isset($_REQUEST['action'])) {
-	$action = scrub_in($_REQUEST['action']);
-}
-
-$type = scrub_in($_REQUEST['type']);
-
-if (isset($_REQUEST['results'])) {
-	$results = scrub_in($_REQUEST['results']);
-}
-else {
-	$results = array();
-}
-
-if (isset($_REQUEST['artist_id'])) {
-	$artist_id = scrub_in($_REQUEST['artist_id']);
-}
-
-if (isset($_REQUEST['playlist_name'])) {
-	$playlist_name = scrub_in($_REQUEST['playlist_name']);
-}
-
-if (isset($_REQUEST['new_playlist_name'])) {
-	$new_playlist_name = scrub_in($_REQUEST['new_playlist_name']);
-}
-
-if (isset($_REQUEST['playlist_id'])) {
-	$playlist_id = scrub_in($_REQUEST['playlist_id']);
-}
-
-if (isset($_REQUEST['confirm'])) {
-	$confirm = scrub_in($_REQUEST['confirm']);
-}
-
-if (isset($_REQUEST['song'])) {
-	$song_ids = scrub_in($_REQUEST['song']);
-}
-
-/* Prepare the Variables */
-$playlist = new Playlist(scrub_in($_REQUEST['playlist_id']));
-
-/* First Switch */
-// Have to handle this here, since we use this file
-//   for playback of the "Play Selected Stuff" and display (for now)
-//   and this has to be done with a header redirection before the actuall top
-//   of the page is shown
+/* Switch on the action passed in */
 switch ($action) { 
-	case _("Flag Selected"):
-	        require_once(conf('prefix').'/lib/flag.php');
-	        $flags = scrub_in($_REQUEST['song']);
-	        set_flag_value($flags, 'badid3','');
-	        header("Location:" . conf('web_path')."/admin/flags.php" );
-	break;
-	case _("Edit Selected"):
-	        require_once(conf('prefix').'/lib/flag.php');
-	        $flags = scrub_in($_REQUEST['song']);
-	        set_flag_value($flags, 'badid3','');
-	        $count = add_to_edit_queue($flags);
-	        session_write_close();
-	        header( 'Location: '.conf('web_path').'/admin/flags.php?action='.urlencode($action) );
-	        exit();
+	case 'delete_playlist': 
+		/* Make sure they have the rights */
+		if (!$playlist->has_access()) { 
+			access_denied();
+			break;
+		}
+		/* Go for it! */
+		$playlist->delete();
+		show_confirmation(_('Playlist Deleted'),_('The Requested Playlist has been deleted'),'/playlist.php');
 	break;
-	default:
+	case 'show_delete_playlist':
+		/* Make sure they have the rights */
+                if (!$playlist->has_access()) {
+                        access_denied();
+                        break;
+                }
+	
+		/* Show Confirmation Question */
+		$message = _('Are you sure you want to delete this playlist') . " " . $playlist->name . "?";
+		show_confirm_action($message,'playlist.php','action=delete_playlist&amp;playlist_id=' . $playlist->id);
 	break;
-} // end first action switch
-
-show_template('header');
-
-$playlist = new Playlist($playlist_id);
-
-if ( isset($playlist_id) && ($playlist_id != 0) && $_REQUEST['action'] != 'delete_playlist' ) {
-	// Get the playlist and check access
-	$pluser = new User($playlist->user);
-
-	if (! isset($playlist->id)) {
-		show_playlist_access_error($playlist_id, $pluser->username);
-	}
-
-	echo "<div style=\"width:50%;\" class=\"text-box\">\n";
-	echo "<span class=\"header2\">$playlist->name</span><br />";
-	echo "&nbsp;&nbsp;&nbsp;" . _("owned by") . " $pluser->fullname ($pluser->username)<br />";
-	echo "<ul>";
-	if ($pluser->username == $user->username || $user->access === 'admin') {
-		echo "<li><a href=\"" . conf('web_path') . "/playlist.php?action=edit&amp;playlist_id=$playlist->id\">" . _("Edit Playlist") . "</a></li>\n";
-	}
-	if (count($playlist->get_songs()) > 0) {
-		echo "<li><a href=\"" . conf('web_path') . "/song.php?action=m3u&amp;playlist_id=$playlist->id\">" . _("Play Full Playlist") . "</a></li>\n";
-		echo "<li><a href=\"" . conf('web_path') . "/song.php?action=random&amp;playlist_id=$playlist->id\">" . _("Play Random") . "</a></li>\n";
-	}
-	echo "</ul>";
-	echo "</div>";
-}
-
-
-switch($action) {
-	// Add to a playlist
-	case 'Add to':
 	case 'add_to':
-		if ($playlist_id == 0) {
-			// Creating a new playlist
-			$playlist_name = _("New Playlist") . " - " . date("m/j/y, g:i a");
-			$playlist->create_playlist($playlist_name, $user->username, 'private');
+	case 'add to':
+		/* If we don't already have a playlist */
+		if (!$playlist->id && $GLOBALS['user']->has_access(25)) { 
+			$playlist_name = _('New Playlist') . " - " . date('m/j/y, g:i a');
+			$id = $playlist->create($playlist_name, 'private');
+			$playlist = new Playlist($id);
+		}
+
+		if (!$playlist->has_access()) { 
+			access_denied();
+			break;
+		}
+
+		/* Must be admin or person who created this playlist */
+		if ($GLOBALS['user']->username != $playlist->user && !$GLOBALS['user']->has_access(100)) { 
+			access_denied();
+		}
+		if ($_REQUEST['type'] == 'album') { 
+			$song_ids = get_songs_from_type($_REQUEST['type'],$_REQUEST['song_ids'],$_REQUEST['artist_id']);
+		}
+		else { 	
+			$song_ids = $_REQUEST['song'];
+		}	
+
+		/* Add the songs */
+		$playlist->add_songs($song_ids);
+
+		/* Show the Playlist */
+		show_playlist($playlist);
+	break;	
+	case 'add_dyn_song':
+		/* Check Rights */
+		if (!$playlist->has_access()) { 
+			access_denied();
+			break;
 		}
-
-		if ($type === 'album') {
-			if ($song_ids = get_songs_from_type($type, $song_ids, $artist_id)) {
-				$playlist->add_songs($song_ids);
-			}
-		}
-		else {
-			if (isset($song_ids) && is_array($song_ids)) {
-				$playlist->add_songs($song_ids);
-			}
-		}
-		show_playlist($playlist->id);
-		break;
-
-	case 'Create':
-		$playlist->create_playlist($playlist_name, $user->username, $type);
-		show_playlists();
-		break;
-
-	case 'delete_playlist':
-		if ($_REQUEST['confirm'] === 'Yes') {
 		
-			$playlist->playlist($_REQUEST['playlist_id']);
-			$playlist->delete();
-			show_confirmation("Playlist Deleted","The $playlist->name Playlist has been deleted","playlist.php");
-		}
-		elseif ($_REQUEST['confirm'] === 'No') {
-			show_songs($playlist->get_songs(), $_REQUEST['playlist_id']);
-		}
-		else {
-			show_confirm_action("Are you sure you want to delete '$playlist->name' playlist?",
-				"playlist.php",
-				"action=delete_playlist&amp;playlist_id=$playlist_id");
-		}
-		break;
+		$playlist->add_dyn_song();
+		show_playlist($playlist);
+	break;
+	case 'create_playlist':
+	case 'create':
+		/* Check rights */
+		if (!$GLOBALS['user']->has_access(25)) { 
+			access_denied();
+			break;
+		} 
+		
+		$playlist_name	= scrub_in($_REQUEST['playlist_name']);
+		$playlist_type	= scrub_in($_REQUEST['type']);
 
+		$playlist->create($playlist_name,$playlist_type);	
+		show_confirmation(_('Playlist Created'),$playlist_name . ' (' . $playlist_type . ') ' . _(' has been created'),'playlist.php');
+	break;
 	case 'edit':
-	case 'Edit':
-		show_playlist_edit($playlist);
-		break;
+		show_playlist_edit($playlist);	
+	break;
 	case 'new':
 		show_playlist_create();
-		break;
-
+	break;
 	case 'remove_song':
-	case 'Remove Selected Tracks':
-		$playlist->remove_songs($song_ids);
-		show_songs($playlist->get_songs(), $playlist_id);
-		break;
-
-	case 'Update':
-		$playlist->update_type($type);
-		$playlist->update_name($new_playlist_name);
-		echo _("Playlist updated.");
-		break;
-
-	case 'Update Selected':
-		pl_update_selected();
-		break;
-	case 'import_playlist':
-		$filename = scrub_in($_REQUEST['filename']);
-		$catalog = new Catalog();
-		if ($catalog->import_m3u($filename)) { 
-			show_confirmation($_REQUEST['playlist_type'] . " Imported",$filename . " was imported as a playlist","playlist.php");	
-		} // it worked
-		else { 
-			show_confirmation("Import Failure",$filename . " failed to import correctly, this can be because the file wasn't found or no songs were matched","playlist.php");
-		} // it didnt' work
-		break;
-	case 'view_list':
-	case 'view':
-        case 'View':
-		show_playlist($playlist->id);
-		break;
+	case _('Remote Selected Tracks'):
+		/* Check em for rights */
+		if (!$playlist->has_access) { 
+			access_denied();
+			break;
+		}
+		$playlist->remove_songs($_REQUEST['song']);
+		show_playlist($playlist);
+	break;
+	case 'update':
+		/* Make sure they've got thems rights */
+		if (!$playlist->has_access()) { 
+			access_denied();
+			break;
+		}
+
+		$playlist->update_type($_REQUEST['type']);
+		$playlist->update_name($_REQUEST['new_playlist_name']);
+		show_confirmation(_('Playlist Updated'),$playlist_name . ' (' . $playlist_type . ') ' . _(' has been updated'),'playlist.php?action=show_playlist&amp;playlist_id=' . $playlist->id);	
+	break;
+	case 'show_playlist':
+		show_playlist($playlist);
+	break;
 	case 'show_import_playlist':
-		$playlist->show_import(); 
-		break;
+		show_import_playlist();
+	break;
 	case 'set_track_numbers':
-	case 'Set Track Numbers':
-		$song_ids = scrub_in($_REQUEST['song']);
-		foreach ($song_ids as $song_id) {
-			$track = scrub_in($_REQUEST['tr_' . $song_id]);
-			$changes[] = array('song_id' => $song_id, 'track' => $track);
+		/* Make sure they have permission */
+		if (!$playlist->has_access()) { 
+			access_denied();
+			break;
+		}
+                $song_ids = scrub_in($_REQUEST['song']);
+                foreach ($song_ids as $song_id) {
+                        $track = scrub_in($_REQUEST['tr_' . $song_id]);
+                        $changes[] = array('song_id' => $song_id, 'track' => $track);
+                }
+
+                $playlist->update_track_numbers($changes);
+
+                show_playlist($playlist);
+        break;
+	case 'normalize_tracks':
+		/* Make sure they have permission */
+		if (!$playlist->has_access()) { 
+			access_denied();
+			break;
 		}
+		
+		/* Normalize the tracks */
+		$playlist->normalize_tracks();
 
-		$playlist->update_track_numbers($changes);
-		show_playlist($playlist->id);
-		break;
-
+		/* Show our wonderful work */
+		show_playlist($playlist);
+	break;
 	default:
 		show_playlists();
+	break;
+} // switch on the action
 
-} //switch on action
-
-show_footer();
-
-/* Function definitions for this file */
-/* GET THIS OUTTA HERE!!!! FIXME */
-/*************************/
-function pl_update_selected() {
-
-	$username = scrub_in($_SESSION['userdata']['id']);
-	if ($user->has_access(100)) {
-		// we have to update the current numbers for the artist these were
-		//   for and who they will become
-		$artists_to_update = array();
-		$artists_to_update[] = $artist;
-
-		while ( list($index, $s) = each($song) ) {
-			$info = get_song_info($s);
-			$artists_to_update[] = $info->artist;
-
-			if ( $update_artist ) {
-				$info->artist = $artist;
-			}
-
-			if ( $update_album ) {
-				$info->album = $album;
-			}
-
-			if ( $update_genre ) {
-				$info->genre = $genre;
-			}
-
-			// now just update the song in the db and you're good to go
-			update_song($info->id, $info->title, 
-					$info->artist, $info->album, $info->genre);
-
-			// let's update the local file (if we can)
-			if ( is_writable($info->file) ) {
-				$id3 = new id3( $info->file );
-				$id3->artists = get_artist_name($info->artist);
-				$id3->album   = get_album_name($info->album);
-				$genre_info   = get_genre($info->genre);
-				$id3->genre   = $genre_info->name;
-				$id3->genreno = $genre_info->id;
-				$id3->write();
-			}
-		}
-
-		$artists_to_update = array_unique($artists_to_update);
-
-		foreach ($artists_to_update as $art) {
-			update_artist_info($art);
-		}
-
-		header("Location:" . $HTTP_REFERER );
-	}//admin access
-	else {
-		header("Location:" . conf('web_path') . "/index.php?access=denied" );
-	}
-} //function pl_update_selected
+show_footer(); 
 ?>
diff -urN ampache-3.3.2-alpha4/randomplay.php ampache-3.3.2-beta1/randomplay.php
--- ampache-3.3.2-alpha4/randomplay.php	2005-12-27 01:33:03.000000000 -0800
+++ ampache-3.3.2-beta1/randomplay.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/register.php ampache-3.3.2-beta1/register.php
--- ampache-3.3.2-alpha4/register.php	2005-12-27 01:33:03.000000000 -0800
+++ ampache-3.3.2-beta1/register.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -30,92 +30,144 @@
 $no_session = true;
 require_once ("modules/init.php");
 
+
 /* Check Perms */
-if (!conf('allow_public_registration')) {
+if (!conf('allow_public_registration') || conf('demo_mode')) {
 	access_denied();
 }
 
+/**
+ * These are only needed for this page so they aren't included in init.php 
+ * this is for email validation and the cool little graphic
+*/
+require ("modules/validatemail/validateEmailFormat.php");
+require ("modules/validatemail/validateEmail.php");
 
-$action = scrub_in($_REQUEST['action']);
+/* Don't even include it if we aren't going to use it */
+if (conf('captcha_public_reg')) { 
+	define ("CAPTCHA_INVERSE, 1");
+	include ("modules/captcha/captcha.php");
+}
 
-?>
+/* Show a light header */
 
-<?php
+$action = scrub_in($_REQUEST['action']);
 
 /* Start switch based on action passed */
 switch ($action) {
-    case 'add_user':
-    // User information has been entered
-    // we need to check the database for possible existing username first
-    // if username exists, error and say "Please choose a different name."
-    // if username does not exist, insert user information into database
-    // then allow the user to 'click here to login'
-    // possibly by logging them in right then and there with their current info
-    // and 'click here to login' would just be a link back to index.php
-    if (conf('demo_mode')) { break; }
-    $accept_agreement = scrub_in($_REQUEST['accept_agreement']);
-	$fullname = scrub_in($_REQUEST['fullname']);
-	$username = scrub_in($_REQUEST['username']);
-	$email = scrub_in($_REQUEST['email']);
-	$pass1 = scrub_in($_REQUEST['password_1']);
-	$pass2 = scrub_in($_REQUEST['password_2']);
-	if(conf('user_agreement')==true){
-		if(!$accept_agreement){
-			echo("<center><b>You <u>must</u> accept the user agreement</b><br>");
-			echo("Click <b><a href=\"javascript:history.back(1)\">here</a></b> to go back");
-			break;
+	case 'add_user':
+		/** 
+		 * User information has been entered
+		 * we need to check the database for possible existing username first
+		 * if username exists, error and say "Please choose a different name."
+		 * if username does not exist, insert user information into database
+		 * then allow the user to 'click here to login'
+		 * possibly by logging them in right then and there with their current info
+		 * and 'click here to login' would just be a link back to index.php
+		 */
+		$accept_agreement 	= scrub_in($_REQUEST['accept_agreement']);
+		$fullname 		= scrub_in($_REQUEST['fullname']);
+		$username		= scrub_in($_REQUEST['username']);
+		$email 			= scrub_in($_REQUEST['email']);
+		$pass1 			= scrub_in($_REQUEST['password_1']);
+		$pass2 			= scrub_in($_REQUEST['password_2']);
+
+		/* If we're using the captcha stuff */
+		if (conf('captcha_public_reg')) { 
+		    	$captcha 		= captcha::check(); 
+			if(!isset ($captcha)) {
+				$GLOBALS['error']->add_error('captcha',_("Error Captcha Required"));
+			}	
+			if (isset ($captcha)) {
+				if ($captcha) {
+					$msg="SUCCESS";
+				}
+		    		else {
+			    		$GLOBALS['error']->add_error('captcha',_("Error Captcha Failed"));
+		    		}
+			} // end if we've got captcha
+		} // end if it's enabled
+
+		if(conf('user_agreement')) {
+			if(!$accept_agreement) {
+				$GLOBALS['error']->add_error('user_agreement',_("You <U>must</U> accept the user agreement"));
+			} 
+		} // if they have to agree to something
+
+		if(!$username) {
+			$GLOBALS['error']->add_error('username',_("You did not enter a username"));
 		}
-	}
 
-	if(!$username){
-		echo("<center><b>You did not enter a username</b><br>");
-		echo("Click <b><a href=\"javascript:history.back(1)\">here</a></b> to go back");
-		break;
-	}
-
-	if(!$fullname){
-		echo("<center><b>Please enter your full name</b><br>");
-		echo("Click <b><a href=\"javascript:history.back(1)\">here</a></b> to go back");
-		break;
-	}
-
-	if(!good_email($email)){
-		echo("<center><b>You must enter a valid email address</b><br>");
-		echo("Click <b><a href=\"javascript:history.back(1)\">here</a></b> to go back");
-		break;
-	}
-
-	if(!$pass1){
-		echo("<center><b>You must enter a password</b><br>");
-		echo("Click <b><a href=\"javascript:history.back(1)\">here</a></b> to go back");
-		break;
-	}
-
-	if ( $pass1 != $pass2 ) {
-		echo("<center><b>Your passwords do not match</b><br>");
-		echo("Click <b><a href=\"javascript:history.back(1)\">here</a></b> to go back");
-		break;
-	}
-	$new_user = new_user("$username", "$fullname", "$email", "$pass1");
-	if(!$new_user){
-		echo("<center><b>That username already exists</b><br>");
-		echo("Click <b><a href=\"javascript:history.back(1)\">here</a></b> to go back");
-		break;
-	}
-	break;
+		if(!$fullname) {
+			$GLOBALS['error']->add_error('fullname',_("Please fill in your full name (Firstname Lastname)"));
+		}
 
-    // This is the default action.
-    case 'show_add_user':
-    default:
-        if (conf('demo_mode')) { break; }
-	$values = array('type'=>"new_user");
-	show_user_registration($values);
-	break;
-	case 'new_user':
-	include("templates/show_new_user.inc");
-	break;
+		/* Check the mail for correct address formation. */
+		$attempt = 0;
+		$max_attempts = 3;
+		$response_code = "";
+
+		while ( $response_code == "" || strstr( $response_code, "fsockopen error" )) {
+			$validate_results = validateEmail( $email );
+			$response_code = $validate_results[1];
+			if($attempt == $max_attempts) {
+				break;
+			}
+			$attempt++;
+		}
 
-}
+		if ($validate_results[0]) {
+			$mmsg = "MAILOK";
+		}
+	        else {
+	                $GLOBALS['error']->add_error('email',_("Error Email address not confirmed<br>$validate_results[1]"));
+	        }
+		/* End of mailcheck */
+	
+		if(!$pass1){
+			$GLOBALS['error']->add_error('password',_("You must enter a password"));
+		}
+
+		if ( $pass1 != $pass2 ) {
+			$GLOBALS['error']->add_error('password',_("Your passwords do not match"));
+		}
+
+		if (!check_username($username)) { 
+			$GLOBALS['error']->add_error('duplicate_user',_("Error Username already exists"));
+		}
 
+		if($GLOBALS['error']->error_state){
+			show_user_registration($values);
+			break;
+		}
 
+		/* Attempt to create the new user */
+		$access = 'disabled';
+		if (conf('auto_user')) { $access = '5'; }
+		$new_user = $GLOBALS['user']->create($username,$fullname,$email,$pass1,$access);
+
+		if (!$new_user) {
+			$GLOBALS['error']->add_error('duplicate_user',_("Error: Insert Failed"));
+			show_user_registration($values);
+			break;
+		}
+
+		$user_object = new User($new_user);
+		$validation = str_rand(20);
+		$user_object->update_validation($validation);
+
+		$message = 'Your account has been created. However, this forum requires account activation.' .
+				' An activation key has been sent to the e-mail address you provided. ' .
+				'Please check your e-mail for further information';
+
+		send_confirmation($username, $fullname, $email, $pass1, $validation);
+		show_template('style');
+		show_confirmation(_('Registration Complete'),$message,'/login.php');	
+	break;
+	case 'show_add_user':
+	default:
+		$values = array('type'=>"new_user");
+		show_user_registration($values);
+	break;
+} // end switch on action
 ?>
diff -urN ampache-3.3.2-alpha4/rss.php ampache-3.3.2-beta1/rss.php
--- ampache-3.3.2-alpha4/rss.php	2005-12-27 01:33:03.000000000 -0800
+++ ampache-3.3.2-beta1/rss.php	2006-01-08 23:06:20.000000000 -0800
@@ -23,6 +23,11 @@
 $no_session = 1;
 require('modules/init.php');
 
-echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
+/* Check Perms */
+if (!conf('use_rss') || conf('demo_mode')) {
+        access_denied();
+}
+
+
 show_now_playingRSS();
 ?>
diff -urN ampache-3.3.2-alpha4/server/ajax.server.php ampache-3.3.2-beta1/server/ajax.server.php
--- ampache-3.3.2-alpha4/server/ajax.server.php	1969-12-31 16:00:00.000000000 -0800
+++ ampache-3.3.2-beta1/server/ajax.server.php	2006-01-08 23:06:13.000000000 -0800
@@ -0,0 +1,109 @@
+<?php
+header('Content-Type: text/xml'); 
+header('Cache-control: no-cache'); 
+header('Pragma: no-cache'); 
+echo '<?xml version="1.0" encoding="UTF-8"?>';
+
+function mpderr() { global $result, $myMpd; $result = $result . '<error>'.$myMpd->errStr.'</error>'; }
+function volume() { global $result, $myMpd; $result = $result . '<volume>'. $myMpd->volume. '</volume>'; }
+function state() { global $result, $myMpd; $result = $result. '<state>'. $myMpd->state. '</state>'; }
+function mpd_cur_track_pos () { global $result, $myMpd; 
+                   $result = $result . '<mpd_cur_track_pos>'.$myMpd->current_track_position.'</mpd_cur_track_pos>'; }
+
+function now_playing() {
+global $result, $myMpd;
+   if (!$myMpd->playlist[($myMpd->current_track_id)]['Title']) {
+      list($tmp, $id, $tmp) = preg_split("/(song=|&)/", $myMpd->playlist[($myMpd->current_track_id)]['file']);
+      $r = new Song($id);
+      $myMpd->playlist[($myMpd->current_track_id)]['Title'] = $r->title;
+      $myMpd->playlist[($myMpd->current_track_id)]['Artist'] = $r->get_artist_name();
+      $myMpd->playlist[($myMpd->current_track_id)]['Album'] = $r->get_album_name();
+   }
+   $result = $result.'<now_playing>'.
+             '<songid>'.$myMpd->current_track_id.'</songid>'.
+             '<songtitle>'.$myMpd->playlist[$myMpd->current_track_id]['Title'].'</songtitle>'.
+             '<songartist>'.$myMpd->playlist[$myMpd->current_track_id]['Artist'].'</songartist>'.
+             '<songalbum>'.$myMpd->playlist[$myMpd->current_track_id]['Album'].'</songalbum>'.
+             '<songlength>'.$myMpd->playlist[($myMpd->current_track_id)]['Time'].'</songlength>'.
+             '</now_playing>';
+}
+
+
+/**********************
+The below handles a request for action on the mpd player and/or the return of mpd
+player state information.
+
+It is grossly inefficient because everytime there is a request it loads init.php and does a full 
+instantiation of myMpd.  Would be much faster if it only loaded limited info to start, then 
+just grabbed what it needed.  (Prolly tougher to maintain abstraction.)
+**********************/
+
+$no_session = true;
+include ('../modules/init.php'); 
+$myMpd = init_mpd();
+
+$action = $_GET['action'];
+$result = '';
+
+/*if (!$user->has_access(25)) { echo '<error>Inadequate access privileges!</error>'; return; }*/
+
+switch ($action) {
+case 'getvol' : 
+	$result = '<volume>'. $myMpd->volume. '</volume>';
+	break;
+case 'setvol' : 
+	if ( is_null($myMpd->SetVolume($_GET['param1'])) ) $result = '<error>'.$myMpd->errStr.'</error>';
+	$result = $result.'<volume>'. $myMpd->volume. '</volume>';
+	break;
+case 'adjvol' :
+        if ( is_null($myMpd->AdjustVolume($_GET['param1'])) ) $result = '<error>'.$myMpd->errStr.'</error>';
+        volume();
+        break;
+    case ' > ':
+    case "play":
+      if ( is_null($myMpd->Play()) ) $result = '<error>'.$myMpd->errStr.'</error>\n';
+        mpd_cur_track_pos();
+        state();
+        now_playing();
+        break;
+    case "stop":
+    case ' X ':
+      if ( is_null($myMpd->Stop()) ) $result = '<error>'.$myMpd->errStr.'</error>\n';
+        $result = $result.'<state>'. $myMpd->state. '</state>';
+        break;
+    case ' | | ':
+    case ' = ':
+    case "pause":
+      if ( is_null($myMpd->Pause()) ) echo "ERROR: " .$myMpd->errStr."\n";
+        mpd_cur_track_pos();
+        state();
+        break;
+    case '|< ':
+    case "Prev":
+      if ( is_null($myMpd->Previous()) ) echo "ERROR: " . $myMpd->errStr."\n";
+        mpd_cur_track_pos();
+        state();
+        now_playing();
+        break;
+    case ' >|';
+    case "Next":
+      if ( is_null($myMpd->Next()) ) echo "ERROR: " . $myMpd->errStr."\n";
+        mpd_cur_track_pos();
+        state();
+        now_playing();
+        break;
+    case 'now_playing' :
+        mpd_cur_track_pos();
+        state();
+        now_playing();
+        break;
+
+
+} //end switch
+
+
+echo '<properties>' .
+	'<action>' . $action .'</action>' .
+	$result .
+'</properties>';
+?>
diff -urN ampache-3.3.2-alpha4/song.php ampache-3.3.2-beta1/song.php
--- ampache-3.3.2-alpha4/song.php	2005-12-27 01:33:03.000000000 -0800
+++ ampache-3.3.2-beta1/song.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 ampache.org
+ Copyright (c) 2001 - 2006 ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -26,6 +26,7 @@
 	a bunch of id's.
 	Special thanx goes to Mike Payson and Jon Disnard for the means
 	to do this.
+	FIXME: don't get me started... :(
 */
 
 require('modules/init.php');
@@ -49,6 +50,10 @@
 		if ($type == 'album') { 
 			$song_ids = get_songs_from_type($type, $_POST['song'], $_REQUEST['artist_id']);
 		} 
+		elseif ($_REQUEST['playlist_id']) { 
+			$playlist = new Playlist($_REQUEST['playlist_id']);
+			$song_ids = $playlist->get_songs();
+		}
 		else { 
 			$song_ids = $_POST['song'];
 		}
@@ -64,9 +69,17 @@
 		$song_ids 	= $genre->get_random_songs();
 		$_REQUEST['action'] = 'm3u';
 	break;
+	case 'playlist':
+		$playlist	= new Playlist($_REQUEST['playlist_id']);
+		$song_ids	= $playlist->get_songs();
+		$_REQUEST['action'] = 'm3u';
+	case 'playlist_random':
+		$playlist	= new Playlist($_REQUEST['playlist_id']);
+		$song_ids	= $playlist->get_random_songs();
+		$_REQUEST['action'] = 'm3u';
+	break;
 	default:
 	break;
-
 } // end action switch
 
 if ($_REQUEST['album']) {
@@ -83,7 +96,8 @@
 	}
 }
 elseif ( $_REQUEST['artist'] ) {
-	$song_ids = get_song_ids_from_artist( $_REQUEST['artist'] );
+	$artist = new Artist($_REQUEST['artist']);
+	$song_ids = $artist->get_song_ids();
 }
 /*! 
 	@action Random Song
diff -urN ampache-3.3.2-alpha4/sql/ampache.sql ampache-3.3.2-beta1/sql/ampache.sql
--- ampache-3.3.2-alpha4/sql/ampache.sql	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/sql/ampache.sql	2006-01-08 23:06:20.000000000 -0800
@@ -19,6 +19,8 @@
   `start` int(11) unsigned NOT NULL default '0',
   `end` int(11) unsigned NOT NULL default '0',
   `level` smallint(3) unsigned NOT NULL default '5',
+  `user` varchar(128) default NULL,
+  `key` varchar(255) default NULL,
   PRIMARY KEY  (`id`),
   KEY `ip` (`start`)
 ) TYPE=MyISAM;
@@ -96,8 +98,7 @@
   `catalog_type` enum('local','remote') NOT NULL default 'local',
   `last_update` int(11) unsigned NOT NULL default '0',
   `last_add` int(11) unsigned NOT NULL default '0',
-  `enabled` enum('true','false') NOT NULL default 'true',
-  `private` int(1) unsigned NOT NULL default '0',
+  `enabled` tinyint(1) unsigned NOT NULL default '1',
   `id3_set_command` varchar(255) NOT NULL default '/usr/bin/id3v2 -a "%a" -A "%A" -t "%t" -g %g -y %y -T %T -c "%c" "%filename"',
   `rename_pattern` varchar(255) NOT NULL default '%a - %T - %t.mp3',
   `sort_pattern` varchar(255) NOT NULL default '%C/%a/%A',
@@ -123,10 +124,10 @@
 DROP TABLE IF EXISTS `flagged`;
 CREATE TABLE `flagged` (
   `id` int(11) NOT NULL auto_increment,
-  `user` int(10) unsigned NOT NULL default '0',
+  `user` varchar(128) NOT NULL default '',
   `type` enum('badmp3','badid3','newid3','setid3','del','sort','ren','notify','done') NOT NULL default 'badid3',
   `song` int(11) unsigned NOT NULL default '0',
-  `date` int(10) unsigned NOT NULL default '0',
+  `date` int(11) unsigned NOT NULL default '0',
   `comment` text,
   UNIQUE KEY `id` (`id`),
   UNIQUE KEY `song` (`song`),
@@ -150,7 +151,7 @@
 DROP TABLE IF EXISTS `flagged_song`;
 CREATE TABLE `flagged_song` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `song` int(10) unsigned NOT NULL default '0',
+  `song` int(11) unsigned NOT NULL default '0',
   `file` varchar(255) NOT NULL default '',
   `catalog` int(11) unsigned NOT NULL default '0',
   `album` int(11) unsigned NOT NULL default '0',
@@ -166,9 +167,9 @@
   `size` mediumint(4) unsigned NOT NULL default '0',
   `time` mediumint(5) NOT NULL default '0',
   `track` int(11) unsigned default NULL,
-  `genre` int(10) default NULL,
-  `played` enum('true','false') NOT NULL default 'false',
-  `enabled` enum('true','false') NOT NULL default 'true',
+  `genre` int(11) unsigned default NULL,
+  `played` tinyint(1) unsigned NOT NULL default '0',
+  `enabled` tinyint(1) unsigned NOT NULL default '1',
   `update_time` int(11) unsigned default '0',
   `addition_time` int(11) unsigned default '0',
   PRIMARY KEY  (`id`),
@@ -203,7 +204,7 @@
   `id` int(11) NOT NULL auto_increment,
   `type` varchar(32) NOT NULL default '',
   `value` varchar(128) NOT NULL default '',
-  `access` enum('user','admin') NOT NULL default 'user',
+  `access` smallint(3) unsigned NOT NULL default '25',
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
@@ -214,7 +215,7 @@
 
 /*!40000 ALTER TABLE `flagged_types` DISABLE KEYS */;
 LOCK TABLES `flagged_types` WRITE;
-INSERT INTO `flagged_types` VALUES (1,'badmp3','Corrupt or low-quality mp3','user'),(2,'badid3','Incomplete or incorrect song information','user'),(3,'newid3','Updated id3 information is available','admin'),(4,'del','Remove this file','admin'),(5,'sort','Put this file in a directory matching the conventions of its catalog','admin'),(6,'ren','Rename this file from id3 info','admin'),(7,'notify','Notify the user who flagged this song that it has been updated.','admin'),(8,'done','Take no action on this song.','admin'),(9,'setid3','Schedule file for id3 update','admin'),(10,'disabled','Disabled this song','admin');
+INSERT INTO `flagged_types` VALUES (1,'badmp3','Corrupt or low-quality mp3',25),(2,'badid3','Incomplete or incorrect song information',25),(3,'newid3','Updated id3 information is available',100),(4,'del','Remove this file',100),(5,'sort','Put this file in a directory matching the conventions of its catalog',100),(6,'ren','Rename this file from id3 info',100),(7,'notify','Notify the user who flagged this song that it has been updated.',100),(8,'done','Take no action on this song.',100),(9,'setid3','Schedule file for id3 update',100),(10,'disabled','Disabled this song',100);
 UNLOCK TABLES;
 /*!40000 ALTER TABLE `flagged_types` ENABLE KEYS */;
 
@@ -240,6 +241,30 @@
 /*!40000 ALTER TABLE `genre` ENABLE KEYS */;
 
 --
+-- Table structure for table `ip_history`
+--
+
+DROP TABLE IF EXISTS `ip_history`;
+CREATE TABLE `ip_history` (
+  `username` varchar(128) default NULL,
+  `ip` int(11) unsigned NOT NULL default '0',
+  `connections` int(11) unsigned NOT NULL default '1',
+  `date` int(11) unsigned NOT NULL default '0',
+  KEY `username` (`username`),
+  KEY `date` (`date`)
+) TYPE=MyISAM;
+
+--
+-- Dumping data for table `ip_history`
+--
+
+
+/*!40000 ALTER TABLE `ip_history` DISABLE KEYS */;
+LOCK TABLES `ip_history` WRITE;
+UNLOCK TABLES;
+/*!40000 ALTER TABLE `ip_history` ENABLE KEYS */;
+
+--
 -- Table structure for table `now_playing`
 --
 
@@ -247,8 +272,9 @@
 CREATE TABLE `now_playing` (
   `id` int(11) unsigned NOT NULL auto_increment,
   `song_id` int(11) unsigned NOT NULL default '0',
-  `user_id` int(11) unsigned default NULL,
+  `user` varchar(128) default NULL,
   `start_time` int(11) unsigned NOT NULL default '0',
+  `session` varchar(64) default NULL,
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
@@ -269,7 +295,7 @@
 DROP TABLE IF EXISTS `object_count`;
 CREATE TABLE `object_count` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `object_type` enum('album','artist','song','playlist') NOT NULL default 'song',
+  `object_type` enum('album','artist','song','playlist','genre','catalog') NOT NULL default 'song',
   `object_id` int(11) unsigned NOT NULL default '0',
   `date` int(11) unsigned NOT NULL default '0',
   `count` int(11) unsigned NOT NULL default '0',
@@ -297,9 +323,9 @@
 
 DROP TABLE IF EXISTS `playlist`;
 CREATE TABLE `playlist` (
-  `id` int(10) unsigned NOT NULL auto_increment,
+  `id` int(11) unsigned NOT NULL auto_increment,
   `name` varchar(128) NOT NULL default '',
-  `owner` int(10) unsigned NOT NULL default '0',
+  `user` varchar(128) NOT NULL default '',
   `type` enum('private','public') NOT NULL default 'private',
   `date` timestamp NOT NULL,
   PRIMARY KEY  (`id`),
@@ -323,9 +349,12 @@
 
 DROP TABLE IF EXISTS `playlist_data`;
 CREATE TABLE `playlist_data` (
+  `id` int(11) unsigned NOT NULL auto_increment,
   `playlist` int(11) unsigned NOT NULL default '0',
-  `song` int(11) unsigned NOT NULL default '0',
+  `song` int(11) unsigned default NULL,
+  `dyn_song` varchar(255) default NULL,
   `track` int(11) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`id`),
   KEY `playlist` (`playlist`)
 ) TYPE=MyISAM;
 
@@ -387,11 +416,36 @@
 
 /*!40000 ALTER TABLE `preferences` DISABLE KEYS */;
 LOCK TABLES `preferences` WRITE;
-INSERT INTO `preferences` VALUES (1,'download','0','Allow Downloads',100,'user',0),(2,'upload','0','Allow Uploads',100,'user',0),(3,'quarantine','1','Quarantine All Uploads',100,'user',0),(4,'popular_threshold','10','Popular Threshold',25,'user',0),(5,'font','Verdana, Helvetica, sans-serif','Interface Font',25,'user',0),(6,'bg_color1','#ffffff','Background Color 1',25,'user',0),(7,'bg_color2','#000000','Background Color 2',25,'user',0),(8,'base_color1','#bbbbbb','Base Color 1',25,'user',0),(9,'base_color2','#dddddd','Base Color 2',25,'user',0),(10,'font_color1','#222222','Font Color 1',25,'user',0),(11,'font_color2','#000000','Font Color 2',25,'user',0),(12,'font_color3','#ffffff','Font Color 3',25,'user',0),(13,'row_color1','#cccccc','Row Color 1',25,'user',0),(14,'row_color2','#bbbbbb','Row Color 2',25,'user',0),(15,'row_color3','#dddddd','Row Color 3',25,'user',0),(16,'error_color','#990033','Error Color',25,'user',0),(17,'font_size','10','Font Size',25,'user',0),(18,'upload_dir','/tmp','Upload Directory',25,'user',0),(19,'sample_rate','32','Downsample Bitrate',25,'user',0),(20,'refresh_limit','0','Refresh Rate for Homepage',100,'system',0),(21,'local_length','900','Session Expire in Seconds',100,'system',0),(22,'site_title','For The Love of Music','Website Title',100,'system',0),(23,'lock_songs','0','Lock Songs',100,'system',1),(24,'force_http_play','1','Forces Http play regardless of port',100,'system',1),(25,'http_port','80','Non-Standard Http Port',100,'system',1),(26,'catalog_echo_count','100','Catalog Echo Interval',100,'system',0),(27,'album_cache_limit','25','Album Cache Limit',100,'system',0),(28,'artist_cache_limit','50','Artist Cache Limit',100,'system',0),(29,'play_type','stream','Type of Playback',25,'user',0),(30,'direct_link','1','Allow Direct Links',100,'user',0),(31,'lang','en_US','Language',100,'user',0),(32,'playlist_type','m3u','Playlist Type',100,'user',0),(33,'theme_name','classic','Theme',0,'user',0),(34,'ellipse_threshold_album','27','Album Ellipse Threshold',0,'user',0),(35,'ellipse_threshold_artist','27','Artist Ellipse Threshold',0,'user',0),(36,'ellipse_threshold_title','27','Title Ellipse Threshold',0,'user',0),(37,'display_menu','1','Show Bottom Menu',0,'user',0);
+INSERT INTO `preferences` VALUES (1,'download','0','Allow Downloads',100,'options',0),(2,'upload','0','Allow Uploads',100,'options',0),(3,'quarantine','1','Quarantine All Uploads',100,'options',0),(4,'popular_threshold','10','Popular Threshold',25,'interface',0),(5,'font','Verdana, Helvetica, sans-serif','Interface Font',25,'theme',0),(6,'bg_color1','#ffffff','Background Color 1',25,'theme',0),(7,'bg_color2','#000000','Background Color 2',25,'theme',0),(8,'base_color1','#bbbbbb','Base Color 1',25,'theme',0),(9,'base_color2','#dddddd','Base Color 2',25,'theme',0),(10,'font_color1','#222222','Font Color 1',25,'theme',0),(11,'font_color2','#000000','Font Color 2',25,'theme',0),(12,'font_color3','#ffffff','Font Color 3',25,'theme',0),(13,'row_color1','#cccccc','Row Color 1',25,'theme',0),(14,'row_color2','#bbbbbb','Row Color 2',25,'theme',0),(15,'row_color3','#dddddd','Row Color 3',25,'theme',0),(16,'error_color','#990033','Error Color',25,'theme',0),(17,'font_size','10','Font Size',25,'theme',0),(18,'upload_dir','/tmp','Upload Directory',25,'options',0),(19,'sample_rate','32','Downsample Bitrate',25,'streaming',0),(20,'refresh_limit','0','Refresh Rate for Homepage',100,'interface',0),(21,'local_length','900','Session Expire in Seconds',100,'system',0),(22,'site_title','For The Love of Music','Website Title',100,'system',0),(23,'lock_songs','0','Lock Songs',100,'system',1),(24,'force_http_play','1','Forces Http play regardless of port',100,'system',1),(25,'http_port','80','Non-Standard Http Port',100,'system',1),(26,'catalog_echo_count','100','Catalog Echo Interval',100,'system',0),(27,'album_cache_limit','25','Album Cache Limit',100,'system',0),(28,'artist_cache_limit','50','Artist Cache Limit',100,'system',0),(29,'play_type','stream','Type of Playback',25,'streaming',0),(30,'direct_link','1','Allow Direct Links',100,'options',0),(31,'lang','en_US','Language',100,'interface',0),(32,'playlist_type','m3u','Playlist Type',100,'streaming',0),(33,'theme_name','classic','Theme',0,'theme',0),(34,'ellipse_threshold_album','27','Album Ellipse Threshold',0,'interface',0),(35,'ellipse_threshold_artist','27','Artist Ellipse Threshold',0,'interface',0),(36,'ellipse_threshold_title','27','Title Ellipse Threshold',0,'interface',0),(38,'condPL','1','Condense Localplay Playlist',0,'interface',0),(39,'quarantine_dir','/tmp','Quarantine Directory',100,'system',0);
 UNLOCK TABLES;
 /*!40000 ALTER TABLE `preferences` ENABLE KEYS */;
 
 --
+-- Table structure for table `ratings`
+--
+
+DROP TABLE IF EXISTS `ratings`;
+CREATE TABLE `ratings` (
+  `id` int(11) unsigned NOT NULL auto_increment,
+  `user` varchar(128) NOT NULL default '',
+  `object_type` enum('artist','album','song') NOT NULL default 'artist',
+  `object_id` int(11) unsigned NOT NULL default '0',
+  `user_rating` enum('00','0','1','2','3','4','5') NOT NULL default '0',
+  PRIMARY KEY  (`id`),
+  KEY `object_id` (`object_id`)
+) TYPE=MyISAM;
+
+--
+-- Dumping data for table `ratings`
+--
+
+
+/*!40000 ALTER TABLE `ratings` DISABLE KEYS */;
+LOCK TABLES `ratings` WRITE;
+UNLOCK TABLES;
+/*!40000 ALTER TABLE `ratings` ENABLE KEYS */;
+
+--
 -- Table structure for table `session`
 --
 
@@ -401,7 +455,8 @@
   `username` varchar(16) NOT NULL default '',
   `expire` int(11) unsigned NOT NULL default '0',
   `value` text NOT NULL,
-  `type` enum('sso','mysql','ldap') NOT NULL default 'mysql',
+  `ip` int(11) unsigned default NULL,
+  `type` enum('sso','mysql','ldap','http') NOT NULL default 'mysql',
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
@@ -435,9 +490,9 @@
   `size` int(11) unsigned NOT NULL default '0',
   `time` mediumint(5) NOT NULL default '0',
   `track` int(11) unsigned default NULL,
-  `genre` int(10) default NULL,
-  `played` enum('true','false') NOT NULL default 'false',
-  `status` enum('disabled','enabled') NOT NULL default 'enabled',
+  `genre` int(11) unsigned default NULL,
+  `played` tinyint(1) unsigned NOT NULL default '0',
+  `enabled` tinyint(1) unsigned NOT NULL default '1',
   `update_time` int(11) unsigned default '0',
   `addition_time` int(11) unsigned default '0',
   PRIMARY KEY  (`id`),
@@ -450,7 +505,7 @@
   KEY `addition_time` (`addition_time`),
   KEY `catalog` (`catalog`),
   KEY `played` (`played`),
-  KEY `enabled` (`status`)
+  KEY `enabled` (`enabled`)
 ) TYPE=MyISAM;
 
 --
@@ -481,7 +536,7 @@
 
 /*!40000 ALTER TABLE `update_info` DISABLE KEYS */;
 LOCK TABLES `update_info` WRITE;
-INSERT INTO `update_info` VALUES ('db_version','331003');
+INSERT INTO `update_info` VALUES ('db_version','332005');
 UNLOCK TABLES;
 /*!40000 ALTER TABLE `update_info` ENABLE KEYS */;
 
@@ -492,10 +547,9 @@
 DROP TABLE IF EXISTS `upload`;
 CREATE TABLE `upload` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `user` int(11) unsigned NOT NULL default '0',
+  `user` varchar(128) NOT NULL default '',
   `file` varchar(255) NOT NULL default '',
-  `comment` varchar(255) NOT NULL default '',
-  `action` enum('add','quarantine','delete') NOT NULL default 'quarantine',
+  `action` enum('add','delete','quarantine') NOT NULL default 'add',
   `addition_time` int(11) unsigned default '0',
   PRIMARY KEY  (`id`),
   KEY `action` (`action`),
@@ -518,7 +572,6 @@
 
 DROP TABLE IF EXISTS `user`;
 CREATE TABLE `user` (
-  `id` int(11) unsigned NOT NULL auto_increment,
   `username` varchar(128) NOT NULL default '',
   `fullname` varchar(128) NOT NULL default '',
   `email` varchar(128) default NULL,
@@ -527,7 +580,6 @@
   `disabled` tinyint(1) NOT NULL default '0',
   `offset_limit` int(5) unsigned NOT NULL default '50',
   `last_seen` int(11) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`id`),
   UNIQUE KEY `username` (`username`)
 ) TYPE=MyISAM;
 
@@ -568,7 +620,7 @@
 
 DROP TABLE IF EXISTS `user_preference`;
 CREATE TABLE `user_preference` (
-  `user` int(11) unsigned NOT NULL default '0',
+  `user` varchar(128) NOT NULL default '',
   `preference` int(11) unsigned NOT NULL default '0',
   `value` varchar(255) NOT NULL default '',
   KEY `user` (`user`),
diff -urN ampache-3.3.2-alpha4/templates/add_catalog.inc ampache-3.3.2-beta1/templates/add_catalog.inc
--- ampache-3.3.2-alpha4/templates/add_catalog.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/add_catalog.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -19,6 +19,7 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
+
 $default_id3 = "/usr/bin/id3v2 -a &quot;%a&quot; -A &quot;%A&quot; -t &quot;%t&quot; -g %g -y %y -T %T -c &quot;%c&quot; %filename";
 $default_rename = "%a - %T - %t";
 $default_sort = "%a/%A";
diff -urN ampache-3.3.2-alpha4/templates/admin_menu.inc ampache-3.3.2-beta1/templates/admin_menu.inc
--- ampache-3.3.2-alpha4/templates/admin_menu.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/admin_menu.inc	1969-12-31 16:00:00.000000000 -0800
@@ -1,55 +0,0 @@
-<?php
-/*
-
- Copyright (c) 2001 - 2005 Ampache.org
- All rights reserved.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-
-/*
-
- @header
- A template file
-
-*/
-
-$web_path = conf('web_path');
-
-$items = array(
-	        _("Users")          => "$web_path/admin/users.php",
-		_("Mail Users")     => "$web_path/admin/mail.php",
-		_("Catalog")        => "$web_path/admin/catalog.php",
-		_("Admin Preferences")    => "$web_path/admin/preferences.php",
-		_("Access Lists")	=>  "$web_path/admin/access.php"
-        );
-
-?>
-<ul id="adminmenu">
-
-	<?php
-	foreach ( array_keys($items) as $item ) {
-		if ( _($admin_highlight) == $item ) {
-        		echo "<li class=\"active\"><a class=\"active\" href=\"$items[$item]\">" . $item . "</a></li>\n";
-		}
-		else {
-        		echo "<li><a href=\"$items[$item]\">" . $item . "</a></li>\n";
-		}
-	}
-
-	?>
-</ul>
-<br />
diff -urN ampache-3.3.2-alpha4/templates/catalog.inc ampache-3.3.2-beta1/templates/catalog.inc
--- ampache-3.3.2-alpha4/templates/catalog.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/catalog.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -19,15 +19,12 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-/*
-
- @header
- A template file
-
-*/
-
+/**
+ * Catalog Display
+ * This template displays all of the catalogs... Currently it's a little cluttered
+ * It would be great if someone cleaned this up
+ */
 ?>
-
 <br />
 <?php  if (!function_exists('iconv')) { ?>
         <div class="fatalerror"><?php echo  _("Error: ICONV not found, ID3V2 Tags will not import correctly. See <a href=\"http://php.oregonstate.edu/iconv\">Iconv</a> for information on getting ICONV"); ?></div>
diff -urN ampache-3.3.2-alpha4/templates/customize_catalog.inc ampache-3.3.2-beta1/templates/customize_catalog.inc
--- ampache-3.3.2-alpha4/templates/customize_catalog.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/customize_catalog.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -44,13 +44,13 @@
 <tr>
 	<td><?php echo _("ID3 set command"); ?>:</td>
 	<td>
-	    	<input size="60" type="text" name="id3_set_command" value="<?php echo htmlspecialchars($catalog->id3_set_command); ?>" />
+	    	<input size="60" type="text" name="id3_set_command" value="<?php echo scrub_out($catalog->id3_set_command); ?>" />
 	</td>
 </tr>
 <tr>
 	<td><?php echo _("Filename pattern"); ?>:</td>
 	<td>
-		<input size="60" type="text" name="rename_pattern" value="<?php echo htmlspecialchars($catalog->rename_pattern); ?>" />
+		<input size="60" type="text" name="rename_pattern" value="<?php echo scrub_out($catalog->rename_pattern); ?>" />
 	</td>
 </tr>
 <tr>
@@ -58,13 +58,13 @@
 		<?php echo _("Folder Pattern"); ?>:<br /><?php echo _("(no leading or ending '/')"); ?>
 	</td>
 	<td>
-		<input size="60" type="text" name="sort_pattern" value="<?php echo htmlspecialchars($catalog->sort_pattern);?>" />
+		<input size="60" type="text" name="sort_pattern" value="<?php echo scrub_out($catalog->sort_pattern);?>" />
 	</td>
 </tr>
 <tr>
 	<td>&nbsp;</td>
 	<td>
-	<input type="hidden" name="catalog_id" value="<?php echo $catalog->id; ?>">
+	<input type="hidden" name="catalog_id" value="<?php echo $catalog->id; ?>" />
 	<input type="hidden" name="action" value="update_catalog_settings" />
 	<input type="submit" value="<?php echo _("Save Catalog Settings"); ?>" />
 	</td>
diff -urN ampache-3.3.2-alpha4/templates/footer.inc ampache-3.3.2-beta1/templates/footer.inc
--- ampache-3.3.2-alpha4/templates/footer.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/footer.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,3 +1,25 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2006 Ampache.org
+ All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+?>
 </td></tr></table>
 </div> <!-- end id="content"-->
 </div> <!-- end id="maincontainer"-->
diff -urN ampache-3.3.2-alpha4/templates/header.inc ampache-3.3.2-beta1/templates/header.inc
--- ampache-3.3.2-alpha4/templates/header.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/header.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -28,7 +28,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>">
 <head>
 <link rel="shortcut icon" href="<?php echo conf('web_path'); ?>/favicon.ico" />
+<?php
+if (conf('use_rss')){
+?>
+<link rel="alternate" type="application/rss+xml" title="<?php echo conf('rss_main_title'); ?>" href="<?php echo conf('web_path'); ?>/rss.php" />
+<?php } ?>
+
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo conf('site_charset'); ?>" />
+<?php show_template('menustyle'); ?>
 <?php show_template('style'); ?>
 <title><?php echo conf('site_title'); ?> - <?php echo $location['title']; ?></title>
 </head>
diff -urN ampache-3.3.2-alpha4/templates/javascript_refresh.inc ampache-3.3.2-beta1/templates/javascript_refresh.inc
--- ampache-3.3.2-alpha4/templates/javascript_refresh.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/javascript_refresh.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,10 +1,26 @@
 <script type="text/javascript" language="javascript">
 <!-- Begin
-// JS variables mpd_elapsed, mpd_song_length and mpd_state set in show_mpdplay.inc
+// when a page/song is loaded, we get starttime and mpd_elapsed.
+// mpd_elapsed is # of seconds elapsed in the now playing song when the page/song was refreshed
+// secondssinceloaded is the calculated number of seconds since mpd_elapsed was set (less some load & execute lag).
 
 // Set refresh interval (in seconds)
 var refreshinterval=<?php echo conf('refresh_limit'); ?>
 
+<?php 
+if ($user->prefs['play_type'] == 'mpd') {
+	echo 'var player = "mpd"' .
+		'; var mpd_elapsed = '. $myMpd->current_track_position .
+		'; var mpd_song_length = '. $myMpd->current_track_length .
+		'; var mpd_songid = '.$myMpd->current_track_id.
+		'; var player_state = "'. $myMpd->state .'";';
+} else {
+	echo 'var player = "'. $user->prefs['play_type'] .
+		'"; var player_state = "";';
+}
+?>
+
+
 // Display the countdown inside the status bar?
 // Set "1" for yes or "0" for no
 var displaycountdown=1
@@ -14,20 +30,19 @@
 var nowtime
 var reloadseconds=0
 var secondssinceloaded=0
-var mpd_notstoppause=1
+//var mpd_notstoppause=1
 
 function starttime() {
    starttime=new Date()
    starttime=starttime.getTime()
-   if (mpd_state == "stop" || mpd_state == "pause") { mpd_notstoppause = 0; }
+//   if (player_state == "stop" || player_state == "pause") { mpd_notstoppause = 0; }
    countdown()
 }
 
 function fmt_time (timenum) {
-var min = Math.floor(timenum / 60)
-var sec = Math.floor(timenum % 60)
-var fmted = min + ':' + ((sec < 10) ? "0" : "") + sec
-return fmted
+var sec = Math.floor(timenum % 60);
+return  Math.floor((1/60) * timenum) + ':' + ((sec < 10) ? '0' : '') + sec; 
+
 }
 
 function countdown() {
@@ -35,31 +50,38 @@
     nowtime=nowtime.getTime()
     secondssinceloaded=(nowtime-starttime)/1000
 
-    if (mpd_notstoppause) {
+    if (player_state == 'play') {
         reloadseconds = Math.round(mpd_song_length - mpd_elapsed - secondssinceloaded)
         }
     else
         { reloadseconds = Math.round(refreshinterval - secondssinceloaded) }
 
-    if (displaycountdown=="1") 
-	{
+    if (displaycountdown==1) {
         window.status="Refreshing in "+reloadseconds+" seconds";
-        if (mpd_notstoppause) {
-            NodeList = document.getElementsByName ('mpd_cur_track_pos');
-            for (var i = 0; i < NodeList.length; i++)
-		{ NodeList.item(i).firstChild.data = fmt_time (mpd_elapsed + secondssinceloaded); }
-            NodeList = document.getElementsByName ('mpd_on_deck_in');
-            for (var i = 0; i < NodeList.length; i++)
-               	{ NodeList.item(i).firstChild.data = fmt_time (mpd_song_length - mpd_elapsed - secondssinceloaded); }
+        if ((player == 'mpd') && (player_state == 'play')) {
+            NodeList = document.getElementById ('mpd_cur_track_pos');
+		{ NodeList.firstChild.data = fmt_time((mpd_elapsed) + (secondssinceloaded)); }
+            NodeList = document.getElementById ('mpd_on_deck_in');
+		{ NodeList.firstChild.data = fmt_time (mpd_song_length - mpd_elapsed - secondssinceloaded); }
+            NodeList = document.getElementById ('mpd_pctplayed');
+		{ NodeList.firstChild.data = Math.floor (100*(mpd_elapsed + secondssinceloaded)/mpd_song_length); }
 	    }
 	if (reloadseconds > 0) {
             var timer=setTimeout("countdown()",1000)
-            }
+        }
 	else { 
             clearTimeout(timer)
-            window.location.reload(true)
-            } //if reloadseconds > 0
-        } // if displaycountdown
+            if (true) { /* rig it for AJAX for now; later replace with conf('AJAX') */
+               startRequest('action=now_playing');
+               starttime = new Date();
+               starttime=starttime.getTime()
+               var timer=setTimeout("countdown()",1000)
+            }
+            else {
+               window.location.reload(true)
+            }
+        } //if reloadseconds > 0
+    } // if displaycountdown
 }
  
 // start with page-load
diff -urN ampache-3.3.2-alpha4/templates/list_duplicates.inc ampache-3.3.2-beta1/templates/list_duplicates.inc
--- ampache-3.3.2-alpha4/templates/list_duplicates.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/list_duplicates.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -19,37 +19,28 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-
-
-/*!
-	@header
-  A template file for listing duplicate songs
-
-*/
 ?>
 
 <?php show_duplicate_searchbox($search_type) ?>
 <?php if ( $flags ) { ?>
 
 <form method="post" enctype="multipart/form-data" action="<?php echo  conf('web_path') . "/admin/song.php?action=disable"; ?>">
-<p style="font-size: 10pt; font-weight: bold;">Duplicate Songs</p>
+<p class="header1"><?php echo _('Duplicate Songs'); ?></p>
 <table class="tabledata" cellspacing="0" cellpadding="0" >
 	<tr class="table-header">
-		<td>Disable</td>
-		<td>Song</td>
-		<td>Artist</td>
-		<td>Album</td>
-		<td>Length</td>
-		<td>Bitrate</td>
-		<td>Size</td>
-		<td>Filename</td>
+		<td><?php echo _('Disable'); ?></td>
+		<td><?php echo _('Song'); ?></td>
+		<td><?php echo _('Artist'); ?></td>
+		<td><?php echo _('Album'); ?></td>
+		<td><?php echo _('Length'); ?></td>
+		<td><?php echo _('Bitrate'); ?></td>
+		<td><?php echo _('Size'); ?></td>
+		<td><?php echo _('Filename'); ?></td>
 	</tr>
 <?php 
-	$class="odd";
 	foreach ($flags as $flag) {
 		$song = new Song($flag['song']);
 		$song->format_song();
-		$class = (++$i%2)?'odd':'even';
 		$alt_title = $song->title;
 	        $formated_title = $song->f_title;
 
@@ -59,11 +50,11 @@
 		$dinfolist = get_duplicate_info($song,$search_type);
 	foreach ($dinfolist as $dinfo)
 	{
-		echo "<tr class=\"".$class."\">".
+		echo "<tr class=\"".flip_class()."\">".
 		"<td><input type=\"checkbox\" name=\"song_ids[]\" value=\"" . $dinfo['songid'] . "\" /></td>".
-	        "<td><a href=\"".conf('web_path')."/song.php?action=m3u&amp;song=$song->id\">".htmlspecialchars($formated_title)."</a> </td>".
-		"<td><a href=\"".conf('web_path')."/artists.php?action=show&amp;artist=".$dinfo['artistid']."\" title=\"".htmlspecialchars($dinfo['artist'])."\">".htmlspecialchars($dinfo['artist'])."</a> </td>".
-		"<td><a href=\"".conf('web_path')."/albums.php?action=show&amp;album=".$dinfo['albumid']."\" title=\"".htmlspecialchars($dinfo['album'])."\">".htmlspecialchars($dinfo['album'])."</a> </td>".
+	        "<td><a href=\"".conf('web_path')."/song.php?action=m3u&amp;song=$song->id\">".scrub_out($formated_title)."</a> </td>".
+		"<td><a href=\"".conf('web_path')."/artists.php?action=show&amp;artist=".$dinfo['artistid']."\" title=\"".scrub_out($dinfo['artist'])."\">".scrub_out($dinfo['artist'])."</a> </td>".
+		"<td><a href=\"".conf('web_path')."/albums.php?action=show&amp;album=".$dinfo['albumid']."\" title=\"".scrub_out($dinfo['album'])."\">".scrub_out($dinfo['album'])."</a> </td>".
 		"<td>".floor($dinfo['time']/60).":".sprintf("%02d", ($dinfo['time']%60) )."</td>".
 		"<td>".intval($dinfo['bitrate']/1000)."</td>".
 		"<td>".sprintf("%.2f", ($dinfo['size']/1000000))."Mb</td>".
@@ -76,11 +67,10 @@
 	}
 ?>
 <tr>
-<td colspan="8" class="<?php echo $class; ?>"><input height="15" type="submit" value="Disable Songs" /></td>
+<td colspan="8" class="<?php echo flip_class(); ?>"><input height="15" type="submit" value="Disable Songs" /></td>
 </tr>
 </table>
 <?php  } else { ?>
-
-<p> You don't have any duplicate songs. </p>
+<p><?php _('You don\'t have any duplicate songs.'); ?></p>
 <?php  } ?>
 </form>
diff -urN ampache-3.3.2-alpha4/templates/list_header.inc ampache-3.3.2-beta1/templates/list_header.inc
--- ampache-3.3.2-alpha4/templates/list_header.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/list_header.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/templates/menustyle.inc ampache-3.3.2-beta1/templates/menustyle.inc
--- ampache-3.3.2-alpha4/templates/menustyle.inc	1969-12-31 16:00:00.000000000 -0800
+++ ampache-3.3.2-beta1/templates/menustyle.inc	2006-01-08 23:06:20.000000000 -0800
@@ -0,0 +1,128 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2006 Ampache.org
+ All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+
+/*!
+ @header Style File
+ @discussion this is the css that handles the menu mojo (#sidebar, etc) and the 
+        outer layer of layout (#maincontainer, #topbar, #content, etc
+*/
+?>
+<style type="text/css">
+<!--
+/**
+ * Div Definitions
+ * These define how the page is laid out, be careful with these as changes to them
+ * can cause drastic layout changes
+ */
+        #maincontainer
+                {
+                        margin: 0px;
+                }
+        #topbar
+                {
+                        height: 80px;
+                        padding-top:10px;
+                        padding-left:10px;
+                        background-color: <?php echo conf('bg_color1'); ?>;
+                }
+        #topbarright
+                {
+                        float: right;
+                }
+        #topbarleft
+                {
+                        float: left;
+                }
+        .nodisplay { display: none;}
+        .display {}
+        #mpdpl td {
+                padding: 0px 2px 0px 2px;
+                text-align: left;
+                }
+/**
+ * End Div Definitions
+ * This is the end of the main structure def's
+ */
+
+/**
+ * Experimental for menus (Thx Sigger)
+ * TO DO: Fill in 1px border around menus & submenu items
+ * Make padding appply to the li, not just an a.  Moving paddng: to li throws off the dropdown menu alignment.
+ */
+	#content {
+/*                float: left;    /*                      use for horizontal menu; comment out otherwise */
+                margin-left:0px;
+	}
+    #sidebar {
+        clear: both;
+        height: 100%;
+        margin: 0;
+        float: left;
+        padding: 0;
+        list-style: none;
+        border: 1px solid #000;
+        line-height: 1.0;
+    }
+    #sidebar ul {
+        margin: 0px;
+        list-style: none;
+        padding: 0px;
+        font-family: verdana, arial, Helvetica, sans-serif;
+        line-height: 1.0;
+    }
+    #sidebar li {
+        margin: 0;
+        display: block;
+        border-bottom: 1px solid white;
+        border-left: 1px solid white;
+        border-right: 1px solid white;
+/*        float: left;                /*          use for horizontal menu; comment out otherwise */
+        padding: 5px 0px 5px 10px;
+        width: 10.5em;
+        background-color: <?php echo conf('row_color2'); ?>;
+    }
+    #sidebar a, .navbutton {
+        display: block;  /*Not sure why this is neccesary, but it is for IE*/
+        text-decoration: none;
+        }
+    #sidebar li:hover, #sidebar li.sfhover {
+        color: <?php echo conf('font_color2'); ?>;
+        background-color: <?php echo conf('row_color3'); ?>;
+    }
+    #sidebar li:active {
+        background-color: <?php echo conf('row_color1'); ?>;
+    }
+    #sidebar li ul {
+        float: left;
+        position: absolute;
+        width: 9em;
+	margin: -1.5em 0 0 10.5em;  /* for vertical menu; comment out otherwise */
+/*	margin: 0.5em 0 0 -1.1em;  /* for horizontal menu;  comment out otherwise */
+
+        left: -999em;  /* this -999em puts the submenu item way off to the left until it's called back by a hover (below) */
+    }
+    #sidebar li:hover ul, #sidebar li.sfhover ul {
+        left: auto;  /* this calls the submenu back when the parent li is hovered. */
+    }
+
+-->
+</style>
diff -urN ampache-3.3.2-alpha4/templates/show_access_list.inc ampache-3.3.2-beta1/templates/show_access_list.inc
--- ampache-3.3.2-alpha4/templates/show_access_list.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_access_list.inc	2006-01-08 23:06:20.000000000 -0800
@@ -31,7 +31,7 @@
 $row_classes = array('even','odd');
 ?>
 
-<p style="font-size: 10pt; font-weight: bold;"><?php print _("Host Access to Your Catalog"); ?></p>
+<p class="header1"><?php print _("Host Access to Your Catalog"); ?></p>
 
 <p>Since your catalog can be accessed remotely you may want to limit the access from
 remote sources so you are not in violation of copyright laws.  By default your
@@ -56,13 +56,14 @@
 foreach ($list as $access) { 
 ?>
 <tr class="<?php print $row_classes[0]; ?>">
-	<td><?php print $access->name; ?></td>
+	<td><?php print scrub_out($access->name); ?></td>
 	<td><?php print int2ip($access->start); ?></td>
 	<td><?php print int2ip($access->end); ?></td>
 	<td><?php print $access->get_level_name(); ?></td>
 	<td>
-		Edit | 
-		<a href="<?php print conf('web_path'); ?>/admin/access.php?action=show_confirm_delete&amp;access_id=<?php print $access->id; ?>"><?php print _("Revoke"); ?></a>
+		<a href="<?php echo conf('web_path'); ?>/admin/access.php?action=show_edit_host&amp;access_id=<?php echo scrub_out($access->id); ?>"><?php echo _('Edit'); ?></a>
+		| 
+		<a href="<?php echo conf('web_path'); ?>/admin/access.php?action=show_confirm_delete&amp;access_id=<?php print scrub_out($access->id); ?>"><?php print _("Revoke"); ?></a>
 	</td>
 </tr>
 <?php  $row_classes = array_reverse($row_classes); ?>
diff -urN ampache-3.3.2-alpha4/templates/show_admin_index.inc ampache-3.3.2-beta1/templates/show_admin_index.inc
--- ampache-3.3.2-alpha4/templates/show_admin_index.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_admin_index.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/templates/show_album_art.inc.php ampache-3.3.2-beta1/templates/show_album_art.inc.php
--- ampache-3.3.2-alpha4/templates/show_album_art.inc.php	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_album_art.inc.php	2006-01-08 23:06:20.000000000 -0800
@@ -22,51 +22,35 @@
 
 // Gotta do some math here!
 $total_images = count($images);
+$rows = floor($total_images/3);
 
-$rows 	= floor($total_images/6);
-$spare 	= $total_images - ($rows * 6);
 
 $i = 0;
 ?>
 
 <table class="text-box"> 
+<tr>
 <?php 
 while ($i <= $rows) { 
-	$images[$i];
-	$ii = $i+1;
-	$iii = $i+2;
+	$j=0;
+	while ($j < 3) { 
+		$key = $i*3+$j;
+		if (!isset($images[$key])) { echo "<td>&nbsp;</td>\n"; } 
+		else { 
 ?>
-	<tr>
 	<td align="center">
-		<a href="<?php echo $images[$i]['url']; ?>" target="_blank">
-		<img src="<?php echo scrub_out($images[$i]['url']); ?>" border="0" height="175" width="175" /><br />
+		<a href="<?php echo $images[$key]['url']; ?>" target="_blank">
+		<img src="<?php echo scrub_out($images[$key]['url']); ?>" border="0" height="175" width="175" /><br />
 		</a>
 		<p align="center">
 			[<a href="<?php echo conf('web_path'); ?>/albums.php?action=select_art&amp;image=<?php echo $i; ?>&amp;album_id=<?php echo urlencode($_REQUEST['album_id']); ?>">Select</a>]
 		</p>
 	</td>
-	<td align="center">
-		<?php if (isset($images[$ii])) { ?>
-		<a href="<?php echo $images[$ii]['url']; ?>" target="_blank">
-		<img src="<?php echo scrub_out($images[$ii]['url']); ?>" border="0" height="175" width="175" /><br />
-		</a>
-		<p align="center">
-			[<a href="<?php echo conf('web_path'); ?>/albums.php?action=select_art&amp;image=<?php echo $ii; ?>&amp;album_id=<?php echo urlencode($_REQUEST['album_id']); ?>">Select</a>]
-		</p>
-		<?php } ?>
-	</td>
-	<td align="center">
-		<?php if (isset($images[$iii])) { ?>
-		<a href="<?php echo $images[$iii]['url']; ?>" target="_blank">
-		<img src="<?php echo scrub_out($images[$iii]['url']); ?>" border="0" height="175" width="175" /><br />
-		</a>
-		<p align="center">
-			[<a href="<?php echo conf('web_path'); ?>/albums.php?action=select_art&amp;image=<?php echo $iii; ?>&amp;album_id=<?php echo urlencode($_REQUEST['album_id']); ?>">Select</a>]
-		</p>
-		<?php } ?>
-	</td>
-	</tr>
 <?php 
+		} // end else
+		$j++;
+	} // end while cells
+	echo "</tr>\n<tr>";
 	$i++;
 } // end while
 ?>
diff -urN ampache-3.3.2-alpha4/templates/show_album.inc ampache-3.3.2-beta1/templates/show_album.inc
--- ampache-3.3.2-alpha4/templates/show_album.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_album.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2004 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -49,7 +49,8 @@
 	<td width="140" align="center">
 	<?php 
         if ($album_name != "Unknown (Orphaned)") {
-                echo "<a target=\"_blank\" href=\"" . conf('web_path') . "/albumart.php?id=" . $album->id . "\">";
+		$aa_url = conf('web_path') . "/albumart.php?id=" . $album->id . "&amp;type=popup";
+		echo "<a target=\"_blank\" href=\"$aa_url\" onclick=\"popup_art('$aa_url'); return false;\">";
 		echo "<img border=\"0\" src=\"" . conf('web_path') . "/albumart.php?id=" . $album->id . "&amp;thumb=2\" alt=\"Album Art\" height=\"128\" />";
 		echo "</a>\n";
         }
@@ -58,8 +59,8 @@
 	<td valign="top">
 		<?php
 		if (conf('ratings')) { 
-			show_rating($album->id,'artist');
-		} // end if flash
+			show_rating($album->id,'album');
+		} // end if ratings
 		echo "<br />\n";
 		?>
 		<b>Actions:</b><br />
diff -urN ampache-3.3.2-alpha4/templates/show_all_popular.inc.php ampache-3.3.2-beta1/templates/show_all_popular.inc.php
--- ampache-3.3.2-alpha4/templates/show_all_popular.inc.php	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_all_popular.inc.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
  
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved. 
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/templates/show_all_recent.inc.php ampache-3.3.2-beta1/templates/show_all_recent.inc.php
--- ampache-3.3.2-alpha4/templates/show_all_recent.inc.php	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_all_recent.inc.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
  
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved. 
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/templates/show_alphabet_form.inc.php ampache-3.3.2-beta1/templates/show_alphabet_form.inc.php
--- ampache-3.3.2-alpha4/templates/show_alphabet_form.inc.php	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_alphabet_form.inc.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -19,20 +19,10 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-/*!
- @header
- A template file
-
-*/
-
 ?>
-
 <form name="f" method="get" action="<?php echo conf('web_path') . "/$action"; ?>" enctype="multipart/form-data">
 	<label for="match" accesskey="S"><?php echo $text; ?></label> 
 	<input type="text" size="3" id="match" name="match" value="<?php echo $match; ?>" />
 	<input type="hidden" name="action" value="match" />
 </form>
 <br />
-
-
-
diff -urN ampache-3.3.2-alpha4/templates/show_artist_box.inc.php ampache-3.3.2-beta1/templates/show_artist_box.inc.php
--- ampache-3.3.2-alpha4/templates/show_artist_box.inc.php	1969-12-31 16:00:00.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_artist_box.inc.php	2006-01-08 23:06:20.000000000 -0800
@@ -0,0 +1,44 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2006 Ampache.org
+ All Rights Reserved
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+        
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+        
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/ 
+?>
+<table class="text-box">
+<tr>
+        <td>
+        <span class="header1"><?php print _("Albums by") . " " . $artist->full_name; ?></span>
+        <ul>
+                <?php
+                        if (conf('ratings')) {
+                                show_rating($artist->id,'artist');
+                        } // end if ratings
+                echo "<br />\n";
+                ?>
+                <li><a href="<?php print $web_path; ?>/artists.php?action=show_all_songs&amp;artist=<?php print $artist_id; ?>"><?php print _("Show All Songs By") . " " . $artist->full_name; ?></a></li>
+                <li><a href="<?php print $web_path; ?>/song.php?action=m3u&amp;artist=<?php print $artist_id; ?>"><?php print _("Play All Songs By") . " " . $artist->full_name; ?></a></li>
+                <li><a href="<?php print $web_path; ?>/song.php?action=m3u&amp;artist_random=<?php print $artist_id; ?>"><?php print _("Play Random Songs By") . " " . $artist->full_name; ?></a></li>
+                <?php  if ($user->has_access('100')) { ?>
+                        <li><a href="<?php echo $web_path; ?>/artists.php?action=update_from_tags&amp;artist=<?php print $artist_id; ?>"><?php print _("Update from tags"); ?></a></li>
+                        <li><a href="<?php echo $web_path; ?>/artists.php?action=show_rename&amp;artist=<?php echo $artist_id; ?>"><?php echo _("Rename Artist"); ?></a></li>
+                <?php } ?>
+        </ul>
+        </td>
+</tr>
+</table>
diff -urN ampache-3.3.2-alpha4/templates/show_artist.inc ampache-3.3.2-beta1/templates/show_artist.inc
--- ampache-3.3.2-alpha4/templates/show_artist.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_artist.inc	2006-01-08 23:06:20.000000000 -0800
@@ -26,22 +26,7 @@
 $web_path = conf('web_path');
 ?>
 <br />
-<table class="text-box">
-<tr>
-	<td>
-	<span class="header1"><?php print _("Albums by") . " " . $artist->full_name; ?></span>
-	<ul>
-        	<li><a href="<?php print $web_path; ?>/artists.php?action=show_all_songs&amp;artist=<?php print $artist_id; ?>"><?php print _("Show All Songs By") . " " . $artist->full_name; ?></a></li>
-	        <li><a href="<?php print $web_path; ?>/song.php?action=m3u&amp;artist=<?php print $artist_id; ?>"><?php print _("Play All Songs By") . " " . $artist->full_name; ?></a></li>
-	        <li><a href="<?php print $web_path; ?>/song.php?action=m3u&amp;artist_random=<?php print $artist_id; ?>"><?php print _("Play Random Songs By") . " " . $artist->full_name; ?></a></li>
-		<?php  if ($user->has_access('100')) { ?> 
-			<li><a href="<?php echo $web_path; ?>/artists.php?action=update_from_tags&amp;artist=<?php print $artist_id; ?>"><?php print _("Update from tags"); ?></a></li>
-			<li><a href="<?php echo $web_path; ?>/artists.php?action=show_rename&amp;artist=<?php echo $artist_id; ?>"><?php echo _("Rename Artist"); ?></a></li>
-		<?php } ?>
-	</ul>
-	</td>
-</tr>
-</table>
+<?php require (conf('prefix') . '/templates/show_artist_box.inc.php'); ?>
 <!-- *** Multi-Album Art Display Thx MrBlahh Updated by clader *** -->
 <br />
 <form name="songs" method="post" enctype="multipart/form-data" action="artists.php">
diff -urN ampache-3.3.2-alpha4/templates/show_artists.inc ampache-3.3.2-beta1/templates/show_artists.inc
--- ampache-3.3.2-alpha4/templates/show_artists.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_artists.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/templates/show_big_art.inc ampache-3.3.2-beta1/templates/show_big_art.inc
--- ampache-3.3.2-alpha4/templates/show_big_art.inc	1969-12-31 16:00:00.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_big_art.inc	2006-01-08 23:06:20.000000000 -0800
@@ -0,0 +1,41 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2006 Ampache.org
+ All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+
+$htmllang = str_replace("_","-",conf('lang'));
+?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>">
+<head>
+<link rel="shortcut icon" href="<?php echo conf('web_path'); ?>/favicon.ico" />
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo conf('site_charset'); ?>" />
+<title><?php echo conf('site_title'); ?> - <?php echo _("Album Art"); ?></title>
+</head>
+<body onLoad="self.resizeTo(document.images[0].width+30, document.images[0].height+70)">
+<?php
+echo "<a href=\"javascript:window.close()\" title=\"" . _("Click to close window") . "\">";
+echo "<img src=\"" . conf('web_path') . "/albumart.php?id=" . $_GET['id'] . "\" border=\"0\" />";
+echo "</a>";
+?>
+</body>
+</html>
+
diff -urN ampache-3.3.2-alpha4/templates/show_box.inc ampache-3.3.2-beta1/templates/show_box.inc
--- ampache-3.3.2-alpha4/templates/show_box.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_box.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2004 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -19,14 +19,7 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-/*!
- @header
- A template file
-
-*/
-
 ?>
-
 <table class="border" cellspacing="1" cellpadding="3">
 	<tr align="center">
 		<td background="<?php echo conf('web_path'); ?>/images/ampache-light-bg.gif" bgcolor="#c0c0c0"><?php echo $title; ?></td>
diff -urN ampache-3.3.2-alpha4/templates/show_browse_menu.inc ampache-3.3.2-beta1/templates/show_browse_menu.inc
--- ampache-3.3.2-alpha4/templates/show_browse_menu.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_browse_menu.inc	1969-12-31 16:00:00.000000000 -0800
@@ -1,55 +0,0 @@
-<?php
-/*
-
- Copyright (c) 2001 - 2005 Ampache.org
- All rights reserved.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-
-/**
- * Browse Menu
- * This menu has all the different ways you can browse your ampache music collection
- * This calls different options of the browse.php file
- * @package Web Interface
- * @catagory Browse
- * @author Karl Vollmer
- */
-
-$web_path = conf('web_path');
-
-$items = array(
-	        _("Artists")      => "$web_path/artists.php",
-		_("Albums")      => "$web_path/albums.php",
-		_("Genre")       => "$web_path/browse.php?action=genre",
-        );
-
-?>
-<ul id="adminmenu">
-
-	<?php
-	foreach ( array_keys($items) as $item ) {
-		if ( _($highlight) == $item ) {
-        		echo "<li class=\"active\"><a class=\"active\" href=\"$items[$item]\">" . $item . "</a></li>\n";
-		}
-		else {
-        		echo "<li><a href=\"$items[$item]\">" . $item . "</a></li>\n";
-		}
-	}
-
-	?>
-</ul>
-<br />
diff -urN ampache-3.3.2-alpha4/templates/show_confirm_action.inc.php ampache-3.3.2-beta1/templates/show_confirm_action.inc.php
--- ampache-3.3.2-alpha4/templates/show_confirm_action.inc.php	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_confirm_action.inc.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*      
         
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/templates/show_confirmation.inc.php ampache-3.3.2-beta1/templates/show_confirmation.inc.php
--- ampache-3.3.2-alpha4/templates/show_confirmation.inc.php	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_confirmation.inc.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/templates/show_disabled_songs.inc ampache-3.3.2-beta1/templates/show_disabled_songs.inc
--- ampache-3.3.2-alpha4/templates/show_disabled_songs.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_disabled_songs.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -18,13 +18,6 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-
-/*!
-	@header Disabled Songs
-
-*/
-
-
 ?>
 <br />
 <form name="songs" method="post" action="<?php echo conf('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data" style="Display:inline">
diff -urN ampache-3.3.2-alpha4/templates/show_edit_access.inc ampache-3.3.2-beta1/templates/show_edit_access.inc
--- ampache-3.3.2-alpha4/templates/show_edit_access.inc	1969-12-31 16:00:00.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_edit_access.inc	2006-01-08 23:06:20.000000000 -0800
@@ -0,0 +1,65 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2006 Ampache.org
+ All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+?>
+
+<p class="header1"><?php print _('Edit Access List'); ?></p>
+
+<form name="edit_access" method="post" enctype="multipart/form-data" action="<?php echo conf('web_path'); ?>/admin/access.php">
+<table class="text-box">
+        <tr>
+                <td><?php print _('Name'); ?>: </td>
+		<td><?php echo scrub_out($access->name); ?></td>
+        </tr>
+        <tr>
+                <td><?php print _('Start IP Address'); ?>:</td>
+		<td>
+			<input type="text" name="start" value="<?php echo int2ip($access->start); ?>" size="20" maxlength="15" />
+		</td>
+        </tr>
+	<tr>
+		<td><?php print _('End IP Address'); ?>:</td>
+		<td>
+			<input type="text" name="end" value="<?php echo int2ip($access->end); ?>" size="20" maxlength="15" />
+		</td>
+	</tr>
+	<tr>
+		<td><?php print _('Level'); ?>:</td>
+		<td>
+			<select name="level">
+				<?php $name = 'level_' . $access->level; ${$name} = 'selected="selected"'; ?>
+				<option value="5" <?php echo $level_5; ?>><?php echo _('Demo'); ?></option>
+				<option value="25" <?php echo $level_25; ?>><?php echo _('Stream'); ?></option>
+				<option value="50" <?php echo $level_50; ?>><?php echo _('Stream/Download'); ?></option>
+				<option value="75" <?php echo $level_75; ?>><?php echo _('XML-RPC'); ?></option>
+			</select>
+		</td>
+	</tr>
+        <tr>
+                <td>&nbsp;</td>
+		<td>
+			<input type="hidden" name="access_id" value="<?php echo scrub_out($access->id); ?>" />
+			<input type="hidden" name="action" value="update_host" />
+			<input type="submit" value="<?php print _('Update'); ?>" />
+		</td>
+        </tr>
+</table>
+</form>
diff -urN ampache-3.3.2-alpha4/templates/show_genre.inc.php ampache-3.3.2-beta1/templates/show_genre.inc.php
--- ampache-3.3.2-alpha4/templates/show_genre.inc.php	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_genre.inc.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -25,7 +25,6 @@
  * albums/artists or songs
 */
 ?>
-
 <table class="text-box">
 <tr>
 	<td>
diff -urN ampache-3.3.2-alpha4/templates/show_import_playlist.inc.php ampache-3.3.2-beta1/templates/show_import_playlist.inc.php
--- ampache-3.3.2-alpha4/templates/show_import_playlist.inc.php	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_import_playlist.inc.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/templates/show_install_account.inc.php ampache-3.3.2-beta1/templates/show_install_account.inc.php
--- ampache-3.3.2-alpha4/templates/show_install_account.inc.php	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_install_account.inc.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -52,8 +52,9 @@
 	<dd><?php echo _("This step creates your initial Ampache admin account. Once your admin account has been created you will be directed to the login page"); ?></dd>
 </dl>
 <br /><br />
-<span class="header2">Create Admin Account</span>
-<form method="post" action="<?php echo $_SERVER['PHP_SELF'] . "?action=create_account"; ?>" enctype="multipart/form-data" >
+<span class="header2"><?php echo _('Create Admin Account'); ?></span>
+<?php echo $GLOBALS['error']->print_error('general'); ?>
+<form method="post" action="<?php echo $GLOBALS['php_self'] . "?action=create_account"; ?>" enctype="multipart/form-data" >
 <table cellpadding="5" cellspacing="0" border="0">
 <tr>
 	<td><?php echo _("Username"); ?></td>
diff -urN ampache-3.3.2-alpha4/templates/show_install_config.inc ampache-3.3.2-beta1/templates/show_install_config.inc
--- ampache-3.3.2-alpha4/templates/show_install_config.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_install_config.inc	2006-01-08 23:06:20.000000000 -0800
@@ -53,6 +53,7 @@
 <?php echo _("Step 3 - Setup Initial Account"); ?></a><br />
 <br /><br />
 <span class="header2">Generate Config File</span>
+<?php echo $GLOBALS['error']->print_error('general'); ?>
 <form method="post" action="<?php echo $_SERVER['PHP_SELF'] . "?action=create_config"; ?>" enctype="multipart/form-data" >
 <table cellpadding="5" cellspacing="0" border="0">
 <tr>
@@ -61,15 +62,15 @@
 </tr>
 <tr>
 	<td><?php echo _("Desired Database Name"); ?></td>
-	<td><input type="textbox" name="local_db" value="<?php echo $_REQUEST['local_db']; ?>" /></td>
+	<td><input type="textbox" name="local_db" value="<?php echo scrub_out($_REQUEST['local_db']); ?>" /></td>
 </tr>
 <tr>
 	<td><?php echo _("MySQL Hostname"); ?></td>
-	<td><input type="textbox" name="local_host" value="<?php echo $_REQUEST['local_host']; ?>" /></td>
+	<td><input type="textbox" name="local_host" value="<?php echo scrub_out($_REQUEST['local_host']); ?>" /></td>
 </tr>
 <tr>
 	<td><?php echo _("MySQL Username"); ?></td>
-	<td><input type="textbox" name="local_username" value="username" /></td>
+	<td><input type="textbox" name="local_username" value="<?php echo scrub_out($_REQUEST['local_username']); ?>" /></td>
 </tr>
 <tr>
 	<td><?php echo _("MySQL Password"); ?></td>
@@ -121,12 +122,12 @@
 <tr>
 	<td>&nbsp;</td>
 	<td>
-	<a href="<?php echo $http_type . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']; ?>?action=show_create_config&local_db=<?php echo $_REQUEST['local_db']; ?>&local_host=<?php echo $_REQUEST['local_host']; ?>">[<?php echo _("Check for Config"); ?>]</a>
+	<a href="<?php echo $GLOBALS['php_self']; ?>?action=show_create_config&local_db=<?php echo $_REQUEST['local_db']; ?>&local_host=<?php echo $_REQUEST['local_host']; ?>">[<?php echo _("Check for Config"); ?>]</a>
 	</td>
 </tr>
 </table>
 <br />
-<form method="post" action="<?php echo $_SERVER['PHP_SELF'] . "?action=show_create_account"; ?>" enctype="multipart/form-data">
+<form method="post" action="<?php echo $GLOBALS['php_self'] . "?action=show_create_account"; ?>" enctype="multipart/form-data">
 <input type="Submit" value="Continue to Step 3" />
 </form>
 </div>
diff -urN ampache-3.3.2-alpha4/templates/show_install.inc ampache-3.3.2-beta1/templates/show_install.inc
--- ampache-3.3.2-alpha4/templates/show_install.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_install.inc	2006-01-08 23:06:20.000000000 -0800
@@ -29,6 +29,7 @@
 <title>Ampache :: For The Love Of Music - Install</title>
 </head>
 <body>
+<script src="lib/general.js" language="javascript" type="text/javascript"></script>
 <?php require_once(conf('prefix') . "/templates/style.inc"); ?>
 <div class="text-box"> 
 <span class="header1"><?php echo _("Ampache Installation"); ?></span>
@@ -51,6 +52,7 @@
 <?php echo _("Step 3 - Setup Initial Account"); ?><br />
 <br /><br />
 <span class="header2">Insert Ampache Database</span>
+<?php echo $GLOBALS['error']->print_error('general'); ?>
 <form method="post" action="<?php echo $http_type . $_SERVER['HTTP_HOST'] .  $_SERVER['PHP_SELF'] . "?action=create_db"; ?>" enctype="multipart/form-data" >
 <table cellpadding="5" cellspacing="0" border="0">
 <tr>
@@ -70,6 +72,19 @@
 	<td><input type="password" name="local_pass" /></td>
 </tr>
 <tr>
+	<td><?php echo _("Create Database User for New Database"); ?>? </td>
+	<td>
+		<input type="checkbox" value="create_db_user" name="db_user" onclick="flipField('db_username');flipField('db_password');">
+	</td>
+<tr>
+	<td><?php echo _("Ampache Database Username"); ?></td>
+	<td><input type="textbox" id="db_username" name="db_username" value="ampache" disabled="disabled" /></td>
+</tr>
+<tr>
+	<td><?php echo _("Ampache Database User Password"); ?></td>
+	<td><input type="password" id="db_password" name="db_password" value="" disabled="disabled" /></td>
+</tr>
+<tr>
 	<td>&nbsp;</td>
 	<td><input type="submit" value="<?php echo _("Insert Database"); ?>" /></td>
 </tr>
diff -urN ampache-3.3.2-alpha4/templates/show_local_catalog_info.inc.php ampache-3.3.2-beta1/templates/show_local_catalog_info.inc.php
--- ampache-3.3.2-alpha4/templates/show_local_catalog_info.inc.php	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_local_catalog_info.inc.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,6 +1,24 @@
 <?php
+/*
 
+ Copyright (c) 2001 - 2006 Ampache.org
+ All Rights Reserved
 
+ this program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
 ?>
 <table width="100%" class="border" cellpadding="0" cellspacing="0"> 
 <tr class="table-header">
diff -urN ampache-3.3.2-alpha4/templates/show_login_form.inc ampache-3.3.2-beta1/templates/show_login_form.inc
--- ampache-3.3.2-alpha4/templates/show_login_form.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_login_form.inc	2006-01-08 23:06:20.000000000 -0800
@@ -19,11 +19,6 @@
 
 */
 
-/*!
-	@header Login Template
-Login Template
-
-*/
 $subject = "/ampache\.com/";
 
 $referrer = $_SERVER['HTTP_REFERER'];
diff -urN ampache-3.3.2-alpha4/templates/show_mpdplay.inc ampache-3.3.2-beta1/templates/show_mpdplay.inc
--- ampache-3.3.2-alpha4/templates/show_mpdplay.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_mpdplay.inc	2006-01-08 23:06:20.000000000 -0800
@@ -33,41 +33,70 @@
 
 ?>
 <div align="center">
+<!-- MPD Control table -->
 <table border="0" cellpadding="3" cellspacing="0" class="tabledata">
-<tr class="table-header">
+   <tr class="table-header">
 	<td colspan="2"><?php echo _("MPD Play Control"); ?></td>
-</tr>
-<tr class="even"><td>
-	<table border="0" cellpadding="0" cellspacing="0" width="100%">
-        <tr>
-		<td>
+   </tr>
+   <tr class="even"><td>
+      <table border="0" cellpadding="0" cellspacing="0" width="100%">
+         <tr>
+	    <td>
+               <?php ${$myMpd->state} = "'selected_button'"; ?>
+
+<?php
+if (true)  /* rigged to do AJAX for now; change to conf('AJAX') later*/ {
+?>
+<!--   <input type="button" class="unselected_button" value="times" onclick="timestuff();"/> -->
+   <input type="button" class="unselected_button" value="|&lt; " onclick="startRequest('action=Prev');"/>
+   <input type="button" class=<?php echo ($stop ? "'selected_button'" : "'unselected_button'") ?> id="stop_button" value=" X " onclick="startRequest('action=stop');"/>
+   <input type="button" class=<?php echo ($play ? "'selected_button'" : "'unselected_button'") ?> id="play_button" value=" &gt; " onclick="startRequest('action=play');"/>
+   <input type="button" class=<?php echo ($pause ? "'selected_button'" : "'unselected_button'") ?> id="pause_button" value=" | | "  onclick="startRequest('action=pause');"/>
+   <input type="button" class="unselected_button" value=" &gt;|" onclick="startRequest('action=Next');"/>
 <?php
-	${$myMpd->state} = "style=\"background-color: black;color:white;\"";
+}
+else  {
 ?>
 	<form action="<?php echo $web_path; ?>/amp-mpd.php" method="post" name="playcontrol" style="display:inline; white-space: nowrap">
-		<input class="button" type="submit" title="<?php echo _("Prev"); ?>" name="action" value="|&lt; " />
-		<input class="button" type="submit" title="<?php echo _("Stop"); ?>" name="action" value=" X " <?php echo $stop; ?> />
-		<input class="button" type="submit" title="<?php echo _("Play"); ?>" name="action" value=" &gt; " <?php echo $play; ?> />
-		<input class="button" type="submit" title="<?php echo _("Pause"); ?>" name="action" value=" | | " <?php echo $pause; ?> />
-		<input class="button" type="submit" title="<?php echo _("Next"); ?>" name="action" value= " &gt;|" />
+		<!-- these used to have class="button" -->
+		<input type="submit" title="<?php echo _("Prev"); ?>" name="action" value="|&lt; " />
+		<input type="submit" title="<?php echo _("Stop"); ?>" name="action" value=" X " <?php echo $stop; ?> />
+		<input type="submit" title="<?php echo _("Play"); ?>" name="action" value=" &gt; " <?php echo $play; ?> />
+		<input type="submit" title="<?php echo _("Pause"); ?>" name="action" value=" | | " <?php echo $pause; ?> />
+		<input type="submit" title="<?php echo _("Next"); ?>" name="action" value= " &gt;|" />
 	</form>
-	</td>
-</tr>
-<tr><td class="content"> 
-       Volume: <b><?php echo $myMpd->volume ?>%</b> 
-</td></tr>
+<?php } ?>
+	    </td>
+         </tr>
+         <tr><td class="content"> Volume: <b><span id='volume'><?php echo $myMpd->volume ?></span>%</b> 
+            </td>
+         </tr>
 
-     <tr><td class="content" align="center"> 
+         <tr><td class="content" align="center"> 
+<?php
+if (true)  /* rigged to do AJAX for now; change to conf('AJAX') later */ {
+?> 
+<input type="button" value="0"   onclick="startRequest('action=setvol&amp;param1=0');"/>
+<input type="button" value="-25" onclick="startRequest('action=adjvol&amp;param1=-25');"/>
+<input type="button" value="-10" onclick="startRequest('action=adjvol&amp;param1=-10');"/>
+<input type="button" value="+10" onclick="startRequest('action=adjvol&amp;param1=10');"/>
+<input type="button" value="+25" onclick="startRequest('action=adjvol&amp;param1=25');"/>
+<?php
+}
+else  {
+?>
          [<a href="<?php echo $web_path; ?>/amp-mpd.php?action=setvol&amp;val=0">mute</a>
 	  <a href="<?php echo $web_path; ?>/amp-mpd.php?action=adjvol&amp;val=-25">-25</a>
 	  <a href="<?php echo $web_path; ?>/amp-mpd.php?action=adjvol&amp;val=-10">-10</a>
 	  <a href="<?php echo $web_path; ?>/amp-mpd.php?action=adjvol&amp;val=+10">+10</a>
-	  <a href="<?php echo $web_path; ?>/amp-mpd.php?action=adjvol&amp;val=+25">+25</a>] 
-     </td></tr> 
-<tr><td>
-</td></tr>
-<tr>
-	<td>
+	  <a href="<?php echo $web_path; ?>/amp-mpd.php?action=adjvol&amp;val=+25">+25</a>] ';
+<?php
+}
+?>
+            </td>
+         </tr> 
+         <tr>
+            <td>
 	<?php echo _("Loop"); ?>: 
 	<form action="<?php echo $web_path; ?>/amp-mpd.php?action=loop" method="post" name="repeatcontrol" style="display:inline;">
 	<?php 
@@ -78,35 +107,31 @@
 		<input class="button" type="submit" title="<?php echo _("On"); ?>" name="val" value="On" <?php echo $repeat_1; ?> />
 		<input class="button" type="submit" title="<?php echo _("Off"); ?>" name="val" value="Off" <?php echo $repeat_0; ?> />
 	</form>
-	</td>
-</tr>
-<tr>
-	<td>
+	    </td>
+         </tr>
+         <tr>
+	    <td>
 	<?php echo _("Random"); ?>: 
-	<form action="<?php echo $web_path; ?>/amp-mpd.php?action=random" method="post" name="randomcontrol" style="display:inline;">
+	       <form action="<?php echo $web_path; ?>/amp-mpd.php?action=random" method="post" name="randomcontrol" style="display:inline;">
 	<?php
 		$random_name = "random_" . intval($myMpd->random);
 		${$random_name} = "style=\"background-color: black;color:white;\"";
 	?>
 		<input class="button" type="submit" title="<?php echo _("On"); ?>" name="val" value="On" <?php echo $random_1; ?> />
 		<input class="button" type="submit" title="<?php echo _("Off"); ?>" name="val" value="Off" <?php echo $random_0; ?> />
-	</form>
-	</td>
-</tr>
-<tr>
-	<td class="content">
-                &nbsp;
-        </td>
-</tr>
-</table>
-</td></tr>
+	       </form>
+	    </td>
+         </tr>
+         <tr><td class="content">&nbsp;</td></tr>
+      </table>
+   </td></tr>
 
 
-<?php   if ( $myMpd->state == MPD_STATE_PLAYING or $myMpd->state == MPD_STATE_PAUSED ) {  ?>
-  <tr><td>
-    <table border="0" cellpadding="0" cellspacing="0" width="100%">
+   <tr><td>
+   <table id="mpd_np" <?php   if ( $myMpd->state == "stop" or $myMpd->state == "pause" ) {echo 'class="nodisplay"'; } ?> 
+                      border="0" cellpadding="0" cellspacing="0" width="100%">
       <tr>
-      	<td class="npsong"><b><?php echo _("Now Playing :")?></b></td>
+      	 <td class="npsong"><b><?php echo _("Now Playing :")?></b></td>
       </tr>
       <tr>
       	<td align="center" class="npsong"><?php
@@ -117,17 +142,22 @@
 		$myMpd->playlist[($myMpd->current_track_id)]['Artist'] = $r->get_artist_name();
 		$myMpd->playlist[($myMpd->current_track_id)]['Album'] = $r->get_album_name();
 	}
-
+	echo "<span id='mpd_npinfo'>";
 	echo ($myMpd->current_track_id+1).
                           ". ".$myMpd->playlist[$myMpd->current_track_id]['Artist'].
                           " - ".$myMpd->playlist[$myMpd->current_track_id]['Title'].
                           " - ".$myMpd->playlist[$myMpd->current_track_id]['Album'].
-                          " - ".fmt_time($myMpd->playlist[$myMpd->current_track_id]['Time'])
-          ?></td>
+                          " - ".fmt_time($myMpd->playlist[$myMpd->current_track_id]['Time']);
+	echo "</span>";
+        ?>
+        </td>
       </tr>
-     <tr> 
-      	<td align="center" class="npsong"><span id="mpd_cur_track_pos"><?php echo fmt_time($myMpd->current_track_position)?></span> (<?php echo (round(($myMpd->current_track_position/$myMpd->current_track_length),2)*100)."%) played" ?></td>
-     </tr>   
+      <tr> 
+        <td align="center" class="npsong">
+           <span id="mpd_cur_track_pos"><?php echo fmt_time($myMpd->current_track_position)?></span>
+           (<span id="mpd_pctplayed"><?php echo (round(($myMpd->current_track_position/$myMpd->current_track_length),2)*100)."</span>%) played" ?>
+        </td>
+      </tr>   
 
       <tr>
         <td><b><?php echo _("On Deck ")?><?php echo _("(in ").
@@ -155,12 +185,18 @@
       </tr>
     </table>
   </td></tr>
-<?php  } ?>
 </table>
 <?php
-echo '<script language="JavaScript" type="text/javascript"> var mpd_elapsed = '. $myMpd->current_track_position.' </script>';
-echo '<script language="JavaScript" type="text/javascript"> var mpd_song_length = '. $myMpd->current_track_length .' </script>';
-echo '<script language="JavaScript" type="text/javascript"> var mpd_state = "'. $myMpd->state .'" </script>';
+/***** moving this into javascript_refresh.js
+
+echo '<script language="JavaScript" type="text/javascript"> var mpd_elapsed = '. $myMpd->current_track_position.
+     ';  var mpd_song_length = '. $myMpd->current_track_length .
+     ';  var mpd_songid = '.$myMpd->current_track_id. 
+     ';  var mpd_state = "'. $myMpd->state .'"; </script>';
+
+****** end move
+******/
+
 ?>
 
 </div>
diff -urN ampache-3.3.2-alpha4/templates/show_mpdpl.inc ampache-3.3.2-beta1/templates/show_mpdpl.inc
--- ampache-3.3.2-alpha4/templates/show_mpdpl.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_mpdpl.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -32,15 +32,14 @@
 
 
 $nopad  = "style='padding: 0px 0px 0px 0px'";
-$minpad = "style='padding: 0px 2px 0px 2px'";
 
 $myMpd = init_mpd();
 ?>
 
 <form name="songs" action="<?php echo conf('web_path')."/amp-mpd.php"; ?>" method="post" enctype="multipart/form-data">
-<table border="0" cellpadding="0" cellspacing="1" width="100%" class="tabledata">
+<table id= "mpdpl" border="0" cellpadding="0" cellspacing="1" width="100%" class="tabledata">
 <tr>
-	<td align="center" class="table-header">
+	<td style="text-align:center" class="table-header">
 		<b><?php echo _("MPD Server Playlist"); ?></b>
 <!--		<i>
 			[<a title="<?php echo _("Refresh the Playlist Window"); ?>" href="<?php echo $_SERVER['PHP_SELF']; ?>">refresh</a>]
@@ -59,13 +58,13 @@
 	<td <?php echo $nopad ?>>
 		<table cellspacing="0" cellpadding="0" border="0" width="100%">
 			<tr class="table-header">
-				<th <?php echo $minpad ?>><a href="#" onclick="check_songs(); return false;">Select</a> - <a href="#" onclick="invert_songs(); return false;">Invert</a></th>
+				<th><a href="#" onclick="check_songs(); return false;">Select</a>/<br><a href="#" onclick="invert_songs(); return false;">Invert</a></th>
 				<th align="left"><?php echo _("Song title"); ?></th>
 				<th align="left"><?php echo _("Artist"); ?></th>
 				<th align="left"><?php echo _("Album"); ?></th>
-				<th align="right" <?php echo $minpad ?>><?php echo _("Track"); ?></th>
-				<th align="right" <?php echo $minpad ?>><?php echo _("Time"); ?></th>
-				<th <?php echo $minpad ?>><?php echo _("Genre"); ?></th>
+				<th align="right"><?php echo _("Track"); ?></th>
+				<th align="right"><?php echo _("Time"); ?></th>
+				<th><?php echo _("Genre"); ?></th>
 				<th><?php echo _("Action"); ?></th>
 			</tr>
 			<?php
@@ -85,27 +84,20 @@
 						if ( ($condPL) and (($id < $myMpd->current_track_id-1) or ($id > $myMpd->current_track_id + 10)) ) {
 							continue; 
 						}
-												
+
 						unset($text_class);
 						$track = $id+1;
 						$len=strlen($track);
-												
+
 						while ($len < $maxlen) {
 							$track = "0".$track;
 							$len++;
 						}
-							
-						echo "<tr class=\"".flip_class()."\">";
+
+						$flip = flip_class();
+                                                echo '<tr id="mpd_row'.$id .'" class ="'.
+                                                      ($id==$myMpd->current_track_id ? 'npsong': $flip). '">';
 												
-						if ($id==$myMpd->current_track_id) {
-							$tdstyle = "style='padding: 0px 2px 0px 2px; font-weight: bold;' class='npsong'";
-		        			        $linkstyle = "class='npsong'";
-						}
-						else { 
-							$tdstyle = $minpad;
-							$linkstyle = ""; 
-						}
-							 
 						$mpddir = conf('mpd_dir')."/";
 						
 						if (strtolower(conf('mpd_method')) == 'file') { 
@@ -126,16 +118,15 @@
 						}
 							
 						$totaltime += $entry['Time']; 
-						$count=0; // Didn't move this because I wasn't sure what it was for...
 			?>
-							<td align="center" <?php echo $minpad  ?>> <input type="checkbox" name="song[]" value="<?php echo $entry['Pos']?>" id="song_<?php echo $entry['Pos']; ?>"></input></td>
-							<td align="left"   <?php echo $tdstyle ?>> <?php echo $track.". ";?><a <?php echo $linkstyle ?> href="<?php echo $web_path; ?>/amp-mpd.php?action=skipto&amp;val=<?php echo $entry['Pos']; ?>" title=" <?php echo htmlspecialchars($entry['Title']); ?>"<?php echo $text_class; ?>><?php echo htmlspecialchars($entry['Title']); ?> </a></td>
-							<td align="left"   <?php echo $tdstyle ?>> <a <?php echo $linkstyle ?> href="<?php echo $web_path; ?>/artists.php?action=show&amp;artist=<?php echo htmlspecialchars($r->artist); ?>" title="More from <?php echo htmlspecialchars($entry['Artist']);?>"<?php echo $text_class; ?>><?php echo htmlspecialchars($entry['Artist']);?> </a></td>
-							<td align="left"   <?php echo $tdstyle ?>> <a <?php echo $linkstyle ?> href="<?php echo $web_path; ?>/albums.php?action=show&amp;album=<?php echo htmlspecialchars($r->album);    ?>" title="More on <?php   echo htmlspecialchars($entry['Album']); ?>"<?php echo $text_class; ?>><?php echo htmlspecialchars($entry['Album']); ?> </a></td>
-							<td align="right"  <?php echo $tdstyle ?>> <?php echo $entry['Track']; ?>&nbsp;&nbsp;</td>
-							<td align="right"  <?php echo $tdstyle ?>> <?php echo sprintf ("%d:%02d",$entry['Time']/60,$entry['Time']%60) ?>&nbsp;</td>
-							<td align="left" <?php echo $tdstyle ?>> &nbsp;<?php echo $entry['genre'] ?></td>
-							<td <?php echo $tdstyle ?>>
+							<td align="center"> <input type="checkbox" name="song[]" value="<?php echo $entry['Pos']?>" id="song_<?php echo $entry['Pos']; ?>"></input></td>
+							<td align="left"> <?php echo $track.". ";?><a href="<?php echo $web_path; ?>/amp-mpd.php?action=skipto&amp;val=<?php echo $entry['Pos']; ?>" title=" <?php echo htmlspecialchars($entry['Title']); ?>"<?php echo $text_class; ?>><?php echo htmlspecialchars($entry['Title']); ?> </a></td>
+							<td align="left"> <a href="<?php echo $web_path; ?>/artists.php?action=show&amp;artist=<?php echo htmlspecialchars($r->artist); ?>" title="More from <?php echo htmlspecialchars($entry['Artist']);?>"<?php echo $text_class; ?>><?php echo htmlspecialchars($entry['Artist']);?> </a></td>
+							<td align="left"> <a href="<?php echo $web_path; ?>/albums.php?action=show&amp;album=<?php echo htmlspecialchars($r->album);    ?>" title="More on <?php   echo htmlspecialchars($entry['Album']); ?>"<?php echo $text_class; ?>><?php echo htmlspecialchars($entry['Album']); ?> </a></td>
+							<td align="right"> <?php echo $entry['Track']; ?>&nbsp;&nbsp;</td>
+							<td align="right"> <?php echo sprintf ("%d:%02d",$entry['Time']/60,$entry['Time']%60); ?>&nbsp;</td>
+							<td align="left"> &nbsp;<?php echo $entry['genre']; ?></td>
+							<td>
 								<a href="<?php echo $web_path;?>/flag.php?song=<?php echo $r->id;?>&amp;action=flag" title="Flag '<?php echo htmlspecialchars($entry['file']);?>' by <?php echo htmlspecialchars($entry['Artist']);?>"<?php echo $text_class;?>>f</a>&nbsp;
 								<a href="<?php echo $web_path;?>/amp-mpd.php?action=movenext&amp;val=<?php echo $entry['Pos'];?>" title="Move '<?php echo htmlspecialchars($entry['Title']);?>' to play next  "<?php echo $text_class;?>>n</a>&nbsp;
 								<a href="<?php echo $web_path;?>/amp-mpd.php?action=rem&amp;id=<?php echo $entry['Pos'];?>" title="Remove '<?php echo htmlspecialchars($entry['Title']);?>' from playlist "<?php echo $text_class;?>>x</a>
@@ -171,7 +162,7 @@
 				<td valign="middle"><?php show_playlist_dropdown($GLOBALS['playlist_id']);  ?></td>
 				<td valign="middle"><?php echo $num; ?> song(s)</td>
 				<td>&nbsp;</td>
-				<td valign="middle" align="right" <?php echo $minpad; ?> nowrap="nowrap"><?php echo $time; ?></td>
+				<td valign="middle" align="right" nowrap="nowrap"><?php echo $time; ?></td>
 				<td>&nbsp;</td>
 				<td>&nbsp;</td>
 			</tr>
diff -urN ampache-3.3.2-alpha4/templates/show_now_playing.inc ampache-3.3.2-beta1/templates/show_now_playing.inc
--- ampache-3.3.2-alpha4/templates/show_now_playing.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_now_playing.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -19,20 +19,14 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-/*!
- @header Show Now Playing
-
-*/
-
 ?>
 <?php if (count($results)) { ?>
 <table class="border" cellspacing="1" cellpadding="3" border="0" width="100%">
   <tr class="table-header">
-    <td colspan="4"><?php echo _("Now Playing"); ?></td>
+    <td colspan="4"><?php echo _('Now Playing'); ?></td>
   </tr>
 <?php
 	$user = $GLOBALS['user'];
-        echo '<script language="JavaScript" type="text/javascript"> var mpd_state = "'. "stop" .'" </script>';
 	foreach($results as $item) { 
 		$song = $item['song'];
 		$np_user = $item['user'];
@@ -41,7 +35,7 @@
                    $album  = $song->get_album_name();
                    $text = "$song->f_title";
 		   if (!$np_user->fullname) { $np_user->fullname = "Unknown User"; }
-		   if ($user->username == $np_user->username)
+		   if ($GLOBALS['user']->username == $np_user->username)
 		       {
                        $sql = "SELECT start_time FROM now_playing WHERE user ='".$user->username."'";
                        $db_results = mysql_query($sql, dbh());
@@ -56,12 +50,13 @@
                    if (conf('use_auth')) { 
 		       echo "\t<td valign=\"middle\">$np_user->fullname</td>\n"; 
 		       }
-                   echo "\t<td><a title=\"" . htmlspecialchars($song->title) . "\" href=\"$web_path/song.php?action=m3u&amp;song=$song->id\">$text</a></td>\n";
-		   echo "\t<td><a title=\"" . htmlspecialchars($song->f_artist) . "\" href=\"$web_path/artists.php?action=show&amp;artist=$song->artist\">$song->f_artist</a> / ";
-                   echo "\t<a title=\"" . htmlspecialchars($album) . "\" href=\"$web_path/albums.php?action=show&amp;album=$song->album\">$song->f_album</a></td>";
+                   echo "\t<td><a title=\"" . scrub_out($song->title) . "\" href=\"$web_path/song.php?action=m3u&amp;song=$song->id\">$text</a></td>\n";
+		   echo "\t<td><a title=\"" . scrub_out($song->f_artist) . "\" href=\"$web_path/artists.php?action=show&amp;artist=$song->artist\">$song->f_artist</a> / ";
+                   echo "\t<a title=\"" . scrub_out($album) . "\" href=\"$web_path/albums.php?action=show&amp;album=$song->album\">$song->f_album</a></td>";
                    if (conf('play_album_art')) {
                        echo "\t<td align=\"center\">";
-                       echo "<a target=\"_blank\" href=\"" . conf('web_path') . "/albumart.php?id=" . $song->album . "\">";
+		       $aa_url = conf('web_path') . "/albumart.php?id=" . $song->album . "&amp;type=popup";
+		       echo "<a target=\"_blank\" href=\"$aa_url\" onclick=\"popup_art('$aa_url'); return false;\">";
                        echo "<img align=\"middle\" border=\"0\" src=\"" . conf('web_path') . "/albumart.php?id=" . $song->album . "&amp;fast=1&amp;thumb=1\" alt=\"Album Art\" height=\"75\" />";
                        echo "</a>\n";
                        echo "\t</td>\n";
diff -urN ampache-3.3.2-alpha4/templates/show_object_rating.inc.php ampache-3.3.2-beta1/templates/show_object_rating.inc.php
--- ampache-3.3.2-alpha4/templates/show_object_rating.inc.php	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_object_rating.inc.php	2006-01-08 23:06:20.000000000 -0800
@@ -26,7 +26,7 @@
 }
 
 /* Create some variables we are going to need */
-$base_url 	= conf('web_path') . '/ratings.php?action=set_rating&mode=' . conf('flash') . '&rating_type=' . $rating->type . '&object_id=' . $rating->id . '&username=' . $GLOBALS['user']->username;
+$base_url 	= conf('web_path') . '/ratings.php?action=set_rating&amp;mode=' . conf('flash') . '&amp;rating_type=' . $rating->type . '&amp;object_id=' . $rating->id . '&amp;username=' . $GLOBALS['user']->username;
 $score		= '0';
 
 
@@ -34,22 +34,27 @@
 while ($score < 6) { 
 	/* Handle the "Not rated" possibility */
 	if ($score == '0' AND $rating->rating == '-1') { 
-		echo "<img src=\"" . conf('web_path') . "/images/ratings/x.gif\" border=\"0\" alt=\"" . get_rating_name($score) . "\">\n";
+		echo "<img src=\"" . conf('web_path') . "/images/ratings/x.gif\" border=\"0\" alt=\"" . get_rating_name($score) . "\" />\n";
 		$found_on = true;
 	}
 	elseif ($score == '0' AND $rating->rating == '0') { 
-		echo "<img src=\"" . conf('web_path') . "/images/ratings/x_off.gif\" border=\"0\" alt=\"" . get_rating_name($score) . "\">\n";
+		echo "<img src=\"" . conf('web_path') . "/images/ratings/x_off.gif\" border=\"0\" alt=\"" . get_rating_name($score) . "\" />\n";
 		$found_on = true;
 	}
+	elseif ($score == '0') { 
+		echo "<a href=\"" . $base_url . "&amp;rating=$score\">\n\t";
+		echo "<img src=\"" . conf('web_path') . "/images/ratings/x_off.gif\" border=\"0\" alt=\"" . get_rating_name($score) . "\" />\n";
+		echo "</a>";
+	}
 	elseif ($score == $rating->rating) { 
-		echo "<img src=\"" . conf('web_path') . "/images/ratings/star.gif\" border=\"0\" alt=\"" . get_rating_name($score) . "\">\n";
+		echo "<img src=\"" . conf('web_path') . "/images/ratings/star.gif\" border=\"0\" alt=\"" . get_rating_name($score) . "\" />\n";
 		$found_on = true;
 	}
 	elseif (!$found_on) { 
-		echo "<a href=\"" . $base_url . "&rating=$score\">\n\t<img src=\"" . conf('web_path') . "/images/ratings/star.gif\" border=\"0\" alt=\"" . get_rating_name($score) . "\">\n</a>\n";
+		echo "<a href=\"" . $base_url . "&amp;rating=$score\">\n\t<img src=\"" . conf('web_path') . "/images/ratings/star.gif\" border=\"0\" alt=\"" . get_rating_name($score) . "\" />\n</a>\n";
 	}
 	else { 
-		echo "<a href=\"" . $base_url . "&rating=$score\">\n\t<img src=\"" . conf('web_path') . "/images/ratings/star_off.gif\" border=\"0\" alt=\"" . get_rating_name($score) . "\">\n</a>\n";
+		echo "<a href=\"" . $base_url . "&amp;rating=$score\">\n\t<img src=\"" . conf('web_path') . "/images/ratings/star_off.gif\" border=\"0\" alt=\"" . get_rating_name($score) . "\" />\n</a>\n";
 	}
 	/* Next! */
 	$score++;
diff -urN ampache-3.3.2-alpha4/templates/show_playlist_box.inc.php ampache-3.3.2-beta1/templates/show_playlist_box.inc.php
--- ampache-3.3.2-alpha4/templates/show_playlist_box.inc.php	1969-12-31 16:00:00.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_playlist_box.inc.php	2006-01-08 23:06:20.000000000 -0800
@@ -0,0 +1,43 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2006 Ampache.org
+ All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+/**
+ * Playlist Box
+ * This box is used for actions on the main screen and on a specific playlist page
+ * It changes depending on where it is 
+ */
+
+$web_path = conf('web_path'); 
+?>
+
+<table class="text-box">
+<tr><td>
+	<span class="header1"><?php echo _('Playlist Actions'); ?></span><br /><br />
+	&nbsp;&nbsp;&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/playlist.php?action=new"><?php echo _('Create New Playlist'); ?></a><br />
+	&nbsp;&nbsp;&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/playlist.php"><?php echo _('View All Playlists'); ?></a><br />
+	&nbsp;&nbsp;&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/playlist.php?action=show_import_playlist"><?php echo _('Import From File'); ?></a><br />
+	<?php if ($_REQUEST['playlist_id']) { ?>
+	&nbsp;&nbsp;&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/playlist.php?action=normalize_tracks"><?php echo _('Normalize Tracks'); ?></a><br />
+	&nbsp;&nbsp;&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/song.php?action=play_selected&amp;playlist_id=<?php echo $_REQUEST['playlist_id']; ?>"><?php echo _('Play This Playlist'); ?></a><br />
+	<?php } ?>
+</td></tr>
+</table>
+<br />
diff -urN ampache-3.3.2-alpha4/templates/show_playlists.inc.php ampache-3.3.2-beta1/templates/show_playlists.inc.php
--- ampache-3.3.2-alpha4/templates/show_playlists.inc.php	1969-12-31 16:00:00.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_playlists.inc.php	2006-01-08 23:06:20.000000000 -0800
@@ -0,0 +1,78 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2006 Ampache.org
+ All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+/**
+ * Show Playlists
+ * This takes an array of playlists and displays them for the default view of
+ * /playlists.php $type is always passed
+ */
+?>
+<h3><?php echo $type . ' ' . _('Playlists'); ?></h3>
+<table class="tabledata" cellspacing="0" cellpadding="0" border="0">
+<tr class="table-header">
+	<th><?php echo _('Playlist Name'); ?></th>
+	<th><?php echo _('# Songs'); ?></th>
+	<th><?php echo _('Owner'); ?></th>
+	<th><?php echo _('Actions'); ?></th>
+</tr>
+<?php 
+	foreach ($playlists as $playlist) { 
+		$playlist_user = new User($playlist->user);
+		$count = $playlist->get_song_count(); 
+?>
+<tr class="<?php echo flip_class(); ?>">
+	<td>
+		<a href="<?php echo conf('web_path'); ?>/playlist.php?action=show_playlist&amp;playlist_id=<?php echo $playlist->id; ?>">
+		<?php echo scrub_out($playlist->name); ?>
+		</a>
+	</td>
+	<td><?php echo $count; ?></td>
+	<td><?php echo scrub_out($playlist_user->fullname); ?></td>
+	<td>
+		| <a href="<?php echo conf('web_path'); ?>/playlist.php?action=show_playlist&amp;playlist_id=<?php echo $playlist->id; ?>">
+		<?php echo _('View'); ?>
+		</a>	
+		<?php if ($GLOBALS['user']->username == $playlist->user || $GLOBALS['user']->has_access(100)) { ?>
+			| <a href="<?php echo conf('web_path'); ?>/playlist.php?action=edit&amp;playlist_id=<?php echo $playlist->id; ?>">
+			<?php echo _('Edit'); ?>
+			</a>
+			| <a href="<?php echo conf('web_path'); ?>/playlist.php?action=show_delete_playlist&amp;playlist_id=<?php echo $playlist->id; ?>">
+			<?php echo _('Delete'); ?>
+			</a>
+		<?php } ?>
+		<?php if ($count > 0) { ?>
+			| <a href="<?php echo conf('web_path'); ?>/song.php?action=playlist&amp;playlist_id=<?php echo $playlist->id; ?>">
+			<?php echo _('Play'); ?>
+			</a>
+			| <a href="<?php echo conf('web_path'); ?>/song.php?action=playlist_random&amp;playlist_id=<?php echo $playlist->id; ?>">
+			<?php echo _('Random'); ?>
+			</a>
+		<?php } ?>
+		<?php if (batch_ok()) { ?>
+			| <a href="<?php echo conf('web_path'); ?>/batch.php?action=pl&amp;id=<?php echo $playlist->id; ?>">
+			<?php echo _('Download'); ?>
+			</a>
+		<?php } ?>
+		|
+	</td>
+</tr>
+<?php } ?>
+</table>
diff -urN ampache-3.3.2-alpha4/templates/show_play_selected.inc.php ampache-3.3.2-beta1/templates/show_play_selected.inc.php
--- ampache-3.3.2-alpha4/templates/show_play_selected.inc.php	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_play_selected.inc.php	2006-01-08 23:06:20.000000000 -0800
@@ -57,14 +57,15 @@
 -->
         </td>
 </tr>
-<?php  if ($GLOBALS['playlist_id']) { ?>
+<?php  if (is_object($GLOBALS['playlist'])) { ?>
 <tr>
         <td>
+		<input type="hidden" name="playlist_id" value="<?php echo $GLOBALS['playlist']->id; ?>" />
                 <input class="button" type="button" name="super_action" value="<?php echo _("Set Track Numbers"); ?>" onclick="return ToPlaylist('set_track_numbers');" />
                 <input class="button" type="button" name="super_action" value="<?php echo _("Remove Selected Tracks"); ?>" onclick="return ToPlaylist('remove_song');" />
         </td>
 </tr>
-<?php  } ?>
+<?php  } else { ?>
 <tr align="center">
         <td colspan="2">
                 <?php echo _("Playlist"); ?>: <input type="button" name="super_action" value="<?php echo _("Add to"); ?>" onclick="return ToPlaylist('add_to');" />
@@ -73,4 +74,5 @@
                 <input class="button" type="button" name="super_action" value="<?php echo _("Edit"); ?>" onclick="return ToPlaylist('edit');" />
         </td>
 </tr>
+<?php } ?>
 </table>
diff -urN ampache-3.3.2-alpha4/templates/show_random_play.inc ampache-3.3.2-beta1/templates/show_random_play.inc
--- ampache-3.3.2-alpha4/templates/show_random_play.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_random_play.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/templates/show_rename_artist.inc.php ampache-3.3.2-beta1/templates/show_rename_artist.inc.php
--- ampache-3.3.2-alpha4/templates/show_rename_artist.inc.php	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_rename_artist.inc.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2004 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/templates/show_search_bar.inc ampache-3.3.2-beta1/templates/show_search_bar.inc
--- ampache-3.3.2-alpha4/templates/show_search_bar.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_search_bar.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -19,26 +19,16 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-
-
-/*!
- @header search template
- @discussion This is the template for the searches... amazing!
-
- 7/16/05 Do it in smaller bar format - sigger
-
-*/
-
 ?>
 <form name="search" method="post" action="<?php echo conf('web_path'); ?>/search.php" enctype="multipart/form-data" style="Display:inline">
 <table class="tabledata" cellspacing="0" cellpadding="3" border="0" style="clear:both;" width="100%">
 <tr class="table-header">
-	<td colspan="4"><b><?php echo  _("Search Ampache"); ?>...</b></td>
+	<td colspan="4"><b><?php echo  _('Search Ampache'); ?>...</b></td>
 </tr>
 <tr class="<?php echo flip_class(); ?>">
-	<td><input type="text" name="search_string" value="<?php echo  $_REQUEST['search_string']; ?>" /></td>
+	<td><input type="text" name="search_string" value="<?php echo  scrub_out($_REQUEST['search_string']); ?>" /></td>
 	<td>
-		<input class="button" type="submit" value="<?php echo  _("Search"); ; ?>" />&nbsp;&nbsp;
+		<input class="button" type="submit" value="<?php echo  _('Search'); ; ?>" />&nbsp;&nbsp;
 		<input type="hidden" name="action" value="quick_search" />
 		<input type="hidden" name="method" value="fuzzy" />
 		<input type="hidden" name="object_type" value="song" />
diff -urN ampache-3.3.2-alpha4/templates/show_search.inc ampache-3.3.2-beta1/templates/show_search.inc
--- ampache-3.3.2-alpha4/templates/show_search.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_search.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -176,6 +176,14 @@
 </tr>
 </table>
 </form>
-
 <?php echo $final_javascript; ?>
 
+<?php if (isset($_REQUEST['search_object'])) { ?>
+<br />
+<form method="post" action="<?php echo conf('web_path'); ?>/playlist.php?action=add_dyn_song">
+<?php echo _('Save Search As Track on'); ?>:
+<?php show_playlist_dropdown('',true); ?>
+<input type="submit" value="<?php echo _('Save'); ?>" /></form>
+<?php } ?>
+<br />
+
diff -urN ampache-3.3.2-alpha4/templates/show_songs.inc ampache-3.3.2-beta1/templates/show_songs.inc
--- ampache-3.3.2-alpha4/templates/show_songs.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_songs.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -21,68 +21,85 @@
 */
 $web_path = conf('web_path');
 
-show_clear();
-
 // Need to set the username for the song ratings.
-$username=$GLOBALS['user']->username;
+$username = $GLOBALS['user']->username;
+
+/* If it's a playlist and they've got rights */
+if (is_object($playlist) && ($GLOBALS['user']->username == $playlist->user || $GLOBALS['user']->has_access('100'))) { 
+	$tab = 1;
+	$playlist_owner = true;
+}
 
 ?>
-<form name="songs" method="post" enctype="multipart/form-data" action="#">
-<table border="0">
-  <tr><td colspan="2">
-    <table class="border" cellspacing="0" cellpadding="0" border="0">
-    <tr class="table-header">
-            <th>&nbsp;&nbsp;<a href="#" onclick="check_songs(); return false;">Select</a></th>
-            <?php if (isset($playlist_id) && $playlist_id != 0 && ($user->username == $pluser->username || $user->has_access('100'))) { $tab = 1; ?> <th><?php echo _("Track"); ?></th> <?php } ?>
-            <th><?php echo _("Song title"); ?></th>
-            <th><?php echo _("Artist"); ?></th>
-            <th><?php echo _("Album"); ?></th>
-            <th><?php echo _("Track"); ?></th>
-            <th><?php echo _("Time"); ?></th>
-            <th><?php echo _("Size"); ?></th>
-            <th><?php echo _("Bitrate"); ?></th>
-            <th><?php echo _("Genre"); ?></th>
-            <th><?php echo _("Flag"); ?></th>
-            <th><?php echo _("Action"); ?></th>
-	    <?php if (conf('ratings') || conf('ratings')=="false") { ?>
-            <th><?php echo _("Rating"); ?></th>
-            <? } ?>            
-    </tr>
-    <?php
-    	/* FIXME: don't even get me started with how many things are wrong with this code */ 
+<form name="songs" method="post" enctype="multipart/form-data" action="#" style="Display:inline;">
+<table class="border" cellspacing="0" cellpadding="0" border="0">
+<tr class="table-header">
+	<th>&nbsp;&nbsp;<a href="#" onclick="check_songs(); return false;">Select</a></th>
+        <?php if ($playlist_owner) { ?> 
+		<th><?php echo _("Track"); ?></th> 
+	<?php } ?>
+	<th><?php echo _("Song title"); ?></th>
+        <th><?php echo _("Artist"); ?></th>
+        <th><?php echo _("Album"); ?></th>
+        <th><?php echo _("Track"); ?></th>
+        <th><?php echo _("Time"); ?></th>
+        <th><?php echo _("Size"); ?></th>
+        <th><?php echo _("Bitrate"); ?></th>
+        <th><?php echo _("Genre"); ?></th>
+        <th><?php echo _("Flag"); ?></th>
+        <th><?php echo _("Action"); ?></th>
+	<?php if (conf('ratings') || conf('ratings')=="false") { ?>
+        	<th><?php echo _("Rating"); ?></th>
+        <? } ?>            
+</tr>
+<?php
+	/* FIXME: don't even get me started with how many things are wrong with this code */ 
 	foreach ($song_ids as $song_id) {
-	
-		if (!is_object($song_id)) { 
+		
+		/* Arr matey crapy code abounds! */
+		if (is_object($playlist)) { 
+			if ($song_id['song']) { 
+				$song = new Song($song_id['song']);
+				$track_id = $song_id['id'];
+			}
+			else { 
+				$song = new Song();
+				$song->title = 'Dynamic Song';
+				$track_id = $song_id['id'];
+			}
+		} // end if playlist
+		elseif (!is_object($song_id)) { 
 			unset($text_class);
 			$song = new Song($song_id);
+			$track_id = $song->id;
 		}
 		else { 
 			$song = $song_id;
+			$track_id = $song->id;
 		}
 
+
 		$song->format_song();
-            // Still needed crap
-            $totalsize += $song->size;
-            $totaltime += $song->time;
-	    if ($song->status == "disabled") { $text_class = "class=\"disabled\""; }
-    ?>
-    <tr class="<?php echo flip_class(); ?>">
-            <td align="center">
-              <input type="checkbox" name="song[]" value="<?php echo $song->id; ?>" id="song_<?php echo $song->id; ?>" />
-            </td>
-        <?php
-            if (isset($playlist_id) && $playlist_id != 0 && ($user->username == $pluser->username || $user->has_access('100'))) {
-                    $tracknum = get_playlist_track_from_song($playlist_id, $song->id);
-        ?>
-            <td>
-              <input type="text" tabindex="<?php echo $tab; ?>" size="3" name="<?php echo "tr_" . $song->id; ?>" value="<?php echo $tracknum ?>" onchange="<?php echo "document.getElementById('song_" . $song->id . "').checked='checked';"; ?>" />
-            </td>
-        <?php
-                    $tab++;
-            }
-        ?>
+		// Still needed crap
+		$totalsize += $song->size;
+		$totaltime += $song->time;
+		/* If it's disabled */
+		if ($song->status == "disabled") { $text_class = "class=\"disabled\""; }
+?>
+<tr class="<?php echo flip_class(); ?>">
+	<td align="center">
+        	<input type="checkbox" name="song[]" value="<?php echo $track_id; ?>" id="song_<?php echo $track_id; ?>" />
+        </td>
+		<?php
+		if ($playlist_owner) {
+			$tracknum = $playlist->get_track($track_id);
+		?>
+            <td>
+              <input type="text" tabindex="<?php echo $tab; ?>" size="3" name="<?php echo "tr_" . $track_id; ?>" value="<?php echo $tracknum; ?>" onchange="<?php echo "document.getElementById('song_" . $track_id . "').checked='checked';"; ?>" />
+            </td>
+		<?php $tab++; } ?>
              <td>
-              <a href="<?php echo $web_path; ?>/song.php?action=m3u&amp;song=<?php echo $song->id; ?>" title="<?php echo htmlspecialchars($song->title); ?>" <?php echo $text_class; ?>><?php echo htmlspecialchars($song->f_title); ?></a>
+              <a href="<?php echo $web_path; ?>/song.php?action=m3u&amp;song=<?php echo $song->id; ?>" title="<?php echo scrub_out($song->title); ?>" <?php echo $text_class; ?>><?php echo scrub_out($song->f_title); ?></a>
             </td>
             <td>
               <a href="<?php echo $web_path; ?>/artists.php?action=show&amp;artist=<?php echo htmlspecialchars($song->artist); ?>" title="<?php echo htmlspecialchars($song->f_artist_full); ?>" <?php echo $text_class; ?>><?php echo htmlspecialchars($song->f_artist); ?></a>
@@ -145,7 +162,7 @@
     ?>
     <tr class="table-header">
       <td></td>
-      <?php if (isset($playlist_id) && $playlist_id != 0 && ($user->username == $pluser->username || $user->access === 'admin')) { ?> <td></td> <?php } ?>
+      <?php if (is_object($playlist)) { ?> <td></td> <?php } ?>
       <td><?php echo _("Total"); ?>:</td>
       <td nowrap="nowrap"><?php echo $num; ?> song(s)</td>
       <td></td>
@@ -158,8 +175,6 @@
       <td colspan="2"></td>
     </tr>
     </table>
-</td></tr>
-</table>
 <br />
 <?php show_play_selected(); ?>
 </form>
diff -urN ampache-3.3.2-alpha4/templates/show_test.inc ampache-3.3.2-beta1/templates/show_test.inc
--- ampache-3.3.2-alpha4/templates/show_test.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_test.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,6 +1,9 @@
 <?php
 /*
 
+ Copyright (c) 2001 - 2006 Ampache.org
+ All Rights Reserved
+
  this program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
  as published by the Free Software Foundation; either version 2
diff -urN ampache-3.3.2-alpha4/templates/show_upload.inc ampache-3.3.2-beta1/templates/show_upload.inc
--- ampache-3.3.2-alpha4/templates/show_upload.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_upload.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*      
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  *Created by Lamar*
diff -urN ampache-3.3.2-alpha4/templates/show_uploads.inc ampache-3.3.2-beta1/templates/show_uploads.inc
--- ampache-3.3.2-alpha4/templates/show_uploads.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_uploads.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*      
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  *Created by Rosensama*
diff -urN ampache-3.3.2-alpha4/templates/show_user.inc.php ampache-3.3.2-beta1/templates/show_user.inc.php
--- ampache-3.3.2-alpha4/templates/show_user.inc.php	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_user.inc.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/templates/show_user_registration.inc.php ampache-3.3.2-beta1/templates/show_user_registration.inc.php
--- ampache-3.3.2-alpha4/templates/show_user_registration.inc.php	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_user_registration.inc.php	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -19,6 +19,7 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
+$htmllang = str_replace("_","-",conf('lang'));
 ?>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
@@ -41,48 +42,47 @@
 	</a>
 	</div>
 </div>
-<br><br>
+<br /><br />
 <?php
 
 $action = scrub_in($_REQUEST['action']);
-$fullname = scrub_in($_REQUEST['full_name']);
+$fullname = scrub_in($_REQUEST['fullname']);
 $username = scrub_in($_REQUEST['username']);
-$password = scrub_in($_REQUEST['password']);
-echo "$password";
-
+$email = scrub_in($_REQUEST['email']);
 ?>
 
 <div align="center">
-    <table class="border" width=600 cellpadding=0 cellspacing=0 border=0>
+<form name="update_user" method="post" action="<?php echo conf('web_path'); ?>/register.php" enctype="multipart/form-data">
+    <table class="border" width='700' cellpadding='0' cellspacing='0' border='0'>
     	<tr class="table-header">
     		<td>
-    			<font size="2"><b><u>Ampache New User Registration</u></b></font>
+    			<font size="2"><b><u><?php echo _("Ampache New User Registration"); ?></u></b></font>
     		</td>
     	</tr>
-				<form name="update_user" method="post" action="<?php echo conf('web_path'); ?>/register.php" enctype="multipart/form-data">
 	<?php
-	// USER AGREEMENT
-	if(conf('user_agreement')==true){ ?>
+	/*  If we should show the user agreement */
+	if(conf('user_agreement')){ ?>
     	<tr>
-    		<td height=15 bgcolor="<?php print conf('base_color2'); ?>">
+    		<td height='15' bgcolor="<?php print conf('base_color2'); ?>">
     		</td>
     	</tr>
 	<tr>
-		<td bgcolor="<?php print conf('base_color2'); ?>" align=center valign=top>
-			<table width=100% border=0 cellpadding=0 cellspacing=0>
+		<td bgcolor="<?php print conf('base_color2'); ?>" align='center' valign='top'>
+			<table width='100%' border='0' cellpadding='0' cellspacing='0'>
 				<tr class="table-header">
-					<td align=center>
-						<font size="1"><b><u>User Agreement</u></b></font>
+					<td align='center'>
+						<font size="1"><b><u><?php echo _('User Agreement'); ?></u></b></font>
 					</td>
 				</tr>
 				<tr>
 					<td>
-						<?php include("templates/user_agreement.php"); ?>
+						<?php show_registration_agreement(); ?>
 					</td>
 				</tr>
 				<tr>
-					<td align=center height=35 valign=center>
-						<input type='checkbox' name='accept_agreement'> I Accept
+					<td align='center' height='35' valign='center'>
+						<input type='checkbox' name='accept_agreement'> <?php echo _('I Accept'); ?>
+						<?php $GLOBALS['error']->print_error('user_agreement'); ?>
 					</td>
 				</tr>
 			</table>
@@ -90,75 +90,89 @@
 	</tr>
 	<? } ?>
 	<tr>
-		<td height=15 bgcolor="<?php print conf('base_color2'); ?>">
+		<td height='15' bgcolor="<?php print conf('base_color2'); ?>">
 		</td>
 	</tr>
 	<tr>
-		<td bgcolor="<?php print conf('base_color2'); ?>" align=center valign=top>
-			<table width=100% cellpadding=0 cellspacing=0 border=0>
+		<td bgcolor="<?php print conf('base_color2'); ?>" align="center" valign="top">
+			<table width="100%" cellpadding="0" cellspacing="0" border="0">
 				<tr class="table-header">
-					<td align=center>
-						<font size="1"><b><u>User Information</u></b></font>
+					<td align='center'>
+						<font size="1"><b><u><?php echo _('User Information'); ?></u></b></font>
 					</td>
 				</tr>
 			</table>
-			<br>
-			<table width=60% cellpadding=0 cellspacing=0 border=0>
+			<br />
+			<table width='99%' cellpadding='0' cellspacing='0' border='0'>
 				<tr>
-					<td align=right>
+					<td align='right'>
 						<?php echo _("Username"); ?>:
 					</td>
 					<td>
-						<font color=red>*</font> <input type='text' name='username' id='username'>
+						<font color='red'>*</font> <input type='text' name='username' id='username' value='<?php echo scrub_out($username); ?>' />
+						<?php $GLOBALS['error']->print_error('username'); ?>
+						<?php $GLOBALS['error']->print_error('duplicate_user'); ?>
 					</td>
 				</tr>
 				<tr>
-					<td align=right>
+					<td align='right'>
 						<?php echo _("Full Name"); ?>:
 					</td>
 					<td>
-						<font color=red>*</font> <input type='text' name='fullname' id='fullname'>
+						<font color='red'>*</font> <input type='text' name='fullname' id='fullname' value='<?php echo scrub_out($fullname); ?>' />
+						<?php $GLOBALS['error']->print_error('fullname'); ?>
 					</td>
 				</tr>
 				<tr>
-					<td align=right>
+					<td align='right'>
 						<?php echo _("E-mail"); ?>:
 					</td>
 					<td>
-						<font color=red>*</font> <input type='text' name='email' id='email'>
+						<font color='red'>*</font> <input type='text' name='email' id='email' value='<?php echo scrub_out($email); ?>' />
+						<?php $GLOBALS['error']->print_error('email'); ?>
 					</td>
 				</tr>
 				<tr>
-					<td align=right>
+					<td align='right'>
 						<?php echo _("Password"); ?>:
 					</td>
 					<td>
-						<font color=red>*</font> <input type='password' name='password_1' id='password_1'>
+						<font color='red'>*</font> <input type='password' name='password_1' id='password_1' />
+						<?php $GLOBALS['error']->print_error('password'); ?>
 					</td>
 				</tr>
 				<tr>
-					<td align=right>
+					<td align='right'>
 						<?php echo _("Confirm Password"); ?>:
 					</td>
 					<td>
-						<font color=red>*</font> <input type='password' name='password_2' id='password_2'>
+						<font color='red'>*</font> <input type='password' name='password_2' id='password_2' />
 					</td>
 				</tr>
+				<?php if (conf('captcha_public_reg')) { ?>
+				<tr>
+						<?php echo captcha::form(); ?>
+						<?php $GLOBALS['error']->print_error('captcha'); ?>
+				</tr>
+				<?php } ?>
 				<tr>
-					<td colspan=2 align=center height=20>
-						<font color=red>*</font>Required fields
+					<td colspan='2' bgcolor="<?php print conf('base_color2'); ?>" align='center' height='20'>
+						<font color='red'>*</font>Required fields
 					</td>
 				</tr>
 				<tr>
-					<td colspan=2 align=center height=50>
+					<td colspan='2' bgcolor="<?php print conf('base_color2'); ?>" align='center' height='50'>
 						<input type="hidden" name="action" value="add_user" />
-						<input type='reset' name='clear_info' id='clear_info' value='Clear Info'>
-						<input type='submit' name='submit_registration' id='submit_registration' value='<?php echo _("Register User"); ?>'>
+						<input type='reset' name='clear_info' id='clear_info' value='<?php echo _('Clear Info'); ?>' />
+						<input type='submit' name='submit_registration' id='submit_registration' value='<?php echo _("Register User"); ?>' />
 					</td>
 				</tr>
-				</form>
 			</table>
 		</td>
 	 </tr>
   </table>
+</form>
 </div>
+</div><!--end <div>id="maincontainer-->
+</body>
+</html>
diff -urN ampache-3.3.2-alpha4/templates/show_users.inc ampache-3.3.2-beta1/templates/show_users.inc
--- ampache-3.3.2-alpha4/templates/show_users.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/show_users.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2004 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -49,6 +49,12 @@
 		</a>
 	</td>
         <td align="center">
+		<a href="<?php echo conf('web_path'); ?>/<?php echo $_SESSION['view_script']; ?>?action=<?php echo $_REQUEST['action']; ?>&amp;keep_view=true&amp;sort_type=last_seen&amp;sort_order=0">
+		<b><?php echo _("Registration Date"); ?></b>
+		</a>
+	</td>
+
+        <td align="center">
 		<b><?php echo _("Edit"); ?></b>
 	</td>
         <td align="center">
@@ -74,6 +80,9 @@
         $last_seen = date("m\/d\/Y - H:i",$user->last_seen);
         if (!$user->last_seen) { $last_seen = "Never"; }
 
+        $create_date = date("m\/d\/Y - H:i",$user->create_date);
+        if (!$user->create_date) { $create_date = "Unknown"; }
+
 ?>
 <tr class="even">
 	<td>
@@ -84,6 +93,10 @@
         <td align="center">
 		<?php echo $last_seen; ?>
 	</td>
+        <td align="center">
+		<?php echo $create_date; ?>
+	</td>
+
         <td>
 		<a href="<?php echo conf('web_path'); ?>/admin/users.php?action=edit&amp;user=<?php echo $user->username; ?>">
 			<?php echo _("Edit"); ?>
@@ -119,7 +132,7 @@
                } elseif ( $user->disabled == 1) {
                        echo "<td bgcolor=\"gray\"> &nbsp; </td>";
                } else {
-                       echo "<td bgcolor=\"darkred\"> &nbsp; </td>";
+                       echo "<td bgcolor=\"#7f0000\"> &nbsp; </td>";
                }
 ?>	
 </tr>
diff -urN ampache-3.3.2-alpha4/templates/sidebar.inc.php ampache-3.3.2-beta1/templates/sidebar.inc.php
--- ampache-3.3.2-alpha4/templates/sidebar.inc.php	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/sidebar.inc.php	2006-01-08 23:06:20.000000000 -0800
@@ -26,16 +26,16 @@
  * that have ['title'] ['url'] and ['active'] url assumes no conf('web_path')
  */
 
-$admin_items[] = array('title'=>'Users','url'=>'admin/users.php','active'=>'');
-$admin_items[] = array('title'=>'Mail Users','url'=>'admin/mail.php','active'=>'');
-$admin_items[] = array('title'=>'Catalog','url'=>'admin/catalog.php','active'=>'');
-$admin_items[] = array('title'=>'Site Preferences','url'=>'admin/preferences.php','active'=>'');
-$admin_items[] = array('title'=>'Access List','url'=>'admin/access.php','active'=>'');
+$admin_items[] = array('title'=>_("Users"),'url'=>'admin/users.php','active'=>'');
+$admin_items[] = array('title'=>_("Mail Users"),'url'=>'admin/mail.php','active'=>'');
+$admin_items[] = array('title'=>_("Catalog"),'url'=>'admin/catalog.php','active'=>'');
+$admin_items[] = array('title'=>_("Site Preferences"),'url'=>'admin/preferences.php','active'=>'');
+$admin_items[] = array('title'=>_("Access List"),'url'=>'admin/access.php','active'=>'');
 
-$browse_items[] = array('title'=>'Albums','url'=>'albums.php','active'=>'');
-$browse_items[] = array('title'=>'Artists','url'=>'artists.php','active'=>'');
-$browse_items[] = array('title'=>'Genre','url'=>'browse.php?action=genre','active'=>'');
-$browse_items[] = array('title'=>'Lists','url'=>'browse.php','active'=>'');
+$browse_items[] = array('title'=>_("Albums"),'url'=>'albums.php','active'=>'');
+$browse_items[] = array('title'=>_("Artists"),'url'=>'artists.php','active'=>'');
+$browse_items[] = array('title'=>_("Genre"),'url'=>'browse.php?action=genre','active'=>'');
+$browse_items[] = array('title'=>_("Lists"),'url'=>'browse.php','active'=>'');
 //$browse_items[] = array('title'=>'File','url'=>'files.php','active'=>'');
 
 ?>
@@ -109,13 +109,13 @@
 		</li>
 	<?php } ?>
 		<li>
-			<a href="<?php echo conf('web_path'); ?>/randomplay.php"><?php echo _("Random Play"); ?></a>
+			<a href="<?php echo conf('web_path'); ?>/randomplay.php"><?php echo _('Random'); ?></a>
 		</li>
 	<?php if ($GLOBALS['theme']['orientation'] != 'horizontal') { ?> 
 		<li>
 			<form name="sub_random" method="post" enctype="multipart/form-data" action="<?php echo conf('web_path'); ?>/song.php" style="Display:inline">
 			<input type="hidden" name="action" value="m3u" />
-			<select name="random" style="width:110px;">
+			<select name="random" style="width:9em;">
 				<option value="1">1</option>
 				<option value="5">5</option>
 				<option value="10">10</option>
@@ -127,9 +127,9 @@
 				<option value="1000">1000</option>
 				<option value="-1"><?php echo _("All"); ?></option>
 			</select>
-		        <?php show_genre_pulldown('genre','','','13','width:110px;'); ?>
+		        <?php show_genre_pulldown('genre','','','13','width:9em;'); ?>
 						<br />  
-			<select name="Quantifier" style="width:110px;">
+			<select name="random_type" style="width:9em;">
 				<option value="Songs"><?php echo _("Songs"); ?></option>
 				<option value="Minutes"><?php echo _("Minutes"); ?></option>
 				<option value="Artists"><?php echo _("Artists"); ?></option>
@@ -143,7 +143,7 @@
 		</li>
 	<?php } ?> 
 		<?php if (conf('use_auth')) { ?>
-			<li><a href="<?php echo conf('web_path'); ?>/logout.php">Logout</a></li>
+			<li><a href="<?php echo conf('web_path'); ?>/logout.php"><?php echo _("Logout"); ?></a></li>
 		<?php } ?>
 	</ul>
 	
diff -urN ampache-3.3.2-alpha4/templates/song_edit.inc ampache-3.3.2-beta1/templates/song_edit.inc
--- ampache-3.3.2-alpha4/templates/song_edit.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/song_edit.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2004 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
 
 */
 preg_match("/^.*\/(.*?)$/",$song->file, $short);
-$filename = htmlspecialchars($short[1]);
+$filename = scrub_out($short[1]);
 $target = conf('web_path').'/admin/flags.php';
 ?>
 
diff -urN ampache-3.3.2-alpha4/templates/style.inc ampache-3.3.2-beta1/templates/style.inc
--- ampache-3.3.2-alpha4/templates/style.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/style.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -26,25 +26,6 @@
  	ampache, mod this to change the look and feel of the site
 */
 ?>
-
-<script type="text/javascript" language="javascript">
-<!-- Begin Suckerfish hover menu JS
-// function needed for IE.  attaches mouseover/out events to give/remove css class .sfhover (fake hover)
-sfHover = function(navlist) {
-var sfEls = document.getElementById("navlist").getElementsByTagName("LI");
-for (var i=0; i <sfEls.length; i++) {
-    sfEls[i].onmouseover=function() {
-        this.className+=" sfhover";
-    }
-    sfEls[i].onmouseout=function() {
-        this.className=this.className.replace(new RegExp("sfhover\\b"), "");
-    }
-} // end for
-} // end function for sfHover
-if (window.attachEvent) window.attachEvent("onload", sfHover);
-// End Suckerfish hover menu JS-->
-</script>
-
 <style type="text/css">
 <!--
 	body	
@@ -91,14 +72,28 @@
 		border-left:2px solid <?php echo conf('bg_color2'); ?>;
 		border-top:2px solid <?php echo conf('bg_color2'); ?>;
 		}
-
+	.selected_button
+        	{
+		background-color: black;color:white;
+		}
+	.unselected_button
+        	{
+		/* there really isn't anything for this */
+		}
 	.npsong
 		{
-		background-color: #FFFF66;
+		background: #FFFF66;
+		font-weight: bold;
 		}
-    table.tabledata
-    {
-    }
+	.nodisplay { display: none;}
+	.display {}
+	#mpdpl td {
+		padding: 0px 2px 0px 2px;
+		text-align: left;
+		}
+    table.tabledata 
+	{
+	}
 
 	td	
 		{ 
@@ -213,118 +208,10 @@
 		font-size: <?php echo conf('font_size') - 1; ?>px;
 		cursor: pointer;
 		}
-	.sidebar 
-		{
-		margin-left:0px;
-		margin-top:0px;
-		margin-right:0px;
-		padding-right:0px;
-		padding-top: 0px;
-		padding-left: 0px;
-		background: <?php echo conf('base_color2'); ?>;
-		}
-/**
- * Div Definitions
- * These define how the page is layed out, be careful with these as changes to them
- * can cause drastic layout changes
- */
-	#maincontainer
-		{
-			margin: 0px;
-		} 	
-	#topbar
-		{
-			height: 80px;
-			padding-top:10px;
-			padding-left:10px;
-			background-color: <?php echo conf('bg_color1'); ?>;
-		}
-	#topbarright
-		{
-			float: right;
-		}
-	#topbarleft
-		{
-			float: left;
-		}
-	#navcontainer ul li
-		{
-			float:left; 
-			width:100%;
-		}
+/* These three lines make a menu vertical */
+        #content { float: none; }
+        #sidebar li { float: none; }
+        #sidebar li ul { margin: -1.5em 0 0 9em; }
 
-	.subnavbutton 
-		{
-			background-color: <?php echo conf('row_color1'); ?>;
-			text-align:center;
-			text-decoration: none;
-			color: <?php echo conf('font_color2'); ?>;
-		}
-
-	#content
-		{ 
-		float: left;	
-		margin-left:0px;
-		}
-/**
- * Experimental for menus (Thx Sigger)
- * TO DO: Fill in 1px border around menus & submenu items 
- * Make padding appply to the li, not just an a.  Moving paddng: to li throws off the dropdown menu alignment.
- */
-    #sidebar {
-	clear: both;
-	height: 100%;
-        margin: 0;
-        float: left;
- /*       width: 110px;  /* this controls the width of the sidebar.  horizontal menu needs more width */
-        padding: 0;
-        list-style: none;
-        border: 1px solid #000;
-	line-height: 1.0;
-    }
-    #sidebar ul {
-	margin: 0px;
-	list-style: none;
-	padding: 0px;
-        font-family: verdana, arial, Helvetica, sans-serif;
-	line-height: 1.0;
-    }
-    #sidebar li {
-/*        margin: 0 0 1px 0; */
-	margin: 0;
-        display: block;   
-	border-bottom: 1px solid white;
-	border-left: 1px solid white;
-	border-right: 1px solid white;
-	padding: 5px 0px 5px 10px;   
-	width: 10em;
-	background-color: <?php echo conf('row_color2'); ?>;
-    }
-    #sidebar a, .navbutton {
-	display: block;  /*Not sure why this is neccesary, but it is for IE*/
-	text-decoration: none;
-	}
-    #sidebar li:hover, #sidebar li.sfhover {
-        color: <?php echo conf('font_color2'); ?>;
-	background-color: <?php echo conf('row_color3'); ?>;
-    }
-    #sidebar li:active {
-        background-color: <?php echo conf('row_color1'); ?>;
-    }
-    #sidebar li ul {
-	float: left;
-	position: absolute;	
-	width: 12em; 
-	margin: -1.5em 0 0 10em;  
-/* -2em 0 0 10em for vertical menu puts the submenu back up and to the right of the hovered menu item by "the right amount"*/
-	left: -999em;  /* this puts the submenu item way off to the left until it's called back by a hover (below) */
-    }
-    #sidebar li:hover ul, #sidebar li.sfhover ul {
-	left: auto;  /* this calls the submenu back when the parent li is hovered. */
-    }
-/**
- * End Div Definitions
- * This is the end of the main structure def's
- */
 -->
 </style>
diff -urN ampache-3.3.2-alpha4/templates/tool_box.inc ampache-3.3.2-beta1/templates/tool_box.inc
--- ampache-3.3.2-alpha4/templates/tool_box.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/tool_box.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff -urN ampache-3.3.2-alpha4/templates/userform.inc ampache-3.3.2-beta1/templates/userform.inc
--- ampache-3.3.2-alpha4/templates/userform.inc	2005-12-27 01:33:02.000000000 -0800
+++ ampache-3.3.2-beta1/templates/userform.inc	2006-01-08 23:06:20.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@
 	$title = _("Adding a New User");
 }
 else {
-	$userfield = "$username";
+	$userfield = $username;
 	$title = _("Editing existing User");
 }
 ?>
diff -urN ampache-3.3.2-alpha4/themes/burgundy/templates/style.inc ampache-3.3.2-beta1/themes/burgundy/templates/style.inc
--- ampache-3.3.2-alpha4/themes/burgundy/templates/style.inc	2005-12-27 01:32:53.000000000 -0800
+++ ampache-3.3.2-beta1/themes/burgundy/templates/style.inc	2006-01-08 23:06:11.000000000 -0800
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2005 Ampache.org
+ Copyright (c) 2001 - 2006 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -200,11 +200,15 @@
 		width:160px;
 		background: <?php echo conf('base_color2'); ?>;
 		}
+/* These three lines make a menu horizontal */
+	#content { float: left; clear: both;}
+	#sidebar li { float: left; }
+	#sidebar li ul { margin: 0.5em 0 0 -1.1em; }
 /**
  * Div Definitions
  * These define how the page is layed out, be careful with these as changes to them
  * can cause drastic layout changes
- */
+
 	#maincontrainer
 		{
 			margin: 0px;
@@ -304,7 +308,7 @@
 		margin-left:0px;
 		margin-top: 35px;
 		}
-/**
+
  * End Div Definitions
  * This is the end of the main structure def's
  */
diff -urN ampache-3.3.2-alpha4/themes/burgundy/theme.cfg.php ampache-3.3.2-beta1/themes/burgundy/theme.cfg.php
--- ampache-3.3.2-alpha4/themes/burgundy/theme.cfg.php	2005-12-27 01:32:53.000000000 -0800
+++ ampache-3.3.2-beta1/themes/burgundy/theme.cfg.php	2006-01-08 23:06:11.000000000 -0800
@@ -39,7 +39,7 @@
 # If this is set to simple the sub menu's will only be shown when you're on one of the 
 # respective pages. If you want to make the menu's something like the classic theme
 # comment this out
-submenu = "simple"
+# submenu = "simple"
 
 # Theme Colors
 ###################
diff -urN ampache-3.3.2-alpha4/themes/classic/theme.cfg.php ampache-3.3.2-beta1/themes/classic/theme.cfg.php
--- ampache-3.3.2-alpha4/themes/classic/theme.cfg.php	2005-12-27 01:32:54.000000000 -0800
+++ ampache-3.3.2-beta1/themes/classic/theme.cfg.php	2006-01-08 23:06:11.000000000 -0800
@@ -25,6 +25,18 @@
 # DEFAULT: N/A
 #maintainer = "Ben Shields <foo@ampache.org>"
 
+# Orientation
+# This was added as of 3.3.2-Alpha4, this tells Ampache if this theme
+# uses vertical or horizontal orientation of the menu, if this is a horizontal
+# theme then it will not show the quick search and quick random play forms
+orientation = "vertical"
+
+# Submenu
+# If this is set to simple the sub menu's will only be shown when you're on one of the
+# respective pages. If you want to make the menu's something like the classic theme
+# comment this out
+#submenu = "simple"
+
 # Theme Colors
 ###################
 [color]
diff -urN ampache-3.3.2-alpha4/themes/greyblock/templates/style.inc ampache-3.3.2-beta1/themes/greyblock/templates/style.inc
--- ampache-3.3.2-alpha4/themes/greyblock/templates/style.inc	2005-12-27 01:32:54.000000000 -0800
+++ ampache-3.3.2-beta1/themes/greyblock/templates/style.inc	2006-01-08 23:06:12.000000000 -0800
@@ -27,24 +27,6 @@
 */
 ?>
 
-<script type="text/javascript" language="javascript">
-<!-- Begin Suckerfish hover menu JS
-// function needed for IE.  attaches mouseover/out events to give/remove css class .sfhover (fake hover)
-sfHover = function(navlist) {
-var sfEls = document.getElementById("navlist").getElementsByTagName("LI");
-for (var i=0; i <sfEls.length; i++) {
-    sfEls[i].onmouseover=function() {
-        this.className+=" sfhover";
-    }
-    sfEls[i].onmouseout=function() {
-        this.className=this.className.replace(new RegExp("sfhover\\b"), "");
-    }
-} // end for
-} // end function for sfHover
-if (window.attachEvent) window.attachEvent("onload", sfHover);
-// End Suckerfish hover menu JS-->
-</script>
-
 <style type="text/css">
 <!--
 	body	
@@ -223,11 +205,15 @@
 		padding-left: 0px;
 		background: <?php echo conf('base_color2'); ?>;
 		}
+/* These three lines make a menu vertical */
+        #content { float: none; }
+        #sidebar li { float: none; }
+        #sidebar li ul { margin: -1.5em 0 0 9em; }
 /**
  * Div Definitions
  * These define how the page is layed out, be careful with these as changes to them
  * can cause drastic layout changes
- */
+
 	#maincontainer
 		{
 			margin: 0px;
@@ -247,81 +233,6 @@
 		{
 			float: left;
 		}
-	#navcontainer ul li
-		{
-			float:left; 
-			width:100%;
-		}
-
-	.subnavbutton 
-		{
-			background-color: <?php echo conf('row_color1'); ?>;
-			text-align:center;
-			text-decoration: none;
-			color: <?php echo conf('font_color2'); ?>;
-		}
-
-	#content
-		{ 
-		float: left;	
-		margin-left:0px;
-		}
-/**
- * Experimental for menus (Thx Sigger)
- * TO DO: Fill in 1px border around menus & submenu items 
- * Make padding appply to the li, not just an a.  Moving paddng: to li throws off the dropdown menu alignment.
- */
-    #sidebar {
-	clear: both;
-	height: 100%;
-        margin: 0;
-        float: left;
- /*       width: 110px;  /* this controls the width of the sidebar.  horizontal menu needs more width */
-        padding: 0;
-        list-style: none;
-        border: 1px solid #000;
-	line-height: 1;
-    }
-    #sidebar ul {
-	margin: 0px;
-	list-style: none;
-	padding: 0px;
-        font-family: verdana, arial, Helvetica, sans-serif;
-	line-height: 1;
-    }
-    #sidebar li {
-/*        margin: 0 0 1px 0; */
-	margin: 0;
-        display: block;   
-	border-bottom: 1px solid white;
-	border-left: 1px solid white;
-	border-right: 1px solid white;
-	padding: 5px 0px 5px 10px;   
-	width: 10em;
-	background-color: <?php echo conf('row_color2'); ?>;
-    }
-    #sidebar a, .navbutton {
-	display: block;  /*Not sure why this is neccesary, but it is for IE*/
-	text-decoration: none;
-	}
-    #sidebar li:hover, #sidebar li.sfhover {
-        color: <?php echo conf('font_color2'); ?>;
-	background-color: <?php echo conf('row_color3'); ?>;
-    }
-    #sidebar li:active {
-        background-color: <?php echo conf('row_color1'); ?>;
-    }
-    #sidebar li ul {
-	float: left;
-	position: absolute;	
-	width: 12em; 
-	margin: -1.5em 0 0 10em;  
-/* -2em 0 0 10em for vertical menu puts the submenu back up and to the right of the hovered menu item by "the right amount"*/
-	left: -999em;  /* this puts the submenu item way off to the left until it's called back by a hover (below) */
-    }
-    #sidebar li:hover ul, #sidebar li.sfhover ul {
-	left: auto;  /* this calls the submenu back when the parent li is hovered. */
-    }
 /**
  * End Div Definitions
  * This is the end of the main structure def's

