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 pa