whole bunch of last-min fixes for Alpha2 release

19 files changed, 5707 insertions, 4548 deletions

diff --git a/admin/song.php b/admin/song.php
index 639f1c1c..15211e5e 100644
--- a/admin/song.php
+++ b/admin/song.php
@@ -4,7 +4,6 @@
  Copyright (c) 2001 - 2005 Ampache.org
  All rights reserved.
 
-
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
  as published by the Free Software Foundation; either version 2
@@ -21,12 +20,13 @@
 
 */
 
-
-/*!
-	@header Song Admin Files
- Edit song information.  Can be just DB or file based (update MP3 ID3 tags).
-
-*/
+/**
+ * Song Admin Document
+ * This document can update/flag disable/enable songs, it's in the admin folder
+ * because all of the above operations require elavated privs
+ * @package Song
+ * @catagory Admin
+ */
 
 require('../modules/init.php');
 require_once(conf('prefix').'/lib/flag.php');
@@ -47,42 +47,40 @@ show_admin_menu('Catalog');
 
 $song_obj = new Song($_REQUEST['song_id']);
 
-switch($action)
-{
-    case "Update":
-    case "update";
-        update_song_info($song);
-        edit_song_info($song);
-        break;
-    case "Edit":
-    case "edit":
-        edit_song_info($song);
+switch($action) {
+	case 'Update':
+	case 'update';
+        	update_song_info($song);
+	        edit_song_info($song);
+	break;
+	case "Edit":
+	case "edit":
+		edit_song_info($song);
         break;
-    case "disable":
-    	
-	// If we pass just one, make it still work
-    	if (!is_array($_REQUEST['song_ids'])) { $song_obj->update_enabled('disabled',$_REQUEST['song_ids']); }
-	else {
-	    	foreach ($_REQUEST['song_ids'] as $song_id) {
-			$song_obj->update_enabled('disabled',$song_id);
-		} // end foreach
-	} // end else
-	show_confirmation(_("Songs Disabled"),_("The requested song(s) have been disabled"),return_referer());
+	case 'disable':
+		// If we pass just one, make it still work
+	    	if (!is_array($_REQUEST['song_ids'])) { $song_obj->update_enabled(0,$_REQUEST['song_ids']); }
+		else {
+		    	foreach ($_REQUEST['song_ids'] as $song_id) {
+				$song_obj->update_enabled(0,$song_id);
+			} // end foreach
+		} // end else
+		show_confirmation(_("Songs Disabled"),_("The requested song(s) have been disabled"),return_referer());
 	break;
-    case "enabled":
-        // If we pass just one, make it still work
-        if (!is_array($_REQUEST['song_ids'])) { $song_obj->update_enabled('enabled',$_REQUEST['song_ids']); }
-	else {
-	        foreach ($_REQUEST['song_ids'] as $song_id) {
-			$song_obj->update_enabled('enabled',$song_id);
-		} // end foreach
-	} // end else
-        show_confirmation(_("Songs Enabled"),_("The requested song(s) have been enabled"),return_referer());
+	case "enabled":
+		// If we pass just one, make it still work
+	        if (!is_array($_REQUEST['song_ids'])) { $song_obj->update_enabled(1,$_REQUEST['song_ids']); }
+		else {
+		        foreach ($_REQUEST['song_ids'] as $song_id) {
+				$song_obj->update_enabled(1,$song_id);
+			} // end foreach
+		} // end else
+	        show_confirmation(_("Songs Enabled"),_("The requested song(s) have been enabled"),return_referer());
         break;
-
-    default:
-        echo "Don't know what to do yet.";
-}
+	default:
+	        echo "Don't know what to do yet.";
+	break;
+} // end switch
 
 
 /*
diff --git a/albums.php b/albums.php
index 2a62b06c..be23a269 100644
--- a/albums.php
+++ b/albums.php
@@ -33,7 +33,8 @@ if(isset($_REQUEST['artist'])) $artist = scrub_in($_REQUEST['artist']);
 $_REQUEST['artist_id'] = scrub_in($_REQUEST['artist_id']);
 
 show_template('header');
-show_menu_items('Albums');
+show_menu_items('Browse');
+show_browse_menu('Albums');
 show_clear();
 
 if ($_REQUEST['action'] === 'clear_art') { 
diff --git a/artists.php b/artists.php
index 19a8836c..e361e27d 100644
--- a/artists.php
+++ b/artists.php
@@ -30,7 +30,8 @@ if (!isset($_REQUEST['action'])) { $_REQUEST['action'] = "match"; }
 $action = scrub_in($_REQUEST['action']);
 
 show_template('header');
-show_menu_items('Artists'); 
+show_menu_items('Browse'); 
+show_browse_menu('Artists');
 show_clear();
 
 
@@ -68,17 +69,17 @@ switch($action) {
 	preg_match("/^(\w*)/", $match, $matches);
 	show_alphabet_list('artists','artists.php',$match);
 	if ($match === "Browse") {
-		show_alphabet_form('',_("Show Artists starting with"),"albums.php?action=match");
+		show_alphabet_form('',_("Show Artists starting with"),"artists.php?action=match");
 		show_artists();
 	}
 	elseif ($match === "Show_all") {
-		show_alphabet_form('',_("Show Artists starting with"),"albums.php?action=match");
+		show_alphabet_form('',_("Show Artists starting with"),"artists.php?action=match");
 		$_SESSION['view_offset_limit'] = 999999;
 		show_artists();
 	}		
         else {
 		$chr = preg_replace("/[^a-zA-Z0-9]/", "", $matches[1]);
-		show_alphabet_form($chr,_("Show Artists starting with"),"albums.php?action=match");
+		show_alphabet_form($chr,_("Show Artists starting with"),"artists.php?action=match");
 
 		if ($chr == '') {
 			show_artists('A');
@@ -91,7 +92,7 @@ switch($action) {
 
     default:
 	show_alphabet_list('artists','artists.php');
-	show_alphabet_form('',_("Show Artists starting with"),"albums.php?action=match");
+	show_alphabet_form('',_("Show Artists starting with"),"artists.php?action=match");
 	show_artists('A');
 	break;
 
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 7351d122..4694af18 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -30,6 +30,7 @@
 	- Fixed problem where catalog wouldn't clean unused genre
 		entries
 	- Fixed a security problem with Albums & Artists browse pages
+	- Fixed Logout button showing up when use_auth was false
 
 
 --------------------------------------------------------------------------
diff --git a/docs/README b/docs/README
index d33f798d..a1b718df 100755
--- a/docs/README
+++ b/docs/README
@@ -57,6 +57,7 @@ Contents:
 		- standard pls
 		- ASX
 	- Realtime Downsampled
+	- Automatic Downsampling based on load
 	- Localplay using Moosic
 	- Localplay using MPD
 	- Icecast2 Stream
@@ -70,6 +71,11 @@ Contents:
 
      	- English	(en_US)
 	- German	(de_DE)
+	- Turkish	(tr_TR)
+	- Spanish	(es_ES)
+	- Dutch		(nl_NL)
+	- Chinese	(zh_CN)
+	- UK English	(en_GB)
 	- French	(fr_FR) *Partial
 
   D) A Special Thanks:
@@ -101,7 +107,6 @@ Contents:
 	PHP4-gd (recommended)
 	PHP4 ICONV & ZLIB support (recommended)
   MySQL >= 3.23 http://www.mysql.com
-  Perl >= 5 (Optional)
   16MB of Ram
 
 3. Setting Up
diff --git a/lib/preferences.php b/lib/preferences.php
index 34765955..28c26ead 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -261,7 +261,7 @@ function create_preference_input($name,$value) {
 			echo "\t<option value=\"fr_FR\" $fr_FR_lang>" . _("French") . "</option>\n";
 			echo "\t<option value=\"tr_TR\" $tr_TR_lang>" . _("Turkish") . "</option>\n";
 			echo "\t<option value=\"es_ES\" $es_ES_lang>" . _("Spanish") . "</option>\n";
-			echo "\t<option value=\"nl_NL\" $nl_NL_lang>" . _("Norwegian") . "</option>\n";
+			echo "\t<option value=\"nl_NL\" $nl_NL_lang>" . _("Dutch") . "</option>\n";
 			echo "\t<option value=\"zh_CN\" $zh_CN_lang>" . _("Simplified Chinese") . "</option>\n";
 			echo "</select>\n";
 		break;
diff --git a/lib/ui.lib.php b/lib/ui.lib.php
index 14ca11b8..4eab4cae 100644
--- a/lib/ui.lib.php
+++ b/lib/ui.lib.php
@@ -568,6 +568,10 @@ function show_all_popular() {
  */
 function show_all_recent() { 
 
+	$artists	= get_newest('artist');
+	$albums		= get_newest('album');
+
+	require_once(conf('prefix') . '/templates/show_all_recent.inc.php');
 
 } // show_all_recent
 
diff --git a/locale/base/messages.po b/locale/base/messages.po
index 84cdeec9..923d6fa3 100644
--- a/locale/base/messages.po
+++ b/locale/base/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-21 19:58-0700\n"
+"POT-Creation-Date: 2005-08-14 16:23-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"
@@ -16,74 +16,90 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../play/index.php:46
+#: ../../play/index.php:50
 msgid "Session Expired: please log in again at"
 msgstr ""
 
-#: ../../lib/preferences.php:210 ../../templates/show_users.inc:97
+#: ../../lib/preferences.php:211 ../../templates/show_users.inc:97
 msgid "Enable"
 msgstr ""
 
-#: ../../lib/preferences.php:211 ../../templates/show_users.inc:100
+#: ../../lib/preferences.php:212 ../../templates/show_users.inc:100
 msgid "Disable"
 msgstr ""
 
-#: ../../lib/preferences.php:223 ../../templates/add_catalog.inc:60
+#: ../../lib/preferences.php:224 ../../templates/add_catalog.inc:60
 msgid "Local"
 msgstr ""
 
-#: ../../lib/preferences.php:226
+#: ../../lib/preferences.php:227
 msgid "Stream"
 msgstr ""
 
-#: ../../lib/preferences.php:229
+#: ../../lib/preferences.php:230
 msgid "IceCast"
 msgstr ""
 
-#: ../../lib/preferences.php:232
+#: ../../lib/preferences.php:233
 msgid "Downsample"
 msgstr ""
 
-#: ../../lib/preferences.php:235
+#: ../../lib/preferences.php:236
 msgid "Music Player Daemon"
 msgstr ""
 
-#: ../../lib/preferences.php:238
+#: ../../lib/preferences.php:239
 msgid "SlimServer"
 msgstr ""
 
-#: ../../lib/preferences.php:247
+#: ../../lib/preferences.php:248
 msgid "M3U"
 msgstr ""
 
-#: ../../lib/preferences.php:248
+#: ../../lib/preferences.php:249
 msgid "Simple M3U"
 msgstr ""
 
-#: ../../lib/preferences.php:249
+#: ../../lib/preferences.php:250
 msgid "PLS"
 msgstr ""
 
-#: ../../lib/preferences.php:250
+#: ../../lib/preferences.php:251
 msgid "Asx"
 msgstr ""
 
-#: ../../lib/preferences.php:257
+#: ../../lib/preferences.php:258
 msgid "English"
 msgstr ""
 
-#: ../../lib/preferences.php:258
+#: ../../lib/preferences.php:259
+msgid "British English"
+msgstr ""
+
+#: ../../lib/preferences.php:260
 msgid "German"
 msgstr ""
 
-#: ../../lib/preferences.php:259
+#: ../../lib/preferences.php:261
 msgid "French"
 msgstr ""
 
-#: ../../lib/preferences.php:260
+#: ../../lib/preferences.php:262
 msgid "Turkish"
 msgstr ""
 
+#: ../../lib/preferences.php:263
+msgid "Spanish"
+msgstr ""
+
+#: ../../lib/preferences.php:264
+msgid "Norwegian"
+msgstr ""
+
+#: ../../lib/preferences.php:265
+msgid "Simplified Chinese"
+msgstr ""
+
 #: ../../lib/duplicates.php:80
 msgid "Find Duplicates"
 msgstr ""
@@ -92,7 +108,7 @@ msgstr ""
 msgid "Search Type"
 msgstr ""
 
-#: ../../lib/duplicates.php:91 ../../modules/class/song.php:253
+#: ../../lib/duplicates.php:91 ../../lib/class/song.class.php:275
 msgid "Title"
 msgstr ""
 
@@ -104,488 +120,469 @@ msgstr ""
 msgid "Artist, Album and Title"
 msgstr ""
 
-#: ../../lib/duplicates.php:110 ../../templates/menu.inc:38
+#: ../../lib/duplicates.php:110 ../../templates/menu.inc:39
 #: ../../templates/show_search.inc:37 ../../templates/show_search.inc:83
+#: ../../templates/show_search_bar.inc:71
 msgid "Search"
 msgstr ""
 
+#: ../../lib/general.lib.php:640
+msgid "Not Enough Data"
+msgstr ""
+
 #: ../../lib/search.php:52 ../../lib/search.php:68 ../../lib/search.php:84
 #: ../../lib/search.php:100 ../../lib/search.php:116 ../../lib/search.php:133
 #: ../../lib/search.php:145 ../../lib/search.php:161 ../../lib/search.php:177
 msgid "No Results Found"
 msgstr ""
 
-#: ../../lib/ui.php:180
-msgid "Playlist Actions"
+#: ../../lib/class/genre.class.php:278
+msgid "Show Genres starting with"
 msgstr ""
 
-#: ../../lib/ui.php:180
-msgid "New"
+#: ../../lib/class/album.class.php:126
+msgid "Various"
 msgstr ""
 
-#: ../../lib/ui.php:181
-msgid "View All"
+#: ../../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/ui.php:182
-msgid "Import"
+#: ../../lib/class/song.class.php:275 ../../lib/class/song.class.php:279
+#: ../../lib/class/song.class.php:283 ../../lib/class/song.class.php:287
+#: ../../lib/class/song.class.php:291 ../../lib/class/song.class.php:295
+#: ../../lib/class/song.class.php:299 ../../lib/class/song.class.php:304
+#: ../../lib/class/song.class.php:309 ../../lib/class/song.class.php:313
+#: ../../lib/class/song.class.php:317 ../../lib/class/song.class.php:322
+msgid "updated to"
 msgstr ""
 
-#: ../../lib/ui.php:282
-msgid "Browse"
+#: ../../lib/class/song.class.php:279 ../../templates/show_songs.inc:39
+#: ../../templates/show_uploads.inc:39
+msgid "Bitrate"
 msgstr ""
 
-#: ../../lib/ui.php:284
-msgid "Show w/o art"
+#: ../../lib/class/song.class.php:283
+msgid "Rate"
 msgstr ""
 
-#: ../../lib/ui.php:287
-msgid "Show all"
+#: ../../lib/class/song.class.php:287
+msgid "Mode"
 msgstr ""
 
-#: ../../lib/ui.php:393
-msgid "No songs in this playlist."
+#: ../../lib/class/song.class.php:291 ../../templates/show_songs.inc:37
+#: ../../templates/show_mpdpl.inc:66 ../../templates/show_uploads.inc:38
+msgid "Time"
 msgstr ""
 
-#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
-#: ../../modules/class/catalog.php:902
-msgid "Error"
+#: ../../lib/class/song.class.php:295 ../../templates/show_songs.inc:32
+#: ../../templates/show_songs.inc:36 ../../templates/show_mpdpl.inc:65
+msgid "Track"
 msgstr ""
 
-#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
-msgid "Could not add"
+#: ../../lib/class/song.class.php:299
+msgid "Filesize"
 msgstr ""
 
-#: ../../lib/Browser.php:867
-msgid "file"
+#: ../../lib/class/song.class.php:304 ../../templates/show_artists.inc:39
+#: ../../templates/show_artists.inc:62 ../../templates/show_songs.inc:34
+#: ../../templates/show_albums.inc:40 ../../templates/show_albums.inc:70
+#: ../../templates/show_mpdpl.inc:63 ../../templates/show_uploads.inc:35
+msgid "Artist"
 msgstr ""
 
-#: ../../lib/Browser.php:871
-msgid "File uploads not supported."
+#: ../../lib/class/song.class.php:309 ../../templates/show_songs.inc:35
+#: ../../templates/show_albums.inc:38 ../../templates/show_albums.inc:68
+#: ../../templates/show_mpdpl.inc:64 ../../templates/show_uploads.inc:36
+msgid "Album"
 msgstr ""
 
-#: ../../lib/Browser.php:889
-msgid "No file uploaded"
+#: ../../lib/class/song.class.php:313 ../../templates/show_albums.inc:43
+#: ../../templates/show_albums.inc:73
+msgid "Year"
 msgstr ""
 
-#: ../../lib/Browser.php:896
-#, php-format
-msgid "There was a problem with the file upload: No %s was uploaded."
+#: ../../lib/class/song.class.php:317 ../../templates/list_flagged.inc:46
+#: ../../templates/flag.inc:66
+msgid "Comment"
 msgstr ""
 
-#: ../../lib/Browser.php:901
-#, php-format
-msgid ""
-"There was a problem with the file upload: The %s was larger than the maximum "
-"allowed size (%d bytes)."
+#: ../../lib/class/song.class.php:322 ../../templates/show_genres.inc.php:36
+#: ../../templates/show_genre.inc.php:32 ../../templates/show_songs.inc:40
+#: ../../templates/show_browse_menu.inc:37 ../../templates/show_mpdpl.inc:67
+#: ../../templates/show_uploads.inc:37
+msgid "Genre"
 msgstr ""
 
-#: ../../lib/Browser.php:903
-#, php-format
-msgid ""
-"There was a problem with the file upload: The %s was only partially uploaded."
+#: ../../lib/class/stream.class.php:198
+msgid "Opened for writing"
 msgstr ""
 
-#: ../../modules/class/catalog.php:267 ../../modules/class/catalog.php:552
-#: ../../modules/class/album.php:241
-msgid "Error: Unable to open"
+#: ../../lib/class/stream.class.php:203
+msgid "Error, cannot write"
+msgstr ""
+
+#: ../../lib/class/stream.class.php:214
+msgid "Error, cannot write song in file"
 msgstr ""
 
-#: ../../modules/class/catalog.php:290
+#: ../../lib/class/stream.class.php:220
+msgid "Closed after write"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:298
 msgid "Error: Unable to change to directory"
 msgstr ""
 
-#: ../../modules/class/catalog.php:313
+#: ../../lib/class/catalog.class.php:321
 msgid "Error: Unable to get filesize for"
 msgstr ""
 
-#: ../../modules/class/catalog.php:332
+#: ../../lib/class/catalog.class.php:340
 msgid "Added Playlist From"
 msgstr ""
 
-#: ../../modules/class/catalog.php:351
+#: ../../lib/class/catalog.class.php:359
 msgid "Added"
 msgstr ""
 
-#: ../../modules/class/catalog.php:363
+#: ../../lib/class/catalog.class.php:371
 msgid "is not readable by ampache"
 msgstr ""
 
-#: ../../modules/class/catalog.php:427
+#: ../../lib/class/catalog.class.php:435
 msgid "Found in ID3"
 msgstr ""
 
-#: ../../modules/class/catalog.php:431
+#: ../../lib/class/catalog.class.php:439
 msgid "Found on Amazon"
 msgstr ""
 
-#: ../../modules/class/catalog.php:435
+#: ../../lib/class/catalog.class.php:443
 msgid "Found in Folder"
 msgstr ""
 
-#: ../../modules/class/catalog.php:439
+#: ../../lib/class/catalog.class.php:447
 msgid "Found"
 msgstr ""
 
-#: ../../modules/class/catalog.php:442
+#: ../../lib/class/catalog.class.php:450
 msgid "Not Found"
 msgstr ""
 
-#: ../../modules/class/catalog.php:450
+#: ../../lib/class/catalog.class.php:458
 msgid "Searched"
 msgstr ""
 
-#: ../../modules/class/catalog.php:605
+#: ../../lib/class/catalog.class.php:613
 msgid "Starting Dump Album Art"
 msgstr ""
 
-#: ../../modules/class/catalog.php:625
+#: ../../lib/class/catalog.class.php:633
 msgid "Written"
 msgstr ""
 
-#: ../../modules/class/catalog.php:634
+#: ../../lib/class/catalog.class.php:642
 msgid "Error unable to open file for writting"
 msgstr ""
 
-#: ../../modules/class/catalog.php:641
+#: ../../lib/class/catalog.class.php:649
 msgid "Album Art Dump Complete"
 msgstr ""
 
-#: ../../modules/class/catalog.php:642 ../../artists.php:62
-#: ../../albums.php:111
+#: ../../lib/class/catalog.class.php:650 ../../artists.php:63
+#: ../../albums.php:112
 msgid "Return"
 msgstr ""
 
-#: ../../modules/class/catalog.php:708
+#: ../../lib/class/catalog.class.php:719
 msgid "Starting Catalog Build"
 msgstr ""
 
-#: ../../modules/class/catalog.php:713
+#: ../../lib/class/catalog.class.php:724
 msgid "Running Remote Sync"
 msgstr ""
 
-#: ../../modules/class/catalog.php:723 ../../modules/class/catalog.php:869
-#: ../../admin/catalog.php:251
+#: ../../lib/class/catalog.class.php:734 ../../lib/class/catalog.class.php:880
+#: ../../admin/catalog.php:264
 msgid "Starting Album Art Search"
 msgstr ""
 
-#: ../../modules/class/catalog.php:733
+#: ../../lib/class/catalog.class.php:744
 msgid "Catalog Finished"
 msgstr ""
 
-#: ../../modules/class/catalog.php:733 ../../modules/class/catalog.php:888
+#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:899
 msgid "Total Time"
 msgstr ""
 
-#: ../../modules/class/catalog.php:733 ../../modules/class/catalog.php:889
+#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:900
 msgid "Total Songs"
 msgstr ""
 
-#: ../../modules/class/catalog.php:734 ../../modules/class/catalog.php:889
+#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:900
 msgid "Songs Per Seconds"
 msgstr ""
 
-#: ../../modules/class/catalog.php:768 ../../modules/class/catalog.php:1379
+#: ../../lib/class/catalog.class.php:779
+#: ../../lib/class/catalog.class.php:1476
 msgid "Updated"
 msgstr ""
 
-#: ../../modules/class/catalog.php:775
+#: ../../lib/class/catalog.class.php:786
 msgid "No Update Needed"
 msgstr ""
 
-#: ../../modules/class/catalog.php:849
+#: ../../lib/class/catalog.class.php:860
 msgid "Starting New Song Search on"
 msgstr ""
 
-#: ../../modules/class/catalog.php:849
+#: ../../lib/class/catalog.class.php:860
 msgid "catalog"
 msgstr ""
 
-#: ../../modules/class/catalog.php:853
+#: ../../lib/class/catalog.class.php:864
 msgid "Running Remote Update"
 msgstr ""
 
-#: ../../modules/class/catalog.php:888
+#: ../../lib/class/catalog.class.php:899
 msgid "Catalog Update Finished"
 msgstr ""
 
-#: ../../modules/class/catalog.php:902
+#: ../../lib/class/catalog.class.php:919 ../../lib/mpd.php:40
+#: ../../lib/mpd.php:49
+msgid "Error"
+msgstr ""
+
+#: ../../lib/class/catalog.class.php:919
 msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
 msgstr ""
 
-#: ../../modules/class/catalog.php:934 ../../modules/class/catalog.php:949
+#: ../../lib/class/catalog.class.php:958
+#: ../../lib/class/catalog.class.php:1009
 msgid "Error connecting to"
 msgstr ""
 
-#: ../../modules/class/catalog.php:934 ../../modules/class/catalog.php:949
+#: ../../lib/class/catalog.class.php:958
+#: ../../lib/class/catalog.class.php:1009
 msgid "Code"
 msgstr ""
 
-#: ../../modules/class/catalog.php:934 ../../modules/class/catalog.php:949
+#: ../../lib/class/catalog.class.php:958
+#: ../../lib/class/catalog.class.php:1009
 msgid "Reason"
 msgstr ""
 
-#: ../../modules/class/catalog.php:954
+#: ../../lib/class/catalog.class.php:974
 msgid "Completed updating remote catalog(s)"
 msgstr ""
 
-#: ../../modules/class/catalog.php:1042
+#: ../../lib/class/catalog.class.php:1105
 msgid "Checking"
 msgstr ""
 
-#: ../../modules/class/catalog.php:1099
+#: ../../lib/class/catalog.class.php:1163
 msgid "Catalog Clean Done"
 msgstr ""
 
-#: ../../modules/class/catalog.php:1099
+#: ../../lib/class/catalog.class.php:1163
 msgid "files removed"
 msgstr ""
 
-#: ../../modules/class/catalog.php:1339
+#: ../../lib/class/catalog.class.php:1436
 msgid "Updating the"
 msgstr ""
 
-#: ../../modules/class/catalog.php:1339
-#: ../../templates/show_admin_index.inc:31 ../../templates/admin_menu.inc:35
+#: ../../lib/class/catalog.class.php:1436 ../../templates/admin_menu.inc:35
 msgid "Catalog"
 msgstr ""
 
-#: ../../modules/class/catalog.php:1340
+#: ../../lib/class/catalog.class.php:1437
 msgid "songs found checking tag information."
 msgstr ""
 
-#: ../../modules/class/catalog.php:1387
+#: ../../lib/class/catalog.class.php:1484
 msgid " FOUND"
 msgstr ""
 
-#: ../../modules/class/catalog.php:1388
+#: ../../lib/class/catalog.class.php:1485
 msgid "Searching for new Album Art"
 msgstr ""
 
-#: ../../modules/class/catalog.php:1392
+#: ../../lib/class/catalog.class.php:1489
 msgid "Album Art Already Found"
 msgstr ""
 
-#: ../../modules/class/stream.php:198
-msgid "Opened for writting"
+#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
+msgid "Could not add"
 msgstr ""
 
-#: ../../modules/class/stream.php:203
-msgid "Error, cannot write"
+#: ../../lib/Browser.php:867
+msgid "file"
 msgstr ""
 
-#: ../../modules/class/stream.php:214
-msgid "Error, cannot write song in file"
+#: ../../lib/Browser.php:871
+msgid "File uploads not supported."
 msgstr ""
 
-#: ../../modules/class/stream.php:220
-msgid "Closed after write"
+#: ../../lib/Browser.php:889
+msgid "No file uploaded"
 msgstr ""
 
-#: ../../modules/class/album.php:126
-msgid "Various"
+#: ../../lib/Browser.php:896
+#, php-format
+msgid "There was a problem with the file upload: No %s was uploaded."
 msgstr ""
 
-#: ../../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"
+#: ../../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 ""
 
-#: ../../modules/class/song.php:257 ../../upload.php:235
-#: ../../templates/show_songs.inc:39
-msgid "Bitrate"
+#: ../../lib/Browser.php:903
+#, php-format
+msgid ""
+"There was a problem with the file upload: The %s was only partially uploaded."
 msgstr ""
 
-#: ../../modules/class/song.php:261
-msgid "Rate"
+#: ../../lib/ui.lib.php:199
+msgid "Playlist Actions"
 msgstr ""
 
-#: ../../modules/class/song.php:265
-msgid "Mode"
+#: ../../lib/ui.lib.php:199
+msgid "New"
 msgstr ""
 
-#: ../../modules/class/song.php:269 ../../upload.php:234
-#: ../../templates/show_songs.inc:37
-msgid "Time"
+#: ../../lib/ui.lib.php:200
+msgid "View All"
 msgstr ""
 
-#: ../../modules/class/song.php:273 ../../templates/show_songs.inc:32
-#: ../../templates/show_songs.inc:36
-msgid "Track"
+#: ../../lib/ui.lib.php:201
+msgid "Import"
 msgstr ""
 
-#: ../../modules/class/song.php:277
-msgid "Filesize"
+#: ../../lib/ui.lib.php:301 ../../templates/menu.inc:35
+msgid "Browse"
 msgstr ""
 
-#: ../../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"
+#: ../../lib/ui.lib.php:303
+msgid "Show w/o art"
 msgstr ""
 
-#: ../../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"
+#: ../../lib/ui.lib.php:306
+msgid "Show all"
 msgstr ""
 
-#: ../../modules/class/song.php:291 ../../templates/show_albums.inc:43
-#: ../../templates/show_albums.inc:73
-msgid "Year"
+#: ../../lib/ui.lib.php:446
+msgid "No songs in this playlist."
 msgstr ""
 
-#: ../../modules/class/song.php:295 ../../templates/list_flagged.inc:46
-#: ../../templates/flag.inc:66
-msgid "Comment"
+#: ../../lib/ui.lib.php:592
+msgid "No Catalogs Found!"
 msgstr ""
 
-#: ../../modules/class/song.php:300 ../../upload.php:233
-#: ../../templates/show_songs.inc:40
-msgid "Genre"
+#: ../../lib/ui.lib.php:593 ../../templates/add_catalog.inc:28
+msgid "Add a Catalog"
 msgstr ""
 
-#: ../../modules/lib.php:53
+#: ../../lib/ui.lib.php:594 ../../templates/show_local_catalog_info.inc.php:7
+msgid "Catalog Statistics"
+msgstr ""
+
+#: ../../lib/ui.lib.php:630
 msgid "day"
 msgstr ""
 
-#: ../../modules/lib.php:53
+#: ../../lib/ui.lib.php:630
 msgid "days"
 msgstr ""
 
-#: ../../modules/lib.php:55
+#: ../../lib/ui.lib.php:632
 msgid "hour"
 msgstr ""
 
-#: ../../modules/lib.php:55
+#: ../../lib/ui.lib.php:632
 msgid "hours"
 msgstr ""
 
-#: ../../modules/lib.php:70
-msgid "Catalog Statistics"
+#: ../../lib/upload.php:225
+msgid "The file uploaded successfully"
 msgstr ""
 
-#: ../../modules/lib.php:73
-msgid "Total Users"
-msgstr ""
-
-#: ../../modules/lib.php:77
-msgid "Connected Users"
-msgstr ""
-
-#: ../../modules/lib.php:81 ../../templates/show_artists.inc:42
-#: ../../templates/show_artists.inc:65 ../../templates/menu.inc:35
-msgid "Albums"
-msgstr ""
-
-#: ../../modules/lib.php:85 ../../templates/menu.inc:36
-msgid "Artists"
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../modules/lib.php:93
-msgid "Catalog Size"
-msgstr ""
-
-#: ../../modules/lib.php:97
-msgid "Catalog Time"
-msgstr ""
-
-#: ../../modules/lib.php:151
-msgid "Play Random Selection"
-msgstr ""
-
-#: ../../modules/lib.php:158
-msgid "Item count"
-msgstr ""
-
-#: ../../modules/lib.php:170 ../../templates/show_artists.inc:55
-#: ../../templates/show_albums.inc:58
-msgid "All"
-msgstr ""
-
-#: ../../modules/lib.php:172
-msgid "From genre"
-msgstr ""
-
-#: ../../modules/lib.php:182
-msgid "Favor Unplayed"
+#: ../../lib/upload.php:226
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ../../modules/lib.php:183
-msgid "Full Albums"
+#: ../../lib/upload.php:227
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
 msgstr ""
 
-#: ../../modules/lib.php:184
-msgid "Full Artist"
+#: ../../lib/upload.php:228
+msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ../../modules/lib.php:193
-msgid "from catalog"
+#: ../../lib/upload.php:229
+msgid "No file was uploaded"
 msgstr ""
 
-#: ../../modules/lib.php:204
-msgid "Play Random Songs"
+#: ../../lib/upload.php:230
+msgid "Missing a temporary folder"
 msgstr ""
 
-#: ../../modules/lib.php:912
+#: ../../modules/lib.php:708
 msgid "Public"
 msgstr ""
 
-#: ../../modules/lib.php:913
+#: ../../modules/lib.php:709
 msgid "Your Private"
 msgstr ""
 
-#: ../../modules/lib.php:914
+#: ../../modules/lib.php:710
 msgid "Other Private"
 msgstr ""
 
-#: ../../modules/lib.php:995 ../../templates/show_play_selected.inc.php:61
+#: ../../modules/lib.php:791 ../../templates/show_play_selected.inc.php:72
 msgid "View"
 msgstr ""
 
-#: ../../modules/lib.php:998 ../../templates/show_play_selected.inc.php:62
+#: ../../modules/lib.php:794 ../../templates/show_play_selected.inc.php:73
 #: ../../templates/show_users.inc:52 ../../templates/show_users.inc:86
 msgid "Edit"
 msgstr ""
 
-#: ../../modules/lib.php:999 ../../upload.php:290
-#: ../../templates/catalog.inc:60 ../../templates/show_users.inc:61
+#: ../../modules/lib.php:795 ../../templates/catalog.inc:60
+#: ../../templates/show_users.inc:61 ../../templates/show_uploads.inc:50
 msgid "Delete"
 msgstr ""
 
-#: ../../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
+#: ../../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 ""
 
-#: ../../modules/lib.php:1008 ../../templates/show_artists.inc:56
-#: ../../templates/show_albums.inc:59 ../../templates/show_mpdplay.inc:67
+#: ../../modules/lib.php:804 ../../templates/show_artists.inc:56
+#: ../../templates/show_albums.inc:59 ../../templates/show_mpdplay.inc:85
 msgid "Random"
 msgstr ""
 
-#: ../../modules/lib.php:1014 ../../templates/show_songs.inc:110
+#: ../../modules/lib.php:810 ../../templates/show_songs.inc:110
 #: ../../templates/show_album.inc:61 ../../templates/show_albums.inc:61
-#: ../../templates/show_artist.inc:81
+#: ../../templates/show_artist.inc:80
 msgid "Download"
 msgstr ""
 
-#: ../../modules/lib.php:1025
+#: ../../modules/lib.php:821
 msgid "There are no playlists of this type"
 msgstr ""
 
-#: ../../modules/lib.php:1060
+#: ../../modules/lib.php:856
 msgid "Create a new playlist"
 msgstr ""
 
@@ -593,7 +590,7 @@ msgstr ""
 msgid "Manage Users"
 msgstr ""
 
-#: ../../modules/admin.php:48
+#: ../../modules/admin.php:48 ../../templates/show_admin_index.inc:34
 msgid "Add a new user"
 msgstr ""
 
@@ -605,71 +602,75 @@ msgstr ""
 msgid "Add to all Catalogs"
 msgstr ""
 
-#: ../../admin/catalog.php:76 ../../templates/catalog.inc:73
+#: ../../admin/catalog.php:75
+msgid "Error Connecting"
+msgstr ""
+
+#: ../../admin/catalog.php:89 ../../templates/catalog.inc:73
 msgid "Update Catalog(s)"
 msgstr ""
 
-#: ../../admin/catalog.php:87 ../../templates/catalog.inc:74
+#: ../../admin/catalog.php:100 ../../templates/catalog.inc:74
 msgid "Update All Catalogs"
 msgstr ""
 
-#: ../../admin/catalog.php:119 ../../templates/catalog.inc:80
+#: ../../admin/catalog.php:132 ../../templates/catalog.inc:80
 msgid "Clean Catalog(s)"
 msgstr ""
 
-#: ../../admin/catalog.php:149 ../../templates/catalog.inc:81
+#: ../../admin/catalog.php:162 ../../templates/catalog.inc:81
 msgid "Clean All Catalogs"
 msgstr ""
 
-#: ../../admin/catalog.php:198
+#: ../../admin/catalog.php:211
 msgid "Now Playing Cleared"
 msgstr ""
 
-#: ../../admin/catalog.php:198
+#: ../../admin/catalog.php:211
 msgid "All now playing data has been cleared"
 msgstr ""
 
-#: ../../admin/catalog.php:203
+#: ../../admin/catalog.php:216
 msgid "Do you really want to clear your catalog?"
 msgstr ""
 
-#: ../../admin/catalog.php:210
+#: ../../admin/catalog.php:223
 msgid "Do you really want to clear the statistics for this catalog?"
 msgstr ""
 
-#: ../../admin/catalog.php:228
+#: ../../admin/catalog.php:241
 msgid "Do you really want to delete this catalog?"
 msgstr ""
 
-#: ../../admin/catalog.php:259
+#: ../../admin/catalog.php:272
 msgid "Album Art Search Finished"
 msgstr ""
 
-#: ../../admin/users.php:77 ../../admin/users.php:124
+#: ../../admin/users.php:76 ../../admin/users.php:122
 msgid "Error Username Required"
 msgstr ""
 
-#: ../../admin/users.php:80 ../../admin/users.php:121
+#: ../../admin/users.php:79 ../../admin/users.php:119
 msgid "Error Passwords don't match"
 msgstr ""
 
-#: ../../admin/users.php:138
+#: ../../admin/users.php:136
 msgid "Are you sure you want to permanently delete"
 msgstr ""
 
-#: ../../admin/users.php:145 ../../templates/show_confirm_action.inc.php:29
+#: ../../admin/users.php:143 ../../templates/show_confirm_action.inc.php:29
 msgid "No"
 msgstr ""
 
-#: ../../admin/users.php:147
+#: ../../admin/users.php:145
 msgid "User Deleted"
 msgstr ""
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:148
 msgid "Delete Error"
 msgstr ""
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:148
 msgid "Unable to delete last Admin User"
 msgstr ""
 
@@ -709,46 +710,46 @@ msgstr ""
 msgid "Send Mail"
 msgstr ""
 
-#: ../../admin/song.php:70
+#: ../../admin/song.php:68
 msgid "Songs Disabled"
 msgstr ""
 
-#: ../../admin/song.php:70
+#: ../../admin/song.php:68
 msgid "The requested song(s) have been disabled"
 msgstr ""
 
-#: ../../admin/song.php:80
+#: ../../admin/song.php:78
 msgid "Songs Enabled"
 msgstr ""
 
-#: ../../admin/song.php:80
+#: ../../admin/song.php:78
 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:41 ../../templates/show_users.inc:40
+#: ../../templates/userform.inc:40 ../../templates/show_users.inc:40
 msgid "Username"
 msgstr ""
 
 #: ../../templates/show_user_registration.inc.php:36
-#: ../../templates/userform.inc:49
+#: ../../templates/userform.inc:48
 msgid "Full Name"
 msgstr ""
 
 #: ../../templates/show_user_registration.inc.php:44
-#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:56
+#: ../../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:64 ../../templates/show_login_form.inc:53
+#: ../../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:73
+#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
 msgid "Confirm Password"
 msgstr ""
 
@@ -766,9 +767,9 @@ msgstr ""
 #: ../../templates/show_install_config.inc:37
 #: ../../templates/show_install.inc:36
 msgid ""
-"This Page handles the installation of the ampache database and the creation "
+"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"
+"have the following pre-requisites"
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:40
@@ -828,7 +829,8 @@ msgstr ""
 msgid "Importing a Playlist from a File"
 msgstr ""
 
-#: ../../templates/show_import_playlist.inc.php:29 ../../upload.php:237
+#: ../../templates/show_import_playlist.inc.php:29
+#: ../../templates/show_uploads.inc:41
 msgid "Filename"
 msgstr ""
 
@@ -840,6 +842,10 @@ msgstr ""
 msgid "Import Playlist"
 msgstr ""
 
+#: ../../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
@@ -848,7 +854,7 @@ msgid "Name"
 msgstr ""
 
 #: ../../templates/show_user.inc.php:48
-msgid "View Limit"
+msgid "Results Per Page"
 msgstr ""
 
 #: ../../templates/show_user.inc.php:56
@@ -863,6 +869,10 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
+#: ../../templates/show_user.inc.php:89
+msgid "Delete Your Personal Statistics"
+msgstr ""
+
 #: ../../templates/show_user.inc.php:91
 msgid "Clear Stats"
 msgstr ""
@@ -871,57 +881,133 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
-#: ../../templates/show_play_selected.inc.php:43
+#: ../../templates/show_play_selected.inc.php:49
 msgid "Play Selected"
 msgstr ""
 
-#: ../../templates/show_play_selected.inc.php:44 ../../playlist.php:77
+#: ../../templates/show_play_selected.inc.php:52
+msgid "Download Selected"
+msgstr ""
+
+#: ../../templates/show_play_selected.inc.php:55 ../../playlist.php:77
 msgid "Flag Selected"
 msgstr ""
 
-#: ../../templates/show_play_selected.inc.php:45 ../../playlist.php:83
+#: ../../templates/show_play_selected.inc.php:56 ../../playlist.php:83
 msgid "Edit Selected"
 msgstr ""
 
-#: ../../templates/show_play_selected.inc.php:52
+#: ../../templates/show_play_selected.inc.php:63
 msgid "Set Track Numbers"
 msgstr ""
 
-#: ../../templates/show_play_selected.inc.php:53
+#: ../../templates/show_play_selected.inc.php:64
 msgid "Remove Selected Tracks"
 msgstr ""
 
-#: ../../templates/show_play_selected.inc.php:59
+#: ../../templates/show_play_selected.inc.php:70
 msgid "Playlist"
 msgstr ""
 
-#: ../../templates/show_play_selected.inc.php:59
+#: ../../templates/show_play_selected.inc.php:70
 msgid "Add to"
 msgstr ""
 
+#: ../../templates/show_all_popular.inc.php:27 ../../index.php:98
+msgid "Most Popular Artists"
+msgstr ""
+
+#: ../../templates/show_all_popular.inc.php:30 ../../index.php:71
+msgid "Most Popular Albums"
+msgstr ""
+
+#: ../../templates/show_all_popular.inc.php:37
+msgid "Most Popular Genres"
+msgstr ""
+
+#: ../../templates/show_all_popular.inc.php:40 ../../index.php:105
+msgid "Most Popular Songs"
+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: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 ""
+
+#: ../../templates/show_local_catalog_info.inc.php:22
+#: ../../templates/show_genre.inc.php:41
+#: ../../templates/show_browse_menu.inc:35
+msgid "Artists"
+msgstr ""
+
+#: ../../templates/show_local_catalog_info.inc.php:26
+#: ../../templates/show_genres.inc.php:37
+#: ../../templates/show_genre.inc.php:46 ../../templates/show_artists.inc:41
+#: ../../templates/show_artists.inc:64 ../../templates/show_albums.inc:41
+#: ../../templates/show_albums.inc:71
+msgid "Songs"
+msgstr ""
+
+#: ../../templates/show_local_catalog_info.inc.php:30
+msgid "Catalog Size"
+msgstr ""
+
+#: ../../templates/show_local_catalog_info.inc.php:34
+msgid "Catalog Time"
+msgstr ""
+
+#: ../../templates/show_genres.inc.php:38 ../../templates/show_artists.inc:43
+#: ../../templates/show_artists.inc:67 ../../templates/show_songs.inc:42
+#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:75
+#: ../../templates/show_access_list.inc:51 ../../templates/show_artist.inc:55
+#: ../../templates/show_mpdpl.inc:68 ../../templates/show_uploads.inc:32
+msgid "Action"
+msgstr ""
+
+#: ../../templates/show_genre.inc.php:32
+msgid "Viewing"
+msgstr ""
+
+#: ../../templates/show_all_recent.inc.php:27 ../../index.php:115
+msgid "Newest Artist Additions"
+msgstr ""
+
+#: ../../templates/show_all_recent.inc.php:30 ../../index.php:122
+msgid "Newest Album Additions"
+msgstr ""
+
 #: ../../localplay.php:79
 msgid "Unknown action requested"
 msgstr ""
 
-#: ../../artists.php:47
+#: ../../artists.php:48
 msgid "All songs by"
 msgstr ""
 
-#: ../../artists.php:56 ../../albums.php:105
+#: ../../artists.php:57 ../../albums.php:106
 msgid "Starting Update from Tags"
 msgstr ""
 
-#: ../../artists.php:61 ../../albums.php:110
+#: ../../artists.php:62 ../../albums.php:111
 msgid "Update From Tags Complete"
 msgstr ""
 
-#: ../../artists.php:73 ../../artists.php:82 ../../artists.php:94
-#: ../../artists.php:111
-msgid "<u>S</u>how artists starting with"
+#: ../../artists.php:72 ../../artists.php:76 ../../artists.php:82
+#: ../../artists.php:95
+msgid "Show Artists starting with"
 msgstr ""
 
-#: ../../amp-mpd.php:41
-msgid "Error Connecting"
+#: ../../amp-mpd.php:176 ../../playlist.php:135
+msgid "New Playlist"
 msgstr ""
 
 #: ../../playlist.php:115
@@ -940,42 +1026,18 @@ msgstr ""
 msgid "Play Random"
 msgstr ""
 
-#: ../../playlist.php:135
-msgid "New Playlist"
-msgstr ""
-
 #: ../../playlist.php:192
 msgid "Playlist updated."
 msgstr ""
 
-#: ../../index.php:38
+#: ../../index.php:41
 msgid "Welcome to"
 msgstr ""
 
-#: ../../index.php:40
+#: ../../index.php:43
 msgid "you are currently logged in as"
 msgstr ""
 
-#: ../../index.php:65
-msgid "Most Popular Albums"
-msgstr ""
-
-#: ../../index.php:75
-msgid "Most Popular Artists"
-msgstr ""
-
-#: ../../index.php:82
-msgid "Most Popular Songs"
-msgstr ""
-
-#: ../../index.php:92
-msgid "Newest Artist Additions"
-msgstr ""
-
-#: ../../index.php:99
-msgid "Newest Album Additions"
-msgstr ""
-
 #: ../../user.php:45
 msgid "Error: Password Does Not Match or Empty"
 msgstr ""
@@ -988,114 +1050,97 @@ msgstr ""
 msgid "Flagging song completed."
 msgstr ""
 
-#: ../../albums.php:43
+#: ../../albums.php:44
 msgid "Album Art Cleared"
 msgstr ""
 
-#: ../../albums.php:43
+#: ../../albums.php:44
 msgid "Album Art information has been removed form the database"
 msgstr ""
 
-#: ../../albums.php:77
+#: ../../albums.php:78
 msgid "Album Art Located"
 msgstr ""
 
-#: ../../albums.php:77
+#: ../../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:85 ../../albums.php:95
+#: ../../albums.php:86 ../../albums.php:96
 msgid "Get Art"
 msgstr ""
 
-#: ../../albums.php:89
+#: ../../albums.php:90
 msgid "Album Art Not Located"
 msgstr ""
 
-#: ../../albums.php:89
+#: ../../albums.php:90
 msgid ""
 "Album Art could not be located at this time. This may be due to Amazon being "
 "busy, or the album not being present in their collection."
 msgstr ""
 
-#: ../../albums.php:126 ../../albums.php:132
-msgid "<u>S</u>how all albums"
+#: ../../albums.php:127 ../../albums.php:133 ../../albums.php:140
+#: ../../albums.php:145 ../../albums.php:150
+msgid "Show Albums starting with"
 msgstr ""
 
-#: ../../albums.php:139 ../../albums.php:146 ../../albums.php:151
-msgid "<u>S</u>how only albums starting with"
+#: ../../bin/quarantine_migration.php.inc:49
+msgid "Error: Unable to write to"
 msgstr ""
 
-#: ../../albums.php:145
-msgid "Select a starting letter or Show all"
+#: ../../bin/quarantine_migration.php.inc:56
+msgid "Error: Upload directory not inside a catalog"
 msgstr ""
 
-#: ../../upload.php:124
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
-
-#: ../../upload.php:127
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-
-#: ../../upload.php:130
-msgid "The uploaded file was only partially uploaded."
-msgstr ""
-
-#: ../../upload.php:133
-msgid "No file was uploaded."
-msgstr ""
-
-#: ../../upload.php:136
-msgid "An Unknown Error has occured."
+#: ../../bin/quarantine_migration.php.inc:74
+msgid "Moved"
 msgstr ""
 
-#: ../../upload.php:157
-msgid "Successfully-Quarantined"
+#: ../../bin/quarantine_migration.php.inc:78
+msgid "Adding"
 msgstr ""
 
-#: ../../upload.php:167
-msgid "Successfully-Cataloged"
+#: ../../bin/quarantine_migration.php.inc:78
+msgid "to database"
 msgstr ""
 
-#: ../../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"
+#: ../../bin/quarantine_migration.php.inc:86
+msgid "Move Failed"
 msgstr ""
 
-#: ../../upload.php:230 ../../templates/list_flagged.inc:41
-#: ../../templates/flag.inc:58
-msgid "Song"
+#: ../../bin/quarantine_migration.php.inc:97
+msgid "Deleted"
 msgstr ""
 
-#: ../../upload.php:236 ../../templates/show_songs.inc:38
-msgid "Size"
-msgstr ""
-
-#: ../../upload.php:238
-msgid "User"
-msgstr ""
-
-#: ../../upload.php:239
-msgid "Date"
+#: ../../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 ""
 
-#: ../../upload.php:267
-msgid "Unknown"
+#: ../../bin/quarantine_migration.php.inc:127
+msgid "Continue?  (Y/N):"
 msgstr ""
 
-#: ../../upload.php:289
-msgid "Add"
+#: ../../bin/quarantine_migration.php.inc:151
+msgid "Error:  "
 msgstr ""
 
-#: ../../upload.php:294
-msgid "Quarantined"
+#: ../../bin/quarantine_migration.php.inc:152
+msgid "!\n"
 msgstr ""
 
 #: ../../templates/customize_catalog.inc:24
@@ -1163,48 +1208,44 @@ msgid "Save Catalog Settings"
 msgstr ""
 
 #: ../../templates/show_admin_index.inc:27
-msgid "Admin Section"
+msgid "User Management"
 msgstr ""
 
-#: ../../templates/show_admin_index.inc:29 ../../templates/admin_menu.inc:33
-msgid "Users"
+#: ../../templates/show_admin_index.inc:28
+msgid "E-mail Management"
 msgstr ""
 
 #: ../../templates/show_admin_index.inc:29
-msgid "Create/Modify User Accounts for Ampache"
+msgid "Catalog Managment"
 msgstr ""
 
-#: ../../templates/show_admin_index.inc:30
-msgid "Mail"
+#: ../../templates/show_admin_index.inc:30 ../../templates/admin_menu.inc:36
+msgid "Admin Preferences"
 msgstr ""
 
-#: ../../templates/show_admin_index.inc:30
-msgid "Mail your users to notfiy them of changes"
+#: ../../templates/show_admin_index.inc:31 ../../templates/catalog.inc:98
+#: ../../templates/admin_menu.inc:37
+msgid "Access Lists"
 msgstr ""
 
-#: ../../templates/show_admin_index.inc:31
-msgid "Create/Update/Clean your catalog here"
+#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:97
+msgid "Add a catalog"
 msgstr ""
 
-#: ../../templates/show_admin_index.inc:32 ../../templates/admin_menu.inc:36
-msgid "Admin Preferences"
+#: ../../templates/show_admin_index.inc:35 ../../templates/catalog.inc:102
+msgid "Clear Now Playing"
 msgstr ""
 
-#: ../../templates/show_admin_index.inc:32
-msgid "Modify Site-wide preferences"
+#: ../../templates/show_admin_index.inc:36
+msgid "Add Access List Entry"
 msgstr ""
 
-#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:98
-#: ../../templates/admin_menu.inc:37
-msgid "Access Lists"
+#: ../../templates/show_admin_index.inc:40
+msgid "Common Functions"
 msgstr ""
 
-#: ../../templates/show_admin_index.inc:33
-msgid "Modify Access List Permissions"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:33
-msgid "Must have access_control=true in ampache.cfg"
+#: ../../templates/show_admin_index.inc:43
+msgid "Admin Sections"
 msgstr ""
 
 #: ../../templates/show_test.inc:29
@@ -1288,9 +1329,9 @@ msgstr ""
 
 #: ../../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"
+"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 ""
 
 #: ../../templates/show_test.inc:160
@@ -1328,20 +1369,20 @@ msgid "Playback"
 msgstr ""
 
 #: ../../templates/show_localplay.inc:39 ../../templates/list_header.inc:71
-#: ../../templates/show_mpdplay.inc:43
+#: ../../templates/show_mpdplay.inc:48
 msgid "Prev"
 msgstr ""
 
-#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:44
+#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:49
 msgid "Stop"
 msgstr ""
 
-#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:46
+#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:51
 msgid "Pause"
 msgstr ""
 
 #: ../../templates/show_localplay.inc:43 ../../templates/list_header.inc:94
-#: ../../templates/show_mpdplay.inc:47
+#: ../../templates/show_mpdplay.inc:52
 msgid "Next"
 msgstr ""
 
@@ -1361,10 +1402,6 @@ msgstr ""
 msgid "Clear queue"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:28
-msgid "Add a Catalog"
-msgstr ""
-
 #: ../../templates/add_catalog.inc:30
 msgid ""
 "In the form below enter either a local path (i.e. /data/music) or the URL to "
@@ -1419,6 +1456,11 @@ msgstr ""
 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
 msgid "Flag"
 msgstr ""
@@ -1443,10 +1485,19 @@ msgstr ""
 msgid "Reject"
 msgstr ""
 
-#: ../../templates/show_songs.inc:33
+#: ../../templates/show_artists.inc:55 ../../templates/show_albums.inc:58
+#: ../../templates/show_random_play.inc:46
+msgid "All"
+msgstr ""
+
+#: ../../templates/show_songs.inc:33 ../../templates/show_mpdpl.inc:62
 msgid "Song title"
 msgstr ""
 
+#: ../../templates/show_songs.inc:38 ../../templates/show_uploads.inc:40
+msgid "Size"
+msgstr ""
+
 #: ../../templates/show_songs.inc:113
 msgid "Direct Link"
 msgstr ""
@@ -1568,15 +1619,15 @@ msgstr ""
 msgid "Editing existing User"
 msgstr ""
 
-#: ../../templates/userform.inc:81
+#: ../../templates/userform.inc:80
 msgid "User Access Level"
 msgstr ""
 
-#: ../../templates/userform.inc:97
+#: ../../templates/userform.inc:96
 msgid "Add User"
 msgstr ""
 
-#: ../../templates/userform.inc:102
+#: ../../templates/userform.inc:101
 msgid "Update User"
 msgstr ""
 
@@ -1667,10 +1718,6 @@ msgstr ""
 msgid "You don't have any catalogs."
 msgstr ""
 
-#: ../../templates/catalog.inc:97
-msgid "Add a catalog"
-msgstr ""
-
 #: ../../templates/catalog.inc:99
 msgid "Show Duplicate Songs"
 msgstr ""
@@ -1683,10 +1730,6 @@ msgstr ""
 msgid "Clear Catalog Stats"
 msgstr ""
 
-#: ../../templates/catalog.inc:102
-msgid "Clear Now Playing"
-msgstr ""
-
 #: ../../templates/catalog.inc:103
 msgid "Dump Album Art"
 msgstr ""
@@ -1699,6 +1742,10 @@ msgstr ""
 msgid "Catalog Tools"
 msgstr ""
 
+#: ../../templates/admin_menu.inc:33
+msgid "Users"
+msgstr ""
+
 #: ../../templates/admin_menu.inc:34
 msgid "Mail Users"
 msgstr ""
@@ -1711,50 +1758,48 @@ msgstr ""
 msgid "Local Play"
 msgstr ""
 
-#: ../../templates/menu.inc:37
+#: ../../templates/menu.inc:38
 msgid "Playlists"
 msgstr ""
 
-#: ../../templates/menu.inc:39
+#: ../../templates/menu.inc:40
 msgid "Preferences"
 msgstr ""
 
-#: ../../templates/menu.inc:42 ../../templates/show_upload.inc:59
+#: ../../templates/menu.inc:43 ../../templates/show_upload.inc:73
 msgid "Upload"
 msgstr ""
 
-#: ../../templates/menu.inc:62 ../../templates/menu.inc:65
+#: ../../templates/menu.inc:63 ../../templates/menu.inc:66
 msgid "Admin"
 msgstr ""
 
-#: ../../templates/menu.inc:72 ../../templates/menu.inc:78
+#: ../../templates/menu.inc:73 ../../templates/menu.inc:79
 msgid "Account"
 msgstr ""
 
-#: ../../templates/menu.inc:73 ../../templates/menu.inc:79
+#: ../../templates/menu.inc:74 ../../templates/menu.inc:80
 msgid "Stats"
 msgstr ""
 
-#: ../../templates/menu.inc:74 ../../templates/menu.inc:80
-#: ../../templates/menu.inc:84
+#: ../../templates/menu.inc:75 ../../templates/menu.inc:81
+#: ../../templates/menu.inc:85
 msgid "Logout"
 msgstr ""
 
-#: ../../templates/show_upload.inc:27
-msgid "Please Ensure All Files Are Tagged Correctly"
+#: ../../templates/show_upload.inc:30
+msgid "Uploading Music to Ampache"
 msgstr ""
 
-#: ../../templates/show_upload.inc:30
-msgid ""
-"Ampache relies on id3 tags to sort data.  If your file is not tagged it may "
-"be deleted."
+#: ../../templates/show_upload.inc:32
+msgid "The following Audio file formats are supported"
 msgstr ""
 
-#: ../../templates/show_upload.inc:34
+#: ../../templates/show_upload.inc:72
 msgid "max_upload_size"
 msgstr ""
 
-#: ../../templates/show_now_playing.inc:31 ../../templates/show_mpdplay.inc:90
+#: ../../templates/show_now_playing.inc:31
 msgid "Now Playing"
 msgstr ""
 
@@ -1811,7 +1856,7 @@ msgstr ""
 msgid "delete"
 msgstr ""
 
-#: ../../templates/show_search.inc:34
+#: ../../templates/show_search.inc:34 ../../templates/show_search_bar.inc:36
 msgid "Search Ampache"
 msgstr ""
 
@@ -1835,66 +1880,126 @@ msgstr ""
 msgid "Play Random Songs By"
 msgstr ""
 
-#: ../../templates/show_artist.inc:50
+#: ../../templates/show_artist.inc:49
 msgid "Select"
 msgstr ""
 
-#: ../../templates/show_artist.inc:52
+#: ../../templates/show_artist.inc:51
 msgid "Cover"
 msgstr ""
 
-#: ../../templates/show_artist.inc:53
+#: ../../templates/show_artist.inc:52
 msgid "Album Name"
 msgstr ""
 
-#: ../../templates/show_artist.inc:54
+#: ../../templates/show_artist.inc:53
 msgid "Album Year"
 msgstr ""
 
-#: ../../templates/show_artist.inc:55
+#: ../../templates/show_artist.inc:54
 msgid "Total Tracks"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:33
+#: ../../templates/show_mpdplay.inc:38
 msgid "MPD Play Control"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:53
+#: ../../templates/show_mpdplay.inc:71
 msgid "Loop"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:60 ../../templates/show_mpdplay.inc:73
+#: ../../templates/show_mpdplay.inc:78 ../../templates/show_mpdplay.inc:91
 msgid "On"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:61 ../../templates/show_mpdplay.inc:74
+#: ../../templates/show_mpdplay.inc:79 ../../templates/show_mpdplay.inc:92
 msgid "Off"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:103
-msgid "Refresh the Playlist Window"
+#: ../../templates/show_mpdplay.inc:114
+msgid "Now Playing :"
+msgstr ""
+
+#: ../../templates/show_mpdplay.inc:138
+msgid "On Deck "
+msgstr ""
+
+#: ../../templates/show_mpdplay.inc:138
+msgid "(in "
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:103
-msgid "refresh now"
+#: ../../templates/show_mpdpl.inc:45
+msgid "MPD Server Playlist"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:111
-msgid "Server Playlist"
+#: ../../templates/show_mpdpl.inc:46 ../../templates/show_mpdpl.inc:184
+msgid "Refresh the Playlist Window"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:146
+#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:189
 msgid "Click to shuffle (randomize) the playlist"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:146
+#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:189
 msgid "shuffle"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:147
-msgid "Click the clear the playlist"
+#: ../../templates/show_mpdpl.inc:49 ../../templates/show_mpdpl.inc:190
+msgid "Click to the clear the playlist"
+msgstr ""
+
+#: ../../templates/show_mpdpl.inc:53 ../../templates/show_mpdpl.inc:194
+msgid "Click to the remove all except the Now Playing"
+msgstr ""
+
+#: ../../templates/show_uploads.inc:33
+msgid "Status"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:147
-msgid "clear"
+#: ../../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_random_play.inc:28
+msgid "Play Random Selection"
+msgstr ""
+
+#: ../../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:60
+msgid "Full Albums"
+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 ""
diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po
index 86a85f2b..4a467205 100644
--- a/locale/de_DE/LC_MESSAGES/messages.po
+++ b/locale/de_DE/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-17 17:14-0700\n"
+"POT-Creation-Date: 2005-08-14 16:23-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"
@@ -16,1118 +16,1207 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../docs/admin/catalog.php:54 ../../templates/catalog.inc:66
-msgid "Add to Catalog(s)"
-msgstr "Zu Katalog hinzufügen"
+#: ../../play/index.php:50
+msgid "Session Expired: please log in again at"
+msgstr ""
 
-#: ../../docs/admin/catalog.php:65 ../../templates/catalog.inc:67
-msgid "Add to all Catalogs"
-msgstr "Zu allen Katalogen hinzufügen"
+#: ../../lib/preferences.php:211 ../../templates/show_users.inc:97
+msgid "Enable"
+msgstr ""
 
-#: ../../docs/admin/catalog.php:75 ../../templates/catalog.inc:73
-msgid "Update Catalog(s)"
-msgstr "Katalog(e) aktualisieren"
+#: ../../lib/preferences.php:212 ../../templates/show_users.inc:100
+msgid "Disable"
+msgstr ""
 
-#: ../../docs/admin/catalog.php:86 ../../templates/catalog.inc:74
-msgid "Update All Catalogs"
-msgstr "Alle Kataloge aktualisieren"
+#: ../../lib/preferences.php:224 ../../templates/add_catalog.inc:60
+msgid "Local"
+msgstr "Lokal"
 
-#: ../../docs/admin/catalog.php:118 ../../templates/catalog.inc:80
-msgid "Clean Catalog(s)"
-msgstr "Katalog säubern"
+#: ../../lib/preferences.php:227
+msgid "Stream"
+msgstr ""
 
-#: ../../docs/admin/catalog.php:148 ../../templates/catalog.inc:81
-msgid "Clean All Catalogs"
-msgstr "Alle Kataloge säubern"
+#: ../../lib/preferences.php:230
+msgid "IceCast"
+msgstr ""
 
-#: ../../docs/admin/catalog.php:196
-msgid "Now Playing Cleared"
-msgstr "Zur Zeit gespielte Liederliste geleert"
+#: ../../lib/preferences.php:233
+msgid "Downsample"
+msgstr ""
 
-#: ../../docs/admin/catalog.php:196
-msgid "All now playing data has been cleared"
-msgstr "Übersicht der aktuell abspielenden Lieder geleert"
+#: ../../lib/preferences.php:236
+msgid "Music Player Daemon"
+msgstr ""
 
-#: ../../docs/admin/catalog.php:201
-msgid "Do you really want to clear your catalog?"
-msgstr "Wollen sie wirklich den Katalog leeren?"
+#: ../../lib/preferences.php:239
+msgid "SlimServer"
+msgstr ""
 
-#: ../../docs/admin/catalog.php:208
-msgid "Do you really want to clear the statistics for this catalog?"
-msgstr "Wollen sie wirklich die Katalogstatistik leeren?"
+#: ../../lib/preferences.php:248
+msgid "M3U"
+msgstr ""
 
-#: ../../docs/admin/catalog.php:226
-msgid "Do you really want to delete this catalog?"
-msgstr "Wollen sie wirklich den Katalog löschen?"
+#: ../../lib/preferences.php:249
+msgid "Simple M3U"
+msgstr ""
 
-#: ../../docs/admin/users.php:76 ../../docs/admin/users.php:123
-msgid "Error Username Required"
+#: ../../lib/preferences.php:250
+msgid "PLS"
 msgstr ""
 
-#: ../../docs/admin/users.php:79 ../../docs/admin/users.php:120
-msgid "Error Passwords don't match"
+#: ../../lib/preferences.php:251
+msgid "Asx"
 msgstr ""
 
-#: ../../docs/admin/users.php:137
-msgid "Are you sure you want to permanently delete"
+#: ../../lib/preferences.php:258
+msgid "English"
 msgstr ""
 
-#: ../../docs/admin/users.php:144
-#: ../../templates/show_confirm_action.inc.php:29
-msgid "No"
+#: ../../lib/preferences.php:259
+msgid "British English"
 msgstr ""
 
-#: ../../docs/admin/users.php:146
-#, fuzzy
-msgid "User Deleted"
-msgstr "Eintrag gelöscht"
+#: ../../lib/preferences.php:260
+msgid "German"
+msgstr ""
 
-#: ../../docs/admin/users.php:149
-#, fuzzy
-msgid "Delete Error"
-msgstr "Löschen"
+#: ../../lib/preferences.php:261
+msgid "French"
+msgstr ""
 
-#: ../../docs/admin/users.php:149
-msgid "Unable to delete last Admin User"
+#: ../../lib/preferences.php:262
+msgid "Turkish"
 msgstr ""
 
-#: ../../docs/admin/access.php:43
-msgid "Do you really want to delete this Access Record?"
-msgstr "Wollen sie wirklich diesen Zugangs-Eintrag löschen?"
+#: ../../lib/preferences.php:263
+msgid "Spanish"
+msgstr ""
 
-#: ../../docs/admin/access.php:51
-msgid "Entry Deleted"
-msgstr "Eintrag gelöscht"
+#: ../../lib/preferences.php:264
+msgid "Norwegian"
+msgstr ""
 
-#: ../../docs/admin/access.php:51
-msgid "Your Access List Entry has been removed"
-msgstr "Ein Zugangs-Eintrag wurde gelöscht"
+#: ../../lib/preferences.php:265
+msgid "Simplified Chinese"
+msgstr ""
 
-#: ../../docs/admin/access.php:61
+#: ../../lib/duplicates.php:80
 #, fuzzy
-msgid "Entry Added"
-msgstr "Eintrag gelöscht"
+msgid "Find Duplicates"
+msgstr "Doppelte Songs anzeigen"
 
-#: ../../docs/admin/access.php:61
-msgid "Your new Access List Entry has been created"
-msgstr "Ein neuer Zugangs-Eintrag wurde erstellt"
+#: ../../lib/duplicates.php:83 ../../templates/show_search.inc:74
+msgid "Search Type"
+msgstr "Suchart"
 
-#: ../../docs/admin/song.php:70
+#: ../../lib/duplicates.php:91 ../../lib/class/song.class.php:275
 #, fuzzy
-msgid "Songs Disabled"
-msgstr "Songname"
-
-#: ../../docs/admin/song.php:70
-msgid "The requested song(s) have been disabled"
-msgstr ""
+msgid "Title"
+msgstr "Seitentitel"
 
-#: ../../docs/admin/song.php:80
+#: ../../lib/duplicates.php:97
 #, fuzzy
-msgid "Songs Enabled"
-msgstr "Lieder gelöscht"
+msgid "Artist and Title"
+msgstr "Interpret Cache Begrenzung"
 
-#: ../../docs/admin/song.php:80
-msgid "The requested song(s) have been enabled"
+#: ../../lib/duplicates.php:102
+msgid "Artist, Album and Title"
 msgstr ""
 
-#: ../../docs/play/index.php:46
-msgid "Session Expired: please log in again at"
+#: ../../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/general.lib.php:640
+msgid "Not Enough Data"
 msgstr ""
 
-#: ../../docs/artists.php:47
+#: ../../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
 #, fuzzy
-msgid "All songs by"
-msgstr "Alle Lieder"
+msgid "No Results Found"
+msgstr "Keine Dateileichen gefunden"
 
-#: ../../docs/artists.php:56 ../../docs/albums.php:103
-msgid "Starting Update from Tags"
-msgstr "Starte Aktuallisierung vom TAG"
+#: ../../lib/class/genre.class.php:278
+#, fuzzy
+msgid "Show Genres starting with"
+msgstr "(<u>S</u>) Zeige Interpreten mit folgendem Beginn"
 
-#: ../../docs/artists.php:61 ../../docs/albums.php:108
-msgid "Update From Tags Compleate"
-msgstr "Aktuallisierung vom Tag vollständig"
+#: ../../lib/class/album.class.php:126
+msgid "Various"
+msgstr ""
 
-#: ../../docs/artists.php:62 ../../docs/albums.php:109
-#: ../../modules/class/catalog.php:615
-msgid "Return"
+#: ../../lib/class/album.class.php:241 ../../lib/class/catalog.class.php:275
+#: ../../lib/class/catalog.class.php:560
+msgid "Error: Unable to open"
 msgstr ""
 
-#: ../../docs/artists.php:73 ../../docs/artists.php:82
-#: ../../docs/artists.php:94 ../../docs/artists.php:111
-msgid "<u>S</u>how artists starting with"
-msgstr "(<u>S</u>) Zeige Interpreten mit folgendem Beginn"
+#: ../../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 "Katalog aktualisieren"
 
-#: ../../docs/amp-mpd.php:32
+#: ../../lib/class/song.class.php:279 ../../templates/show_songs.inc:39
+#: ../../templates/show_uploads.inc:39
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: ../../lib/class/song.class.php:283
 #, fuzzy
-msgid "Error Connecting"
-msgstr "Datenbank Verbindung"
+msgid "Rate"
+msgstr "Entfernt"
 
-#: ../../docs/playlist.php:71 ../../templates/show_songs.inc:151
-#: ../../templates/show_artist.inc:95
-msgid "Play Selected"
-msgstr "Ausgewählte abspielen"
+#: ../../lib/class/song.class.php:287
+#, fuzzy
+msgid "Mode"
+msgstr "Demo Modus"
 
-#: ../../docs/playlist.php:89 ../../templates/show_songs.inc:152
-msgid "Flag Selected"
-msgstr "Ausgewählte markieren"
+#: ../../lib/class/song.class.php:291 ../../templates/show_songs.inc:37
+#: ../../templates/show_mpdpl.inc:66 ../../templates/show_uploads.inc:38
+msgid "Time"
+msgstr "Dauer"
 
-#: ../../docs/playlist.php:95 ../../templates/show_songs.inc:153
-msgid "Edit Selected"
-msgstr "Ausgwählte editieren"
+#: ../../lib/class/song.class.php:295 ../../templates/show_songs.inc:32
+#: ../../templates/show_songs.inc:36 ../../templates/show_mpdpl.inc:65
+msgid "Track"
+msgstr "Lied"
 
-#: ../../docs/playlist.php:125 ../../modules/lib.php:1007
-#: ../../templates/show_songs.inc:169 ../../templates/show_users.inc:51
-#: ../../templates/show_artist.inc:103
-msgid "Edit"
-msgstr "Editieren"
+#: ../../lib/class/song.class.php:299
+msgid "Filesize"
+msgstr ""
 
-#: ../../docs/playlist.php:128 ../../modules/lib.php:1016
-#: ../../templates/show_localplay.inc:41 ../../templates/show_artists.inc:54
-#: ../../templates/show_albums.inc:57 ../../templates/show_mpdplay.inc:45
-#: ../../templates/show_artist.inc:79
-msgid "Play"
-msgstr "Abspielen"
+#: ../../lib/class/song.class.php:304 ../../templates/show_artists.inc:39
+#: ../../templates/show_artists.inc:62 ../../templates/show_songs.inc:34
+#: ../../templates/show_albums.inc:40 ../../templates/show_albums.inc:70
+#: ../../templates/show_mpdpl.inc:63 ../../templates/show_uploads.inc:35
+msgid "Artist"
+msgstr "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
+msgid "Album"
+msgstr "Album"
 
-#: ../../docs/playlist.php:140
+#: ../../lib/class/song.class.php:313 ../../templates/show_albums.inc:43
+#: ../../templates/show_albums.inc:73
 #, fuzzy
-msgid "New Playlist"
-msgstr "Playlist"
+msgid "Year"
+msgstr "Jahr"
 
-#: ../../docs/playlist.php:198
+#: ../../lib/class/song.class.php:317 ../../templates/list_flagged.inc:46
+#: ../../templates/flag.inc:66
 #, fuzzy
-msgid "Playlist updated."
-msgstr "Playlistenname"
+msgid "Comment"
+msgstr "id3-Kommentar"
 
-#: ../../docs/playlist.php:305
-msgid "No songs in this playlist."
-msgstr ""
+#: ../../lib/class/song.class.php:322 ../../templates/show_genres.inc.php:36
+#: ../../templates/show_genre.inc.php:32 ../../templates/show_songs.inc:40
+#: ../../templates/show_browse_menu.inc:37 ../../templates/show_mpdpl.inc:67
+#: ../../templates/show_uploads.inc:37
+msgid "Genre"
+msgstr "Genre"
 
-#: ../../docs/localplay.php:79
-msgid "Unknown action requested"
+#: ../../lib/class/stream.class.php:198
+msgid "Opened for writing"
 msgstr ""
 
-#: ../../docs/index.php:39
-msgid "Welcome to"
-msgstr "Willkommen bei"
-
-#: ../../docs/index.php:41
-msgid "you are currently logged in as"
+#: ../../lib/class/stream.class.php:203
+msgid "Error, cannot write"
 msgstr ""
 
-#: ../../docs/index.php:72
-msgid "Most Popular Songs"
-msgstr "Meistgespielte Lieder"
-
-#: ../../docs/index.php:79
-msgid "Most Popular Artists"
-msgstr "Meistgespielte Interpreten"
+#: ../../lib/class/stream.class.php:214
+msgid "Error, cannot write song in file"
+msgstr ""
 
-#: ../../docs/index.php:91
-msgid "Newest Album Additions"
-msgstr "Neuste Albenzugänge"
+#: ../../lib/class/stream.class.php:220
+msgid "Closed after write"
+msgstr ""
 
-#: ../../docs/index.php:98
-msgid "Newest Artist Additions"
-msgstr "Neuste Interpretenzugänge"
+#: ../../lib/class/catalog.class.php:298
+msgid "Error: Unable to change to directory"
+msgstr ""
 
-#: ../../docs/flag.php:35
-msgid "Flagging song completed."
+#: ../../lib/class/catalog.class.php:321
+msgid "Error: Unable to get filesize for"
 msgstr ""
 
-#: ../../docs/albums.php:43
+#: ../../lib/class/catalog.class.php:340
 #, fuzzy
-msgid "Album Art Cleared"
-msgstr "Album Jahr"
-
-#: ../../docs/albums.php:43
-msgid "Album Art information has been removed form the database"
-msgstr ""
+msgid "Added Playlist From"
+msgstr "Playlist"
 
-#: ../../docs/albums.php:75
-msgid "Album Art Located"
+#: ../../lib/class/catalog.class.php:359
+msgid "Added"
 msgstr ""
 
-#: ../../docs/albums.php:75
-msgid ""
-"Album Art information has been located in Amazon. If incorrect, click "
-"\"Reset Album Art\" below to remove the artwork."
+#: ../../lib/class/catalog.class.php:371
+msgid "is not readable by ampache"
 msgstr ""
 
-#: ../../docs/albums.php:83 ../../docs/albums.php:93
-msgid "Get Art"
+#: ../../lib/class/catalog.class.php:435
+msgid "Found in ID3"
 msgstr ""
 
-#: ../../docs/albums.php:87
-msgid "Album Art Not Located"
+#: ../../lib/class/catalog.class.php:439
+msgid "Found on Amazon"
 msgstr ""
 
-#: ../../docs/albums.php:87
-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."
+#: ../../lib/class/catalog.class.php:443
+msgid "Found in Folder"
 msgstr ""
 
-#: ../../docs/albums.php:123 ../../docs/albums.php:138
-msgid "All Albums"
-msgstr "Alle Alben"
-
-#: ../../docs/albums.php:124 ../../docs/albums.php:131
-msgid "<u>S</u>how all albums"
-msgstr "(<u>S</u>) Zeige alle Alben"
+#: ../../lib/class/catalog.class.php:447
+#, fuzzy
+msgid "Found"
+msgstr "Schrift"
 
-#: ../../docs/albums.php:130
-msgid "Albums with no artwork"
+#: ../../lib/class/catalog.class.php:450
+msgid "Not Found"
 msgstr ""
 
-#: ../../docs/albums.php:139 ../../docs/albums.php:146
-#: ../../docs/albums.php:151
-msgid "<u>S</u>how only albums starting with"
-msgstr "(<u>S</u>) Zeige alle Alben mit folgendem Beginn"
-
-#: ../../docs/albums.php:145
-msgid "Select a starting letter or Show all"
-msgstr "Wähle einen Anfangsbuchstaben oder 'Zeige Alle'"
+#: ../../lib/class/catalog.class.php:458
+#, fuzzy
+msgid "Searched"
+msgstr "Suchen"
 
-#: ../../docs/upload.php:124
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+#: ../../lib/class/catalog.class.php:613
+#, fuzzy
+msgid "Starting Dump Album Art"
+msgstr "Cover finden"
 
-#: ../../docs/upload.php:127
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
+#: ../../lib/class/catalog.class.php:633
+msgid "Written"
 msgstr ""
 
-#: ../../docs/upload.php:130
-msgid "The uploaded file was only partially uploaded."
+#: ../../lib/class/catalog.class.php:642
+msgid "Error unable to open file for writting"
 msgstr ""
 
-#: ../../docs/upload.php:133
-msgid "No file was uploaded."
-msgstr ""
+#: ../../lib/class/catalog.class.php:649
+#, fuzzy
+msgid "Album Art Dump Complete"
+msgstr "Album Jahr"
 
-#: ../../docs/upload.php:136
-msgid "An Unknown Error has occured."
+#: ../../lib/class/catalog.class.php:650 ../../artists.php:63
+#: ../../albums.php:112
+msgid "Return"
 msgstr ""
 
-#: ../../docs/upload.php:157
-msgid "Successfully-Quarantined"
+#: ../../lib/class/catalog.class.php:719
+msgid "Starting Catalog Build"
 msgstr ""
 
-#: ../../docs/upload.php:167
-msgid "Successfully-Cataloged"
+#: ../../lib/class/catalog.class.php:724
+msgid "Running Remote Sync"
 msgstr ""
 
-#: ../../docs/upload.php:229 ../../templates/show_songs.inc:42
-#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:67
-#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:73
-#: ../../templates/show_access_list.inc:51 ../../templates/show_artist.inc:56
-msgid "Action"
-msgstr "Aktion"
+#: ../../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"
 
-#: ../../docs/upload.php:230 ../../templates/flag.inc:58
-#: ../../templates/list_flagged.inc:41
+#: ../../lib/class/catalog.class.php:744
 #, fuzzy
-msgid "Song"
-msgstr "Lieder"
+msgid "Catalog Finished"
+msgstr "Kataloggröße"
 
-#: ../../docs/upload.php:231 ../../modules/class/song.php:275
-#: ../../templates/show_songs.inc:34 ../../templates/show_artists.inc:39
-#: ../../templates/show_artists.inc:62 ../../templates/show_albums.inc:40
-#: ../../templates/show_albums.inc:70
-msgid "Artist"
-msgstr "Interpret"
+#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:899
+#, fuzzy
+msgid "Total Time"
+msgstr "Katalog Spielzeit"
 
-#: ../../docs/upload.php:232 ../../modules/class/song.php:280
-#: ../../templates/show_songs.inc:35 ../../templates/show_albums.inc:38
-#: ../../templates/show_albums.inc:68
-msgid "Album"
-msgstr "Album"
+#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:900
+#, fuzzy
+msgid "Total Songs"
+msgstr "Alle Lieder"
 
-#: ../../docs/upload.php:233 ../../modules/class/song.php:293
-#: ../../templates/show_songs.inc:40
-msgid "Genre"
-msgstr "Genre"
+#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:900
+msgid "Songs Per Seconds"
+msgstr ""
 
-#: ../../docs/upload.php:234 ../../modules/class/song.php:262
-#: ../../templates/show_songs.inc:37
-msgid "Time"
-msgstr "Dauer"
+#: ../../lib/class/catalog.class.php:779
+#: ../../lib/class/catalog.class.php:1476
+#, fuzzy
+msgid "Updated"
+msgstr "Schnelles Aktualisieren"
 
-#: ../../docs/upload.php:235 ../../modules/class/song.php:250
-#: ../../templates/show_songs.inc:39
-msgid "Bitrate"
-msgstr "Bitrate"
+#: ../../lib/class/catalog.class.php:786
+msgid "No Update Needed"
+msgstr ""
 
-#: ../../docs/upload.php:236 ../../templates/show_songs.inc:38
-msgid "Size"
-msgstr "Größe"
+#: ../../lib/class/catalog.class.php:860
+msgid "Starting New Song Search on"
+msgstr ""
 
-#: ../../docs/upload.php:237
+#: ../../lib/class/catalog.class.php:860
 #, fuzzy
-msgid "Filename"
-msgstr "Dateinamenmuster"
+msgid "catalog"
+msgstr "Katalog"
 
-#: ../../docs/upload.php:238
-#, fuzzy
-msgid "User"
-msgstr "Benutzer"
+#: ../../lib/class/catalog.class.php:864
+msgid "Running Remote Update"
+msgstr ""
 
-#: ../../docs/upload.php:239
+#: ../../lib/class/catalog.class.php:899
 #, fuzzy
-msgid "Date"
-msgstr "Entfernt"
-
-#: ../../docs/upload.php:267
-msgid "Unknown"
-msgstr ""
+msgid "Catalog Update Finished"
+msgstr "Katalogstatistik"
 
-#: ../../docs/upload.php:289
+#: ../../lib/class/catalog.class.php:919 ../../lib/mpd.php:40
+#: ../../lib/mpd.php:49
 #, fuzzy
-msgid "Add"
-msgstr "Katalog hinzufügen"
+msgid "Error"
+msgstr "Fehler-Farbe"
 
-#: ../../docs/upload.php:290 ../../modules/lib.php:1008
-#: ../../templates/catalog.inc:60 ../../templates/show_users.inc:57
-msgid "Delete"
-msgstr "Löschen"
+#: ../../lib/class/catalog.class.php:919
+msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
+msgstr ""
 
-#: ../../docs/upload.php:294
-#, fuzzy
-msgid "Quarantined"
-msgstr "Quarantine"
+#: ../../lib/class/catalog.class.php:958
+#: ../../lib/class/catalog.class.php:1009
+msgid "Error connecting to"
+msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:28
-#: ../../templates/show_install_account.inc.php:60
-#: ../../templates/userform.inc:41 ../../templates/show_users.inc:39
+#: ../../lib/class/catalog.class.php:958
+#: ../../lib/class/catalog.class.php:1009
 #, fuzzy
-msgid "Username"
-msgstr "Benutzer"
+msgid "Code"
+msgstr "Demo Modus"
 
-#: ../../templates/show_user_registration.inc.php:36
-#: ../../templates/userform.inc:49
+#: ../../lib/class/catalog.class.php:958
+#: ../../lib/class/catalog.class.php:1009
 #, fuzzy
-msgid "Full Name"
-msgstr "Playlistenname"
+msgid "Reason"
+msgstr "Lied"
 
-#: ../../templates/show_user_registration.inc.php:44
-#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:56
-msgid "E-mail"
+#: ../../lib/class/catalog.class.php:974
+msgid "Completed updating remote catalog(s)"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:52
-#: ../../templates/show_install_account.inc.php:64
-#: ../../templates/userform.inc:64 ../../templates/show_login_form.inc:44
-msgid "Password"
-msgstr "Passwort"
+#: ../../lib/class/catalog.class.php:1105
+msgid "Checking"
+msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:60
-#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:73
+#: ../../lib/class/catalog.class.php:1163
 #, fuzzy
-msgid "Confirm Password"
-msgstr "Passwort"
+msgid "Catalog Clean Done"
+msgstr "Katalogname"
 
-#: ../../templates/show_user_registration.inc.php:69
-msgid "Register User"
+#: ../../lib/class/catalog.class.php:1163
+msgid "files removed"
 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 "Name"
+#: ../../lib/class/catalog.class.php:1436
+msgid "Updating the"
+msgstr ""
 
-#: ../../templates/show_user.inc.php:48
+#: ../../lib/class/catalog.class.php:1436 ../../templates/admin_menu.inc:35
 #, fuzzy
-msgid "View Limit"
-msgstr "Speicherbegrenzung"
+msgid "Catalog"
+msgstr "Katalog"
 
-#: ../../templates/show_user.inc.php:56
-#, fuzzy
-msgid "Update Profile"
-msgstr "Einstellungen aktualisieren"
+#: ../../lib/class/catalog.class.php:1437
+msgid "songs found checking tag information."
+msgstr ""
 
-#: ../../templates/show_user.inc.php:67
-#, fuzzy
-msgid "Enter password"
-msgstr "Passwort"
+#: ../../lib/class/catalog.class.php:1484
+msgid " FOUND"
+msgstr ""
 
-#: ../../templates/show_user.inc.php:83
+#: ../../lib/class/catalog.class.php:1485
 #, fuzzy
-msgid "Change Password"
-msgstr "Passwort"
+msgid "Searching for new Album Art"
+msgstr "Cover finden"
 
-#: ../../templates/show_user.inc.php:91
+#: ../../lib/class/catalog.class.php:1489
 #, fuzzy
-msgid "Clear Stats"
-msgstr "Katalogstatistiken löschen"
+msgid "Album Art Already Found"
+msgstr "Album Jahr"
 
-#: ../../templates/show_install_account.inc.php:35
-#: ../../templates/show_install_config.inc:35
-#: ../../templates/show_install.inc:34
-msgid "Ampache Installation"
+#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
+msgid "Could not add"
 msgstr ""
 
-#: ../../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 file. Before you continue please make sure that you have "
-"the following pre-requisits"
+#: ../../lib/Browser.php:867
+#, fuzzy
+msgid "file"
+msgstr "Seitentitel"
+
+#: ../../lib/Browser.php:871
+msgid "File uploads not supported."
 msgstr ""
 
-#: ../../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"
+#: ../../lib/Browser.php:889
+msgid "No file uploaded"
 msgstr ""
 
-#: ../../templates/show_install_account.inc.php:41
-#: ../../templates/show_install_config.inc:41
-msgid ""
-"Your webserver configured so that your config directory is not visable to "
-"the web"
+#: ../../lib/Browser.php:896
+#, php-format
+msgid "There was a problem with the file upload: No %s was uploaded."
 msgstr ""
 
-#: ../../templates/show_install_account.inc.php:42
-#: ../../templates/show_install_config.inc:42
-#: ../../templates/show_install.inc:41
+#: ../../lib/Browser.php:901
+#, php-format
 msgid ""
-"Your webserver has read access to the /sql/ampache.sql file and the /config/"
-"ampache.cfg.dist file"
+"There was a problem with the file upload: The %s was larger than the maximum "
+"allowed size (%d bytes)."
 msgstr ""
 
-#: ../../templates/show_install_account.inc.php:44
-#: ../../templates/show_install_config.inc:44
-#: ../../templates/show_install.inc:43
+#: ../../lib/Browser.php:903
+#, php-format
 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"
+"There was a problem with the file upload: The %s was only partially uploaded."
 msgstr ""
 
-#: ../../templates/show_install_account.inc.php:49
-#: ../../templates/show_install_config.inc:49
-#: ../../templates/show_install.inc:47
-msgid "Step 1 - Creating and Inserting the Ampache Database"
-msgstr ""
+#: ../../lib/ui.lib.php:199
+#, fuzzy
+msgid "Playlist Actions"
+msgstr "Playlists"
 
-#: ../../templates/show_install_account.inc.php:50
-#: ../../templates/show_install_config.inc:50
-#: ../../templates/show_install.inc:51
-msgid "Step 2 - Creating the Ampache.cfg file"
-msgstr ""
+#: ../../lib/ui.lib.php:199
+msgid "New"
+msgstr "Neu"
 
-#: ../../templates/show_install_account.inc.php:51
-#: ../../templates/show_install_config.inc:54
-#: ../../templates/show_install.inc:52
-msgid "Step 3 - Setup Initial Account"
+#: ../../lib/ui.lib.php:200
+msgid "View All"
+msgstr "Alle ansehen"
+
+#: ../../lib/ui.lib.php:201
+msgid "Import"
 msgstr ""
 
-#: ../../templates/show_install_account.inc.php:53
-msgid ""
-"This step creates your initial Ampache admin account. Once your admin "
-"account has been created you will be directed to the login page"
+#: ../../lib/ui.lib.php:301 ../../templates/menu.inc:35
+msgid "Browse"
 msgstr ""
 
-#: ../../templates/show_install_account.inc.php:69
+#: ../../lib/ui.lib.php:303
 #, fuzzy
-msgid "Create Account"
-msgstr "Account"
+msgid "Show w/o art"
+msgstr "Zeige Alle"
 
-#: ../../templates/show_confirm_action.inc.php:28
-msgid "Yes"
+#: ../../lib/ui.lib.php:306
+msgid "Show all"
+msgstr "Zeige Alle"
+
+#: ../../lib/ui.lib.php:446
+msgid "No songs in this playlist."
 msgstr ""
 
-#: ../../templates/show_confirmation.inc.php:30
-msgid "Continue"
-msgstr "Weiter"
+#: ../../lib/ui.lib.php:592
+#, fuzzy
+msgid "No Catalogs Found!"
+msgstr "Keine Dateileichen gefunden"
 
-#: ../../lib/preferences.php:199
-msgid "Enable"
-msgstr ""
+#: ../../lib/ui.lib.php:593 ../../templates/add_catalog.inc:28
+#, fuzzy
+msgid "Add a Catalog"
+msgstr "Katalog hinzufügen"
 
-#: ../../lib/preferences.php:200 ../../templates/show_users.inc:63
-msgid "Disable"
-msgstr ""
+#: ../../lib/ui.lib.php:594 ../../templates/show_local_catalog_info.inc.php:7
+msgid "Catalog Statistics"
+msgstr "Katalogstatistik"
 
-#: ../../lib/preferences.php:210 ../../templates/add_catalog.inc:60
-msgid "Local"
-msgstr "Lokal"
+#: ../../lib/ui.lib.php:630
+msgid "day"
+msgstr "Tag"
 
-#: ../../lib/preferences.php:211
-msgid "Stream"
-msgstr ""
+#: ../../lib/ui.lib.php:630
+msgid "days"
+msgstr "Tage"
 
-#: ../../lib/preferences.php:212
-msgid "IceCast"
-msgstr ""
+#: ../../lib/ui.lib.php:632
+msgid "hour"
+msgstr "Stunde"
 
-#: ../../lib/preferences.php:213
-msgid "Downsample"
-msgstr ""
+#: ../../lib/ui.lib.php:632
+msgid "hours"
+msgstr "Stunden"
 
-#: ../../lib/preferences.php:214
-msgid "Music Player Daemon"
+#: ../../lib/upload.php:225
+msgid "The file uploaded successfully"
 msgstr ""
 
-#: ../../lib/preferences.php:221
-msgid "M3U"
+#: ../../lib/upload.php:226
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
 
-#: ../../lib/preferences.php:222
-msgid "Simple M3U"
+#: ../../lib/upload.php:227
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
 msgstr ""
 
-#: ../../lib/preferences.php:223
-msgid "PLS"
+#: ../../lib/upload.php:228
+msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ../../lib/preferences.php:224
-msgid "Asx"
+#: ../../lib/upload.php:229
+msgid "No file was uploaded"
 msgstr ""
 
-#: ../../lib/preferences.php:231
-msgid "English"
+#: ../../lib/upload.php:230
+msgid "Missing a temporary folder"
 msgstr ""
 
-#: ../../lib/preferences.php:232
-msgid "German"
-msgstr ""
+#: ../../modules/lib.php:708
+msgid "Public"
+msgstr "öffentliche"
 
-#: ../../lib/preferences.php:233
-msgid "French"
-msgstr ""
+#: ../../modules/lib.php:709
+msgid "Your Private"
+msgstr "Deine private"
 
-#: ../../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
-#, fuzzy
-msgid "No Results Found"
-msgstr "Keine Dateileichen gefunden"
+#: ../../modules/lib.php:710
+msgid "Other Private"
+msgstr "Andere private"
 
-#: ../../lib/ui.php:180 ../../templates/show_songs.inc:166
-#: ../../templates/show_artist.inc:100
-msgid "Playlist"
-msgstr "Playlist"
+#: ../../modules/lib.php:791 ../../templates/show_play_selected.inc.php:72
+msgid "View"
+msgstr "Anschauen"
 
-#: ../../lib/ui.php:180
-msgid "New"
-msgstr "Neu"
+#: ../../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/ui.php:181
-msgid "View All"
-msgstr "Alle ansehen"
+#: ../../modules/lib.php:795 ../../templates/catalog.inc:60
+#: ../../templates/show_users.inc:61 ../../templates/show_uploads.inc:50
+msgid "Delete"
+msgstr "Löschen"
 
-#: ../../lib/ui.php:305
-#, fuzzy
-msgid "Show w/o art"
-msgstr "Zeige Alle"
+#: ../../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/ui.php:307
-msgid "Show all"
-msgstr "Zeige Alle"
+#: ../../modules/lib.php:804 ../../templates/show_artists.inc:56
+#: ../../templates/show_albums.inc:59 ../../templates/show_mpdplay.inc:85
+msgid "Random"
+msgstr "Zufällig"
+
+#: ../../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"
+
+#: ../../modules/lib.php:821
+msgid "There are no playlists of this type"
+msgstr "Keine Playliste von diesem Typ verhanden"
+
+#: ../../modules/lib.php:856
+msgid "Create a new playlist"
+msgstr "Neue Playlist erstellen"
 
-#: ../../lib/mpd.php:31 ../../modules/class/catalog.php:876
+#: ../../modules/admin.php:46
 #, fuzzy
-msgid "Error"
-msgstr "Fehler-Farbe"
+msgid "Manage Users"
+msgstr "Den Benutzern mailen"
 
-#: ../../lib/mpd.php:31
-msgid "Could not add"
-msgstr ""
+#: ../../modules/admin.php:48 ../../templates/show_admin_index.inc:34
+#, fuzzy
+msgid "Add a new user"
+msgstr "Rechner hinzufügen"
 
-#: ../../lib/Browser.php:867
+#: ../../admin/catalog.php:55 ../../templates/catalog.inc:66
+msgid "Add to Catalog(s)"
+msgstr "Zu Katalog hinzufügen"
+
+#: ../../admin/catalog.php:66 ../../templates/catalog.inc:67
+msgid "Add to all Catalogs"
+msgstr "Zu allen Katalogen hinzufügen"
+
+#: ../../admin/catalog.php:75
 #, fuzzy
-msgid "file"
-msgstr "Seitentitel"
+msgid "Error Connecting"
+msgstr "Datenbank Verbindung"
 
-#: ../../lib/Browser.php:871
-msgid "File uploads not supported."
-msgstr ""
+#: ../../admin/catalog.php:89 ../../templates/catalog.inc:73
+msgid "Update Catalog(s)"
+msgstr "Katalog(e) aktualisieren"
 
-#: ../../lib/Browser.php:889
-msgid "No file uploaded"
-msgstr ""
+#: ../../admin/catalog.php:100 ../../templates/catalog.inc:74
+msgid "Update All Catalogs"
+msgstr "Alle Kataloge aktualisieren"
 
-#: ../../lib/Browser.php:896
-#, php-format
-msgid "There was a problem with the file upload: No %s was uploaded."
-msgstr ""
+#: ../../admin/catalog.php:132 ../../templates/catalog.inc:80
+msgid "Clean Catalog(s)"
+msgstr "Katalog säubern"
 
-#: ../../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 ""
+#: ../../admin/catalog.php:162 ../../templates/catalog.inc:81
+msgid "Clean All Catalogs"
+msgstr "Alle Kataloge säubern"
 
-#: ../../lib/Browser.php:903
-#, php-format
-msgid ""
-"There was a problem with the file upload: The %s was only partially uploaded."
-msgstr ""
+#: ../../admin/catalog.php:211
+msgid "Now Playing Cleared"
+msgstr "Zur Zeit gespielte Liederliste geleert"
 
-#: ../../modules/class/catalog.php:267 ../../modules/class/catalog.php:527
-#: ../../modules/class/album.php:241
-msgid "Error: Unable to open"
-msgstr ""
+#: ../../admin/catalog.php:211
+msgid "All now playing data has been cleared"
+msgstr "Übersicht der aktuell abspielenden Lieder geleert"
 
-#: ../../modules/class/catalog.php:289
-msgid "Error: Unable to change to directory"
-msgstr ""
+#: ../../admin/catalog.php:216
+msgid "Do you really want to clear your catalog?"
+msgstr "Wollen sie wirklich den Katalog leeren?"
 
-#: ../../modules/class/catalog.php:312
-msgid "Error: Unable to get filesize for"
-msgstr ""
+#: ../../admin/catalog.php:223
+msgid "Do you really want to clear the statistics for this catalog?"
+msgstr "Wollen sie wirklich die Katalogstatistik leeren?"
 
-#: ../../modules/class/catalog.php:332
-msgid "Added"
-msgstr ""
+#: ../../admin/catalog.php:241
+msgid "Do you really want to delete this catalog?"
+msgstr "Wollen sie wirklich den Katalog löschen?"
 
-#: ../../modules/class/catalog.php:342
-msgid "is not readable by ampache"
+#: ../../admin/catalog.php:272
+#, fuzzy
+msgid "Album Art Search Finished"
+msgstr "Album Jahr"
+
+#: ../../admin/users.php:76 ../../admin/users.php:122
+msgid "Error Username Required"
 msgstr ""
 
-#: ../../modules/class/catalog.php:402
-msgid "Found in ID3"
+#: ../../admin/users.php:79 ../../admin/users.php:119
+msgid "Error Passwords don't match"
 msgstr ""
 
-#: ../../modules/class/catalog.php:406
-msgid "Found on Amazon"
+#: ../../admin/users.php:136
+msgid "Are you sure you want to permanently delete"
 msgstr ""
 
-#: ../../modules/class/catalog.php:410
-msgid "Found in Folder"
+#: ../../admin/users.php:143 ../../templates/show_confirm_action.inc.php:29
+msgid "No"
 msgstr ""
 
-#: ../../modules/class/catalog.php:414
+#: ../../admin/users.php:145
 #, fuzzy
-msgid "Found"
-msgstr "Schrift"
+msgid "User Deleted"
+msgstr "Eintrag gelöscht"
 
-#: ../../modules/class/catalog.php:417
-msgid "Not Found"
+#: ../../admin/users.php:148
+#, fuzzy
+msgid "Delete Error"
+msgstr "Löschen"
+
+#: ../../admin/users.php:148
+msgid "Unable to delete last Admin User"
 msgstr ""
 
-#: ../../modules/class/catalog.php:425
-#, fuzzy
-msgid "Searched"
-msgstr "Suchen"
+#: ../../admin/access.php:43
+msgid "Do you really want to delete this Access Record?"
+msgstr "Wollen sie wirklich diesen Zugangs-Eintrag löschen?"
 
-#: ../../modules/class/catalog.php:578
+#: ../../admin/access.php:51
+msgid "Entry Deleted"
+msgstr "Eintrag gelöscht"
+
+#: ../../admin/access.php:51
+msgid "Your Access List Entry has been removed"
+msgstr "Ein Zugangs-Eintrag wurde gelöscht"
+
+#: ../../admin/access.php:61
 #, fuzzy
-msgid "Starting Dump Album Art"
-msgstr "Cover finden"
+msgid "Entry Added"
+msgstr "Eintrag gelöscht"
 
-#: ../../modules/class/catalog.php:598
-msgid "Written"
-msgstr ""
+#: ../../admin/access.php:61
+msgid "Your new Access List Entry has been created"
+msgstr "Ein neuer Zugangs-Eintrag wurde erstellt"
 
-#: ../../modules/class/catalog.php:607
-msgid "Error unable to open file for writting"
+#: ../../admin/mail.php:98
+msgid "Mail to"
 msgstr ""
 
-#: ../../modules/class/catalog.php:614
+#: ../../admin/mail.php:109
 #, fuzzy
-msgid "Album Art Dump Complete"
-msgstr "Album Jahr"
+msgid "Subject"
+msgstr "Auswahl"
 
-#: ../../modules/class/catalog.php:681
-msgid "Starting Catalog Build"
+#: ../../admin/mail.php:116
+msgid "Message"
 msgstr ""
 
-#: ../../modules/class/catalog.php:686
-msgid "Running Remote Sync"
+#: ../../admin/mail.php:126
+msgid "Send Mail"
 msgstr ""
 
-#: ../../modules/class/catalog.php:696 ../../modules/class/catalog.php:843
+#: ../../admin/song.php:68
 #, fuzzy
-msgid "Starting Album Art Search"
-msgstr "Album Jahr"
+msgid "Songs Disabled"
+msgstr "Songname"
+
+#: ../../admin/song.php:68
+msgid "The requested song(s) have been disabled"
+msgstr ""
 
-#: ../../modules/class/catalog.php:706
+#: ../../admin/song.php:78
 #, fuzzy
-msgid "Catalog Finished"
-msgstr "Kataloggröße"
+msgid "Songs Enabled"
+msgstr "Lieder gelöscht"
+
+#: ../../admin/song.php:78
+msgid "The requested song(s) have been enabled"
+msgstr ""
 
-#: ../../modules/class/catalog.php:706 ../../modules/class/catalog.php:862
+#: ../../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 "Total Time"
-msgstr "Katalog Spielzeit"
+msgid "Username"
+msgstr "Benutzer"
 
-#: ../../modules/class/catalog.php:706 ../../modules/class/catalog.php:863
+#: ../../templates/show_user_registration.inc.php:36
+#: ../../templates/userform.inc:48
 #, fuzzy
-msgid "Total Songs"
-msgstr "Alle Lieder"
+msgid "Full Name"
+msgstr "Playlistenname"
 
-#: ../../modules/class/catalog.php:707 ../../modules/class/catalog.php:863
-msgid "Songs Per Seconds"
+#: ../../templates/show_user_registration.inc.php:44
+#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:55
+msgid "E-mail"
 msgstr ""
 
-#: ../../modules/class/catalog.php:741
+#: ../../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 "Updated"
-msgstr "Schnelles Aktualisieren"
+msgid "Confirm Password"
+msgstr "Passwort"
 
-#: ../../modules/class/catalog.php:748
-msgid "No Update Needed"
+#: ../../templates/show_user_registration.inc.php:69
+msgid "Register User"
 msgstr ""
 
-#: ../../modules/class/catalog.php:823
-msgid "Starting New Song Search on"
+#: ../../templates/show_install_account.inc.php:35
+#: ../../templates/show_install_config.inc:35
+#: ../../templates/show_install.inc:34
+msgid "Ampache Installation"
 msgstr ""
 
-#: ../../modules/class/catalog.php:823
-#, fuzzy
-msgid "catalog"
-msgstr "Katalog"
-
-#: ../../modules/class/catalog.php:827
-msgid "Running Remote Update"
+#: ../../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-requisites"
 msgstr ""
 
-#: ../../modules/class/catalog.php:862
-#, fuzzy
-msgid "Catalog Update Finished"
-msgstr "Katalogstatistik"
+#: ../../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 ""
 
-#: ../../modules/class/catalog.php:876
-msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
+#: ../../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 ""
 
-#: ../../modules/class/catalog.php:908 ../../modules/class/catalog.php:923
-msgid "Error connecting to"
+#: ../../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 ""
 
-#: ../../modules/class/catalog.php:908 ../../modules/class/catalog.php:923
-#, fuzzy
-msgid "Code"
-msgstr "Demo Modus"
+#: ../../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 ""
 
-#: ../../modules/class/catalog.php:908 ../../modules/class/catalog.php:923
-#, fuzzy
-msgid "Reason"
-msgstr "Lied"
+#: ../../templates/show_install_account.inc.php:49
+msgid "Step 2 - Creating the ampache.cfg.php file"
+msgstr ""
 
-#: ../../modules/class/catalog.php:928
-msgid "Completed updating remote catalog(s)"
+#: ../../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 ""
 
-#: ../../modules/class/catalog.php:1016
-msgid "Checking"
+#: ../../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 ""
 
-#: ../../modules/class/catalog.php:1073
+#: ../../templates/show_install_account.inc.php:68
 #, fuzzy
-msgid "Catalog Clean Done"
-msgstr "Katalogname"
+msgid "Create Account"
+msgstr "Account"
 
-#: ../../modules/class/catalog.php:1073
-msgid "files removed"
+#: ../../templates/show_confirm_action.inc.php:28
+msgid "Yes"
 msgstr ""
 
-#: ../../modules/class/catalog.php:1313
-msgid "Updating the"
+#: ../../templates/show_import_playlist.inc.php:26
+msgid "Importing a Playlist from a File"
 msgstr ""
 
-#: ../../modules/class/catalog.php:1313
-#: ../../templates/show_admin_index.inc:34 ../../templates/admin_menu.inc:35
+#: ../../templates/show_import_playlist.inc.php:29
+#: ../../templates/show_uploads.inc:41
 #, fuzzy
-msgid "Catalog"
-msgstr "Katalog"
-
-#: ../../modules/class/catalog.php:1314
-msgid "songs found checking tag information."
-msgstr ""
+msgid "Filename"
+msgstr "Dateinamenmuster"
 
-#: ../../modules/class/stream.php:192
-msgid "Opened for writting"
-msgstr ""
+#: ../../templates/show_import_playlist.inc.php:36
+#, fuzzy
+msgid "Playlist Type"
+msgstr "Abspielart"
 
-#: ../../modules/class/stream.php:197
-msgid "Error, cannot write"
-msgstr ""
+#: ../../templates/show_import_playlist.inc.php:49
+#, fuzzy
+msgid "Import Playlist"
+msgstr "Playlist"
 
-#: ../../modules/class/stream.php:208
-msgid "Error, cannot write song in file"
+#: ../../templates/show_user.inc.php:26
+msgid "Changing User Information for"
 msgstr ""
 
-#: ../../modules/class/stream.php:214
-msgid "Closed after write"
-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 "Name"
 
-#: ../../modules/class/album.php:126
-msgid "Various"
+#: ../../templates/show_user.inc.php:48
+msgid "Results Per Page"
 msgstr ""
 
-#: ../../modules/class/song.php:246
+#: ../../templates/show_user.inc.php:56
 #, fuzzy
-msgid "Title"
-msgstr "Seitentitel"
+msgid "Update Profile"
+msgstr "Einstellungen aktualisieren"
 
-#: ../../modules/class/song.php:246 ../../modules/class/song.php:250
-#: ../../modules/class/song.php:254 ../../modules/class/song.php:258
-#: ../../modules/class/song.php:262 ../../modules/class/song.php:266
-#: ../../modules/class/song.php:270 ../../modules/class/song.php:275
-#: ../../modules/class/song.php:280 ../../modules/class/song.php:284
-#: ../../modules/class/song.php:288 ../../modules/class/song.php:293
+#: ../../templates/show_user.inc.php:67
 #, fuzzy
-msgid "updated to"
-msgstr "Katalog aktualisieren"
+msgid "Enter password"
+msgstr "Passwort"
 
-#: ../../modules/class/song.php:254
+#: ../../templates/show_user.inc.php:83
 #, fuzzy
-msgid "Rate"
-msgstr "Entfernt"
+msgid "Change Password"
+msgstr "Passwort"
 
-#: ../../modules/class/song.php:258
+#: ../../templates/show_user.inc.php:89
+msgid "Delete Your Personal Statistics"
+msgstr ""
+
+#: ../../templates/show_user.inc.php:91
 #, fuzzy
-msgid "Mode"
-msgstr "Demo Modus"
+msgid "Clear Stats"
+msgstr "Katalogstatistiken löschen"
 
-#: ../../modules/class/song.php:266 ../../templates/show_songs.inc:32
-#: ../../templates/show_songs.inc:36
-msgid "Track"
-msgstr "Lied"
+#: ../../templates/show_confirmation.inc.php:30
+msgid "Continue"
+msgstr "Weiter"
 
-#: ../../modules/class/song.php:270
-msgid "Filesize"
-msgstr ""
+#: ../../templates/show_play_selected.inc.php:49
+msgid "Play Selected"
+msgstr "Ausgewählte abspielen"
 
-#: ../../modules/class/song.php:284 ../../templates/show_albums.inc:43
-#: ../../templates/show_albums.inc:72
+#: ../../templates/show_play_selected.inc.php:52
 #, fuzzy
-msgid "Year"
-msgstr "Jahr"
+msgid "Download Selected"
+msgstr "Ausgewählte markieren"
 
-#: ../../modules/class/song.php:288 ../../templates/flag.inc:66
-#: ../../templates/list_flagged.inc:46
-#, fuzzy
-msgid "Comment"
-msgstr "id3-Kommentar"
+#: ../../templates/show_play_selected.inc.php:55 ../../playlist.php:77
+msgid "Flag Selected"
+msgstr "Ausgewählte markieren"
 
-#: ../../modules/lib.php:51
-msgid "day"
-msgstr "Tag"
+#: ../../templates/show_play_selected.inc.php:56 ../../playlist.php:83
+msgid "Edit Selected"
+msgstr "Ausgwählte editieren"
 
-#: ../../modules/lib.php:54
-msgid "days"
-msgstr "Tage"
+#: ../../templates/show_play_selected.inc.php:63
+msgid "Set Track Numbers"
+msgstr "Tracknummern setzen"
 
-#: ../../modules/lib.php:58
-msgid "hour"
-msgstr "Stunde"
+#: ../../templates/show_play_selected.inc.php:64
+msgid "Remove Selected Tracks"
+msgstr "Ausgwählte Lieder entfernen"
 
-#: ../../modules/lib.php:61
-msgid "hours"
-msgstr "Stunden"
+#: ../../templates/show_play_selected.inc.php:70
+msgid "Playlist"
+msgstr "Playlist"
 
-#: ../../modules/lib.php:78
-msgid "Catalog Statistics"
-msgstr "Katalogstatistik"
+#: ../../templates/show_play_selected.inc.php:70
+#, fuzzy
+msgid "Add to"
+msgstr "Katalog hinzufügen"
+
+#: ../../templates/show_all_popular.inc.php:27 ../../index.php:98
+msgid "Most Popular Artists"
+msgstr "Meistgespielte Interpreten"
 
-#: ../../modules/lib.php:81
+#: ../../templates/show_all_popular.inc.php:30 ../../index.php:71
+#, fuzzy
+msgid "Most Popular Albums"
+msgstr "Meistgespielte Interpreten"
+
+#: ../../templates/show_all_popular.inc.php:37
+#, fuzzy
+msgid "Most Popular Genres"
+msgstr "Meistgespielte Lieder"
+
+#: ../../templates/show_all_popular.inc.php:40 ../../index.php:105
+msgid "Most Popular Songs"
+msgstr "Meistgespielte Lieder"
+
+#: ../../templates/show_local_catalog_info.inc.php:10
 msgid "Total Users"
 msgstr "Gesamtzahl Benutzer"
 
-#: ../../modules/lib.php:85
+#: ../../templates/show_local_catalog_info.inc.php:14
 msgid "Connected Users"
 msgstr "Verbundene Benutzer"
 
-#: ../../modules/lib.php:89 ../../templates/show_artists.inc:42
-#: ../../templates/show_artists.inc:65 ../../templates/menu.inc:32
+#: ../../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"
 
-#: ../../modules/lib.php:93 ../../templates/menu.inc:33
+#: ../../templates/show_local_catalog_info.inc.php:22
+#: ../../templates/show_genre.inc.php:41
+#: ../../templates/show_browse_menu.inc:35
 msgid "Artists"
 msgstr "Interpreten"
 
-#: ../../modules/lib.php:97 ../../templates/show_artists.inc:41
+#: ../../templates/show_local_catalog_info.inc.php:26
+#: ../../templates/show_genres.inc.php:37
+#: ../../templates/show_genre.inc.php:46 ../../templates/show_artists.inc:41
 #: ../../templates/show_artists.inc:64 ../../templates/show_albums.inc:41
 #: ../../templates/show_albums.inc:71
 msgid "Songs"
 msgstr "Lieder"
 
-#: ../../modules/lib.php:101
+#: ../../templates/show_local_catalog_info.inc.php:30
 msgid "Catalog Size"
 msgstr "Kataloggröße"
 
-#: ../../modules/lib.php:105
+#: ../../templates/show_local_catalog_info.inc.php:34
 msgid "Catalog Time"
 msgstr "Katalog Spielzeit"
 
-#: ../../modules/lib.php:159
-msgid "Play Random Selection"
-msgstr "Spiele Zufallsauswahl"
+#: ../../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"
 
-#: ../../modules/lib.php:166
+#: ../../templates/show_genre.inc.php:32
 #, fuzzy
-msgid "Item count"
-msgstr "Liederanzahl"
+msgid "Viewing"
+msgstr "Anschauen"
 
-#: ../../modules/lib.php:178 ../../templates/show_artists.inc:55
-#: ../../templates/show_albums.inc:58
-msgid "All"
-msgstr "Alle"
+#: ../../templates/show_all_recent.inc.php:27 ../../index.php:115
+msgid "Newest Artist Additions"
+msgstr "Neuste Interpretenzugänge"
 
-#: ../../modules/lib.php:180
+#: ../../templates/show_all_recent.inc.php:30 ../../index.php:122
+msgid "Newest Album Additions"
+msgstr "Neuste Albenzugänge"
+
+#: ../../localplay.php:79
+msgid "Unknown action requested"
+msgstr ""
+
+#: ../../artists.php:48
 #, fuzzy
-msgid "From genre"
-msgstr "vom Genre"
+msgid "All songs by"
+msgstr "Alle Lieder"
+
+#: ../../artists.php:57 ../../albums.php:106
+msgid "Starting Update from Tags"
+msgstr "Starte Aktuallisierung vom TAG"
 
-#: ../../modules/lib.php:190
+#: ../../artists.php:62 ../../albums.php:111
 #, fuzzy
-msgid "Favor Unplayed"
-msgstr "nicht gespielte vorziehen"
+msgid "Update From Tags Complete"
+msgstr "Aktuallisierung vom Tag vollständig"
 
-#: ../../modules/lib.php:191
+#: ../../artists.php:72 ../../artists.php:76 ../../artists.php:82
+#: ../../artists.php:95
 #, fuzzy
-msgid "Full Albums"
-msgstr "Alle Alben"
+msgid "Show Artists starting with"
+msgstr "(<u>S</u>) Zeige Interpreten mit folgendem Beginn"
 
-#: ../../modules/lib.php:192
+#: ../../amp-mpd.php:176 ../../playlist.php:135
 #, fuzzy
-msgid "Full Artist"
-msgstr "Interpret"
+msgid "New Playlist"
+msgstr "Playlist"
 
-#: ../../modules/lib.php:201
-msgid "from catalog"
-msgstr "vom Katalog"
+#: ../../playlist.php:115
+msgid "owned by"
+msgstr ""
 
-#: ../../modules/lib.php:212
-msgid "Play Random Songs"
-msgstr "Spiele zufällige Lieder"
+#: ../../playlist.php:118
+#, fuzzy
+msgid "Edit Playlist"
+msgstr "Playlist"
 
-#: ../../modules/lib.php:921
-msgid "Public"
-msgstr "öffentliche"
+#: ../../playlist.php:121
+#, fuzzy
+msgid "Play Full Playlist"
+msgstr "Playlist"
 
-#: ../../modules/lib.php:922
-msgid "Your Private"
-msgstr "Deine private"
+#: ../../playlist.php:122
+#, fuzzy
+msgid "Play Random"
+msgstr "Spiele zufällige Lieder"
 
-#: ../../modules/lib.php:923
-msgid "Other Private"
-msgstr "Andere private"
+#: ../../playlist.php:192
+#, fuzzy
+msgid "Playlist updated."
+msgstr "Playlistenname"
 
-#: ../../modules/lib.php:1004 ../../templates/show_songs.inc:168
-#: ../../templates/show_artist.inc:102
-msgid "View"
-msgstr "Anschauen"
+#: ../../index.php:41
+msgid "Welcome to"
+msgstr "Willkommen bei"
 
-#: ../../modules/lib.php:1022 ../../templates/show_songs.inc:110
-#: ../../templates/show_album.inc:61 ../../templates/show_albums.inc:61
-#: ../../templates/show_artist.inc:81
-msgid "Download"
-msgstr "Download"
+#: ../../index.php:43
+msgid "you are currently logged in as"
+msgstr ""
 
-#: ../../modules/lib.php:1033
-msgid "There are no playlists of this type"
-msgstr "Keine Playliste von diesem Typ verhanden"
+#: ../../user.php:45
+msgid "Error: Password Does Not Match or Empty"
+msgstr ""
 
-#: ../../modules/lib.php:1061
-msgid "Create a new playlist"
-msgstr "Neue Playlist erstellen"
+#: ../../user.php:51 ../../user.php:62
+msgid "Error: Insufficient Rights"
+msgstr ""
 
-#: ../../modules/admin.php:45
-#, fuzzy
-msgid "Manage Users"
-msgstr "Den Benutzern mailen"
+#: ../../flag.php:35
+msgid "Flagging song completed."
+msgstr ""
 
-#: ../../modules/admin.php:47
+#: ../../albums.php:44
 #, fuzzy
-msgid "Add a new user"
-msgstr "Rechner hinzufügen"
+msgid "Album Art Cleared"
+msgstr "Album Jahr"
 
-#: ../../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"
+#: ../../albums.php:44
+msgid "Album Art information has been removed form the database"
 msgstr ""
-"Fehler: ICONV nicht gefunden, die ID3V Tags werden nicht korrekt importiert "
-"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
-msgid "Update Catalogs"
-msgstr "Katalog aktualisieren"
 
-#: ../../templates/catalog.inc:68
-msgid "Fast Add"
-msgstr "Schnelles Hinzufügen"
+#: ../../albums.php:78
+msgid "Album Art Located"
+msgstr ""
 
-#: ../../templates/catalog.inc:75
-msgid "Fast Update"
-msgstr "Schnelles Aktualisieren"
+#: ../../albums.php:78
+msgid ""
+"Album Art information has been located in Amazon. If incorrect, click "
+"\"Reset Album Art\" below to remove the artwork."
+msgstr ""
 
-#: ../../templates/catalog.inc:88
-msgid "You don't have any catalogs."
-msgstr "Sie haben keine Kataloge"
+#: ../../albums.php:86 ../../albums.php:96
+msgid "Get Art"
+msgstr ""
 
-#: ../../templates/catalog.inc:97
-msgid "Add a catalog"
-msgstr "Katalog hinzufügen"
+#: ../../albums.php:90
+msgid "Album Art Not Located"
+msgstr ""
 
-#: ../../templates/catalog.inc:98 ../../templates/show_admin_index.inc:36
-#: ../../templates/admin_menu.inc:37
-msgid "Access Lists"
-msgstr "Zugriffsliste"
+#: ../../albums.php:90
+msgid ""
+"Album Art could not be located at this time. This may be due to Amazon being "
+"busy, or the album not being present in their collection."
+msgstr ""
 
-#: ../../templates/catalog.inc:99
-msgid "Show Duplicate Songs"
-msgstr "Doppelte Songs anzeigen"
+#: ../../albums.php:127 ../../albums.php:133 ../../albums.php:140
+#: ../../albums.php:145 ../../albums.php:150
+#, fuzzy
+msgid "Show Albums starting with"
+msgstr "Alle Alben, beginnend mit"
 
-#: ../../templates/catalog.inc:100
-msgid "Show Disabled Songs"
-msgstr "Gesperrte Songs anzeigen"
+#: ../../bin/quarantine_migration.php.inc:49
+msgid "Error: Unable to write to"
+msgstr ""
 
-#: ../../templates/catalog.inc:101
-msgid "Clear Catalog Stats"
-msgstr "Katalogstatistiken löschen"
+#: ../../bin/quarantine_migration.php.inc:56
+msgid "Error: Upload directory not inside a catalog"
+msgstr ""
 
-#: ../../templates/catalog.inc:102
-msgid "Clear Now Playing"
-msgstr "Die aktuelle Songanzeige löschen"
+#: ../../bin/quarantine_migration.php.inc:74
+#, fuzzy
+msgid "Moved"
+msgstr "Demo Modus"
 
-#: ../../templates/catalog.inc:103
+#: ../../bin/quarantine_migration.php.inc:78
 #, fuzzy
-msgid "Dump Album Art"
-msgstr "Cover finden"
+msgid "Adding"
+msgstr "Admin"
 
-#: ../../templates/catalog.inc:104
-msgid "View flagged songs"
-msgstr "Markierte Songs betrachten"
+#: ../../bin/quarantine_migration.php.inc:78
+msgid "to database"
+msgstr ""
 
-#: ../../templates/catalog.inc:105
-msgid "Catalog Tools"
-msgstr "Katalogwerkzeuge"
+#: ../../bin/quarantine_migration.php.inc:86
+msgid "Move Failed"
+msgstr ""
 
-#: ../../templates/flag.inc:43
+#: ../../bin/quarantine_migration.php.inc:97
 #, fuzzy
-msgid "Flag song"
-msgstr "Markieren"
+msgid "Deleted"
+msgstr "Löschen"
 
-#: ../../templates/flag.inc:45
+#: ../../bin/quarantine_migration.php.inc:113
 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 ""
+"\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 "Weiter"
 
-#: ../../templates/flag.inc:73
+#: ../../bin/quarantine_migration.php.inc:151
 #, fuzzy
-msgid "Flag Song"
-msgstr "Alle Lieder"
+msgid "Error:  "
+msgstr "Fehler-Farbe"
+
+#: ../../bin/quarantine_migration.php.inc:152
+msgid "!\n"
+msgstr ""
 
 #: ../../templates/customize_catalog.inc:24
 msgid "Settings for catalog in"
@@ -1199,6 +1288,52 @@ msgstr "Sortiermuster: (Ohne '/' an Anfang oder Ende"
 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"
@@ -1211,15 +1346,23 @@ msgstr ""
 "Sie sind auf dieser Seite gelandet, weil ein Konfigurationsfehler "
 "aufgetreten ist. Debuginformationen erhalten sie unterhalb dieses Textes."
 
-#: ../../templates/show_test.inc:35
+#: ../../templates/show_test.inc:34
+msgid "CHECK"
+msgstr ""
+
+#: ../../templates/show_test.inc:36
 msgid "STATUS"
 msgstr "Status"
 
-#: ../../templates/show_test.inc:39
+#: ../../templates/show_test.inc:38
+msgid "DESCRIPTION"
+msgstr ""
+
+#: ../../templates/show_test.inc:41
 msgid "PHP Version"
 msgstr "PHP Version"
 
-#: ../../templates/show_test.inc:54
+#: ../../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."
@@ -1227,124 +1370,100 @@ msgstr ""
 "Dieser Test überprüft, ob sie eine PHP Version benutzen, mit der Ampache "
 "funktioniert."
 
-#: ../../templates/show_test.inc:58
+#: ../../templates/show_test.inc:60
 msgid "Mysql for PHP"
 msgstr ""
 
-#: ../../templates/show_test.inc:73
+#: ../../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 ""
 
-#: ../../templates/show_test.inc:77
+#: ../../templates/show_test.inc:79
 #, fuzzy
 msgid "PHP Session Support"
 msgstr "PHP Version"
 
-#: ../../templates/show_test.inc:92
+#: ../../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 ""
 
-#: ../../templates/show_test.inc:96
+#: ../../templates/show_test.inc:98
 #, fuzzy
 msgid "PHP ICONV Support"
 msgstr "PHP Version"
 
-#: ../../templates/show_test.inc:110
+#: ../../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 ""
 
-#: ../../templates/show_test.inc:114
-#: ../../templates/show_install_config.inc:88
-msgid "Ampache.cfg Exists"
+#: ../../templates/show_test.inc:116
+#: ../../templates/show_install_config.inc:87
+#, fuzzy
+msgid "Ampache.cfg.php Exists"
 msgstr "Ampache.cfg vorhanden"
 
-#: ../../templates/show_test.inc:129
+#: ../../templates/show_test.inc:131
+#, fuzzy
 msgid ""
-"This attempts to read /config/ampache.cfg If this fails either the ampache."
-"cfg is not in the correct locations or\n"
+"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 ""
 "Hier versuchen wir /config/ampache.cfg zu lesen. Wenn dies fehlschläft ist "
 "die Datei entweder nicht an der richtigen Stelle, oder sie ist nicht lesbar "
 "(Dateirechte?)"
 
-#: ../../templates/show_test.inc:135
-#: ../../templates/show_install_config.inc:105
-msgid "Ampache.cfg Configured?"
+#: ../../templates/show_test.inc:137
+#: ../../templates/show_install_config.inc:104
+#, fuzzy
+msgid "Ampache.cfg.php Configured?"
 msgstr "Ampache.cfg konfiguriert?"
 
-#: ../../templates/show_test.inc:152
+#: ../../templates/show_test.inc:154
+#, fuzzy
 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"
+"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 ""
 "Hier versuchen wir, dass alle erforderlichen Konfigurationsvariablen gesetzt "
 "sind, und dass wir ihre Konfigurationsdatei lesen können."
 
-#: ../../templates/show_test.inc:159
+#: ../../templates/show_test.inc:160
 #, fuzzy
-msgid "Ampache.cfg Up to Date?"
+msgid "Ampache.cfg.php Up to Date?"
 msgstr "Ampache.cfg konfiguriert?"
 
-#: ../../templates/show_test.inc:165
-msgid "DB Connection"
-msgstr "Datenbank Verbindung"
+#: ../../templates/show_test.inc:180
+msgid "Ampache.cfg.php is missing the following:"
+msgstr ""
 
 #: ../../templates/show_test.inc:181
-msgid ""
-"This attempts to connect to your database using the values from your ampache."
-"cfg"
+msgid "Under CONF"
 msgstr ""
-"Hier versuchen wir, uns mit den Werten aus ihrer ampache.cfg zur Datenbank "
-"zu verbinden."
-
-#: ../../templates/show_admin_index.inc:30
-msgid "Admin Section"
-msgstr "Administrator Bereich"
-
-#: ../../templates/show_admin_index.inc:32 ../../templates/admin_menu.inc:33
-msgid "Users"
-msgstr "Benutzer"
-
-#: ../../templates/show_admin_index.inc:32
-msgid "Create/Modify User Accounts for Ampache"
-msgstr "Erstelle/Verändere Ampache-Benutzerkontos"
 
-#: ../../templates/show_admin_index.inc:33
-msgid "Mail"
+#: ../../templates/show_test.inc:185
+msgid "Under LIBGLUE"
 msgstr ""
 
-#: ../../templates/show_admin_index.inc:33
-msgid "Mail your users to notfiy them of changes"
-msgstr "Notiz über Neuerungen den Benutzern mailen"
-
-#: ../../templates/show_admin_index.inc:34
-msgid "Create/Update/Clean your catalog here"
-msgstr "Erstelle/Aktuallisiere/Säubere deinen Katalog hier"
-
-#: ../../templates/show_admin_index.inc:35 ../../templates/admin_menu.inc:36
-msgid "Admin Preferences"
-msgstr "Admineinstellungen"
+#: ../../templates/show_test.inc:196
+msgid "DB Connection"
+msgstr "Datenbank Verbindung"
 
-#: ../../templates/show_admin_index.inc:35
+#: ../../templates/show_test.inc:212
 #, fuzzy
-msgid "Modify Site-wide preferences"
-msgstr "Einstellungen aktualisieren"
-
-#: ../../templates/show_admin_index.inc:36
-msgid "Modify Access List Permissions"
-msgstr "Einstellungen Zugriffsrechteliste"
-
-#: ../../templates/show_admin_index.inc:36
-msgid "Must have access_control=true in ampache.cfg"
-msgstr "access_control muss auf true in der ampache.cfg stehen"
+msgid ""
+"This attempts to connect to your database using the values from your ampache."
+"cfg.php"
+msgstr ""
+"Hier versuchen wir, uns mit den Werten aus ihrer ampache.cfg zur Datenbank "
+"zu verbinden."
 
 #: ../../templates/show_localplay.inc:30
 msgid "Local Play Control"
@@ -1355,22 +1474,22 @@ msgstr ""
 msgid "Playback"
 msgstr "Abspielen"
 
-#: ../../templates/show_localplay.inc:39 ../../templates/list_header.inc:69
-#: ../../templates/show_mpdplay.inc:43
+#: ../../templates/show_localplay.inc:39 ../../templates/list_header.inc:71
+#: ../../templates/show_mpdplay.inc:48
 msgid "Prev"
 msgstr "Vorherige"
 
-#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:44
+#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:49
 msgid "Stop"
 msgstr ""
 
-#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:46
+#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:51
 #, fuzzy
 msgid "Pause"
 msgstr "Wert"
 
-#: ../../templates/show_localplay.inc:43 ../../templates/list_header.inc:92
-#: ../../templates/show_mpdplay.inc:47
+#: ../../templates/show_localplay.inc:43 ../../templates/list_header.inc:94
+#: ../../templates/show_mpdplay.inc:52
 msgid "Next"
 msgstr "Nächste"
 
@@ -1391,11 +1510,6 @@ msgstr ""
 msgid "Clear queue"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:28
-#, fuzzy
-msgid "Add a Catalog"
-msgstr "Katalog hinzufügen"
-
 #: ../../templates/add_catalog.inc:30
 msgid ""
 "In the form below enter either a local path (i.e. /data/music) or the URL to "
@@ -1428,7 +1542,7 @@ msgstr "Kommando zum Setzen der ID3-Tags"
 msgid "Filename Pattern"
 msgstr "Dateinamenmuster"
 
-#: ../../templates/add_catalog.inc:78
+#: ../../templates/add_catalog.inc:78 ../../templates/catalog.inc:104
 msgid "Gather Album Art"
 msgstr "Nach Covern suchen"
 
@@ -1445,11 +1559,21 @@ msgstr "Amazon"
 msgid "File Folder"
 msgstr "MP3 Verzeichnis"
 
-#: ../../templates/add_catalog.inc:98
+#: ../../templates/add_catalog.inc:95
+msgid "Build Playlists from m3u Files"
+msgstr ""
+
+#: ../../templates/add_catalog.inc:102
 #, 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
 msgid "Flag"
 msgstr "Markieren"
@@ -1478,72 +1602,76 @@ msgstr "Account"
 msgid "Reject"
 msgstr "Auswahl"
 
-#: ../../templates/show_songs.inc:33
+#: ../../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/show_songs.inc:114
+#: ../../templates/show_songs.inc:38 ../../templates/show_uploads.inc:40
+msgid "Size"
+msgstr "Größe"
+
+#: ../../templates/show_songs.inc:113
 msgid "Direct Link"
 msgstr ""
 
-#: ../../templates/show_songs.inc:133
+#: ../../templates/show_songs.inc:131
 msgid "Total"
 msgstr "Insgesamt"
 
-#: ../../templates/show_songs.inc:159
-msgid "Set Track Numbers"
-msgstr "Tracknummern setzen"
-
-#: ../../templates/show_songs.inc:160
-msgid "Remove Selected Tracks"
-msgstr "Ausgwählte Lieder entfernen"
-
-#: ../../templates/show_songs.inc:166 ../../templates/show_artist.inc:100
-#, fuzzy
-msgid "Add to"
-msgstr "Katalog hinzufügen"
+#: ../../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 ""
 
-#: ../../templates/show_artists.inc:56 ../../templates/show_albums.inc:59
-msgid "Random"
-msgstr "Zufällig"
+#: ../../templates/show_install_config.inc:49
+#: ../../templates/show_install.inc:50
+msgid "Step 2 - Creating the Ampache.cfg.php file"
+msgstr ""
 
-#: ../../templates/show_install_config.inc:52
+#: ../../templates/show_install_config.inc:51
 msgid ""
 "This steps takes the basic config values, and first attempts to write them "
 "out directly to your webserver. If access is denied it will prompt you to "
 "download the config file. Please put the downloaded config file in /config"
 msgstr ""
 
-#: ../../templates/show_install_config.inc:60
+#: ../../templates/show_install_config.inc:59
 #, fuzzy
 msgid "Web Path"
 msgstr "Pfad"
 
-#: ../../templates/show_install_config.inc:64
-#: ../../templates/show_install.inc:58
+#: ../../templates/show_install_config.inc:63
+#: ../../templates/show_install.inc:57
 msgid "Desired Database Name"
 msgstr ""
 
-#: ../../templates/show_install_config.inc:68
-#: ../../templates/show_install.inc:62
+#: ../../templates/show_install_config.inc:67
+#: ../../templates/show_install.inc:61
 msgid "MySQL Hostname"
 msgstr ""
 
-#: ../../templates/show_install_config.inc:72
+#: ../../templates/show_install_config.inc:71
 #, fuzzy
 msgid "MySQL Username"
 msgstr "Benutzer"
 
-#: ../../templates/show_install_config.inc:76
+#: ../../templates/show_install_config.inc:75
 #, fuzzy
 msgid "MySQL Password"
 msgstr "Passwort"
 
-#: ../../templates/show_install_config.inc:81
+#: ../../templates/show_install_config.inc:80
 msgid "Write Config"
 msgstr ""
 
-#: ../../templates/show_install_config.inc:125
+#: ../../templates/show_install_config.inc:124
 msgid "Check for Config"
 msgstr ""
 
@@ -1596,11 +1724,11 @@ msgstr "Typ"
 msgid "Apply to All"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:58
+#: ../../templates/show_preferences.inc:83
 msgid "Update Preferences"
 msgstr "Einstellungen aktualisieren"
 
-#: ../../templates/show_preferences.inc:62
+#: ../../templates/show_preferences.inc:87
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -1613,43 +1741,59 @@ msgstr "Rechner hinzufügen"
 msgid "Editing existing User"
 msgstr ""
 
-#: ../../templates/userform.inc:81
+#: ../../templates/userform.inc:80
 msgid "User Access Level"
 msgstr ""
 
-#: ../../templates/userform.inc:98
+#: ../../templates/userform.inc:96
 #, fuzzy
 msgid "Add User"
 msgstr "Rechner hinzufügen"
 
-#: ../../templates/userform.inc:103
+#: ../../templates/userform.inc:101
 #, fuzzy
 msgid "Update User"
 msgstr "Einstellungen aktualisieren"
 
-#: ../../templates/show_install.inc:40
-msgid "Your webserver configured so that <ampache_root>/docs is your webroot"
-msgstr ""
-
-#: ../../templates/show_install.inc:49
+#: ../../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 ""
 
-#: ../../templates/show_install.inc:66
+#: ../../templates/show_install.inc:65
 msgid "MySQL Administrative Username"
 msgstr ""
 
-#: ../../templates/show_install.inc:70
+#: ../../templates/show_install.inc:69
 msgid "MySQL Administrative Password"
 msgstr ""
 
-#: ../../templates/show_install.inc:75
+#: ../../templates/show_install.inc:74
 msgid "Insert 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."
+msgstr ""
+
+#: ../../templates/flag.inc:62
+msgid "Reason to flag"
+msgstr ""
+
+#: ../../templates/flag.inc:73
+#, fuzzy
+msgid "Flag Song"
+msgstr "Alle Lieder"
+
 #: ../../templates/show_add_access.inc:31
 msgid "Add Access for a Host"
 msgstr "Zugang für einen Rechner einrichten"
@@ -1679,90 +1823,125 @@ msgstr "Level"
 msgid "Add Host"
 msgstr "Rechner hinzufügen"
 
-#: ../../templates/admin_menu.inc:34
-msgid "Mail Users"
-msgstr "Den Benutzern mailen"
-
-#: ../../templates/show_upload.inc:27
-msgid "Please Ensure All Files Are Tagged Correctly"
-msgstr ""
-
-#: ../../templates/show_upload.inc:30
+#: ../../templates/catalog.inc:33
 msgid ""
-"Ampache relies on id3 tags to sort data.  If your file is not tagged it may "
-"be deleted."
+"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 ""
+"Fehler: ICONV nicht gefunden, die ID3V Tags werden nicht korrekt importiert "
+"werden. Besuchen sie die <a href=\"http://php.oregonstate.edu/iconv\">Iconv-"
+"Seite</a> um an Informationen zu ICONV zu gelangen."
 
-#: ../../templates/show_upload.inc:34
-msgid "max_upload_size"
-msgstr ""
+#: ../../templates/catalog.inc:42
+msgid "Update Catalogs"
+msgstr "Katalog aktualisieren"
 
-#: ../../templates/show_upload.inc:59 ../../templates/menu.inc:39
-msgid "Upload"
-msgstr "Upload"
+#: ../../templates/catalog.inc:68
+msgid "Fast Add"
+msgstr "Schnelles Hinzufügen"
 
-#: ../../templates/show_users.inc:42
-#, fuzzy
-msgid "Fullname"
-msgstr "Playlistenname"
+#: ../../templates/catalog.inc:75
+msgid "Fast Update"
+msgstr "Schnelles Aktualisieren"
 
-#: ../../templates/show_users.inc:47
-msgid "Last Seen"
-msgstr ""
+#: ../../templates/catalog.inc:88
+msgid "You don't have any catalogs."
+msgstr "Sie haben keine Kataloge"
 
-#: ../../templates/show_users.inc:54
-#, fuzzy
-msgid "Prefs"
-msgstr "Vorherige"
+#: ../../templates/catalog.inc:99
+msgid "Show Duplicate Songs"
+msgstr "Doppelte Songs anzeigen"
 
-#: ../../templates/show_users.inc:60
-#, fuzzy
-msgid "Set Access"
-msgstr "Start Adresse"
+#: ../../templates/catalog.inc:100
+msgid "Show Disabled Songs"
+msgstr "Gesperrte Songs anzeigen"
 
-#: ../../templates/show_users.inc:66
-msgid "On-line"
-msgstr ""
+#: ../../templates/catalog.inc:101
+msgid "Clear Catalog Stats"
+msgstr "Katalogstatistiken löschen"
 
-#: ../../templates/show_users.inc:88
+#: ../../templates/catalog.inc:103
 #, fuzzy
-msgid "edit"
-msgstr "Editieren"
+msgid "Dump Album Art"
+msgstr "Cover finden"
+
+#: ../../templates/catalog.inc:105
+msgid "View flagged songs"
+msgstr "Markierte Songs betrachten"
+
+#: ../../templates/catalog.inc:106
+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/show_users.inc:93
+#: ../../templates/menu.inc:32
 #, fuzzy
-msgid "prefs"
+msgid "Local Play"
+msgstr "Lokal"
+
+#: ../../templates/menu.inc:38
+msgid "Playlists"
+msgstr "Playlists"
+
+#: ../../templates/menu.inc:40
+msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../../templates/show_users.inc:98
-#, fuzzy
-msgid "delete"
-msgstr "Löschen"
+#: ../../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/show_users.inc:104 ../../templates/show_users.inc:113
-#: ../../templates/show_users.inc:116
-msgid "set to user"
+#: ../../templates/menu.inc:73 ../../templates/menu.inc:79
+msgid "Account"
+msgstr "Account"
+
+#: ../../templates/menu.inc:74 ../../templates/menu.inc:80
+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 ""
 
-#: ../../templates/show_users.inc:105 ../../templates/show_users.inc:109
-#: ../../templates/show_users.inc:117
-msgid "disable"
+#: ../../templates/show_upload.inc:32
+msgid "The following Audio file formats are supported"
 msgstr ""
 
-#: ../../templates/show_users.inc:108 ../../templates/show_users.inc:112
-msgid "set to admin"
+#: ../../templates/show_upload.inc:72
+msgid "max_upload_size"
 msgstr ""
 
-#: ../../templates/show_now_playing.inc:34 ../../templates/show_mpdplay.inc:68
+#: ../../templates/show_now_playing.inc:31
 msgid "Now Playing"
 msgstr "Aktuell wird gespielt"
 
-#: ../../templates/show_login_form.inc:40
-#: ../../templates/show_login_form.inc:54
+#: ../../templates/show_login_form.inc:49
+#: ../../templates/show_login_form.inc:63
 msgid "Login"
 msgstr "Benutzer"
 
-#: ../../templates/show_login_form.inc:50
+#: ../../templates/show_login_form.inc:59
 msgid "Remember Me"
 msgstr ""
 
@@ -1786,135 +1965,245 @@ msgstr "End Adresse"
 msgid "Revoke"
 msgstr "Zurückziehen"
 
-#: ../../templates/menu.inc:31
-msgid "Home"
-msgstr "Home"
-
-#: ../../templates/menu.inc:34
-msgid "Playlists"
-msgstr "Playlists"
-
-#: ../../templates/menu.inc:35 ../../templates/show_search.inc:38
-#: ../../templates/show_search.inc:84
-msgid "Search"
-msgstr "Suchen"
+#: ../../templates/show_users.inc:43
+#, fuzzy
+msgid "Fullname"
+msgstr "Playlistenname"
 
-#: ../../templates/menu.inc:36
-msgid "Preferences"
-msgstr "Einstellungen"
+#: ../../templates/show_users.inc:48
+msgid "Last Seen"
+msgstr ""
 
-#: ../../templates/menu.inc:57 ../../templates/menu.inc:60
-msgid "Admin"
-msgstr "Admin"
+#: ../../templates/show_users.inc:55 ../../templates/show_users.inc:91
+#, fuzzy
+msgid "Prefs"
+msgstr "Vorherige"
 
-#: ../../templates/menu.inc:69 ../../templates/menu.inc:76
-msgid "Account"
-msgstr "Account"
+#: ../../templates/show_users.inc:58
+#, fuzzy
+msgid "Access"
+msgstr "Start Adresse"
 
-#: ../../templates/menu.inc:70 ../../templates/menu.inc:77
-msgid "Stats"
-msgstr "Statistiken"
+#: ../../templates/show_users.inc:64
+msgid "On-line"
+msgstr ""
 
-#: ../../templates/menu.inc:71 ../../templates/menu.inc:78
-#: ../../templates/menu.inc:83
-msgid "Logout"
-msgstr "Ausloggen"
+#: ../../templates/show_users.inc:105
+#, fuzzy
+msgid "delete"
+msgstr "Löschen"
 
-#: ../../templates/show_search.inc:35
+#: ../../templates/show_search.inc:34 ../../templates/show_search_bar.inc:36
 msgid "Search Ampache"
 msgstr "In Ampache suchen"
 
-#: ../../templates/show_search.inc:42
+#: ../../templates/show_search.inc:41
 msgid "Object Type"
 msgstr "Objektart"
 
-#: ../../templates/show_search.inc:75
-msgid "Search Type"
-msgstr "Suchart"
+#: ../../templates/show_artist.inc:31
+msgid "Albums by"
+msgstr "Alben von"
+
+#: ../../templates/show_artist.inc:33
+msgid "Show All Songs By"
+msgstr "Zeige alle Lieder von"
+
+#: ../../templates/show_artist.inc:34
+msgid "Play All Songs By"
+msgstr "Spiele alle Lieder von"
+
+#: ../../templates/show_artist.inc:35
+msgid "Play Random Songs By"
+msgstr "Spiele Zufallsauswahl von"
+
+#: ../../templates/show_artist.inc:49
+msgid "Select"
+msgstr "Auswahl"
+
+#: ../../templates/show_artist.inc:51
+msgid "Cover"
+msgstr "Cover"
+
+#: ../../templates/show_artist.inc:52
+msgid "Album Name"
+msgstr "Album Name"
+
+#: ../../templates/show_artist.inc:53
+msgid "Album Year"
+msgstr "Album Jahr"
 
-#: ../../templates/show_mpdplay.inc:33
+#: ../../templates/show_artist.inc:54
+msgid "Total Tracks"
+msgstr "Anzahl Stücke"
+
+#: ../../templates/show_mpdplay.inc:38
 msgid "MPD Play Control"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:52
+#: ../../templates/show_mpdplay.inc:71
 #, fuzzy
 msgid "Loop"
 msgstr "Ausloggen"
 
-#: ../../templates/show_mpdplay.inc:54
-msgid "Loop is off"
+#: ../../templates/show_mpdplay.inc:78 ../../templates/show_mpdplay.inc:91
+msgid "On"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:55
-msgid "Loop is on"
+#: ../../templates/show_mpdplay.inc:79 ../../templates/show_mpdplay.inc:92
+msgid "Off"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:81
-msgid "Refresh the Playlist Window"
+#: ../../templates/show_mpdplay.inc:114
+#, fuzzy
+msgid "Now Playing :"
+msgstr "Aktuell wird gespielt"
+
+#: ../../templates/show_mpdplay.inc:138
+msgid "On Deck "
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:81
-msgid "refresh now"
+#: ../../templates/show_mpdplay.inc:138
+msgid "(in "
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:89
+#: ../../templates/show_mpdpl.inc:45
 #, fuzzy
-msgid "Server Playlist"
+msgid "MPD Server Playlist"
 msgstr "Playlist"
 
-#: ../../templates/show_mpdplay.inc:122
+#: ../../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:189
 msgid "Click to shuffle (randomize) the playlist"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:122
+#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:189
 msgid "shuffle"
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:123
+#: ../../templates/show_mpdpl.inc:49 ../../templates/show_mpdpl.inc:190
 #, fuzzy
-msgid "Click the clear the playlist"
+msgid "Click to the clear the playlist"
 msgstr "Neue Playlist erstellen"
 
-#: ../../templates/show_mpdplay.inc:123
+#: ../../templates/show_mpdpl.inc:53 ../../templates/show_mpdpl.inc:194
+msgid "Click to the remove all except the Now Playing"
+msgstr ""
+
+#: ../../templates/show_uploads.inc:33
 #, fuzzy
-msgid "clear"
-msgstr "Jahr"
+msgid "Status"
+msgstr "Statistiken"
 
-#: ../../templates/show_artist.inc:31
-msgid "Albums by"
-msgstr "Alben von"
+#: ../../templates/show_uploads.inc:42
+#, fuzzy
+msgid "User"
+msgstr "Benutzer"
 
-#: ../../templates/show_artist.inc:33
-msgid "Show All Songs By"
-msgstr "Zeige alle Lieder von"
+#: ../../templates/show_uploads.inc:43
+#, fuzzy
+msgid "Date"
+msgstr "Entfernt"
 
-#: ../../templates/show_artist.inc:34
-msgid "Play All Songs By"
-msgstr "Spiele alle Lieder von"
+#: ../../templates/show_uploads.inc:49
+#, fuzzy
+msgid "Add"
+msgstr "Katalog hinzufügen"
 
-#: ../../templates/show_artist.inc:35
-msgid "Play Random Songs By"
-msgstr "Spiele Zufallsauswahl von"
+#: ../../templates/show_random_play.inc:28
+msgid "Play Random Selection"
+msgstr "Spiele Zufallsauswahl"
 
-#: ../../templates/show_artist.inc:50
-msgid "Select"
-msgstr "Auswahl"
+#: ../../templates/show_random_play.inc:34
+#, fuzzy
+msgid "Item count"
+msgstr "Liederanzahl"
 
-#: ../../templates/show_artist.inc:52
-msgid "Cover"
-msgstr "Cover"
+#: ../../templates/show_random_play.inc:49
+#, fuzzy
+msgid "From genre"
+msgstr "vom Genre"
 
-#: ../../templates/show_artist.inc:53
-msgid "Album Name"
-msgstr "Album Name"
+#: ../../templates/show_random_play.inc:58
+msgid "Standard"
+msgstr ""
 
-#: ../../templates/show_artist.inc:54
-msgid "Album Year"
-msgstr "Album Jahr"
+#: ../../templates/show_random_play.inc:59
+#, fuzzy
+msgid "Favor Unplayed"
+msgstr "nicht gespielte vorziehen"
 
-#: ../../templates/show_artist.inc:55
-msgid "Total Tracks"
-msgstr "Anzahl Stücke"
+#: ../../templates/show_random_play.inc:60
+#, fuzzy
+msgid "Full Albums"
+msgstr "Alle Alben"
+
+#: ../../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"
+
+#~ msgid "All Albums"
+#~ msgstr "Alle Alben"
+
+#~ msgid "<u>S</u>how all albums"
+#~ msgstr "(<u>S</u>) Zeige alle Alben"
+
+#~ msgid "<u>S</u>how only albums starting with"
+#~ msgstr "(<u>S</u>) Zeige alle Alben mit folgendem Beginn"
+
+#~ msgid "Select a starting letter or Show all"
+#~ msgstr "Wähle einen Anfangsbuchstaben oder 'Zeige Alle'"
+
+#, fuzzy
+#~ msgid "Quarantined"
+#~ msgstr "Quarantine"
+
+#, fuzzy
+#~ msgid "View Limit"
+#~ msgstr "Speicherbegrenzung"
+
+#~ msgid "Create/Modify User Accounts for Ampache"
+#~ msgstr "Erstelle/Verändere Ampache-Benutzerkontos"
+
+#~ msgid "Mail your users to notfiy them of changes"
+#~ msgstr "Notiz über Neuerungen den Benutzern mailen"
+
+#~ msgid "Create/Update/Clean your catalog here"
+#~ msgstr "Erstelle/Aktuallisiere/Säubere deinen Katalog hier"
+
+#, fuzzy
+#~ msgid "Modify Site-wide preferences"
+#~ msgstr "Einstellungen aktualisieren"
+
+#~ msgid "Modify Access List Permissions"
+#~ msgstr "Einstellungen Zugriffsrechteliste"
+
+#~ msgid "Must have access_control=true in ampache.cfg"
+#~ msgstr "access_control muss auf true in der ampache.cfg stehen"
+
+#, fuzzy
+#~ msgid "edit"
+#~ msgstr "Editieren"
+
+#, fuzzy
+#~ msgid "prefs"
+#~ msgstr "Einstellungen"
+
+#, fuzzy
+#~ msgid "clear"
+#~ msgstr "Jahr"
 
 #~ msgid "In the form below enter either a local path entry (i.e. /data/music)"
 #~ msgstr "Hier bitte den Pfad zur Musik angeben (z.B. /daten/musik)"
@@ -1929,9 +2218,6 @@ msgstr "Anzahl Stücke"
 #~ msgstr ""
 #~ "Entschuldigung, sie haben keinen Zugriff auf diesen Teil des Servers."
 
-#~ msgid "All Albums starting with"
-#~ msgstr "Alle Alben, beginnend mit"
-
 #~ msgid "Actions"
 #~ msgstr "Aktionen"
 
@@ -1941,9 +2227,6 @@ msgstr "Anzahl Stücke"
 #~ msgid "No Disabled songs found"
 #~ msgstr "Keine 'abgeschalteten' Lieder gefunden"
 
-#~ msgid "Play Type"
-#~ msgstr "Abspielart"
-
 #~ msgid "Popular Threshold"
 #~ msgstr "Weiter"
 
@@ -1992,9 +2275,6 @@ msgstr "Anzahl Stücke"
 #~ msgid "Album Cache Limit"
 #~ msgstr "Album Cache Begrenzung"
 
-#~ msgid "Artist Cache Limit"
-#~ msgstr "Interpret Cache Begrenzung"
-
 #~ msgid "Catalog Echo Count"
 #~ msgstr "Catalog Echo Count"
 
diff --git a/locale/nl_NL/LC_MESSAGES/messages.po b/locale/nl_NL/LC_MESSAGES/messages.po
index 67b8086f..7c79450d 100644
--- a/locale/nl_NL/LC_MESSAGES/messages.po
+++ b/locale/nl_NL/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-21 19:58-0700\n"
+"POT-Creation-Date: 2005-08-14 16:23-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Ruud Schilders <ruudboy@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,74 +16,91 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../play/index.php:46
+#: ../../play/index.php:50
 msgid "Session Expired: please log in again at"
 msgstr "Sessie Verlopen: Log a.u.b. nogmaals in"
 
-#: ../../lib/preferences.php:210 ../../templates/show_users.inc:97
+#: ../../lib/preferences.php:211 ../../templates/show_users.inc:97
 msgid "Enable"
 msgstr "Geaktiveerd"
 
-#: ../../lib/preferences.php:211 ../../templates/show_users.inc:100
+#: ../../lib/preferences.php:212 ../../templates/show_users.inc:100
 msgid "Disable"
 msgstr "Ge-deaktiveerd"
 
-#: ../../lib/preferences.php:223 ../../templates/add_catalog.inc:60
+#: ../../lib/preferences.php:224 ../../templates/add_catalog.inc:60
 msgid "Local"
 msgstr "Lokaal"
 
-#: ../../lib/preferences.php:226
+#: ../../lib/preferences.php:227
 msgid "Stream"
 msgstr ""
 
-#: ../../lib/preferences.php:229
+#: ../../lib/preferences.php:230
 msgid "IceCast"
 msgstr ""
 
-#: ../../lib/preferences.php:232
+#: ../../lib/preferences.php:233
 msgid "Downsample"
 msgstr ""
 
-#: ../../lib/preferences.php:235
+#: ../../lib/preferences.php:236
 msgid "Music Player Daemon"
 msgstr ""
 
-#: ../../lib/preferences.php:238
+#: ../../lib/preferences.php:239
 msgid "SlimServer"
 msgstr ""
 
-#: ../../lib/preferences.php:247
+#: ../../lib/preferences.php:248
 msgid "M3U"
 msgstr ""
 
-#: ../../lib/preferences.php:248
+#: ../../lib/preferences.php:249
 msgid "Simple M3U"
 msgstr "Eenvoudige M3U"
 
-#: ../../lib/preferences.php:249
+#: ../../lib/preferences.php:250
 msgid "PLS"
 msgstr ""
 
-#: ../../lib/preferences.php:250
+#: ../../lib/preferences.php:251
 msgid "Asx"
 msgstr ""
 
-#: ../../lib/preferences.php:257
+#: ../../lib/preferences.php:258
 msgid "English"
 msgstr "Engels"
 
-#: ../../lib/preferences.php:258
+#: ../../lib/preferences.php:259
+#, fuzzy
+msgid "British English"
+msgstr "Engels"
+
+#: ../../lib/preferences.php:260
 msgid "German"
 msgstr "Duits"
 
-#: ../../lib/preferences.php:259
+#: ../../lib/preferences.php:261
 msgid "French"
 msgstr "Frans"
 
-#: ../../lib/preferences.php:260
+#: ../../lib/preferences.php:262
 msgid "Turkish"
 msgstr "Turks"
 
+#: ../../lib/preferences.php:263
+msgid "Spanish"
+msgstr ""
+
+#: ../../lib/preferences.php:264
+msgid "Norwegian"
+msgstr ""
+
+#: ../../lib/preferences.php:265
+msgid "Simplified Chinese"
+msgstr ""
+
 #: ../../lib/duplicates.php:80
 msgid "Find Duplicates"
 msgstr "Zoek dubbele"
@@ -92,7 +109,7 @@ msgstr "Zoek dubbele"
 msgid "Search Type"
 msgstr "Zoek Type"
 
-#: ../../lib/duplicates.php:91 ../../modules/class/song.php:253
+#: ../../lib/duplicates.php:91 ../../lib/class/song.class.php:275
 msgid "Title"
 msgstr "Titel"
 
@@ -104,491 +121,485 @@ msgstr "Artiest en Titel"
 msgid "Artist, Album and Title"
 msgstr "Artiest, Album en Titel"
 
-#: ../../lib/duplicates.php:110 ../../templates/menu.inc:38
+#: ../../lib/duplicates.php:110 ../../templates/menu.inc:39
 #: ../../templates/show_search.inc:37 ../../templates/show_search.inc:83
+#: ../../templates/show_search_bar.inc:71
 msgid "Search"
 msgstr "Zoeken"
 
+#: ../../lib/general.lib.php:640
+msgid "Not Enough Data"
+msgstr ""
+
 #: ../../lib/search.php:52 ../../lib/search.php:68 ../../lib/search.php:84
 #: ../../lib/search.php:100 ../../lib/search.php:116 ../../lib/search.php:133
 #: ../../lib/search.php:145 ../../lib/search.php:161 ../../lib/search.php:177
 msgid "No Results Found"
 msgstr "Geen Resultaten Gevonden"
 
-#: ../../lib/ui.php:180
-msgid "Playlist Actions"
-msgstr "Speellijst Akties"
+#: ../../lib/class/genre.class.php:278
+#, fuzzy
+msgid "Show Genres starting with"
+msgstr "<u>T</u>oon artiesten beginnend met"
 
-#: ../../lib/ui.php:180
-msgid "New"
-msgstr "Nieuw"
+#: ../../lib/class/album.class.php:126
+msgid "Various"
+msgstr "Diverse"
 
-#: ../../lib/ui.php:181
-msgid "View All"
-msgstr "Bekijk Alles"
+#: ../../lib/class/album.class.php:241 ../../lib/class/catalog.class.php:275
+#: ../../lib/class/catalog.class.php:560
+msgid "Error: Unable to open"
+msgstr "Fout: Kon niet openen"
 
-#: ../../lib/ui.php:182
-msgid "Import"
-msgstr "Importeren"
+#: ../../lib/class/song.class.php:275 ../../lib/class/song.class.php:279
+#: ../../lib/class/song.class.php:283 ../../lib/class/song.class.php:287
+#: ../../lib/class/song.class.php:291 ../../lib/class/song.class.php:295
+#: ../../lib/class/song.class.php:299 ../../lib/class/song.class.php:304
+#: ../../lib/class/song.class.php:309 ../../lib/class/song.class.php:313
+#: ../../lib/class/song.class.php:317 ../../lib/class/song.class.php:322
+msgid "updated to"
+msgstr "bijgewerkt tot"
 
-#: ../../lib/ui.php:282
-msgid "Browse"
-msgstr "Bladeren"
+#: ../../lib/class/song.class.php:279 ../../templates/show_songs.inc:39
+#: ../../templates/show_uploads.inc:39
+msgid "Bitrate"
+msgstr "Bitratio"
 
-#: ../../lib/ui.php:284
-msgid "Show w/o art"
-msgstr "Toon zonder hoesje"
+#: ../../lib/class/song.class.php:283
+msgid "Rate"
+msgstr "Ratio"
 
-#: ../../lib/ui.php:287
-msgid "Show all"
-msgstr "Toon alles"
+#: ../../lib/class/song.class.php:287
+msgid "Mode"
+msgstr ""
 
-#: ../../lib/ui.php:393
-msgid "No songs in this playlist."
-msgstr "Geen liedjes in deze speellijst."
+#: ../../lib/class/song.class.php:291 ../../templates/show_songs.inc:37
+#: ../../templates/show_mpdpl.inc:66 ../../templates/show_uploads.inc:38
+msgid "Time"
+msgstr "Tijd"
 
-#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
-#: ../../modules/class/catalog.php:902
-msgid "Error"
-msgstr "Fout"
+#: ../../lib/class/song.class.php:295 ../../templates/show_songs.inc:32
+#: ../../templates/show_songs.inc:36 ../../templates/show_mpdpl.inc:65
+msgid "Track"
+msgstr "Nummer"
 
-#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
-msgid "Could not add"
-msgstr "Kon niet toevoegen"
+#: ../../lib/class/song.class.php:299
+msgid "Filesize"
+msgstr "Bestandsgrootte"
 
-#: ../../lib/Browser.php:867
-msgid "file"
-msgstr "bestand"
+#: ../../lib/class/song.class.php:304 ../../templates/show_artists.inc:39
+#: ../../templates/show_artists.inc:62 ../../templates/show_songs.inc:34
+#: ../../templates/show_albums.inc:40 ../../templates/show_albums.inc:70
+#: ../../templates/show_mpdpl.inc:63 ../../templates/show_uploads.inc:35
+msgid "Artist"
+msgstr "Artiest"
 
-#: ../../lib/Browser.php:871
-msgid "File uploads not supported."
-msgstr "Bestanden uploaden niet ondersteund."
+#: ../../lib/class/song.class.php:309 ../../templates/show_songs.inc:35
+#: ../../templates/show_albums.inc:38 ../../templates/show_albums.inc:68
+#: ../../templates/show_mpdpl.inc:64 ../../templates/show_uploads.inc:36
+msgid "Album"
+msgstr ""
 
-#: ../../lib/Browser.php:889
-msgid "No file uploaded"
-msgstr "Geen bestand ge-upload."
+#: ../../lib/class/song.class.php:313 ../../templates/show_albums.inc:43
+#: ../../templates/show_albums.inc:73
+msgid "Year"
+msgstr "Jaar"
 
-#: ../../lib/Browser.php:896
-#, php-format
-msgid "There was a problem with the file upload: No %s was uploaded."
-msgstr "Er was een probleem met de bestands-upload: Geen %s was ge-upload."
+#: ../../lib/class/song.class.php:317 ../../templates/list_flagged.inc:46
+#: ../../templates/flag.inc:66
+msgid "Comment"
+msgstr "Commentaar"
 
-#: ../../lib/Browser.php:901
-#, php-format
-msgid ""
-"There was a problem with the file upload: The %s was larger than the maximum "
-"allowed size (%d bytes)."
+#: ../../lib/class/song.class.php:322 ../../templates/show_genres.inc.php:36
+#: ../../templates/show_genre.inc.php:32 ../../templates/show_songs.inc:40
+#: ../../templates/show_browse_menu.inc:37 ../../templates/show_mpdpl.inc:67
+#: ../../templates/show_uploads.inc:37
+msgid "Genre"
 msgstr ""
-"Er was een probleem met de bestands-upload: De %s was groter dan de maximum "
-"toegestane grootte (%d bytes)."
 
-#: ../../lib/Browser.php:903
-#, php-format
-msgid ""
-"There was a problem with the file upload: The %s was only partially uploaded."
-msgstr ""
-"Er was een probleem met de bestands-upload: De %s was slechts gedeeltelijk ge-upload."
+#: ../../lib/class/stream.class.php:198
+#, fuzzy
+msgid "Opened for writing"
+msgstr "Geopend om te schrijven"
 
-#: ../../modules/class/catalog.php:267 ../../modules/class/catalog.php:552
-#: ../../modules/class/album.php:241
-msgid "Error: Unable to open"
-msgstr "Fout: Kon niet openen"
+#: ../../lib/class/stream.class.php:203
+msgid "Error, cannot write"
+msgstr "Fout, kan niet schrijven"
 
-#: ../../modules/class/catalog.php:290
+#: ../../lib/class/stream.class.php:214
+msgid "Error, cannot write song in file"
+msgstr "Fout, kan liedje niet in bestand wegschrijven"
+
+#: ../../lib/class/stream.class.php:220
+msgid "Closed after write"
+msgstr "Gesloten na schrijven"
+
+#: ../../lib/class/catalog.class.php:298
 msgid "Error: Unable to change to directory"
 msgstr "Fout: Kon niet van directory veranderen"
 
-#: ../../modules/class/catalog.php:313
+#: ../../lib/class/catalog.class.php:321
 msgid "Error: Unable to get filesize for"
 msgstr "Fout: Kon bestandsgrootte niet achterhalen voor"
 
-#: ../../modules/class/catalog.php:332
+#: ../../lib/class/catalog.class.php:340
 msgid "Added Playlist From"
 msgstr "Speellijst Toegevoegd Van"
 
-#: ../../modules/class/catalog.php:351
+#: ../../lib/class/catalog.class.php:359
 msgid "Added"
 msgstr "Toegevoegd"
 
-#: ../../modules/class/catalog.php:363
+#: ../../lib/class/catalog.class.php:371
 msgid "is not readable by ampache"
 msgstr "kan niet worden gelezen door ampache"
 
-#: ../../modules/class/catalog.php:427
+#: ../../lib/class/catalog.class.php:435
 msgid "Found in ID3"
 msgstr "Gevonden in ID3"
 
-#: ../../modules/class/catalog.php:431
+#: ../../lib/class/catalog.class.php:439
 msgid "Found on Amazon"
 msgstr "Gevonden op Amazon"
 
-#: ../../modules/class/catalog.php:435
+#: ../../lib/class/catalog.class.php:443
 msgid "Found in Folder"
 msgstr "Gevonden in Map"
 
-#: ../../modules/class/catalog.php:439
+#: ../../lib/class/catalog.class.php:447
 msgid "Found"
 msgstr "Gevonden"
 
-#: ../../modules/class/catalog.php:442
+#: ../../lib/class/catalog.class.php:450
 msgid "Not Found"
 msgstr "Niet Gevonden"
 
-#: ../../modules/class/catalog.php:450
+#: ../../lib/class/catalog.class.php:458
 msgid "Searched"
 msgstr "Gezocht"
 
-#: ../../modules/class/catalog.php:605
+#: ../../lib/class/catalog.class.php:613
 msgid "Starting Dump Album Art"
 msgstr "Start Dumpen Album Hoesjes"
 
-#: ../../modules/class/catalog.php:625
+#: ../../lib/class/catalog.class.php:633
 msgid "Written"
 msgstr "Geschreven"
 
-#: ../../modules/class/catalog.php:634
+#: ../../lib/class/catalog.class.php:642
 msgid "Error unable to open file for writting"
 msgstr "Fout kon bestand niet openen voor schrijven"
 
-#: ../../modules/class/catalog.php:641
+#: ../../lib/class/catalog.class.php:649
 msgid "Album Art Dump Complete"
 msgstr "Album Hoesjes Dump Compleet"
 
-#: ../../modules/class/catalog.php:642 ../../artists.php:62
-#: ../../albums.php:111
+#: ../../lib/class/catalog.class.php:650 ../../artists.php:63
+#: ../../albums.php:112
 msgid "Return"
 msgstr "Terug"
 
-#: ../../modules/class/catalog.php:708
+#: ../../lib/class/catalog.class.php:719
 msgid "Starting Catalog Build"
 msgstr "Start Catalogus Opbouwen"
 
-#: ../../modules/class/catalog.php:713
+#: ../../lib/class/catalog.class.php:724
 msgid "Running Remote Sync"
 msgstr "Draait Synchronisatie Op Afstand"
 
-#: ../../modules/class/catalog.php:723 ../../modules/class/catalog.php:869
-#: ../../admin/catalog.php:251
+#: ../../lib/class/catalog.class.php:734 ../../lib/class/catalog.class.php:880
+#: ../../admin/catalog.php:264
 msgid "Starting Album Art Search"
 msgstr "Start Zoeken van Album Hoesjes"
 
-#: ../../modules/class/catalog.php:733
+#: ../../lib/class/catalog.class.php:744
 msgid "Catalog Finished"
 msgstr "Catalogus Klaar"
 
-#: ../../modules/class/catalog.php:733 ../../modules/class/catalog.php:888
+#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:899
 msgid "Total Time"
 msgstr "Totale Tijdsduur"
 
-#: ../../modules/class/catalog.php:733 ../../modules/class/catalog.php:889
+#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:900
 msgid "Total Songs"
 msgstr "Totaal Liedjes"
 
-#: ../../modules/class/catalog.php:734 ../../modules/class/catalog.php:889
+#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:900
 msgid "Songs Per Seconds"
 msgstr "Liedjes Per Seconde"
 
-#: ../../modules/class/catalog.php:768 ../../modules/class/catalog.php:1379
+#: ../../lib/class/catalog.class.php:779
+#: ../../lib/class/catalog.class.php:1476
 msgid "Updated"
 msgstr "Bijgewerkt"
 
-#: ../../modules/class/catalog.php:775
+#: ../../lib/class/catalog.class.php:786
 msgid "No Update Needed"
 msgstr "Bijwerken Niet Nodig"
 
-#: ../../modules/class/catalog.php:849
+#: ../../lib/class/catalog.class.php:860
 msgid "Starting New Song Search on"
 msgstr "Start Nieuwe Liedjes Zoekopdracht op"
 
-#: ../../modules/class/catalog.php:849
+#: ../../lib/class/catalog.class.php:860
 msgid "catalog"
 msgstr "catalogus"
 
-#: ../../modules/class/catalog.php:853
+#: ../../lib/class/catalog.class.php:864
 msgid "Running Remote Update"
 msgstr "Werkt Bij Op Afstand"
 
-#: ../../modules/class/catalog.php:888
+#: ../../lib/class/catalog.class.php:899
 msgid "Catalog Update Finished"
 msgstr "Catalogus Bijwerken Klaar"
 
-#: ../../modules/class/catalog.php:902
+#: ../../lib/class/catalog.class.php:919 ../../lib/mpd.php:40
+#: ../../lib/mpd.php:49
+msgid "Error"
+msgstr "Fout"
+
+#: ../../lib/class/catalog.class.php:919
 msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
-msgstr "Kon XMLRPB bibliotheek niet laden, controleer of XML-RPC geaktiveerd is"
+msgstr ""
+"Kon XMLRPB bibliotheek niet laden, controleer of XML-RPC geaktiveerd is"
 
-#: ../../modules/class/catalog.php:934 ../../modules/class/catalog.php:949
+#: ../../lib/class/catalog.class.php:958
+#: ../../lib/class/catalog.class.php:1009
 msgid "Error connecting to"
 msgstr "Fout met verbinden naar"
 
-#: ../../modules/class/catalog.php:934 ../../modules/class/catalog.php:949
+#: ../../lib/class/catalog.class.php:958
+#: ../../lib/class/catalog.class.php:1009
 msgid "Code"
 msgstr "Code"
 
-#: ../../modules/class/catalog.php:934 ../../modules/class/catalog.php:949
+#: ../../lib/class/catalog.class.php:958
+#: ../../lib/class/catalog.class.php:1009
 msgid "Reason"
 msgstr "Reden"
 
-#: ../../modules/class/catalog.php:954
+#: ../../lib/class/catalog.class.php:974
 msgid "Completed updating remote catalog(s)"
 msgstr "Bijwerken catalogus(sen) op afstand klaar"
 
-#: ../../modules/class/catalog.php:1042
+#: ../../lib/class/catalog.class.php:1105
 msgid "Checking"
 msgstr "Controleren"
 
-#: ../../modules/class/catalog.php:1099
+#: ../../lib/class/catalog.class.php:1163
 msgid "Catalog Clean Done"
 msgstr "Catalogus Opschonen Klaar"
 
-#: ../../modules/class/catalog.php:1099
+#: ../../lib/class/catalog.class.php:1163
 msgid "files removed"
 msgstr "bestanden verwijderd"
 
-#: ../../modules/class/catalog.php:1339
+#: ../../lib/class/catalog.class.php:1436
 msgid "Updating the"
 msgstr "Bijwerken van de"
 
-#: ../../modules/class/catalog.php:1339
-#: ../../templates/show_admin_index.inc:31 ../../templates/admin_menu.inc:35
+#: ../../lib/class/catalog.class.php:1436 ../../templates/admin_menu.inc:35
 msgid "Catalog"
 msgstr "Catalogus"
 
-#: ../../modules/class/catalog.php:1340
+#: ../../lib/class/catalog.class.php:1437
 msgid "songs found checking tag information."
 msgstr "liedjes gevonden controleert label informatie"
 
-#: ../../modules/class/catalog.php:1387
+#: ../../lib/class/catalog.class.php:1484
 msgid " FOUND"
 msgstr "GEVONDEN"
 
-#: ../../modules/class/catalog.php:1388
+#: ../../lib/class/catalog.class.php:1485
 msgid "Searching for new Album Art"
 msgstr "Zoekt naar nieuwe Album Hoesjes"
 
-#: ../../modules/class/catalog.php:1392
+#: ../../lib/class/catalog.class.php:1489
 msgid "Album Art Already Found"
 msgstr "Album Hoesjes Al Gevonden"
 
-#: ../../modules/class/stream.php:198
-msgid "Opened for writting"
-msgstr "Geopend om te schrijven"
+#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
+msgid "Could not add"
+msgstr "Kon niet toevoegen"
 
-#: ../../modules/class/stream.php:203
-msgid "Error, cannot write"
-msgstr "Fout, kan niet schrijven"
+#: ../../lib/Browser.php:867
+msgid "file"
+msgstr "bestand"
 
-#: ../../modules/class/stream.php:214
-msgid "Error, cannot write song in file"
-msgstr "Fout, kan liedje niet in bestand wegschrijven"
+#: ../../lib/Browser.php:871
+msgid "File uploads not supported."
+msgstr "Bestanden uploaden niet ondersteund."
 
-#: ../../modules/class/stream.php:220
-msgid "Closed after write"
-msgstr "Gesloten na schrijven"
+#: ../../lib/Browser.php:889
+msgid "No file uploaded"
+msgstr "Geen bestand ge-upload."
 
-#: ../../modules/class/album.php:126
-msgid "Various"
-msgstr "Diverse"
+#: ../../lib/Browser.php:896
+#, php-format
+msgid "There was a problem with the file upload: No %s was uploaded."
+msgstr "Er was een probleem met de bestands-upload: Geen %s was ge-upload."
 
-#: ../../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 "bijgewerkt tot"
+#: ../../lib/Browser.php:901
+#, php-format
+msgid ""
+"There was a problem with the file upload: The %s was larger than the maximum "
+"allowed size (%d bytes)."
+msgstr ""
+"Er was een probleem met de bestands-upload: De %s was groter dan de maximum "
+"toegestane grootte (%d bytes)."
 
-#: ../../modules/class/song.php:257 ../../upload.php:235
-#: ../../templates/show_songs.inc:39
-msgid "Bitrate"
-msgstr "Bitratio"
+#: ../../lib/Browser.php:903
+#, php-format
+msgid ""
+"There was a problem with the file upload: The %s was only partially uploaded."
+msgstr ""
+"Er was een probleem met de bestands-upload: De %s was slechts gedeeltelijk "
+"ge-upload."
 
-#: ../../modules/class/song.php:261
-msgid "Rate"
-msgstr "Ratio"
+#: ../../lib/ui.lib.php:199
+msgid "Playlist Actions"
+msgstr "Speellijst Akties"
 
-#: ../../modules/class/song.php:265
-msgid "Mode"
-msgstr ""
+#: ../../lib/ui.lib.php:199
+msgid "New"
+msgstr "Nieuw"
 
-#: ../../modules/class/song.php:269 ../../upload.php:234
-#: ../../templates/show_songs.inc:37
-msgid "Time"
-msgstr "Tijd"
+#: ../../lib/ui.lib.php:200
+msgid "View All"
+msgstr "Bekijk Alles"
 
-#: ../../modules/class/song.php:273 ../../templates/show_songs.inc:32
-#: ../../templates/show_songs.inc:36
-msgid "Track"
-msgstr "Nummer"
+#: ../../lib/ui.lib.php:201
+msgid "Import"
+msgstr "Importeren"
 
-#: ../../modules/class/song.php:277
-msgid "Filesize"
-msgstr "Bestandsgrootte"
+#: ../../lib/ui.lib.php:301 ../../templates/menu.inc:35
+msgid "Browse"
+msgstr "Bladeren"
 
-#: ../../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 "Artiest"
+#: ../../lib/ui.lib.php:303
+msgid "Show w/o art"
+msgstr "Toon zonder hoesje"
 
-#: ../../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 ""
+#: ../../lib/ui.lib.php:306
+msgid "Show all"
+msgstr "Toon alles"
 
-#: ../../modules/class/song.php:291 ../../templates/show_albums.inc:43
-#: ../../templates/show_albums.inc:73
-msgid "Year"
-msgstr "Jaar"
+#: ../../lib/ui.lib.php:446
+msgid "No songs in this playlist."
+msgstr "Geen liedjes in deze speellijst."
 
-#: ../../modules/class/song.php:295 ../../templates/list_flagged.inc:46
-#: ../../templates/flag.inc:66
-msgid "Comment"
-msgstr "Commentaar"
+#: ../../lib/ui.lib.php:592
+#, fuzzy
+msgid "No Catalogs Found!"
+msgstr "Niet Gevonden"
 
-#: ../../modules/class/song.php:300 ../../upload.php:233
-#: ../../templates/show_songs.inc:40
-msgid "Genre"
-msgstr ""
+#: ../../lib/ui.lib.php:593 ../../templates/add_catalog.inc:28
+msgid "Add a Catalog"
+msgstr "Catalogus toevoegen"
 
-#: ../../modules/lib.php:53
+#: ../../lib/ui.lib.php:594 ../../templates/show_local_catalog_info.inc.php:7
+msgid "Catalog Statistics"
+msgstr "Catalogus Statistieken"
+
+#: ../../lib/ui.lib.php:630
 msgid "day"
 msgstr "dag"
 
-#: ../../modules/lib.php:53
+#: ../../lib/ui.lib.php:630
 msgid "days"
 msgstr "dagen"
 
-#: ../../modules/lib.php:55
+#: ../../lib/ui.lib.php:632
 msgid "hour"
 msgstr "uur"
 
-#: ../../modules/lib.php:55
+#: ../../lib/ui.lib.php:632
 msgid "hours"
 msgstr "uren"
 
-#: ../../modules/lib.php:70
-msgid "Catalog Statistics"
-msgstr "Catalogus Statistieken"
-
-#: ../../modules/lib.php:73
-msgid "Total Users"
-msgstr "Totaal Aantal Gebruikers"
-
-#: ../../modules/lib.php:77
-msgid "Connected Users"
-msgstr "Verbonden Gebruikers"
+#: ../../lib/upload.php:225
+#, fuzzy
+msgid "The file uploaded successfully"
+msgstr "Geen bestand ge-upload."
 
-#: ../../modules/lib.php:81 ../../templates/show_artists.inc:42
-#: ../../templates/show_artists.inc:65 ../../templates/menu.inc:35
-msgid "Albums"
+#: ../../lib/upload.php:226
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr ""
+"Het ge-uploade bestand overschrijdt de upload_max_filesize parameter in php."
+"ini"
 
-#: ../../modules/lib.php:85 ../../templates/menu.inc:36
-msgid "Artists"
-msgstr "Artiesten"
-
-#: ../../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 "Liedjes"
-
-#: ../../modules/lib.php:93
-msgid "Catalog Size"
-msgstr "Catalogus Grootte"
-
-#: ../../modules/lib.php:97
-msgid "Catalog Time"
-msgstr "Catalogus Tijd"
-
-#: ../../modules/lib.php:151
-msgid "Play Random Selection"
-msgstr "Speel Willekeurige Selectie"
-
-#: ../../modules/lib.php:158
-msgid "Item count"
-msgstr "Aantal"
-
-#: ../../modules/lib.php:170 ../../templates/show_artists.inc:55
-#: ../../templates/show_albums.inc:58
-msgid "All"
-msgstr "Alles"
-
-#: ../../modules/lib.php:172
-msgid "From genre"
-msgstr "Van genre"
-
-#: ../../modules/lib.php:182
-msgid "Favor Unplayed"
-msgstr "Voorkeur voor Ongespeelde"
-
-#: ../../modules/lib.php:183
-msgid "Full Albums"
-msgstr "Volledige Albums"
+#: ../../lib/upload.php:227
+#, fuzzy
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+"Het ge-uploade bestand overschrijdt de MAX_FILE_SIZE parameter "
+"gespecificeerd in het HTML formulier."
 
-#: ../../modules/lib.php:184
-msgid "Full Artist"
-msgstr "Volledige Artiest"
+#: ../../lib/upload.php:228
+#, fuzzy
+msgid "The uploaded file was only partially uploaded"
+msgstr "Het ge-uploade bestand was slechts gedeeltelijk ge-upload."
 
-#: ../../modules/lib.php:193
-msgid "from catalog"
-msgstr "uit catalogus"
+#: ../../lib/upload.php:229
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "Er is geen bestand ge-ulpoad."
 
-#: ../../modules/lib.php:204
-msgid "Play Random Songs"
-msgstr "Speel Willekeurige Liedjes"
+#: ../../lib/upload.php:230
+msgid "Missing a temporary folder"
+msgstr ""
 
-#: ../../modules/lib.php:912
+#: ../../modules/lib.php:708
 msgid "Public"
 msgstr "Openbaar"
 
-#: ../../modules/lib.php:913
+#: ../../modules/lib.php:709
 msgid "Your Private"
 msgstr "Jouw Prive"
 
-#: ../../modules/lib.php:914
+#: ../../modules/lib.php:710
 msgid "Other Private"
 msgstr "Andere Prive"
 
-#: ../../modules/lib.php:995 ../../templates/show_play_selected.inc.php:61
+#: ../../modules/lib.php:791 ../../templates/show_play_selected.inc.php:72
 msgid "View"
 msgstr "Bekijken"
 
-#: ../../modules/lib.php:998 ../../templates/show_play_selected.inc.php:62
+#: ../../modules/lib.php:794 ../../templates/show_play_selected.inc.php:73
 #: ../../templates/show_users.inc:52 ../../templates/show_users.inc:86
 msgid "Edit"
 msgstr "Aanpassen"
 
-#: ../../modules/lib.php:999 ../../upload.php:290
-#: ../../templates/catalog.inc:60 ../../templates/show_users.inc:61
+#: ../../modules/lib.php:795 ../../templates/catalog.inc:60
+#: ../../templates/show_users.inc:61 ../../templates/show_uploads.inc:50
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: ../../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
+#: ../../modules/lib.php:803 ../../templates/show_genres.inc.php:48
+#: ../../templates/show_localplay.inc:41 ../../templates/show_artists.inc:54
+#: ../../templates/show_albums.inc:57 ../../templates/show_artist.inc:78
+#: ../../templates/show_mpdplay.inc:50
 msgid "Play"
 msgstr "Afspelen"
 
-#: ../../modules/lib.php:1008 ../../templates/show_artists.inc:56
-#: ../../templates/show_albums.inc:59 ../../templates/show_mpdplay.inc:67
+#: ../../modules/lib.php:804 ../../templates/show_artists.inc:56
+#: ../../templates/show_albums.inc:59 ../../templates/show_mpdplay.inc:85
 msgid "Random"
 msgstr "Willekeurig"
 
-#: ../../modules/lib.php:1014 ../../templates/show_songs.inc:110
+#: ../../modules/lib.php:810 ../../templates/show_songs.inc:110
 #: ../../templates/show_album.inc:61 ../../templates/show_albums.inc:61
-#: ../../templates/show_artist.inc:81
+#: ../../templates/show_artist.inc:80
 msgid "Download"
 msgstr ""
 
-#: ../../modules/lib.php:1025
+#: ../../modules/lib.php:821
 msgid "There are no playlists of this type"
 msgstr "Er zijn geen speellijsten van dit type"
 
-#: ../../modules/lib.php:1060
+#: ../../modules/lib.php:856
 msgid "Create a new playlist"
 msgstr "Maak een nieuwe speellijst"
 
@@ -596,7 +607,7 @@ msgstr "Maak een nieuwe speellijst"
 msgid "Manage Users"
 msgstr "Beheer Gebruikers"
 
-#: ../../modules/admin.php:48
+#: ../../modules/admin.php:48 ../../templates/show_admin_index.inc:34
 msgid "Add a new user"
 msgstr "Gebruiker Toevoegen"
 
@@ -608,71 +619,75 @@ msgstr "Voeg toe aan catalogus(sen)"
 msgid "Add to all Catalogs"
 msgstr "Voeg toe aan alle Catalogussen"
 
-#: ../../admin/catalog.php:76 ../../templates/catalog.inc:73
+#: ../../admin/catalog.php:75
+msgid "Error Connecting"
+msgstr "Fout bij Verbinding"
+
+#: ../../admin/catalog.php:89 ../../templates/catalog.inc:73
 msgid "Update Catalog(s)"
 msgstr "Catalogus(sen) Bijwerken"
 
-#: ../../admin/catalog.php:87 ../../templates/catalog.inc:74
+#: ../../admin/catalog.php:100 ../../templates/catalog.inc:74
 msgid "Update All Catalogs"
 msgstr "Alle Catalogussen Bijwerken"
 
-#: ../../admin/catalog.php:119 ../../templates/catalog.inc:80
+#: ../../admin/catalog.php:132 ../../templates/catalog.inc:80
 msgid "Clean Catalog(s)"
 msgstr "Catalogus(sen) Opschonen"
 
-#: ../../admin/catalog.php:149 ../../templates/catalog.inc:81
+#: ../../admin/catalog.php:162 ../../templates/catalog.inc:81
 msgid "Clean All Catalogs"
 msgstr "Alle Catalogussen Opschonen"
 
-#: ../../admin/catalog.php:198
+#: ../../admin/catalog.php:211
 msgid "Now Playing Cleared"
 msgstr "Speelt Nu Leeggemaakt"
 
-#: ../../admin/catalog.php:198
+#: ../../admin/catalog.php:211
 msgid "All now playing data has been cleared"
 msgstr "Alle Speelt Nu gegevens zijn leeggemaakt."
 
-#: ../../admin/catalog.php:203
+#: ../../admin/catalog.php:216
 msgid "Do you really want to clear your catalog?"
 msgstr "Wilt u echt uw catalogus leegmaken?"
 
-#: ../../admin/catalog.php:210
+#: ../../admin/catalog.php:223
 msgid "Do you really want to clear the statistics for this catalog?"
 msgstr "Wilt u echt de statistieken voor deze catalogus leegmaken?"
 
-#: ../../admin/catalog.php:228
+#: ../../admin/catalog.php:241
 msgid "Do you really want to delete this catalog?"
 msgstr "Wilt u echt deze catalogus verwijderen?"
 
-#: ../../admin/catalog.php:259
+#: ../../admin/catalog.php:272
 msgid "Album Art Search Finished"
 msgstr "Album Hoesjes Zoeken Klaar"
 
-#: ../../admin/users.php:77 ../../admin/users.php:124
+#: ../../admin/users.php:76 ../../admin/users.php:122
 msgid "Error Username Required"
 msgstr "Fout Gebruikersnaam Vereist"
 
-#: ../../admin/users.php:80 ../../admin/users.php:121
+#: ../../admin/users.php:79 ../../admin/users.php:119
 msgid "Error Passwords don't match"
 msgstr "Fout Wachtwoorden niet hetzelfde"
 
-#: ../../admin/users.php:138
+#: ../../admin/users.php:136
 msgid "Are you sure you want to permanently delete"
 msgstr "Weet u zeker dat u dit permanent wilt verwijderen:"
 
-#: ../../admin/users.php:145 ../../templates/show_confirm_action.inc.php:29
+#: ../../admin/users.php:143 ../../templates/show_confirm_action.inc.php:29
 msgid "No"
 msgstr "Nee"
 
-#: ../../admin/users.php:147
+#: ../../admin/users.php:145
 msgid "User Deleted"
 msgstr "Gebruiker Verwijderd"
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:148
 msgid "Delete Error"
 msgstr "Fout bij Verwijderen"
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:148
 msgid "Unable to delete last Admin User"
 msgstr "Kan niet de laatste beheerder verwijderen"
 
@@ -712,46 +727,46 @@ msgstr "Bericht"
 msgid "Send Mail"
 msgstr "Verstuur mail"
 
-#: ../../admin/song.php:70
+#: ../../admin/song.php:68
 msgid "Songs Disabled"
 msgstr "Liedjes Uitgeschakeld"
 
-#: ../../admin/song.php:70
+#: ../../admin/song.php:68
 msgid "The requested song(s) have been disabled"
 msgstr "De gevraagde liedjes zijn uitgeschakeld"
 
-#: ../../admin/song.php:80
+#: ../../admin/song.php:78
 msgid "Songs Enabled"
 msgstr "Liedjes Aktief"
 
-#: ../../admin/song.php:80
+#: ../../admin/song.php:78
 msgid "The requested song(s) have been enabled"
 msgstr "De gevraagde liedjes zijn aktief gemaakt"
 
 #: ../../templates/show_user_registration.inc.php:28
 #: ../../templates/show_install_account.inc.php:59
-#: ../../templates/userform.inc:41 ../../templates/show_users.inc:40
+#: ../../templates/userform.inc:40 ../../templates/show_users.inc:40
 msgid "Username"
 msgstr "Gebruikersnaam"
 
 #: ../../templates/show_user_registration.inc.php:36
-#: ../../templates/userform.inc:49
+#: ../../templates/userform.inc:48
 msgid "Full Name"
 msgstr "Volledige Naam"
 
 #: ../../templates/show_user_registration.inc.php:44
-#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:56
+#: ../../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:64 ../../templates/show_login_form.inc:53
+#: ../../templates/userform.inc:63 ../../templates/show_login_form.inc:53
 msgid "Password"
 msgstr "Wachtwoord"
 
 #: ../../templates/show_user_registration.inc.php:60
-#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:73
+#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
 msgid "Confirm Password"
 msgstr "Bevestig Wachtwoord"
 
@@ -768,10 +783,11 @@ msgstr "Ampache Installatie"
 #: ../../templates/show_install_account.inc.php:37
 #: ../../templates/show_install_config.inc:37
 #: ../../templates/show_install.inc:36
+#, fuzzy
 msgid ""
-"This Page handles the installation of the ampache database and the creation "
+"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"
+"have the following pre-requisites"
 msgstr ""
 "Deze pagina gaat over de installatie van de Ampache database en het aanmaken "
 "van het ampache.cfg.php bestand. Voordat u doorgaat controleer of u aan de "
@@ -783,14 +799,17 @@ msgstr ""
 msgid ""
 "A MySQL Server with a username and password that can create/modify databases"
 msgstr ""
-"Een MySQL Server met een gebruikersnaam en wachtwoord welke databases kan aanmaken/aanpassen"
+"Een MySQL Server met een gebruikersnaam en wachtwoord welke databases kan "
+"aanmaken/aanpassen"
+
 #: ../../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 ""
-"Uw webserver heeft leestoegang tot het /sql/ampache.sql bestand en het /config/"
-"ampache.cfg.dist.php bestand"
+"Uw webserver heeft leestoegang tot het /sql/ampache.sql bestand en het /"
+"config/ampache.cfg.dist.php bestand"
+
 #: ../../templates/show_install_account.inc.php:43
 #: ../../templates/show_install_config.inc:43
 #: ../../templates/show_install.inc:42
@@ -800,10 +819,10 @@ msgid ""
 "values. If you would like to make changes to your ampache install at a later "
 "date simply edit /config/ampache.cfg.php"
 msgstr ""
-"Als u heeft gecontroleerd dat u aan de bovenstaande vereisten voldoet vul dan de "
-"onderstaande informatie in. U wordt alleen gevraagd om de vereiste configuratie "
-"waarden. Als u later aanpassingen wilt maken aan uw ampache installatie past u "
-"gewoon /config/ampache.cfg.php aan"
+"Als u heeft gecontroleerd dat u aan de bovenstaande vereisten voldoet vul "
+"dan de onderstaande informatie in. U wordt alleen gevraagd om de vereiste "
+"configuratie waarden. Als u later aanpassingen wilt maken aan uw ampache "
+"installatie past u gewoon /config/ampache.cfg.php aan"
 
 #: ../../templates/show_install_account.inc.php:48
 #: ../../templates/show_install_config.inc:48
@@ -826,8 +845,8 @@ 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 ""
-"Deze stap maakt uw eerste Ampache beheerder aan. Als uw beheerder eenmaal "
-"is aangemaakt wordt u doorgestuurd naar de inlog pagina"
+"Deze stap maakt uw eerste Ampache beheerder aan. Als uw beheerder eenmaal is "
+"aangemaakt wordt u doorgestuurd naar de inlog pagina"
 
 #: ../../templates/show_install_account.inc.php:68
 msgid "Create Account"
@@ -841,7 +860,8 @@ msgstr "Ja"
 msgid "Importing a Playlist from a File"
 msgstr "Speellijst importeren uit een Bestand"
 
-#: ../../templates/show_import_playlist.inc.php:29 ../../upload.php:237
+#: ../../templates/show_import_playlist.inc.php:29
+#: ../../templates/show_uploads.inc:41
 msgid "Filename"
 msgstr "Bestandsnaam"
 
@@ -853,6 +873,10 @@ msgstr "Speellijst type"
 msgid "Import Playlist"
 msgstr "Speellijst Importeren"
 
+#: ../../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
@@ -861,8 +885,8 @@ msgid "Name"
 msgstr "Naam"
 
 #: ../../templates/show_user.inc.php:48
-msgid "View Limit"
-msgstr "Bekijk Limiet"
+msgid "Results Per Page"
+msgstr ""
 
 #: ../../templates/show_user.inc.php:56
 msgid "Update Profile"
@@ -876,6 +900,10 @@ msgstr "Geef Wachtwoord"
 msgid "Change Password"
 msgstr "Wachtwoord Wijzigen"
 
+#: ../../templates/show_user.inc.php:89
+msgid "Delete Your Personal Statistics"
+msgstr ""
+
 #: ../../templates/show_user.inc.php:91
 msgid "Clear Stats"
 msgstr "Statistieken Verwijderen"
@@ -884,58 +912,138 @@ msgstr "Statistieken Verwijderen"
 msgid "Continue"
 msgstr "Doorgaan"
 
-#: ../../templates/show_play_selected.inc.php:43
+#: ../../templates/show_play_selected.inc.php:49
 msgid "Play Selected"
 msgstr "Selectie Afspelen"
 
-#: ../../templates/show_play_selected.inc.php:44 ../../playlist.php:77
+#: ../../templates/show_play_selected.inc.php:52
+#, fuzzy
+msgid "Download Selected"
+msgstr "Selectie Aanvinken"
+
+#: ../../templates/show_play_selected.inc.php:55 ../../playlist.php:77
 msgid "Flag Selected"
 msgstr "Selectie Aanvinken"
 
-#: ../../templates/show_play_selected.inc.php:45 ../../playlist.php:83
+#: ../../templates/show_play_selected.inc.php:56 ../../playlist.php:83
 msgid "Edit Selected"
 msgstr "Selectie Bewerken"
 
-#: ../../templates/show_play_selected.inc.php:52
+#: ../../templates/show_play_selected.inc.php:63
 msgid "Set Track Numbers"
 msgstr "Nummering"
 
-#: ../../templates/show_play_selected.inc.php:53
+#: ../../templates/show_play_selected.inc.php:64
 msgid "Remove Selected Tracks"
 msgstr "Verwijder Geselecteerde Nummers"
 
-#: ../../templates/show_play_selected.inc.php:59
+#: ../../templates/show_play_selected.inc.php:70
 msgid "Playlist"
 msgstr "Speellijst"
 
-#: ../../templates/show_play_selected.inc.php:59
+#: ../../templates/show_play_selected.inc.php:70
 msgid "Add to"
 msgstr "Voeg toe aan"
 
+#: ../../templates/show_all_popular.inc.php:27 ../../index.php:98
+msgid "Most Popular Artists"
+msgstr "Meest Populaire Artiesten"
+
+#: ../../templates/show_all_popular.inc.php:30 ../../index.php:71
+msgid "Most Popular Albums"
+msgstr "Meest Populaire Albums"
+
+#: ../../templates/show_all_popular.inc.php:37
+#, fuzzy
+msgid "Most Popular Genres"
+msgstr "Meest Populaire Liedjes"
+
+#: ../../templates/show_all_popular.inc.php:40 ../../index.php:105
+msgid "Most Popular Songs"
+msgstr "Meest Populaire Liedjes"
+
+#: ../../templates/show_local_catalog_info.inc.php:10
+msgid "Total Users"
+msgstr "Totaal Aantal Gebruikers"
+
+#: ../../templates/show_local_catalog_info.inc.php:14
+msgid "Connected Users"
+msgstr "Verbonden Gebruikers"
+
+#: ../../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 ""
+
+#: ../../templates/show_local_catalog_info.inc.php:22
+#: ../../templates/show_genre.inc.php:41
+#: ../../templates/show_browse_menu.inc:35
+msgid "Artists"
+msgstr "Artiesten"
+
+#: ../../templates/show_local_catalog_info.inc.php:26
+#: ../../templates/show_genres.inc.php:37
+#: ../../templates/show_genre.inc.php:46 ../../templates/show_artists.inc:41
+#: ../../templates/show_artists.inc:64 ../../templates/show_albums.inc:41
+#: ../../templates/show_albums.inc:71
+msgid "Songs"
+msgstr "Liedjes"
+
+#: ../../templates/show_local_catalog_info.inc.php:30
+msgid "Catalog Size"
+msgstr "Catalogus Grootte"
+
+#: ../../templates/show_local_catalog_info.inc.php:34
+msgid "Catalog Time"
+msgstr "Catalogus Tijd"
+
+#: ../../templates/show_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 "Aktie"
+
+#: ../../templates/show_genre.inc.php:32
+#, fuzzy
+msgid "Viewing"
+msgstr "Bekijken"
+
+#: ../../templates/show_all_recent.inc.php:27 ../../index.php:115
+msgid "Newest Artist Additions"
+msgstr "Nieuwste Artiest Toevoegingen"
+
+#: ../../templates/show_all_recent.inc.php:30 ../../index.php:122
+msgid "Newest Album Additions"
+msgstr "Nieuwste Album Toevoegingen"
+
 #: ../../localplay.php:79
 msgid "Unknown action requested"
 msgstr "Onbekende aktie gevraagd"
 
-#: ../../artists.php:47
+#: ../../artists.php:48
 msgid "All songs by"
 msgstr "Alle liedjes van"
 
-#: ../../artists.php:56 ../../albums.php:105
+#: ../../artists.php:57 ../../albums.php:106
 msgid "Starting Update from Tags"
 msgstr "Start Bijwerken vanuit Labels"
 
-#: ../../artists.php:61 ../../albums.php:110
+#: ../../artists.php:62 ../../albums.php:111
 msgid "Update From Tags Complete"
 msgstr "Bijwerken vanuit Labels Klaar"
 
-#: ../../artists.php:73 ../../artists.php:82 ../../artists.php:94
-#: ../../artists.php:111
-msgid "<u>S</u>how artists starting with"
+#: ../../artists.php:72 ../../artists.php:76 ../../artists.php:82
+#: ../../artists.php:95
+#, fuzzy
+msgid "Show Artists starting with"
 msgstr "<u>T</u>oon artiesten beginnend met"
 
-#: ../../amp-mpd.php:41
-msgid "Error Connecting"
-msgstr "Fout bij Verbinding"
+#: ../../amp-mpd.php:176 ../../playlist.php:135
+msgid "New Playlist"
+msgstr "Nieuwe Speellijst"
 
 #: ../../playlist.php:115
 msgid "owned by"
@@ -953,42 +1061,18 @@ msgstr "Speel de Gehele Speellijst"
 msgid "Play Random"
 msgstr "Speel Willekeurig"
 
-#: ../../playlist.php:135
-msgid "New Playlist"
-msgstr "Nieuwe Speellijst"
-
 #: ../../playlist.php:192
 msgid "Playlist updated."
 msgstr "Speellijst Bijgewerkt"
 
-#: ../../index.php:38
+#: ../../index.php:41
 msgid "Welcome to"
 msgstr "Welkom bij"
 
-#: ../../index.php:40
+#: ../../index.php:43
 msgid "you are currently logged in as"
 msgstr "u bent momenteel aangemeld als"
 
-#: ../../index.php:65
-msgid "Most Popular Albums"
-msgstr "Meest Populaire Albums"
-
-#: ../../index.php:75
-msgid "Most Popular Artists"
-msgstr "Meest Populaire Artiesten"
-
-#: ../../index.php:82
-msgid "Most Popular Songs"
-msgstr "Meest Populaire Liedjes"
-
-#: ../../index.php:92
-msgid "Newest Artist Additions"
-msgstr "Nieuwste Artiest Toevoegingen"
-
-#: ../../index.php:99
-msgid "Newest Album Additions"
-msgstr "Nieuwste Album Toevoegingen"
-
 #: ../../user.php:45
 msgid "Error: Password Does Not Match or Empty"
 msgstr "Fout: Wachtwoord klopt niet of is leeg"
@@ -1001,19 +1085,19 @@ msgstr "Fout: Onvoldoende Rechten"
 msgid "Flagging song completed."
 msgstr "Aanvinken Liedje Gedaan"
 
-#: ../../albums.php:43
+#: ../../albums.php:44
 msgid "Album Art Cleared"
 msgstr "Album Hoesje Verwijderd"
 
-#: ../../albums.php:43
+#: ../../albums.php:44
 msgid "Album Art information has been removed form the database"
 msgstr "Album Hoes informatie is verwijderd uit de database"
 
-#: ../../albums.php:77
+#: ../../albums.php:78
 msgid "Album Art Located"
 msgstr "Album Hoesje Gevonden"
 
-#: ../../albums.php:77
+#: ../../albums.php:78
 msgid ""
 "Album Art information has been located in Amazon. If incorrect, click "
 "\"Reset Album Art\" below to remove the artwork."
@@ -1021,101 +1105,90 @@ msgstr ""
 "Album Hoes Informatie is gevonden in Amazon. Als dit niet juist is, klik "
 "\"Herstel Album Hoesje\" hieronder om het plaatje te verwijderen."
 
-#: ../../albums.php:85 ../../albums.php:95
+#: ../../albums.php:86 ../../albums.php:96
 msgid "Get Art"
 msgstr "Haal Hoesje"
 
-#: ../../albums.php:89
+#: ../../albums.php:90
 msgid "Album Art Not Located"
 msgstr "Album Hoesje Niet Gevonden"
 
-#: ../../albums.php:89
+#: ../../albums.php:90
 msgid ""
 "Album Art could not be located at this time. This may be due to Amazon being "
 "busy, or the album not being present in their collection."
 msgstr ""
-"Album Hoesje kon nu niet worden gevonden. Dit kan komen doordat Amazon druk is, "
-"of het album bestaat niet in hun collectie."
+"Album Hoesje kon nu niet worden gevonden. Dit kan komen doordat Amazon druk "
+"is, of het album bestaat niet in hun collectie."
 
-#: ../../albums.php:126 ../../albums.php:132
-msgid "<u>S</u>how all albums"
-msgstr "<u>T</u>oon alle albums"
-
-#: ../../albums.php:139 ../../albums.php:146 ../../albums.php:151
-msgid "<u>S</u>how only albums starting with"
+#: ../../albums.php:127 ../../albums.php:133 ../../albums.php:140
+#: ../../albums.php:145 ../../albums.php:150
+#, fuzzy
+msgid "Show Albums starting with"
 msgstr "<u>T</u>oon alleen albums beginnend met"
 
-#: ../../albums.php:145
-msgid "Select a starting letter or Show all"
-msgstr "Selecteer beginletter of Toon Alles"
-
-#: ../../upload.php:124
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr "Het ge-uploade bestand overschrijdt de upload_max_filesize parameter in php.ini"
+#: ../../bin/quarantine_migration.php.inc:49
+#, fuzzy
+msgid "Error: Unable to write to"
+msgstr "Fout: Kon niet openen"
 
-#: ../../upload.php:127
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
+#: ../../bin/quarantine_migration.php.inc:56
+msgid "Error: Upload directory not inside a catalog"
 msgstr ""
-"Het ge-uploade bestand overschrijdt de MAX_FILE_SIZE parameter gespecificeerd in "
-"het HTML formulier."
-
-#: ../../upload.php:130
-msgid "The uploaded file was only partially uploaded."
-msgstr "Het ge-uploade bestand was slechts gedeeltelijk ge-upload."
-
-#: ../../upload.php:133
-msgid "No file was uploaded."
-msgstr "Er is geen bestand ge-ulpoad."
 
-#: ../../upload.php:136
-msgid "An Unknown Error has occured."
-msgstr "Er is een onbekende fout opgetreden."
-
-#: ../../upload.php:157
-msgid "Successfully-Quarantined"
-msgstr "Succesvol-Veiliggesteld"
-
-#: ../../upload.php:167
-msgid "Successfully-Cataloged"
-msgstr "Succesvol-Gecatalogiseerd"
+#: ../../bin/quarantine_migration.php.inc:74
+#, fuzzy
+msgid "Moved"
+msgstr "Hoesje"
 
-#: ../../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 "Aktie"
+#: ../../bin/quarantine_migration.php.inc:78
+#, fuzzy
+msgid "Adding"
+msgstr "Beheer"
 
-#: ../../upload.php:230 ../../templates/list_flagged.inc:41
-#: ../../templates/flag.inc:58
-msgid "Song"
-msgstr "Liedje"
+#: ../../bin/quarantine_migration.php.inc:78
+#, fuzzy
+msgid "to database"
+msgstr "Database Laden"
 
-#: ../../upload.php:236 ../../templates/show_songs.inc:38
-msgid "Size"
-msgstr "Grootte"
+#: ../../bin/quarantine_migration.php.inc:86
+msgid "Move Failed"
+msgstr ""
 
-#: ../../upload.php:238
-msgid "User"
-msgstr "Gebruiker"
+#: ../../bin/quarantine_migration.php.inc:97
+#, fuzzy
+msgid "Deleted"
+msgstr "Verwijderen"
 
-#: ../../upload.php:239
-msgid "Date"
-msgstr "Datum"
+#: ../../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 ""
 
-#: ../../upload.php:267
-msgid "Unknown"
-msgstr "Onbekend"
+#: ../../bin/quarantine_migration.php.inc:127
+#, fuzzy
+msgid "Continue?  (Y/N):"
+msgstr "Doorgaan"
 
-#: ../../upload.php:289
-msgid "Add"
-msgstr "Toevoegen"
+#: ../../bin/quarantine_migration.php.inc:151
+#, fuzzy
+msgid "Error:  "
+msgstr "Fout"
 
-#: ../../upload.php:294
-msgid "Quarantined"
-msgstr "Veiliggesteld"
+#: ../../bin/quarantine_migration.php.inc:152
+msgid "!\n"
+msgstr ""
 
 #: ../../templates/customize_catalog.inc:24
 msgid "Settings for catalog in"
@@ -1182,49 +1255,50 @@ msgid "Save Catalog Settings"
 msgstr "Catalogus Instellingen Opslaan"
 
 #: ../../templates/show_admin_index.inc:27
-msgid "Admin Section"
-msgstr "Beheer Afdeling"
-
-#: ../../templates/show_admin_index.inc:29 ../../templates/admin_menu.inc:33
-msgid "Users"
-msgstr "Gebruikers"
-
-#: ../../templates/show_admin_index.inc:29
-msgid "Create/Modify User Accounts for Ampache"
-msgstr "Maken/Aanpassen Gebruikers voor Ampache"
+#, fuzzy
+msgid "User Management"
+msgstr "Gebruikersnaam"
 
-#: ../../templates/show_admin_index.inc:30
-msgid "Mail"
+#: ../../templates/show_admin_index.inc:28
+msgid "E-mail Management"
 msgstr ""
 
-#: ../../templates/show_admin_index.inc:30
-msgid "Mail your users to notfiy them of changes"
-msgstr "Mail uw gebruikers om ze te informeren over wijzigingen"
-
-#: ../../templates/show_admin_index.inc:31
-msgid "Create/Update/Clean your catalog here"
-msgstr "Maak/Bewerk/Schoon uw catalogus hier"
+#: ../../templates/show_admin_index.inc:29
+#, fuzzy
+msgid "Catalog Managment"
+msgstr "Catalogus Naam"
 
-#: ../../templates/show_admin_index.inc:32 ../../templates/admin_menu.inc:36
+#: ../../templates/show_admin_index.inc:30 ../../templates/admin_menu.inc:36
 msgid "Admin Preferences"
 msgstr "Beheer Voorkeuren"
 
-#: ../../templates/show_admin_index.inc:32
-msgid "Modify Site-wide preferences"
-msgstr "Voorkeuren voor de gehele Site Aanpassen"
-
-#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:98
+#: ../../templates/show_admin_index.inc:31 ../../templates/catalog.inc:98
 #: ../../templates/admin_menu.inc:37
 msgid "Access Lists"
 msgstr "Toegangs lijsten"
 
-#: ../../templates/show_admin_index.inc:33
-msgid "Modify Access List Permissions"
-msgstr "Toegangslijst Permissies Aanpassen"
+#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:97
+msgid "Add a catalog"
+msgstr "Catalogus toevoegen"
 
-#: ../../templates/show_admin_index.inc:33
-msgid "Must have access_control=true in ampache.cfg"
-msgstr "access_control=true moet in ampache.cfg staan"
+#: ../../templates/show_admin_index.inc:35 ../../templates/catalog.inc:102
+msgid "Clear Now Playing"
+msgstr "Nu Spelen Leegmaken"
+
+#: ../../templates/show_admin_index.inc:36
+#, fuzzy
+msgid "Add Access List Entry"
+msgstr "Toegangs lijsten"
+
+#: ../../templates/show_admin_index.inc:40
+#, fuzzy
+msgid "Common Functions"
+msgstr "DB Connectie"
+
+#: ../../templates/show_admin_index.inc:43
+#, fuzzy
+msgid "Admin Sections"
+msgstr "Beheer Afdeling"
 
 #: ../../templates/show_test.inc:29
 msgid "Ampache Debug"
@@ -1270,8 +1344,8 @@ msgid ""
 "This test checks to see if you have the mysql extensions loaded for PHP. "
 "These are required for Ampache to work."
 msgstr ""
-"Deze test controleert of u de mysql extensies heeft geladen voor PHP. "
-"Deze zijn benodigd om Ampache werkend te krijgen."
+"Deze test controleert of u de mysql extensies heeft geladen voor PHP. Deze "
+"zijn benodigd om Ampache werkend te krijgen."
 
 #: ../../templates/show_test.inc:79
 msgid "PHP Session Support"
@@ -1282,8 +1356,8 @@ msgid ""
 "This test checks to make sure that you have PHP session support enabled. "
 "Sessions are required for Ampache to work."
 msgstr ""
-"Deze test controleert of u PHP Sessie Ondersteuning aktief heeft. "
-"Sessies zijn benodigd om Ampache werkend te krijgen."
+"Deze test controleert of u PHP Sessie Ondersteuning aktief heeft. Sessies "
+"zijn benodigd om Ampache werkend te krijgen."
 
 #: ../../templates/show_test.inc:98
 msgid "PHP ICONV Support"
@@ -1308,8 +1382,8 @@ msgid ""
 "ampache.cfg.php is not in the correct locations or\n"
 "\tit is not currently readable by your webserver."
 msgstr ""
-"Dit tracht /config/ampache.cfg.php te lezen. Als dit mislukt is de "
-"ampache.cfg.php niet op de juiste locatie of \n"
+"Dit tracht /config/ampache.cfg.php te lezen. Als dit mislukt is de ampache."
+"cfg.php niet op de juiste locatie of \n"
 "\tdeze is niet leesbaar door uw webserver."
 
 #: ../../templates/show_test.inc:137
@@ -1318,10 +1392,11 @@ msgid "Ampache.cfg.php Configured?"
 msgstr "Ampache.cfg.php Geconfigureerd?"
 
 #: ../../templates/show_test.inc:154
+#, fuzzy
 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"
+"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 ""
 "Deze test gaat na of u all de vereiste configuratie variabelen heeft gezet "
 "en dat we uw configuratie \n"
@@ -1363,20 +1438,20 @@ msgid "Playback"
 msgstr "Afspelen"
 
 #: ../../templates/show_localplay.inc:39 ../../templates/list_header.inc:71
-#: ../../templates/show_mpdplay.inc:43
+#: ../../templates/show_mpdplay.inc:48
 msgid "Prev"
 msgstr "Vorig"
 
-#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:44
+#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:49
 msgid "Stop"
 msgstr ""
 
-#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:46
+#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:51
 msgid "Pause"
 msgstr "Pauze"
 
 #: ../../templates/show_localplay.inc:43 ../../templates/list_header.inc:94
-#: ../../templates/show_mpdplay.inc:47
+#: ../../templates/show_mpdplay.inc:52
 msgid "Next"
 msgstr "Volgend"
 
@@ -1396,17 +1471,14 @@ msgstr "Volume verminderen"
 msgid "Clear queue"
 msgstr "Wachtrij vrijmaken"
 
-#: ../../templates/add_catalog.inc:28
-msgid "Add a Catalog"
-msgstr "Catalogus toevoegen"
-
 #: ../../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 ""
-"In het formulier hieronder kunt u een lokale map (bijv. /data/muziek) of de URL "
-"naar een Ampache installatie op afstand (bijv http://theotherampache.com) invullen"
+"In het formulier hieronder kunt u een lokale map (bijv. /data/muziek) of de "
+"URL naar een Ampache installatie op afstand (bijv http://theotherampache."
+"com) invullen"
 
 #: ../../templates/add_catalog.inc:36
 msgid "Catalog Name"
@@ -1456,6 +1528,11 @@ msgstr "Bouw Speellijsten uit m3u bestanden"
 msgid "Add Catalog"
 msgstr "Catalogus toevoegen"
 
+#: ../../templates/list_flagged.inc:41 ../../templates/flag.inc:58
+#: ../../templates/show_uploads.inc:34
+msgid "Song"
+msgstr "Liedje"
+
 #: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:41
 msgid "Flag"
 msgstr "Aanvinken"
@@ -1480,10 +1557,19 @@ msgstr "Accepteren"
 msgid "Reject"
 msgstr "Afwijzen"
 
-#: ../../templates/show_songs.inc:33
+#: ../../templates/show_artists.inc:55 ../../templates/show_albums.inc:58
+#: ../../templates/show_random_play.inc:46
+msgid "All"
+msgstr "Alles"
+
+#: ../../templates/show_songs.inc:33 ../../templates/show_mpdpl.inc:62
 msgid "Song title"
 msgstr "Titel liedje"
 
+#: ../../templates/show_songs.inc:38 ../../templates/show_uploads.inc:40
+msgid "Size"
+msgstr "Grootte"
+
 #: ../../templates/show_songs.inc:113
 msgid "Direct Link"
 msgstr "Directe Link"
@@ -1498,8 +1584,8 @@ msgid ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
 "ampache.cfg.php.dist file"
 msgstr ""
-"Uw webserver heeft lees toegang tot het /sql/ampache.sql bestand en het "
-"/config/ampache.cfg.php.dist bestand"
+"Uw webserver heeft lees toegang tot het /sql/ampache.sql bestand en het /"
+"config/ampache.cfg.php.dist bestand"
 
 #: ../../templates/show_install_config.inc:49
 #: ../../templates/show_install.inc:50
@@ -1610,15 +1696,15 @@ msgstr "Nieuwe Gebruiker Toevoegen"
 msgid "Editing existing User"
 msgstr "Bestaande Gebruiker Aanpassen"
 
-#: ../../templates/userform.inc:81
+#: ../../templates/userform.inc:80
 msgid "User Access Level"
 msgstr "Gebruiker Toegangsniveau"
 
-#: ../../templates/userform.inc:97
+#: ../../templates/userform.inc:96
 msgid "Add User"
 msgstr "Gebruiker Toevoegen"
 
-#: ../../templates/userform.inc:102
+#: ../../templates/userform.inc:101
 msgid "Update User"
 msgstr "Gebruiker Bijwerken"
 
@@ -1653,8 +1739,8 @@ msgid ""
 "Flag the following song as having one of the problems listed below.  Site "
 "admins will then take the appropriate action for the flagged files."
 msgstr ""
-"Vink het volgende liedje aan zodat site beheerders kunnen zien dat deze "
-"1 van de volgende problemen heeft. Zij zullen dan aktie hierop ondernemen."
+"Vink het volgende liedje aan zodat site beheerders kunnen zien dat deze 1 "
+"van de volgende problemen heeft. Zij zullen dan aktie hierop ondernemen."
 
 #: ../../templates/flag.inc:62
 msgid "Reason to flag"
@@ -1719,10 +1805,6 @@ msgstr "Snel Bijwerken"
 msgid "You don't have any catalogs."
 msgstr "U heeft geen catalogussen"
 
-#: ../../templates/catalog.inc:97
-msgid "Add a catalog"
-msgstr "Catalogus toevoegen"
-
 #: ../../templates/catalog.inc:99
 msgid "Show Duplicate Songs"
 msgstr "Toon Dubbele Liedjes"
@@ -1735,10 +1817,6 @@ msgstr "Toon Uitgeschakelde Liedjes"
 msgid "Clear Catalog Stats"
 msgstr "Catalogus Statistieken Leegmaken"
 
-#: ../../templates/catalog.inc:102
-msgid "Clear Now Playing"
-msgstr "Nu Spelen Leegmaken"
-
 #: ../../templates/catalog.inc:103
 msgid "Dump Album Art"
 msgstr "Dump Album Hoesjes"
@@ -1751,6 +1829,10 @@ msgstr "Bekijk Aangevinkte Liedjes"
 msgid "Catalog Tools"
 msgstr "Catalogus Gereedschap"
 
+#: ../../templates/admin_menu.inc:33
+msgid "Users"
+msgstr "Gebruikers"
+
 #: ../../templates/admin_menu.inc:34
 msgid "Mail Users"
 msgstr "Mail Gebruikers"
@@ -1763,52 +1845,48 @@ msgstr "Begin"
 msgid "Local Play"
 msgstr "Lokaal Afspelen"
 
-#: ../../templates/menu.inc:37
+#: ../../templates/menu.inc:38
 msgid "Playlists"
 msgstr "Speellijsten"
 
-#: ../../templates/menu.inc:39
+#: ../../templates/menu.inc:40
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../../templates/menu.inc:42 ../../templates/show_upload.inc:59
+#: ../../templates/menu.inc:43 ../../templates/show_upload.inc:73
 msgid "Upload"
 msgstr "Uploaden"
 
-#: ../../templates/menu.inc:62 ../../templates/menu.inc:65
+#: ../../templates/menu.inc:63 ../../templates/menu.inc:66
 msgid "Admin"
 msgstr "Beheer"
 
-#: ../../templates/menu.inc:72 ../../templates/menu.inc:78
+#: ../../templates/menu.inc:73 ../../templates/menu.inc:79
 msgid "Account"
 msgstr "Profiel"
 
-#: ../../templates/menu.inc:73 ../../templates/menu.inc:79
+#: ../../templates/menu.inc:74 ../../templates/menu.inc:80
 msgid "Stats"
 msgstr "Statistieken"
 
-#: ../../templates/menu.inc:74 ../../templates/menu.inc:80
-#: ../../templates/menu.inc:84
+#: ../../templates/menu.inc:75 ../../templates/menu.inc:81
+#: ../../templates/menu.inc:85
 msgid "Logout"
 msgstr "Uitloggen"
 
-#: ../../templates/show_upload.inc:27
-msgid "Please Ensure All Files Are Tagged Correctly"
-msgstr "Controleer aub. of alle bestanden juist zijn gelabelled"
-
 #: ../../templates/show_upload.inc:30
-msgid ""
-"Ampache relies on id3 tags to sort data.  If your file is not tagged it may "
-"be deleted."
+msgid "Uploading Music to Ampache"
 msgstr ""
-"Ampache is afhankelijk van id3 labels om data te sorteren. Als uw bestand niet "
-"is gelabeld kan het worden verwijderd."
 
-#: ../../templates/show_upload.inc:34
+#: ../../templates/show_upload.inc:32
+msgid "The following Audio file formats are supported"
+msgstr ""
+
+#: ../../templates/show_upload.inc:72
 msgid "max_upload_size"
 msgstr ""
 
-#: ../../templates/show_now_playing.inc:31 ../../templates/show_mpdplay.inc:90
+#: ../../templates/show_now_playing.inc:31
 msgid "Now Playing"
 msgstr "Speelt Nu"
 
@@ -1865,7 +1943,7 @@ msgstr ""
 msgid "delete"
 msgstr "verwijderen"
 
-#: ../../templates/show_search.inc:34
+#: ../../templates/show_search.inc:34 ../../templates/show_search_bar.inc:36
 msgid "Search Ampache"
 msgstr "Doorzoek Ampache"
 
@@ -1889,66 +1967,188 @@ msgstr "Speel alle liedjes van"
 msgid "Play Random Songs By"
 msgstr "Speel willekeurige liedjes van"
 
-#: ../../templates/show_artist.inc:50
+#: ../../templates/show_artist.inc:49
 msgid "Select"
 msgstr "Selecteer"
 
-#: ../../templates/show_artist.inc:52
+#: ../../templates/show_artist.inc:51
 msgid "Cover"
 msgstr "Hoesje"
 
-#: ../../templates/show_artist.inc:53
+#: ../../templates/show_artist.inc:52
 msgid "Album Name"
 msgstr "Album Naam"
 
-#: ../../templates/show_artist.inc:54
+#: ../../templates/show_artist.inc:53
 msgid "Album Year"
 msgstr "Album Jaar"
 
-#: ../../templates/show_artist.inc:55
+#: ../../templates/show_artist.inc:54
 msgid "Total Tracks"
 msgstr "Aantal Nummers"
 
-#: ../../templates/show_mpdplay.inc:33
+#: ../../templates/show_mpdplay.inc:38
 msgid "MPD Play Control"
 msgstr "MPD Speel Controle"
 
-#: ../../templates/show_mpdplay.inc:53
+#: ../../templates/show_mpdplay.inc:71
 msgid "Loop"
 msgstr "Herhaal"
 
-#: ../../templates/show_mpdplay.inc:60 ../../templates/show_mpdplay.inc:73
+#: ../../templates/show_mpdplay.inc:78 ../../templates/show_mpdplay.inc:91
 msgid "On"
 msgstr "Aan"
 
-#: ../../templates/show_mpdplay.inc:61 ../../templates/show_mpdplay.inc:74
+#: ../../templates/show_mpdplay.inc:79 ../../templates/show_mpdplay.inc:92
 msgid "Off"
 msgstr "Uit"
 
-#: ../../templates/show_mpdplay.inc:103
-msgid "Refresh the Playlist Window"
-msgstr "Ververs het speellijst venster"
+#: ../../templates/show_mpdplay.inc:114
+#, fuzzy
+msgid "Now Playing :"
+msgstr "Speelt Nu"
 
-#: ../../templates/show_mpdplay.inc:103
-msgid "refresh now"
-msgstr "Ververs Nu"
+#: ../../templates/show_mpdplay.inc:138
+msgid "On Deck "
+msgstr ""
+
+#: ../../templates/show_mpdplay.inc:138
+msgid "(in "
+msgstr ""
 
-#: ../../templates/show_mpdplay.inc:111
-msgid "Server Playlist"
+#: ../../templates/show_mpdpl.inc:45
+#, fuzzy
+msgid "MPD Server Playlist"
 msgstr "Server Speellijst"
 
-#: ../../templates/show_mpdplay.inc:146
+#: ../../templates/show_mpdpl.inc:46 ../../templates/show_mpdpl.inc:184
+msgid "Refresh the Playlist Window"
+msgstr "Ververs het speellijst venster"
+
+#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:189
 msgid "Click to shuffle (randomize) the playlist"
 msgstr "Klik om de speellijst willekeurig te maken"
 
-#: ../../templates/show_mpdplay.inc:146
+#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:189
 msgid "shuffle"
 msgstr "willekeurig"
 
-#: ../../templates/show_mpdplay.inc:147
-msgid "Click the clear the playlist"
+#: ../../templates/show_mpdpl.inc:49 ../../templates/show_mpdpl.inc:190
+#, fuzzy
+msgid "Click to the clear the playlist"
 msgstr "Klik om de speellijst leeg te maken"
 
-#: ../../templates/show_mpdplay.inc:147
-msgid "clear"
-msgstr "leegmaken"
+#: ../../templates/show_mpdpl.inc:53 ../../templates/show_mpdpl.inc:194
+msgid "Click to the remove all except the Now Playing"
+msgstr ""
+
+#: ../../templates/show_uploads.inc:33
+#, fuzzy
+msgid "Status"
+msgstr "Statistieken"
+
+#: ../../templates/show_uploads.inc:42
+msgid "User"
+msgstr "Gebruiker"
+
+#: ../../templates/show_uploads.inc:43
+msgid "Date"
+msgstr "Datum"
+
+#: ../../templates/show_uploads.inc:49
+msgid "Add"
+msgstr "Toevoegen"
+
+#: ../../templates/show_random_play.inc:28
+msgid "Play Random Selection"
+msgstr "Speel Willekeurige Selectie"
+
+#: ../../templates/show_random_play.inc:34
+msgid "Item count"
+msgstr "Aantal"
+
+#: ../../templates/show_random_play.inc:49
+msgid "From genre"
+msgstr "Van genre"
+
+#: ../../templates/show_random_play.inc:58
+msgid "Standard"
+msgstr ""
+
+#: ../../templates/show_random_play.inc:59
+msgid "Favor Unplayed"
+msgstr "Voorkeur voor Ongespeelde"
+
+#: ../../templates/show_random_play.inc:60
+msgid "Full Albums"
+msgstr "Volledige Albums"
+
+#: ../../templates/show_random_play.inc:61
+msgid "Full Artist"
+msgstr "Volledige Artiest"
+
+#: ../../templates/show_random_play.inc:66
+msgid "from catalog"
+msgstr "uit catalogus"
+
+#: ../../templates/show_random_play.inc:75
+msgid "Play Random Songs"
+msgstr "Speel Willekeurige Liedjes"
+
+#~ msgid "View Limit"
+#~ msgstr "Bekijk Limiet"
+
+#~ msgid "<u>S</u>how all albums"
+#~ msgstr "<u>T</u>oon alle albums"
+
+#~ msgid "Select a starting letter or Show all"
+#~ msgstr "Selecteer beginletter of Toon Alles"
+
+#~ msgid "An Unknown Error has occured."
+#~ msgstr "Er is een onbekende fout opgetreden."
+
+#~ msgid "Successfully-Quarantined"
+#~ msgstr "Succesvol-Veiliggesteld"
+
+#~ msgid "Successfully-Cataloged"
+#~ msgstr "Succesvol-Gecatalogiseerd"
+
+#~ msgid "Unknown"
+#~ msgstr "Onbekend"
+
+#~ msgid "Quarantined"
+#~ msgstr "Veiliggesteld"
+
+#~ msgid "Create/Modify User Accounts for Ampache"
+#~ msgstr "Maken/Aanpassen Gebruikers voor Ampache"
+
+#~ msgid "Mail your users to notfiy them of changes"
+#~ msgstr "Mail uw gebruikers om ze te informeren over wijzigingen"
+
+#~ msgid "Create/Update/Clean your catalog here"
+#~ msgstr "Maak/Bewerk/Schoon uw catalogus hier"
+
+#~ msgid "Modify Site-wide preferences"
+#~ msgstr "Voorkeuren voor de gehele Site Aanpassen"
+
+#~ msgid "Modify Access List Permissions"
+#~ msgstr "Toegangslijst Permissies Aanpassen"
+
+#~ msgid "Must have access_control=true in ampache.cfg"
+#~ msgstr "access_control=true moet in ampache.cfg staan"
+
+#~ msgid "Please Ensure All Files Are Tagged Correctly"
+#~ msgstr "Controleer aub. of alle bestanden juist zijn gelabelled"
+
+#~ msgid ""
+#~ "Ampache relies on id3 tags to sort data.  If your file is not tagged it "
+#~ "may be deleted."
+#~ msgstr ""
+#~ "Ampache is afhankelijk van id3 labels om data te sorteren. Als uw bestand "
+#~ "niet is gelabeld kan het worden verwijderd."
+
+#~ msgid "refresh now"
+#~ msgstr "Ververs Nu"
+
+#~ msgid "clear"
+#~ msgstr "leegmaken"
diff --git a/locale/tr_TR/LC_MESSAGES/messages.po b/locale/tr_TR/LC_MESSAGES/messages.po
index 86389562..636c2368 100644
--- a/locale/tr_TR/LC_MESSAGES/messages.po
+++ b/locale/tr_TR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ampache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-05 10:43-0800\n"
+"POT-Creation-Date: 2005-08-14 16:23-0700\n"
 "PO-Revision-Date: 2005-04-25 21:14+0100\n"
 "Last-Translator: vireas <vireas at gmail.com>\n"
 "Language-Team: TURKISH <dev@ampache.org>\n"
@@ -18,1424 +18,1490 @@ msgstr ""
 "X-Poedit-Country: TURKEY\n"
 "X-Poedit-SourceCharset: iso-8859-9\n"
 
-#: ../../docs/admin/users.php:76
-#: ../../docs/admin/users.php:123
-msgid "Error Username Required"
-msgstr "Hata, kullanýcý ismi gerekli"
-
-#: ../../docs/admin/users.php:79
-#: ../../docs/admin/users.php:120
-msgid "Error Passwords don't match"
-msgstr "Hata, parolalar uyuþmuyor"
-
-#: ../../docs/admin/users.php:137
-msgid "Are you sure you want to permanently delete"
-msgstr "Tamamen silmek istediðinizden emin misiniz: "
-
-#: ../../docs/admin/users.php:144
-#: ../../templates/show_confirm_action.inc.php:29
-msgid "No"
-msgstr "Hayýr"
-
-#: ../../docs/admin/users.php:146
-msgid "User Deleted"
-msgstr "Kullanýcý silindi"
-
-#: ../../docs/admin/users.php:149
-msgid "Delete Error"
-msgstr "Silme hatasý"
-
-#: ../../docs/admin/users.php:149
-msgid "Unable to delete last Admin User"
-msgstr "Son yönetici silinemedi"
-
-#: ../../docs/admin/access.php:43
-msgid "Do you really want to delete this Access Record?"
-msgstr "Bu giriþ izini gerçekten silmek mi istiyorsunuz?"
-
-#: ../../docs/admin/access.php:51
-msgid "Entry Deleted"
-msgstr "Giriþ silindi"
-
-#: ../../docs/admin/access.php:51
-msgid "Your Access List Entry has been removed"
-msgstr "Eriþim listesindeki giriþiniz silindi"
-
-#: ../../docs/admin/access.php:61
-msgid "Entry Added"
-msgstr "Giriþ eklendi"
-
-#: ../../docs/admin/access.php:61
-msgid "Your new Access List Entry has been created"
-msgstr "Eriþim listesine giriþiniz eklendi"
-
-#: ../../docs/admin/catalog.php:54
-#: ../../templates/catalog.inc:66
-msgid "Add to Catalog(s)"
-msgstr "Kataloða ekle"
-
-#: ../../docs/admin/catalog.php:65
-#: ../../templates/catalog.inc:67
-msgid "Add to all Catalogs"
-msgstr "Tüm kataloglara ekle"
-
-#: ../../docs/admin/catalog.php:75
-#: ../../templates/catalog.inc:73
-msgid "Update Catalog(s)"
-msgstr "Kataloðu güncelleþtir"
-
-#: ../../docs/admin/catalog.php:86
-#: ../../templates/catalog.inc:74
-msgid "Update All Catalogs"
-msgstr "Tüm kataloglarý güncelleþtir"
-
-#: ../../docs/admin/catalog.php:118
-#: ../../templates/catalog.inc:80
-msgid "Clean Catalog(s)"
-msgstr "Kataloðu temizle"
-
-#: ../../docs/admin/catalog.php:148
-#: ../../templates/catalog.inc:81
-msgid "Clean All Catalogs"
-msgstr "Tüm kataloglarý temizle"
-
-#: ../../docs/admin/catalog.php:196
-msgid "Now Playing Cleared"
-msgstr "Þu anda çalýnanlar silindi"
-
-#: ../../docs/admin/catalog.php:196
-msgid "All now playing data has been cleared"
-msgstr "Tüm þu anda çalýnanlar silindi"
-
-#: ../../docs/admin/catalog.php:201
-msgid "Do you really want to clear your catalog?"
-msgstr "Kataloðunuzu gerçekten boþaltmak mý istiyorsunuz?"
-
-#: ../../docs/admin/catalog.php:208
-msgid "Do you really want to clear the statistics for this catalog?"
-msgstr "Bu kataloðun istatistik bilgilerini gerçekten silmek mi istiyorsunuz?"
-
-#: ../../docs/admin/catalog.php:226
-msgid "Do you really want to delete this catalog?"
-msgstr "Kataloðunuzu gerçekten silmek mi istiyorsunuz?"
-
-#: ../../docs/admin/song.php:70
-msgid "Songs Disabled"
-msgstr "Edilgenleþtirilmiþ Þarkýlar"
-
-#: ../../docs/admin/song.php:70
-msgid "The requested song(s) have been disabled"
-msgstr "Ýstenen þarký(lar) edilgenleþtirildi"
-
-#: ../../docs/admin/song.php:80
-msgid "Songs Enabled"
-msgstr "Etkinlentirilmiþ Þarkýlar"
-
-#: ../../docs/admin/song.php:80
-msgid "The requested song(s) have been enabled"
-msgstr "Ýstenen þarký(lar) etkinleþtirildi"
-
-#: ../../docs/localplay.php:79
-msgid "Unknown action requested"
-msgstr "Bilinmeyen eylem istendi"
-
-#: ../../docs/upload.php:124
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr "Gönderilen dosya daha önce php.ini'de belirlenen upload_max_filesize hattýný aþýyor."
-
-#: ../../docs/upload.php:127
-msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form."
-msgstr "Gönderilen dosya daha önce belirlenen MAX_FILE_SIZE hattýný aþýyor."
-
-#: ../../docs/upload.php:130
-msgid "The uploaded file was only partially uploaded."
-msgstr "Gönderilen dosya kýsmen yüklendi."
-
-#: ../../docs/upload.php:133
-msgid "No file was uploaded."
-msgstr "Hicbir dosya yüklenmedi."
-
-#: ../../docs/upload.php:136
-msgid "An Unknown Error has occured."
-msgstr "Bilinmeyen bir hata oluþtu."
-
-#: ../../docs/upload.php:157
-msgid "Successfully-Quarantined"
-msgstr "Baþarýyla karantinaya alýndý"
-
-#: ../../docs/upload.php:167
-msgid "Successfully-Cataloged"
-msgstr "Baþarýyla kataloglaþtýrýldý"
-
-#: ../../docs/upload.php:229
-#: ../../templates/show_artist.inc:56
-#: ../../templates/show_access_list.inc:51
-#: ../../templates/show_albums.inc:45
-#: ../../templates/show_albums.inc:73
-#: ../../templates/show_artists.inc:43
-#: ../../templates/show_artists.inc:67
-#: ../../templates/show_songs.inc:42
-msgid "Action"
-msgstr "Eylem"
-
-#: ../../docs/upload.php:230
-#: ../../templates/flag.inc:58
-#: ../../templates/list_flagged.inc:41
-msgid "Song"
-msgstr "Þarký"
-
-#: ../../docs/upload.php:231
-#: ../../modules/class/song.php:275
-#: ../../templates/show_albums.inc:40
-#: ../../templates/show_albums.inc:70
-#: ../../templates/show_artists.inc:39
-#: ../../templates/show_artists.inc:62
-#: ../../templates/show_songs.inc:34
-msgid "Artist"
-msgstr "Sanatçý"
-
-#: ../../docs/upload.php:232
-#: ../../modules/class/song.php:280
-#: ../../templates/show_albums.inc:38
-#: ../../templates/show_albums.inc:68
-#: ../../templates/show_songs.inc:35
-msgid "Album"
-msgstr "Albüm"
-
-#: ../../docs/upload.php:233
-#: ../../modules/class/song.php:293
-#: ../../templates/show_songs.inc:40
-msgid "Genre"
-msgstr "Kategori"
-
-#: ../../docs/upload.php:234
-#: ../../modules/class/song.php:262
-#: ../../templates/show_songs.inc:37
-msgid "Time"
-msgstr "Süre"
-
-#: ../../docs/upload.php:235
-#: ../../modules/class/song.php:250
-#: ../../templates/show_songs.inc:39
-msgid "Bitrate"
-msgstr "Ýkil hýzý"
-
-#: ../../docs/upload.php:236
-#: ../../templates/show_songs.inc:38
-msgid "Size"
-msgstr "Boyut"
-
-#: ../../docs/upload.php:237
-msgid "Filename"
-msgstr "Dosya adý"
-
-#: ../../docs/upload.php:238
-msgid "User"
-msgstr "Kullanýcý"
-
-#: ../../docs/upload.php:239
-msgid "Date"
-msgstr "Tarih"
-
-#: ../../docs/upload.php:267
-msgid "Unknown"
-msgstr "Bilinmeyen"
-
-#: ../../docs/upload.php:289
-msgid "Add"
-msgstr "Ekle"
-
-#: ../../docs/upload.php:290
-#: ../../modules/lib.php:1008
-#: ../../templates/catalog.inc:60
-#: ../../templates/show_users.inc:57
-msgid "Delete"
-msgstr "Sil"
-
-#: ../../docs/upload.php:294
-msgid "Quarantined"
-msgstr "Karantinaya alýnmýþ"
-
-#: ../../docs/play/index.php:46
+#: ../../play/index.php:50
 msgid "Session Expired: please log in again at"
 msgstr "Oturumun süresi bitmiþ: lütfen yeniden giriþ yapýn"
 
-#: ../../docs/flag.php:35
-msgid "Flagging song completed."
-msgstr "Þarký iþaretleme tamamlandý"
-
-#: ../../docs/playlist.php:71
-#: ../../templates/show_artist.inc:95
-#: ../../templates/show_songs.inc:151
-msgid "Play Selected"
-msgstr "Seçilmiþleri çal"
-
-#: ../../docs/playlist.php:89
-#: ../../templates/show_songs.inc:152
-msgid "Flag Selected"
-msgstr "Seçilmiþleri iþaretle"
-
-#: ../../docs/playlist.php:95
-#: ../../templates/show_songs.inc:153
-msgid "Edit Selected"
-msgstr "Seçilmiþleri düzenle"
-
-#: ../../docs/playlist.php:125
-#: ../../modules/lib.php:1007
-#: ../../templates/show_artist.inc:103
-#: ../../templates/show_users.inc:51
-#: ../../templates/show_songs.inc:169
-msgid "Edit"
-msgstr "Düzenle"
-
-#: ../../docs/playlist.php:128
-#: ../../modules/lib.php:1016
-#: ../../templates/show_artist.inc:79
-#: ../../templates/show_mpdplay.inc:45
-#: ../../templates/show_albums.inc:57
-#: ../../templates/show_artists.inc:54
-#: ../../templates/show_localplay.inc:41
-msgid "Play"
-msgstr "Çal"
-
-#: ../../docs/playlist.php:140
-msgid "New Playlist"
-msgstr "Yeni þarký listesi"
-
-#: ../../docs/playlist.php:198
-msgid "Playlist updated."
-msgstr "Þarký listesi güncelendi."
-
-#: ../../docs/playlist.php:305
-msgid "No songs in this playlist."
-msgstr "Bu listede þarký bulunamadý."
-
-#: ../../docs/artists.php:47
-msgid "All songs by"
-msgstr "Tüm þarkýlarý"
-
-#: ../../docs/artists.php:56
-#: ../../docs/albums.php:103
-msgid "Starting Update from Tags"
-msgstr "Etiketten güncelleþtirme baþlýyor"
-
-#: ../../docs/artists.php:61
-#: ../../docs/albums.php:108
-msgid "Update From Tags Compleate"
-msgstr "Etiketten güncelleþtirme tamamlandý"
-
-#: ../../docs/artists.php:62
-#: ../../docs/albums.php:109
-#: ../../modules/class/catalog.php:615
-msgid "Return"
-msgstr "Dön"
-
-#: ../../docs/artists.php:73
-#: ../../docs/artists.php:82
-#: ../../docs/artists.php:94
-#: ../../docs/artists.php:111
-msgid "<u>S</u>how artists starting with"
-msgstr "Ýsmi bu harfle baþlayan sanatçýlarý göster"
-
-#: ../../docs/index.php:39
-msgid "Welcome to"
-msgstr "Hoþgeldiniz"
-
-#: ../../docs/index.php:41
-msgid "you are currently logged in as"
-msgstr "Kullanýcý adýnýz"
+#: ../../lib/preferences.php:211 ../../templates/show_users.inc:97
+msgid "Enable"
+msgstr "Etkinleþtir"
 
-#: ../../docs/index.php:72
-msgid "Most Popular Songs"
-msgstr "En popüler þarkýlar"
+#: ../../lib/preferences.php:212 ../../templates/show_users.inc:100
+msgid "Disable"
+msgstr "Edilgenleþtir"
 
-#: ../../docs/index.php:79
-msgid "Most Popular Artists"
-msgstr "En popüler sanatçýlar"
+#: ../../lib/preferences.php:224 ../../templates/add_catalog.inc:60
+msgid "Local"
+msgstr "Yerel"
 
-#: ../../docs/index.php:91
-msgid "Newest Album Additions"
-msgstr "Son eklenen albümler"
+#: ../../lib/preferences.php:227
+msgid "Stream"
+msgstr "Akým"
 
-#: ../../docs/index.php:98
-msgid "Newest Artist Additions"
-msgstr "Son eklenen sanatçýlar"
+#: ../../lib/preferences.php:230
+msgid "IceCast"
+msgstr "IceCast"
 
-#: ../../docs/albums.php:43
-msgid "Album Art Cleared"
-msgstr "Albüm kapaðý silindi"
+#: ../../lib/preferences.php:233
+msgid "Downsample"
+msgstr "Kaliteyi düþür (downsample)"
 
-#: ../../docs/albums.php:43
-msgid "Album Art information has been removed form the database"
-msgstr "Albüm kapaðý ile ilgili bilgiler veritabanýndan silindi"
+#: ../../lib/preferences.php:236
+msgid "Music Player Daemon"
+msgstr "Music Player Daemon"
 
-#: ../../docs/albums.php:75
-msgid "Album Art Located"
-msgstr "Albüm kapaðý bulundu"
+#: ../../lib/preferences.php:239
+msgid "SlimServer"
+msgstr ""
 
-#: ../../docs/albums.php:75
-msgid "Album Art information has been located in Amazon. If incorrect, click \"Reset Album Art\" below to remove the artwork."
-msgstr "Albüm kapaðý Amazon'da bulundu. Doðru olmadýðý takdirde \"Albüm kapaðý silinsin\" i týklayarak bilgileri silin."
+#: ../../lib/preferences.php:248
+msgid "M3U"
+msgstr "M3U"
 
-#: ../../docs/albums.php:83
-#: ../../docs/albums.php:93
-msgid "Get Art"
-msgstr "Albüm kapaðý çaðýr"
+#: ../../lib/preferences.php:249
+msgid "Simple M3U"
+msgstr "Simple M3U"
 
-#: ../../docs/albums.php:87
-msgid "Album Art Not Located"
-msgstr "Albüm kapaðý bulunamadý"
+#: ../../lib/preferences.php:250
+msgid "PLS"
+msgstr "PLS"
 
-#: ../../docs/albums.php:87
-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 "Albüm kapaðý bulunamadý. Bu Amazon'un meþgul yada bu albümün orada olmayýþýndan ileri gelebilir."
+#: ../../lib/preferences.php:251
+msgid "Asx"
+msgstr "Asx"
 
-#: ../../docs/albums.php:123
-#: ../../docs/albums.php:138
-msgid "All Albums"
-msgstr "Tüm albümler"
+#: ../../lib/preferences.php:258
+msgid "English"
+msgstr "Ýngilizce"
 
-#: ../../docs/albums.php:124
-#: ../../docs/albums.php:131
-msgid "<u>S</u>how all albums"
-msgstr "Tüm albümleri göster"
+#: ../../lib/preferences.php:259
+#, fuzzy
+msgid "British English"
+msgstr "Ýngilizce"
 
-#: ../../docs/albums.php:130
-msgid "Albums with no artwork"
-msgstr "Kapaksýz Albümler"
+#: ../../lib/preferences.php:260
+msgid "German"
+msgstr "Almanca"
 
-#: ../../docs/albums.php:139
-#: ../../docs/albums.php:146
-#: ../../docs/albums.php:151
-msgid "<u>S</u>how only albums starting with"
-msgstr "Ýsmi bu harfle baþlayan albümleri göster"
+#: ../../lib/preferences.php:261
+msgid "French"
+msgstr "Fransýzca"
 
-#: ../../docs/albums.php:145
-msgid "Select a starting letter or Show all"
-msgstr "Baþlangýç harfini seç yada hepsini görüntüle"
+#: ../../lib/preferences.php:262
+msgid "Turkish"
+msgstr ""
 
-#: ../../docs/amp-mpd.php:32
-msgid "Error Connecting"
-msgstr "Baðlantý hatasý"
+#: ../../lib/preferences.php:263
+msgid "Spanish"
+msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:28
-#: ../../templates/show_install_account.inc.php:60
-#: ../../templates/show_users.inc:39
-#: ../../templates/userform.inc:41
-msgid "Username"
-msgstr "Kullanýcý adý"
+#: ../../lib/preferences.php:264
+msgid "Norwegian"
+msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:36
-#: ../../templates/userform.inc:49
-msgid "Full Name"
-msgstr "Tam Ýsim"
+#: ../../lib/preferences.php:265
+msgid "Simplified Chinese"
+msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:44
-#: ../../templates/show_user.inc.php:40
-#: ../../templates/userform.inc:56
-msgid "E-mail"
-msgstr "Elektronik posta"
+#: ../../lib/duplicates.php:80
+#, fuzzy
+msgid "Find Duplicates"
+msgstr "Duble þarkýlarý görüntüle"
 
-#: ../../templates/show_user_registration.inc.php:52
-#: ../../templates/show_install_account.inc.php:64
-#: ../../templates/show_login_form.inc:44
-#: ../../templates/userform.inc:64
-msgid "Password"
-msgstr "Parola"
+#: ../../lib/duplicates.php:83 ../../templates/show_search.inc:74
+msgid "Search Type"
+msgstr "Arama türü"
 
-#: ../../templates/show_user_registration.inc.php:60
-#: ../../templates/show_user.inc.php:75
-#: ../../templates/userform.inc:73
-msgid "Confirm Password"
-msgstr "Parola doðrulama"
+#: ../../lib/duplicates.php:91 ../../lib/class/song.class.php:275
+msgid "Title"
+msgstr "Þarký adý"
 
-#: ../../templates/show_user_registration.inc.php:69
-msgid "Register User"
-msgstr "Kullanýcý kaydý"
+#: ../../lib/duplicates.php:97
+msgid "Artist and Title"
+msgstr ""
 
-#: ../../templates/show_confirmation.inc.php:30
-msgid "Continue"
-msgstr "Devam"
+#: ../../lib/duplicates.php:102
+msgid "Artist, Album and Title"
+msgstr ""
 
-#: ../../templates/show_install_account.inc.php:35
-#: ../../templates/show_install.inc:34
-#: ../../templates/show_install_config.inc:35
-msgid "Ampache Installation"
-msgstr "Ampache'nin Kuruluþu"
+#: ../../lib/duplicates.php:110 ../../templates/menu.inc:39
+#: ../../templates/show_search.inc:37 ../../templates/show_search.inc:83
+#: ../../templates/show_search_bar.inc:71
+msgid "Search"
+msgstr "Ara"
 
-#: ../../templates/show_install_account.inc.php:37
-#: ../../templates/show_install.inc:36
-#: ../../templates/show_install_config.inc:37
-msgid "This Page handles the installation of the ampache database and the creation of the ampache.cfg file. Before you continue please make sure that you have the following pre-requisits"
-msgstr "Bu sayfa Ampache veritabanýnýn ve ampache.cfg'nin kurulmasýný saðlýyor. Devam etmeden önce asaðýda istenenleri yerine getiriniz"
+#: ../../lib/general.lib.php:640
+msgid "Not Enough Data"
+msgstr ""
 
-#: ../../templates/show_install_account.inc.php:40
-#: ../../templates/show_install.inc:39
-#: ../../templates/show_install_config.inc:40
-msgid "A MySQL Server with a username and password that can create/modify databases"
-msgstr "Bir MySQL Sunucusu ve bunun veritabaný ekleyebilen ve düzenleyebilen kullanýcý giriþi ve parolasý"
+#: ../../lib/search.php:52 ../../lib/search.php:68 ../../lib/search.php:84
+#: ../../lib/search.php:100 ../../lib/search.php:116 ../../lib/search.php:133
+#: ../../lib/search.php:145 ../../lib/search.php:161 ../../lib/search.php:177
+msgid "No Results Found"
+msgstr "Sonuç bulunamadý"
 
-#: ../../templates/show_install_account.inc.php:41
-#: ../../templates/show_install_config.inc:41
-msgid "Your webserver configured so that your config directory is not visable to the web"
-msgstr "Web Sunucunuz yapýlandýrma klasörünüzün görünmeyeceði þekilde ayarlanmýþ olmalý"
+#: ../../lib/class/genre.class.php:278
+#, fuzzy
+msgid "Show Genres starting with"
+msgstr "Ýsmi bu harfle baþlayan sanatçýlarý göster"
 
-#: ../../templates/show_install_account.inc.php:42
-#: ../../templates/show_install.inc:41
-#: ../../templates/show_install_config.inc:42
-msgid "Your webserver has read access to the /sql/ampache.sql file and the /config/ampache.cfg.dist file"
-msgstr "Web Sunucunuz /sql/ampache.sql ve /config/ampache.cfg.dist dosyalarýný okuyabilmeli "
+#: ../../lib/class/album.class.php:126
+msgid "Various"
+msgstr "Çeþitli"
 
-#: ../../templates/show_install_account.inc.php:44
-#: ../../templates/show_install.inc:43
-#: ../../templates/show_install_config.inc:44
-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"
-msgstr "Yukarýdaki istenenleri saðladýktan sonra aþaðýda istenen verileri giriniz. Yalnýz gerekli olanlar sorulacaktýr. Ýsterseniz daha sonra /config/ampache.cfg dosyasýna deðiþiklikler yapabilirsiniz"
+#: ../../lib/class/album.class.php:241 ../../lib/class/catalog.class.php:275
+#: ../../lib/class/catalog.class.php:560
+msgid "Error: Unable to open"
+msgstr "Hata: açýlamadý"
 
-#: ../../templates/show_install_account.inc.php:49
-#: ../../templates/show_install.inc:47
-#: ../../templates/show_install_config.inc:49
-msgid "Step 1 - Creating and Inserting the Ampache Database"
-msgstr "Ýlk Adým - Ampache veritabanýnýn kurulmasý ve doldurulmasý"
+#: ../../lib/class/song.class.php:275 ../../lib/class/song.class.php:279
+#: ../../lib/class/song.class.php:283 ../../lib/class/song.class.php:287
+#: ../../lib/class/song.class.php:291 ../../lib/class/song.class.php:295
+#: ../../lib/class/song.class.php:299 ../../lib/class/song.class.php:304
+#: ../../lib/class/song.class.php:309 ../../lib/class/song.class.php:313
+#: ../../lib/class/song.class.php:317 ../../lib/class/song.class.php:322
+msgid "updated to"
+msgstr "güncelleþtirildi"
 
-#: ../../templates/show_install_account.inc.php:50
-#: ../../templates/show_install.inc:51
-#: ../../templates/show_install_config.inc:50
-msgid "Step 2 - Creating the Ampache.cfg file"
-msgstr "Ýkinci Adým - amapche.cfg'nin kurulmasý"
+#: ../../lib/class/song.class.php:279 ../../templates/show_songs.inc:39
+#: ../../templates/show_uploads.inc:39
+msgid "Bitrate"
+msgstr "Ýkil hýzý"
 
-#: ../../templates/show_install_account.inc.php:51
-#: ../../templates/show_install.inc:52
-#: ../../templates/show_install_config.inc:54
-msgid "Step 3 - Setup Initial Account"
-msgstr "Üçüncü Adým - Ýlk kullanýcýnýn kurulmasý"
+#: ../../lib/class/song.class.php:283
+msgid "Rate"
+msgstr "Oran"
 
-#: ../../templates/show_install_account.inc.php:53
-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 "Bu adýmda ilk yönetici hesabý oluþturuluyor.  Oluþturulduktan sonra giriþ sayfasýna yönlendirileceksiniz."
+#: ../../lib/class/song.class.php:287
+msgid "Mode"
+msgstr "Kip"
 
-#: ../../templates/show_install_account.inc.php:69
-msgid "Create Account"
-msgstr "Hesap ekle"
+#: ../../lib/class/song.class.php:291 ../../templates/show_songs.inc:37
+#: ../../templates/show_mpdpl.inc:66 ../../templates/show_uploads.inc:38
+msgid "Time"
+msgstr "Süre"
 
-#: ../../templates/show_user.inc.php:31
-#: ../../templates/show_access_list.inc:47
-#: ../../templates/show_add_access.inc:40
-#: ../../templates/customize_catalog.inc:29
-msgid "Name"
-msgstr "Ýsim"
+#: ../../lib/class/song.class.php:295 ../../templates/show_songs.inc:32
+#: ../../templates/show_songs.inc:36 ../../templates/show_mpdpl.inc:65
+msgid "Track"
+msgstr "Parça"
 
-#: ../../templates/show_user.inc.php:48
-msgid "View Limit"
-msgstr "Sýnýrlarý görüntüle"
+#: ../../lib/class/song.class.php:299
+msgid "Filesize"
+msgstr "Dosya boyutu"
 
-#: ../../templates/show_user.inc.php:56
-msgid "Update Profile"
-msgstr "Profil güncelleme"
+#: ../../lib/class/song.class.php:304 ../../templates/show_artists.inc:39
+#: ../../templates/show_artists.inc:62 ../../templates/show_songs.inc:34
+#: ../../templates/show_albums.inc:40 ../../templates/show_albums.inc:70
+#: ../../templates/show_mpdpl.inc:63 ../../templates/show_uploads.inc:35
+msgid "Artist"
+msgstr "Sanatçý"
 
-#: ../../templates/show_user.inc.php:67
-msgid "Enter password"
-msgstr "Parola giriþ"
+#: ../../lib/class/song.class.php:309 ../../templates/show_songs.inc:35
+#: ../../templates/show_albums.inc:38 ../../templates/show_albums.inc:68
+#: ../../templates/show_mpdpl.inc:64 ../../templates/show_uploads.inc:36
+msgid "Album"
+msgstr "Albüm"
 
-#: ../../templates/show_user.inc.php:83
-msgid "Change Password"
-msgstr "Parola deðiþtirme"
+#: ../../lib/class/song.class.php:313 ../../templates/show_albums.inc:43
+#: ../../templates/show_albums.inc:73
+msgid "Year"
+msgstr "Yýl"
 
-#: ../../templates/show_user.inc.php:91
-msgid "Clear Stats"
-msgstr "Ýstatistikleri sil"
+#: ../../lib/class/song.class.php:317 ../../templates/list_flagged.inc:46
+#: ../../templates/flag.inc:66
+msgid "Comment"
+msgstr "Yorum"
 
-#: ../../templates/show_confirm_action.inc.php:28
-msgid "Yes"
-msgstr "Evet"
+#: ../../lib/class/song.class.php:322 ../../templates/show_genres.inc.php:36
+#: ../../templates/show_genre.inc.php:32 ../../templates/show_songs.inc:40
+#: ../../templates/show_browse_menu.inc:37 ../../templates/show_mpdpl.inc:67
+#: ../../templates/show_uploads.inc:37
+msgid "Genre"
+msgstr "Kategori"
 
-#: ../../modules/class/stream.php:192
-msgid "Opened for writting"
+#: ../../lib/class/stream.class.php:198
+#, fuzzy
+msgid "Opened for writing"
 msgstr "Yazmak için açýldý"
 
-#: ../../modules/class/stream.php:197
+#: ../../lib/class/stream.class.php:203
 msgid "Error, cannot write"
 msgstr "Hata, yazýlamýyor"
 
-#: ../../modules/class/stream.php:208
+#: ../../lib/class/stream.class.php:214
 msgid "Error, cannot write song in file"
 msgstr "Hata, þarký dosyaya yazýlamadý"
 
-#: ../../modules/class/stream.php:214
+#: ../../lib/class/stream.class.php:220
 msgid "Closed after write"
 msgstr "Yazýldýktan sonra kapatýldý"
 
-#: ../../modules/class/album.php:126
-msgid "Various"
-msgstr "Çeþitli"
-
-#: ../../modules/class/album.php:241
-#: ../../modules/class/catalog.php:267
-#: ../../modules/class/catalog.php:527
-msgid "Error: Unable to open"
-msgstr "Hata: açýlamadý"
-
-#: ../../modules/class/catalog.php:289
+#: ../../lib/class/catalog.class.php:298
 msgid "Error: Unable to change to directory"
 msgstr "Hata: klasöre geçiþ yapýlamadý"
 
-#: ../../modules/class/catalog.php:312
+#: ../../lib/class/catalog.class.php:321
 msgid "Error: Unable to get filesize for"
 msgstr "Hata: dosya boyutu sorgulanamadý"
 
-#: ../../modules/class/catalog.php:332
+#: ../../lib/class/catalog.class.php:340
+#, fuzzy
+msgid "Added Playlist From"
+msgstr "Yeni þarký listesi"
+
+#: ../../lib/class/catalog.class.php:359
 msgid "Added"
 msgstr "Eklendi"
 
-#: ../../modules/class/catalog.php:342
+#: ../../lib/class/catalog.class.php:371
 msgid "is not readable by ampache"
 msgstr "Ampache tarafýndan okunamadý"
 
-#: ../../modules/class/catalog.php:402
+#: ../../lib/class/catalog.class.php:435
 msgid "Found in ID3"
 msgstr "ID3 içinde bulundu"
 
-#: ../../modules/class/catalog.php:406
+#: ../../lib/class/catalog.class.php:439
 msgid "Found on Amazon"
 msgstr "Amazon'da bulundu"
 
-#: ../../modules/class/catalog.php:410
+#: ../../lib/class/catalog.class.php:443
 msgid "Found in Folder"
 msgstr "Klasörde bulundu"
 
-#: ../../modules/class/catalog.php:414
+#: ../../lib/class/catalog.class.php:447
 msgid "Found"
 msgstr "Bulundu"
 
-#: ../../modules/class/catalog.php:417
+#: ../../lib/class/catalog.class.php:450
 msgid "Not Found"
 msgstr "Bulunamadý"
 
-#: ../../modules/class/catalog.php:425
+#: ../../lib/class/catalog.class.php:458
 msgid "Searched"
 msgstr "Arandý"
 
-#: ../../modules/class/catalog.php:578
+#: ../../lib/class/catalog.class.php:613
 msgid "Starting Dump Album Art"
 msgstr "Albüm kapaðý boþaltmasý baþlýyor"
 
-#: ../../modules/class/catalog.php:598
+#: ../../lib/class/catalog.class.php:633
 msgid "Written"
 msgstr "Yazýldý"
 
-#: ../../modules/class/catalog.php:607
+#: ../../lib/class/catalog.class.php:642
 msgid "Error unable to open file for writting"
 msgstr "Hata: dosya yazmak için açýlamadý"
 
-#: ../../modules/class/catalog.php:614
+#: ../../lib/class/catalog.class.php:649
 msgid "Album Art Dump Complete"
 msgstr "Albüm kapaðý boþaltmasý tamamlandý"
 
-#: ../../modules/class/catalog.php:681
+#: ../../lib/class/catalog.class.php:650 ../../artists.php:63
+#: ../../albums.php:112
+msgid "Return"
+msgstr "Dön"
+
+#: ../../lib/class/catalog.class.php:719
 msgid "Starting Catalog Build"
 msgstr "Katalog yapýlandýrma baþladý"
 
-#: ../../modules/class/catalog.php:686
+#: ../../lib/class/catalog.class.php:724
 msgid "Running Remote Sync"
 msgstr "Uzak anuyum sürüyor"
 
-#: ../../modules/class/catalog.php:696
-#: ../../modules/class/catalog.php:843
+#: ../../lib/class/catalog.class.php:734 ../../lib/class/catalog.class.php:880
+#: ../../admin/catalog.php:264
 msgid "Starting Album Art Search"
 msgstr "Albüm kapaðý aramasý baþlýyor"
 
-#: ../../modules/class/catalog.php:706
+#: ../../lib/class/catalog.class.php:744
 msgid "Catalog Finished"
 msgstr "Katalog tamamlandý"
 
-#: ../../modules/class/catalog.php:706
-#: ../../modules/class/catalog.php:862
+#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:899
 msgid "Total Time"
 msgstr "Genel Süre"
 
-#: ../../modules/class/catalog.php:706
-#: ../../modules/class/catalog.php:863
+#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:900
 msgid "Total Songs"
 msgstr "Tüm Þarkýlar"
 
-#: ../../modules/class/catalog.php:707
-#: ../../modules/class/catalog.php:863
+#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:900
 msgid "Songs Per Seconds"
 msgstr "Þarký/Saniye"
 
-#: ../../modules/class/catalog.php:741
+#: ../../lib/class/catalog.class.php:779
+#: ../../lib/class/catalog.class.php:1476
 msgid "Updated"
 msgstr "Güncelleþtirildi"
 
-#: ../../modules/class/catalog.php:748
+#: ../../lib/class/catalog.class.php:786
 msgid "No Update Needed"
 msgstr "Güncelleþtirme gereksiz"
 
-#: ../../modules/class/catalog.php:823
+#: ../../lib/class/catalog.class.php:860
 msgid "Starting New Song Search on"
 msgstr "Yeni þarký arama baþladý"
 
-#: ../../modules/class/catalog.php:823
+#: ../../lib/class/catalog.class.php:860
 msgid "catalog"
 msgstr "Katalog"
 
-#: ../../modules/class/catalog.php:827
+#: ../../lib/class/catalog.class.php:864
 msgid "Running Remote Update"
 msgstr "Uzak güncelleme sürüyor"
 
-#: ../../modules/class/catalog.php:862
+#: ../../lib/class/catalog.class.php:899
 msgid "Catalog Update Finished"
 msgstr "Katalog güncelleme tamamlandý"
 
-#: ../../modules/class/catalog.php:876
-#: ../../lib/mpd.php:31
+#: ../../lib/class/catalog.class.php:919 ../../lib/mpd.php:40
+#: ../../lib/mpd.php:49
 msgid "Error"
 msgstr "Hata"
 
-#: ../../modules/class/catalog.php:876
+#: ../../lib/class/catalog.class.php:919
 msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
-msgstr "XMLRPC kitaplýðý yüklenemedi, XML-RPC'nin etkinleþtirilmiþ olduðunu kontrol edin"
+msgstr ""
+"XMLRPC kitaplýðý yüklenemedi, XML-RPC'nin etkinleþtirilmiþ olduðunu kontrol "
+"edin"
 
-#: ../../modules/class/catalog.php:908
-#: ../../modules/class/catalog.php:923
+#: ../../lib/class/catalog.class.php:958
+#: ../../lib/class/catalog.class.php:1009
 msgid "Error connecting to"
 msgstr "Hata, baðlanilamýyor: "
 
-#: ../../modules/class/catalog.php:908
-#: ../../modules/class/catalog.php:923
+#: ../../lib/class/catalog.class.php:958
+#: ../../lib/class/catalog.class.php:1009
 msgid "Code"
 msgstr "Kod"
 
-#: ../../modules/class/catalog.php:908
-#: ../../modules/class/catalog.php:923
+#: ../../lib/class/catalog.class.php:958
+#: ../../lib/class/catalog.class.php:1009
 msgid "Reason"
 msgstr "Neden"
 
-#: ../../modules/class/catalog.php:928
+#: ../../lib/class/catalog.class.php:974
 msgid "Completed updating remote catalog(s)"
 msgstr "Uzak katalog(lar) güncellendi"
 
-#: ../../modules/class/catalog.php:1016
+#: ../../lib/class/catalog.class.php:1105
 msgid "Checking"
 msgstr "Saðlama yapýlýyor"
 
-#: ../../modules/class/catalog.php:1073
+#: ../../lib/class/catalog.class.php:1163
 msgid "Catalog Clean Done"
 msgstr "Kalalog temizleme tamamlandý"
 
-#: ../../modules/class/catalog.php:1073
+#: ../../lib/class/catalog.class.php:1163
 msgid "files removed"
 msgstr "dosya silindi"
 
-#: ../../modules/class/catalog.php:1313
+#: ../../lib/class/catalog.class.php:1436
 msgid "Updating the"
 msgstr "Güncelleþtiriliyor"
 
-#: ../../modules/class/catalog.php:1313
-#: ../../templates/admin_menu.inc:35
-#: ../../templates/show_admin_index.inc:34
+#: ../../lib/class/catalog.class.php:1436 ../../templates/admin_menu.inc:35
 msgid "Catalog"
 msgstr "Katalog"
 
-#: ../../modules/class/catalog.php:1314
+#: ../../lib/class/catalog.class.php:1437
 msgid "songs found checking tag information."
 msgstr "þarký etiket bilgisi taramasý sonucu bulundu."
 
-#: ../../modules/class/song.php:246
-msgid "Title"
-msgstr "Þarký adý"
+#: ../../lib/class/catalog.class.php:1484
+msgid " FOUND"
+msgstr ""
 
-#: ../../modules/class/song.php:246
-#: ../../modules/class/song.php:250
-#: ../../modules/class/song.php:254
-#: ../../modules/class/song.php:258
-#: ../../modules/class/song.php:262
-#: ../../modules/class/song.php:266
-#: ../../modules/class/song.php:270
-#: ../../modules/class/song.php:275
-#: ../../modules/class/song.php:280
-#: ../../modules/class/song.php:284
-#: ../../modules/class/song.php:288
-#: ../../modules/class/song.php:293
-msgid "updated to"
-msgstr "güncelleþtirildi"
+#: ../../lib/class/catalog.class.php:1485
+#, fuzzy
+msgid "Searching for new Album Art"
+msgstr "Albüm kapaðý boþaltmasý baþlýyor"
 
-#: ../../modules/class/song.php:254
-msgid "Rate"
-msgstr "Oran"
+#: ../../lib/class/catalog.class.php:1489
+#, fuzzy
+msgid "Album Art Already Found"
+msgstr "Albüm kapaðý silindi"
 
-#: ../../modules/class/song.php:258
-msgid "Mode"
-msgstr "Kip"
+#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
+msgid "Could not add"
+msgstr "Eklenemedi"
 
-#: ../../modules/class/song.php:266
-#: ../../templates/show_songs.inc:32
-#: ../../templates/show_songs.inc:36
-msgid "Track"
-msgstr "Parça"
+#: ../../lib/Browser.php:867
+msgid "file"
+msgstr "dosya"
 
-#: ../../modules/class/song.php:270
-msgid "Filesize"
-msgstr "Dosya boyutu"
+#: ../../lib/Browser.php:871
+msgid "File uploads not supported."
+msgstr "Dosya yükleme desteði verilmiyor."
 
-#: ../../modules/class/song.php:284
-#: ../../templates/show_albums.inc:43
-#: ../../templates/show_albums.inc:72
-msgid "Year"
-msgstr "Yýl"
+#: ../../lib/Browser.php:889
+msgid "No file uploaded"
+msgstr "Hicbir dosya yüklenmedi."
 
-#: ../../modules/class/song.php:288
-#: ../../templates/flag.inc:66
-#: ../../templates/list_flagged.inc:46
-msgid "Comment"
-msgstr "Yorum"
+#: ../../lib/Browser.php:896
+#, php-format
+msgid "There was a problem with the file upload: No %s was uploaded."
+msgstr "Dosya yüklemede sorun çýktý: %s yüklenemedi"
 
-#: ../../modules/lib.php:51
-msgid "day"
-msgstr "gün"
+#: ../../lib/Browser.php:901
+#, php-format
+msgid ""
+"There was a problem with the file upload: The %s was larger than the maximum "
+"allowed size (%d bytes)."
+msgstr ""
+"Dosya yüklemede sorun çýktý: %s müsaade edilen azami boyutu aþýyor (%d byte)"
 
-#: ../../modules/lib.php:54
-msgid "days"
-msgstr "gün"
+#: ../../lib/Browser.php:903
+#, php-format
+msgid ""
+"There was a problem with the file upload: The %s was only partially uploaded."
+msgstr "Gönderilen dosya (%s) yalnýz kýsmen yüklendi."
 
-#: ../../modules/lib.php:58
-msgid "hour"
-msgstr "saat"
+#: ../../lib/ui.lib.php:199
+#, fuzzy
+msgid "Playlist Actions"
+msgstr "Þarký listeleri"
 
-#: ../../modules/lib.php:61
-msgid "hours"
-msgstr "saat"
+#: ../../lib/ui.lib.php:199
+msgid "New"
+msgstr "Yeni"
 
-#: ../../modules/lib.php:78
-msgid "Catalog Statistics"
-msgstr "Katalog istatistikleri"
+#: ../../lib/ui.lib.php:200
+msgid "View All"
+msgstr "Hepsini görüntüle"
 
-#: ../../modules/lib.php:81
-msgid "Total Users"
-msgstr "Tüm Kullanýcýlar"
+#: ../../lib/ui.lib.php:201
+msgid "Import"
+msgstr ""
 
-#: ../../modules/lib.php:85
-msgid "Connected Users"
-msgstr "Baðlanmýþ Kullanýcýlar"
+#: ../../lib/ui.lib.php:301 ../../templates/menu.inc:35
+msgid "Browse"
+msgstr ""
 
-#: ../../modules/lib.php:89
-#: ../../templates/menu.inc:32
-#: ../../templates/show_artists.inc:42
-#: ../../templates/show_artists.inc:65
-msgid "Albums"
-msgstr "Albümler"
+#: ../../lib/ui.lib.php:303
+msgid "Show w/o art"
+msgstr "Kapaksýz göster"
 
-#: ../../modules/lib.php:93
-#: ../../templates/menu.inc:33
-msgid "Artists"
-msgstr "Sanatçýlar"
+#: ../../lib/ui.lib.php:306
+msgid "Show all"
+msgstr "Tümünü görüntüle"
 
-#: ../../modules/lib.php:97
-#: ../../templates/show_albums.inc:41
-#: ../../templates/show_albums.inc:71
-#: ../../templates/show_artists.inc:41
-#: ../../templates/show_artists.inc:64
-msgid "Songs"
-msgstr "Þarkýlar"
+#: ../../lib/ui.lib.php:446
+msgid "No songs in this playlist."
+msgstr "Bu listede þarký bulunamadý."
 
-#: ../../modules/lib.php:101
-msgid "Catalog Size"
-msgstr "Katalog boyutu"
+#: ../../lib/ui.lib.php:592
+#, fuzzy
+msgid "No Catalogs Found!"
+msgstr "Bulunamadý"
 
-#: ../../modules/lib.php:105
-msgid "Catalog Time"
-msgstr "Katalog süresi"
+#: ../../lib/ui.lib.php:593 ../../templates/add_catalog.inc:28
+msgid "Add a Catalog"
+msgstr "Katalog ekle"
 
-#: ../../modules/lib.php:159
-msgid "Play Random Selection"
-msgstr "Rasgele seçilenleri çal"
+#: ../../lib/ui.lib.php:594 ../../templates/show_local_catalog_info.inc.php:7
+msgid "Catalog Statistics"
+msgstr "Katalog istatistikleri"
 
-#: ../../modules/lib.php:166
-msgid "Item count"
-msgstr "Öðe sayýsý"
+#: ../../lib/ui.lib.php:630
+msgid "day"
+msgstr "gün"
 
-#: ../../modules/lib.php:178
-#: ../../templates/show_albums.inc:58
-#: ../../templates/show_artists.inc:55
-msgid "All"
-msgstr "Hepsi"
+#: ../../lib/ui.lib.php:630
+msgid "days"
+msgstr "gün"
 
-#: ../../modules/lib.php:180
-msgid "From genre"
-msgstr "Kategoriden"
+#: ../../lib/ui.lib.php:632
+msgid "hour"
+msgstr "saat"
 
-#: ../../modules/lib.php:190
-msgid "Favor Unplayed"
-msgstr "Çalýnmamýþlardan"
+#: ../../lib/ui.lib.php:632
+msgid "hours"
+msgstr "saat"
 
-#: ../../modules/lib.php:191
-msgid "Full Albums"
-msgstr "Tüm Albümler"
+#: ../../lib/upload.php:225
+#, fuzzy
+msgid "The file uploaded successfully"
+msgstr "Hicbir dosya yüklenmedi."
 
-#: ../../modules/lib.php:192
-msgid "Full Artist"
-msgstr "Tüm Sanatçýlar"
+#: ../../lib/upload.php:226
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+"Gönderilen dosya daha önce php.ini'de belirlenen upload_max_filesize hattýný "
+"aþýyor."
 
-#: ../../modules/lib.php:201
-msgid "from catalog"
-msgstr "Katalogdan"
+#: ../../lib/upload.php:227
+#, fuzzy
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr "Gönderilen dosya daha önce belirlenen MAX_FILE_SIZE hattýný aþýyor."
 
-#: ../../modules/lib.php:212
-msgid "Play Random Songs"
-msgstr "Rasgele þarký çal"
+#: ../../lib/upload.php:228
+#, fuzzy
+msgid "The uploaded file was only partially uploaded"
+msgstr "Gönderilen dosya kýsmen yüklendi."
+
+#: ../../lib/upload.php:229
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "Hicbir dosya yüklenmedi."
+
+#: ../../lib/upload.php:230
+msgid "Missing a temporary folder"
+msgstr ""
 
-#: ../../modules/lib.php:921
+#: ../../modules/lib.php:708
 msgid "Public"
 msgstr "Genel"
 
-#: ../../modules/lib.php:922
+#: ../../modules/lib.php:709
 msgid "Your Private"
 msgstr "Size özel"
 
-#: ../../modules/lib.php:923
+#: ../../modules/lib.php:710
 msgid "Other Private"
 msgstr "Diðerlerine özel"
 
-#: ../../modules/lib.php:1004
-#: ../../templates/show_artist.inc:102
-#: ../../templates/show_songs.inc:168
+#: ../../modules/lib.php:791 ../../templates/show_play_selected.inc.php:72
 msgid "View"
 msgstr "Görüntüle"
 
-#: ../../modules/lib.php:1022
-#: ../../templates/show_artist.inc:81
-#: ../../templates/show_albums.inc:61
-#: ../../templates/show_songs.inc:110
-#: ../../templates/show_album.inc:61
+#: ../../modules/lib.php:794 ../../templates/show_play_selected.inc.php:73
+#: ../../templates/show_users.inc:52 ../../templates/show_users.inc:86
+msgid "Edit"
+msgstr "Düzenle"
+
+#: ../../modules/lib.php:795 ../../templates/catalog.inc:60
+#: ../../templates/show_users.inc:61 ../../templates/show_uploads.inc:50
+msgid "Delete"
+msgstr "Sil"
+
+#: ../../modules/lib.php:803 ../../templates/show_genres.inc.php:48
+#: ../../templates/show_localplay.inc:41 ../../templates/show_artists.inc:54
+#: ../../templates/show_albums.inc:57 ../../templates/show_artist.inc:78
+#: ../../templates/show_mpdplay.inc:50
+msgid "Play"
+msgstr "Çal"
+
+#: ../../modules/lib.php:804 ../../templates/show_artists.inc:56
+#: ../../templates/show_albums.inc:59 ../../templates/show_mpdplay.inc:85
+msgid "Random"
+msgstr "Rasgele"
+
+#: ../../modules/lib.php:810 ../../templates/show_songs.inc:110
+#: ../../templates/show_album.inc:61 ../../templates/show_albums.inc:61
+#: ../../templates/show_artist.inc:80
 msgid "Download"
 msgstr "Ýndirme"
 
-#: ../../modules/lib.php:1033
+#: ../../modules/lib.php:821
 msgid "There are no playlists of this type"
 msgstr "Bu çeþit bir þarký listesi bulunamadý"
 
-#: ../../modules/lib.php:1061
+#: ../../modules/lib.php:856
 msgid "Create a new playlist"
 msgstr "Þarký listesi oluþtur"
 
-#: ../../modules/admin.php:45
+#: ../../modules/admin.php:46
 msgid "Manage Users"
 msgstr "Kullanýcýlarý düzenle"
 
-#: ../../modules/admin.php:47
+#: ../../modules/admin.php:48 ../../templates/show_admin_index.inc:34
 msgid "Add a new user"
 msgstr "Kullanýcý ekle"
 
-#: ../../lib/search.php:52
-#: ../../lib/search.php:68
-#: ../../lib/search.php:84
-#: ../../lib/search.php:100
-#: ../../lib/search.php:116
-#: ../../lib/search.php:133
-#: ../../lib/search.php:145
-#: ../../lib/search.php:161
-#: ../../lib/search.php:177
-msgid "No Results Found"
-msgstr "Sonuç bulunamadý"
+#: ../../admin/catalog.php:55 ../../templates/catalog.inc:66
+msgid "Add to Catalog(s)"
+msgstr "Kataloða ekle"
 
-#: ../../lib/ui.php:180
-#: ../../templates/show_artist.inc:100
-#: ../../templates/show_songs.inc:166
-msgid "Playlist"
-msgstr "Þarký listesi"
+#: ../../admin/catalog.php:66 ../../templates/catalog.inc:67
+msgid "Add to all Catalogs"
+msgstr "Tüm kataloglara ekle"
 
-#: ../../lib/ui.php:180
-msgid "New"
-msgstr "Yeni"
+#: ../../admin/catalog.php:75
+msgid "Error Connecting"
+msgstr "Baðlantý hatasý"
 
-#: ../../lib/ui.php:181
-msgid "View All"
-msgstr "Hepsini görüntüle"
+#: ../../admin/catalog.php:89 ../../templates/catalog.inc:73
+msgid "Update Catalog(s)"
+msgstr "Kataloðu güncelleþtir"
 
-#: ../../lib/ui.php:305
-msgid "Show w/o art"
-msgstr "Kapaksýz göster"
+#: ../../admin/catalog.php:100 ../../templates/catalog.inc:74
+msgid "Update All Catalogs"
+msgstr "Tüm kataloglarý güncelleþtir"
 
-#: ../../lib/ui.php:307
-msgid "Show all"
-msgstr "Tümünü görüntüle"
+#: ../../admin/catalog.php:132 ../../templates/catalog.inc:80
+msgid "Clean Catalog(s)"
+msgstr "Kataloðu temizle"
 
-#: ../../lib/preferences.php:199
-msgid "Enable"
-msgstr "Etkinleþtir"
+#: ../../admin/catalog.php:162 ../../templates/catalog.inc:81
+msgid "Clean All Catalogs"
+msgstr "Tüm kataloglarý temizle"
 
-#: ../../lib/preferences.php:200
-#: ../../templates/show_users.inc:63
-msgid "Disable"
-msgstr "Edilgenleþtir"
+#: ../../admin/catalog.php:211
+msgid "Now Playing Cleared"
+msgstr "Þu anda çalýnanlar silindi"
 
-#: ../../lib/preferences.php:210
-#: ../../templates/add_catalog.inc:60
-msgid "Local"
-msgstr "Yerel"
+#: ../../admin/catalog.php:211
+msgid "All now playing data has been cleared"
+msgstr "Tüm þu anda çalýnanlar silindi"
 
-#: ../../lib/preferences.php:211
-msgid "Stream"
-msgstr "Akým"
+#: ../../admin/catalog.php:216
+msgid "Do you really want to clear your catalog?"
+msgstr "Kataloðunuzu gerçekten boþaltmak mý istiyorsunuz?"
 
-#: ../../lib/preferences.php:212
-msgid "IceCast"
-msgstr "IceCast"
+#: ../../admin/catalog.php:223
+msgid "Do you really want to clear the statistics for this catalog?"
+msgstr "Bu kataloðun istatistik bilgilerini gerçekten silmek mi istiyorsunuz?"
 
-#: ../../lib/preferences.php:213
-msgid "Downsample"
-msgstr "Kaliteyi düþür (downsample)"
+#: ../../admin/catalog.php:241
+msgid "Do you really want to delete this catalog?"
+msgstr "Kataloðunuzu gerçekten silmek mi istiyorsunuz?"
 
-#: ../../lib/preferences.php:214
-msgid "Music Player Daemon"
-msgstr "Music Player Daemon"
+#: ../../admin/catalog.php:272
+#, fuzzy
+msgid "Album Art Search Finished"
+msgstr "Albüm kapaðý silindi"
 
-#: ../../lib/preferences.php:221
-msgid "M3U"
-msgstr "M3U"
+#: ../../admin/users.php:76 ../../admin/users.php:122
+msgid "Error Username Required"
+msgstr "Hata, kullanýcý ismi gerekli"
 
-#: ../../lib/preferences.php:222
-msgid "Simple M3U"
-msgstr "Simple M3U"
+#: ../../admin/users.php:79 ../../admin/users.php:119
+msgid "Error Passwords don't match"
+msgstr "Hata, parolalar uyuþmuyor"
 
-#: ../../lib/preferences.php:223
-msgid "PLS"
-msgstr "PLS"
+#: ../../admin/users.php:136
+msgid "Are you sure you want to permanently delete"
+msgstr "Tamamen silmek istediðinizden emin misiniz: "
 
-#: ../../lib/preferences.php:224
-msgid "Asx"
-msgstr "Asx"
+#: ../../admin/users.php:143 ../../templates/show_confirm_action.inc.php:29
+msgid "No"
+msgstr "Hayýr"
 
-#: ../../lib/preferences.php:231
-msgid "English"
-msgstr "Ýngilizce"
+#: ../../admin/users.php:145
+msgid "User Deleted"
+msgstr "Kullanýcý silindi"
 
-#: ../../lib/preferences.php:232
-msgid "German"
-msgstr "Almanca"
+#: ../../admin/users.php:148
+msgid "Delete Error"
+msgstr "Silme hatasý"
 
-#: ../../lib/preferences.php:233
-msgid "French"
-msgstr "Fransýzca"
+#: ../../admin/users.php:148
+msgid "Unable to delete last Admin User"
+msgstr "Son yönetici silinemedi"
 
-#: ../../lib/Browser.php:867
-msgid "file"
-msgstr "dosya"
+#: ../../admin/access.php:43
+msgid "Do you really want to delete this Access Record?"
+msgstr "Bu giriþ izini gerçekten silmek mi istiyorsunuz?"
 
-#: ../../lib/Browser.php:871
-msgid "File uploads not supported."
-msgstr "Dosya yükleme desteði verilmiyor."
+#: ../../admin/access.php:51
+msgid "Entry Deleted"
+msgstr "Giriþ silindi"
 
-#: ../../lib/Browser.php:889
-msgid "No file uploaded"
-msgstr "Hicbir dosya yüklenmedi."
+#: ../../admin/access.php:51
+msgid "Your Access List Entry has been removed"
+msgstr "Eriþim listesindeki giriþiniz silindi"
 
-#: ../../lib/Browser.php:896
-#, php-format
-msgid "There was a problem with the file upload: No %s was uploaded."
-msgstr "Dosya yüklemede sorun çýktý: %s yüklenemedi"
+#: ../../admin/access.php:61
+msgid "Entry Added"
+msgstr "Giriþ eklendi"
 
-#: ../../lib/Browser.php:901
-#, php-format
-msgid "There was a problem with the file upload: The %s was larger than the maximum allowed size (%d bytes)."
-msgstr "Dosya yüklemede sorun çýktý: %s müsaade edilen azami boyutu aþýyor (%d byte)"
+#: ../../admin/access.php:61
+msgid "Your new Access List Entry has been created"
+msgstr "Eriþim listesine giriþiniz eklendi"
 
-#: ../../lib/Browser.php:903
-#, php-format
-msgid "There was a problem with the file upload: The %s was only partially uploaded."
-msgstr "Gönderilen dosya (%s) yalnýz kýsmen yüklendi."
+#: ../../admin/mail.php:98
+#, fuzzy
+msgid "Mail to"
+msgstr "Mesaj"
 
-#: ../../lib/mpd.php:31
-msgid "Could not add"
-msgstr "Eklenemedi"
+#: ../../admin/mail.php:109
+#, fuzzy
+msgid "Subject"
+msgstr "Seçim"
 
-#: ../../templates/flag.inc:43
-msgid "Flag song"
-msgstr "Þarkýyý iþaretle"
+#: ../../admin/mail.php:116
+msgid "Message"
+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 "Þarkýyý aþaðýda gösterilen sorunlardan biriyle iliþkili olarak iþaretle. Site yöneticileri bu iþaretli dosyalar hakkýnda gereken iþlemleri yaparlar."
+#: ../../admin/mail.php:126
+#, fuzzy
+msgid "Send Mail"
+msgstr "Mesaj"
 
-#: ../../templates/flag.inc:62
-msgid "Reason to flag"
-msgstr "Ýþaretleme nedeni"
+#: ../../admin/song.php:68
+msgid "Songs Disabled"
+msgstr "Edilgenleþtirilmiþ Þarkýlar"
 
-#: ../../templates/flag.inc:73
-msgid "Flag Song"
-msgstr "Þarkýyý iþaretle"
+#: ../../admin/song.php:68
+msgid "The requested song(s) have been disabled"
+msgstr "Ýstenen þarký(lar) edilgenleþtirildi"
 
-#: ../../templates/admin_menu.inc:33
-#: ../../templates/show_admin_index.inc:32
-msgid "Users"
-msgstr "Kullanýcýlar"
+#: ../../admin/song.php:78
+msgid "Songs Enabled"
+msgstr "Etkinlentirilmiþ Þarkýlar"
 
-#: ../../templates/admin_menu.inc:34
-msgid "Mail Users"
-msgstr "Kullanýcýlara mesaj"
+#: ../../admin/song.php:78
+msgid "The requested song(s) have been enabled"
+msgstr "Ýstenen þarký(lar) etkinleþtirildi"
 
-#: ../../templates/admin_menu.inc:36
-#: ../../templates/show_admin_index.inc:35
-msgid "Admin Preferences"
-msgstr "Yönetici tercihleri"
+#: ../../templates/show_user_registration.inc.php:28
+#: ../../templates/show_install_account.inc.php:59
+#: ../../templates/userform.inc:40 ../../templates/show_users.inc:40
+msgid "Username"
+msgstr "Kullanýcý adý"
 
-#: ../../templates/admin_menu.inc:37
-#: ../../templates/show_admin_index.inc:36
-#: ../../templates/catalog.inc:98
-msgid "Access Lists"
-msgstr "Eriþim listesi"
+#: ../../templates/show_user_registration.inc.php:36
+#: ../../templates/userform.inc:48
+msgid "Full Name"
+msgstr "Tam Ýsim"
 
-#: ../../templates/show_artist.inc:31
-msgid "Albums by"
-msgstr "Albümler"
+#: ../../templates/show_user_registration.inc.php:44
+#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:55
+msgid "E-mail"
+msgstr "Elektronik posta"
 
-#: ../../templates/show_artist.inc:33
-msgid "Show All Songs By"
-msgstr "Tüm þarkýlarýný görüntüle: "
+#: ../../templates/show_user_registration.inc.php:52
+#: ../../templates/show_install_account.inc.php:63
+#: ../../templates/userform.inc:63 ../../templates/show_login_form.inc:53
+msgid "Password"
+msgstr "Parola"
 
-#: ../../templates/show_artist.inc:34
-msgid "Play All Songs By"
-msgstr "Tüm þarkýlarýný çal: "
+#: ../../templates/show_user_registration.inc.php:60
+#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
+msgid "Confirm Password"
+msgstr "Parola doðrulama"
 
-#: ../../templates/show_artist.inc:35
-msgid "Play Random Songs By"
-msgstr "Rasgele þarkýlarýný çal: "
+#: ../../templates/show_user_registration.inc.php:69
+msgid "Register User"
+msgstr "Kullanýcý kaydý"
 
-#: ../../templates/show_artist.inc:37
-#: ../../templates/show_album.inc:58
-msgid "Update from tags"
-msgstr "Etiketlerden güncelle"
+#: ../../templates/show_install_account.inc.php:35
+#: ../../templates/show_install_config.inc:35
+#: ../../templates/show_install.inc:34
+msgid "Ampache Installation"
+msgstr "Ampache'nin Kuruluþu"
 
-#: ../../templates/show_artist.inc:50
-msgid "Select"
-msgstr "Seçim"
+#: ../../templates/show_install_account.inc.php:37
+#: ../../templates/show_install_config.inc:37
+#: ../../templates/show_install.inc:36
+#, 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 ""
+"Bu sayfa Ampache veritabanýnýn ve ampache.cfg'nin kurulmasýný saðlýyor. "
+"Devam etmeden önce asaðýda istenenleri yerine getiriniz"
 
-#: ../../templates/show_artist.inc:52
-msgid "Cover"
-msgstr "Kapak"
+#: ../../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 ""
+"Bir MySQL Sunucusu ve bunun veritabaný ekleyebilen ve düzenleyebilen "
+"kullanýcý giriþi ve parolasý"
 
-#: ../../templates/show_artist.inc:53
-msgid "Album Name"
-msgstr "Albüm adý"
+#: ../../templates/show_install_account.inc.php:41
+#, fuzzy
+msgid ""
+"Your webserver has read access to the /sql/ampache.sql file and the /config/"
+"ampache.cfg.dist.php file"
+msgstr ""
+"Web Sunucunuz /sql/ampache.sql ve /config/ampache.cfg.dist dosyalarýný "
+"okuyabilmeli "
 
-#: ../../templates/show_artist.inc:54
-msgid "Album Year"
-msgstr "Albüm yýlý"
+#: ../../templates/show_install_account.inc.php:43
+#: ../../templates/show_install_config.inc:43
+#: ../../templates/show_install.inc:42
+#, fuzzy
+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 ""
+"Yukarýdaki istenenleri saðladýktan sonra aþaðýda istenen verileri giriniz. "
+"Yalnýz gerekli olanlar sorulacaktýr. Ýsterseniz daha sonra /config/ampache."
+"cfg dosyasýna deðiþiklikler yapabilirsiniz"
 
-#: ../../templates/show_artist.inc:55
-msgid "Total Tracks"
-msgstr "Tüm parçalar"
+#: ../../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 "Ýlk Adým - Ampache veritabanýnýn kurulmasý ve doldurulmasý"
 
-#: ../../templates/show_artist.inc:100
-#: ../../templates/show_songs.inc:166
-msgid "Add to"
-msgstr "Ekle"
+#: ../../templates/show_install_account.inc.php:49
+#, fuzzy
+msgid "Step 2 - Creating the ampache.cfg.php file"
+msgstr "Ýkinci Adým - amapche.cfg'nin kurulmasý"
 
-#: ../../templates/show_mpdplay.inc:33
-msgid "MPD Play Control"
-msgstr "MPD Kontrol"
+#: ../../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 "Üçüncü Adým - Ýlk kullanýcýnýn kurulmasý"
 
-#: ../../templates/show_mpdplay.inc:43
-#: ../../templates/list_header.inc:69
-#: ../../templates/show_localplay.inc:39
-msgid "Prev"
-msgstr "Önceki"
+#: ../../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 ""
+"Bu adýmda ilk yönetici hesabý oluþturuluyor.  Oluþturulduktan sonra giriþ "
+"sayfasýna yönlendirileceksiniz."
 
-#: ../../templates/show_mpdplay.inc:44
-#: ../../templates/show_localplay.inc:40
-msgid "Stop"
-msgstr "Dur"
+#: ../../templates/show_install_account.inc.php:68
+msgid "Create Account"
+msgstr "Hesap ekle"
 
-#: ../../templates/show_mpdplay.inc:46
-#: ../../templates/show_localplay.inc:42
-msgid "Pause"
-msgstr "Durakla"
+#: ../../templates/show_confirm_action.inc.php:28
+msgid "Yes"
+msgstr "Evet"
 
-#: ../../templates/show_mpdplay.inc:47
-#: ../../templates/list_header.inc:92
-#: ../../templates/show_localplay.inc:43
-msgid "Next"
-msgstr "Sonraki"
+#: ../../templates/show_import_playlist.inc.php:26
+msgid "Importing a Playlist from a File"
+msgstr ""
 
-#: ../../templates/show_mpdplay.inc:52
-msgid "Loop"
-msgstr "Döngü"
+#: ../../templates/show_import_playlist.inc.php:29
+#: ../../templates/show_uploads.inc:41
+msgid "Filename"
+msgstr "Dosya adý"
 
-#: ../../templates/show_mpdplay.inc:54
-msgid "Loop is off"
-msgstr "Döngü kapalý"
+#: ../../templates/show_import_playlist.inc.php:36
+#, fuzzy
+msgid "Playlist Type"
+msgstr "Þarký listesi"
 
-#: ../../templates/show_mpdplay.inc:55
-msgid "Loop is on"
-msgstr "Döngü açýk"
+#: ../../templates/show_import_playlist.inc.php:49
+#, fuzzy
+msgid "Import Playlist"
+msgstr "Þarký listesi"
 
-#: ../../templates/show_mpdplay.inc:68
-#: ../../templates/show_now_playing.inc:34
-msgid "Now Playing"
-msgstr "Þu anda çalan"
+#: ../../templates/show_user.inc.php:26
+msgid "Changing User Information for"
+msgstr ""
 
-#: ../../templates/show_mpdplay.inc:81
-msgid "Refresh the Playlist Window"
-msgstr "Þarký Listesi görüntüsünü yenile"
+#: ../../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 "Ýsim"
 
-#: ../../templates/show_mpdplay.inc:81
-msgid "refresh now"
-msgstr "þimdi yenile"
+#: ../../templates/show_user.inc.php:48
+msgid "Results Per Page"
+msgstr ""
 
-#: ../../templates/show_mpdplay.inc:89
-msgid "Server Playlist"
-msgstr "Sunucu þarký listesi"
+#: ../../templates/show_user.inc.php:56
+msgid "Update Profile"
+msgstr "Profil güncelleme"
 
-#: ../../templates/show_mpdplay.inc:122
-msgid "Click to shuffle (randomize) the playlist"
-msgstr "Þarký Listesini karýþtýrmak (rasgele) icin týkla"
+#: ../../templates/show_user.inc.php:67
+msgid "Enter password"
+msgstr "Parola giriþ"
 
-#: ../../templates/show_mpdplay.inc:122
-msgid "shuffle"
-msgstr "rasgele"
+#: ../../templates/show_user.inc.php:83
+msgid "Change Password"
+msgstr "Parola deðiþtirme"
 
-#: ../../templates/show_mpdplay.inc:123
-msgid "Click the clear the playlist"
-msgstr "Þarký listesini silmek için týkla"
+#: ../../templates/show_user.inc.php:89
+msgid "Delete Your Personal Statistics"
+msgstr ""
 
-#: ../../templates/show_mpdplay.inc:123
-msgid "clear"
-msgstr "sil"
+#: ../../templates/show_user.inc.php:91
+msgid "Clear Stats"
+msgstr "Ýstatistikleri sil"
 
-#: ../../templates/show_admin_index.inc:30
-msgid "Admin Section"
-msgstr "Yönetici Kýsmý"
+#: ../../templates/show_confirmation.inc.php:30
+msgid "Continue"
+msgstr "Devam"
 
-#: ../../templates/show_admin_index.inc:32
-msgid "Create/Modify User Accounts for Ampache"
-msgstr "Ampache kullanýcý hesabý ekle/güncelle"
+#: ../../templates/show_play_selected.inc.php:49
+msgid "Play Selected"
+msgstr "Seçilmiþleri çal"
 
-#: ../../templates/show_admin_index.inc:33
-msgid "Mail"
-msgstr "Mesaj"
+#: ../../templates/show_play_selected.inc.php:52
+#, fuzzy
+msgid "Download Selected"
+msgstr "Seçilmiþleri iþaretle"
 
-#: ../../templates/show_admin_index.inc:33
-msgid "Mail your users to notfiy them of changes"
-msgstr "Kullanýcýlara mail ile yenilikleri bildir"
+#: ../../templates/show_play_selected.inc.php:55 ../../playlist.php:77
+msgid "Flag Selected"
+msgstr "Seçilmiþleri iþaretle"
 
-#: ../../templates/show_admin_index.inc:34
-msgid "Create/Update/Clean your catalog here"
-msgstr "Buradan katalog ekle/güncelleþtir/sil"
+#: ../../templates/show_play_selected.inc.php:56 ../../playlist.php:83
+msgid "Edit Selected"
+msgstr "Seçilmiþleri düzenle"
 
-#: ../../templates/show_admin_index.inc:35
-msgid "Modify Site-wide preferences"
-msgstr "Site genelinde geçerli olan tercihleri düzenle"
+#: ../../templates/show_play_selected.inc.php:63
+msgid "Set Track Numbers"
+msgstr "Parça numaralarýný iþle"
 
-#: ../../templates/show_admin_index.inc:36
-msgid "Modify Access List Permissions"
-msgstr "Eriþim listesindeki izinleri düzenle"
+#: ../../templates/show_play_selected.inc.php:64
+msgid "Remove Selected Tracks"
+msgstr "Seçilmiþ parçalarý sil"
 
-#: ../../templates/show_admin_index.inc:36
-msgid "Must have access_control=true in ampache.cfg"
-msgstr "Ampache.cfg'de 'access_control=true' nun bulunmasý zorunludur"
+#: ../../templates/show_play_selected.inc.php:70
+msgid "Playlist"
+msgstr "Þarký listesi"
 
-#: ../../templates/show_test.inc:29
-msgid "Ampache Debug"
-msgstr "Ampache Hata Ayýklamasý"
+#: ../../templates/show_play_selected.inc.php:70
+msgid "Add to"
+msgstr "Ekle"
 
-#: ../../templates/show_test.inc:30
-msgid "You've reached this page because a configuration error has occured. Debug Information below"
-msgstr "Bir yapýlandýrma hatasý yüzünden bu sayfaya yönlendirildiniz. Hata ayýklamasýný asaðýda görebilirsiniz"
+#: ../../templates/show_all_popular.inc.php:27 ../../index.php:98
+msgid "Most Popular Artists"
+msgstr "En popüler sanatçýlar"
 
-#: ../../templates/show_test.inc:35
-msgid "STATUS"
-msgstr "Durum"
+#: ../../templates/show_all_popular.inc.php:30 ../../index.php:71
+#, fuzzy
+msgid "Most Popular Albums"
+msgstr "En popüler sanatçýlar"
 
-#: ../../templates/show_test.inc:39
-msgid "PHP Version"
-msgstr "PHP Version"
+#: ../../templates/show_all_popular.inc.php:37
+#, fuzzy
+msgid "Most Popular Genres"
+msgstr "En popüler þarkýlar"
 
-#: ../../templates/show_test.inc:54
-msgid "This tests to make sure that you are running a version of PHP that is known to work with Ampache."
-msgstr "Bu test PHP'nin Ampache ile uyuþan bir sürümünün kullanýldýðýný tasdik ediyor."
+#: ../../templates/show_all_popular.inc.php:40 ../../index.php:105
+msgid "Most Popular Songs"
+msgstr "En popüler þarkýlar"
 
-#: ../../templates/show_test.inc:58
-msgid "Mysql for PHP"
-msgstr "Mysql for PHP"
+#: ../../templates/show_local_catalog_info.inc.php:10
+msgid "Total Users"
+msgstr "Tüm Kullanýcýlar"
 
-#: ../../templates/show_test.inc:73
-msgid "This test checks to see if you have the mysql extensions loaded for PHP. These are required for Ampache to work."
-msgstr "Bu testler PHP'nin mysql uzantýlarýnýn varlýðýný kontrol ediyor. Bu uzantýlar olmazsa Ampache calýþmaz."
+#: ../../templates/show_local_catalog_info.inc.php:14
+msgid "Connected Users"
+msgstr "Baðlanmýþ Kullanýcýlar"
 
-#: ../../templates/show_test.inc:77
-msgid "PHP Session Support"
-msgstr "PHP Session Support"
+#: ../../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 "Albümler"
 
-#: ../../templates/show_test.inc:92
-msgid "This test checks to make sure that you have PHP session support enabled. Sessions are required for Ampache to work."
-msgstr "Bu testler PHP'nin oturum desteðinin varlýðýný kontrol ediyor. Oturum desteði olmazsa Ampache calýþmaz."
+#: ../../templates/show_local_catalog_info.inc.php:22
+#: ../../templates/show_genre.inc.php:41
+#: ../../templates/show_browse_menu.inc:35
+msgid "Artists"
+msgstr "Sanatçýlar"
 
-#: ../../templates/show_test.inc:96
-msgid "PHP ICONV Support"
-msgstr "PHP ICONV desteði"
+#: ../../templates/show_local_catalog_info.inc.php:26
+#: ../../templates/show_genres.inc.php:37
+#: ../../templates/show_genre.inc.php:46 ../../templates/show_artists.inc:41
+#: ../../templates/show_artists.inc:64 ../../templates/show_albums.inc:41
+#: ../../templates/show_albums.inc:71
+msgid "Songs"
+msgstr "Þarkýlar"
 
-#: ../../templates/show_test.inc:110
-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 "Bu testler PHP'nin ICONV desteðinin varlýðýný kontrol ediyor. ICONV Ampache'nin çalýþmasý icin gerekli olmasada tavsiyemizdir"
+#: ../../templates/show_local_catalog_info.inc.php:30
+msgid "Catalog Size"
+msgstr "Katalog boyutu"
 
-#: ../../templates/show_test.inc:114
-#: ../../templates/show_install_config.inc:88
-msgid "Ampache.cfg Exists"
-msgstr "Ampache.cfg bulundu"
+#: ../../templates/show_local_catalog_info.inc.php:34
+msgid "Catalog Time"
+msgstr "Katalog süresi"
 
-#: ../../templates/show_test.inc:129
-msgid ""
-"This attempts to read /config/ampache.cfg If this fails either the ampache.cfg is not in the correct locations or\n"
-"\tit is not currently readable by your webserver."
-msgstr "Þimdi ampache.cfg okunmaya calýþýlacak. Eger baþarýsýz olunursa ya doðru yerde deðildir yada  web sunucunuz tarafýndan okunamýyordur."
+#: ../../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 "Eylem"
 
-#: ../../templates/show_test.inc:135
-#: ../../templates/show_install_config.inc:105
-msgid "Ampache.cfg Configured?"
-msgstr "Ampache.cfg'yi yapýlandýrdýnýzmý ?"
+#: ../../templates/show_genre.inc.php:32
+#, fuzzy
+msgid "Viewing"
+msgstr "Görüntüle"
 
-#: ../../templates/show_test.inc:152
-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 "Bu test gerekli tüm yapýlandýrma deðiþkenlerinin ayarlandýðýný ve yapýlandýrma dosyasýnýn ayrýþtýrýlabileceðini doðrulamak içindir"
+#: ../../templates/show_all_recent.inc.php:27 ../../index.php:115
+msgid "Newest Artist Additions"
+msgstr "Son eklenen sanatçýlar"
 
-#: ../../templates/show_test.inc:159
-msgid "Ampache.cfg Up to Date?"
-msgstr "Ampache.cfg güncel mi?"
+#: ../../templates/show_all_recent.inc.php:30 ../../index.php:122
+msgid "Newest Album Additions"
+msgstr "Son eklenen albümler"
 
-#: ../../templates/show_test.inc:165
-msgid "DB Connection"
-msgstr "Veritabaný baðlantýsý"
+#: ../../localplay.php:79
+msgid "Unknown action requested"
+msgstr "Bilinmeyen eylem istendi"
 
-#: ../../templates/show_test.inc:181
-msgid "This attempts to connect to your database using the values from your ampache.cfg"
-msgstr "Þimdi ampache.cfg'deki verilerle veritabanýnýza ulaþmaya calýsýlacak"
+#: ../../artists.php:48
+msgid "All songs by"
+msgstr "Tüm þarkýlarý"
 
-#: ../../templates/list_flagged.inc:42
-#: ../../templates/show_songs.inc:41
-msgid "Flag"
-msgstr "Ýþaret"
+#: ../../artists.php:57 ../../albums.php:106
+msgid "Starting Update from Tags"
+msgstr "Etiketten güncelleþtirme baþlýyor"
 
-#: ../../templates/list_flagged.inc:43
-msgid "New Flag"
-msgstr "Yeni iþaret"
+#: ../../artists.php:62 ../../albums.php:111
+#, fuzzy
+msgid "Update From Tags Complete"
+msgstr "Etiketten güncelleþtirme tamamlandý"
 
-#: ../../templates/list_flagged.inc:44
-msgid "Flagged by"
-msgstr "Ýþaretleyen"
+#: ../../artists.php:72 ../../artists.php:76 ../../artists.php:82
+#: ../../artists.php:95
+#, fuzzy
+msgid "Show Artists starting with"
+msgstr "Ýsmi bu harfle baþlayan sanatçýlarý göster"
 
-#: ../../templates/list_flagged.inc:45
-msgid "ID3 Update"
-msgstr "ID3 Güncelleme"
+#: ../../amp-mpd.php:176 ../../playlist.php:135
+msgid "New Playlist"
+msgstr "Yeni þarký listesi"
 
-#: ../../templates/list_flagged.inc:69
-msgid "Accept"
-msgstr "Kabul"
+#: ../../playlist.php:115
+msgid "owned by"
+msgstr ""
 
-#: ../../templates/list_flagged.inc:70
-msgid "Reject"
-msgstr "Red"
+#: ../../playlist.php:118
+#, fuzzy
+msgid "Edit Playlist"
+msgstr "Þarký listesi"
 
-#: ../../templates/show_upload.inc:27
-msgid "Please Ensure All Files Are Tagged Correctly"
-msgstr "Lütfen tüm dosyalarýn doðru etiketlendirilmesini saðlayýn"
+#: ../../playlist.php:121
+#, fuzzy
+msgid "Play Full Playlist"
+msgstr "Þarký listesi"
 
-#: ../../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 sýralama için ID3 etiketlerini kullanýr. Dosyanýz etiketsizse silinebilir."
+#: ../../playlist.php:122
+#, fuzzy
+msgid "Play Random"
+msgstr "Rasgele þarký çal"
 
-#: ../../templates/show_upload.inc:34
-msgid "max_upload_size"
-msgstr "max_upload_size (azami_yükleme_hacmi)"
+#: ../../playlist.php:192
+msgid "Playlist updated."
+msgstr "Þarký listesi güncelendi."
 
-#: ../../templates/show_upload.inc:59
-#: ../../templates/menu.inc:39
-msgid "Upload"
-msgstr "Yükleme"
+#: ../../index.php:41
+msgid "Welcome to"
+msgstr "Hoþgeldiniz"
 
-#: ../../templates/show_access_list.inc:34
-msgid "Host Access to Your Catalog"
-msgstr "Kataloða makine eriþimi"
+#: ../../index.php:43
+msgid "you are currently logged in as"
+msgstr "Kullanýcý adýnýz"
 
-#: ../../templates/show_access_list.inc:43
-msgid "Add Entry"
-msgstr "Giriþ ekle"
+#: ../../user.php:45
+#, fuzzy
+msgid "Error: Password Does Not Match or Empty"
+msgstr "Hata, parolalar uyuþmuyor"
 
-#: ../../templates/show_access_list.inc:48
-msgid "Start Address"
-msgstr "Ýlk Adres"
+#: ../../user.php:51 ../../user.php:62
+msgid "Error: Insufficient Rights"
+msgstr ""
 
-#: ../../templates/show_access_list.inc:49
-msgid "End Address"
-msgstr "Son Adres"
+#: ../../flag.php:35
+msgid "Flagging song completed."
+msgstr "Þarký iþaretleme tamamlandý"
 
-#: ../../templates/show_access_list.inc:50
-#: ../../templates/show_add_access.inc:58
-msgid "Level"
-msgstr "Düzey"
+#: ../../albums.php:44
+msgid "Album Art Cleared"
+msgstr "Albüm kapaðý silindi"
 
-#: ../../templates/show_access_list.inc:65
-msgid "Revoke"
-msgstr "Ýptal"
+#: ../../albums.php:44
+msgid "Album Art information has been removed form the database"
+msgstr "Albüm kapaðý ile ilgili bilgiler veritabanýndan silindi"
 
-#: ../../templates/add_catalog.inc:28
-msgid "Add a Catalog"
-msgstr "Katalog ekle"
+#: ../../albums.php:78
+msgid "Album Art Located"
+msgstr "Albüm kapaðý bulundu"
 
-#: ../../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 "Aþaðidaki forma ya yerel bir yol girin (örn. /data/muzik) yada uzak bir Ampache Sunucusunun adresini (örn. http://benimampachem.com)"
+#: ../../albums.php:78
+msgid ""
+"Album Art information has been located in Amazon. If incorrect, click "
+"\"Reset Album Art\" below to remove the artwork."
+msgstr ""
+"Albüm kapaðý Amazon'da bulundu. Doðru olmadýðý takdirde \"Albüm kapaðý "
+"silinsin\" i týklayarak bilgileri silin."
 
-#: ../../templates/add_catalog.inc:36
-msgid "Catalog Name"
-msgstr "Kalalog Ýsmi"
+#: ../../albums.php:86 ../../albums.php:96
+msgid "Get Art"
+msgstr "Albüm kapaðý çaðýr"
 
-#: ../../templates/add_catalog.inc:39
-#: ../../templates/customize_catalog.inc:32
+#: ../../albums.php:90
+msgid "Album Art Not Located"
+msgstr "Albüm kapaðý bulunamadý"
+
+#: ../../albums.php:90
+msgid ""
+"Album Art could not be located at this time. This may be due to Amazon being "
+"busy, or the album not being present in their collection."
+msgstr ""
+"Albüm kapaðý bulunamadý. Bu Amazon'un meþgul yada bu albümün orada "
+"olmayýþýndan ileri gelebilir."
+
+#: ../../albums.php:127 ../../albums.php:133 ../../albums.php:140
+#: ../../albums.php:145 ../../albums.php:150
+#, fuzzy
+msgid "Show Albums starting with"
+msgstr "Ýsmi bu harfle baþlayan albümleri göster"
+
+#: ../../bin/quarantine_migration.php.inc:49
+#, fuzzy
+msgid "Error: Unable to write to"
+msgstr "Hata: açýlamadý"
+
+#: ../../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 "Kip"
+
+#: ../../bin/quarantine_migration.php.inc:78
+#, fuzzy
+msgid "Adding"
+msgstr "Yönetici"
+
+#: ../../bin/quarantine_migration.php.inc:78
+#, fuzzy
+msgid "to database"
+msgstr "Veritabanýný ekle"
+
+#: ../../bin/quarantine_migration.php.inc:86
+msgid "Move Failed"
+msgstr ""
+
+#: ../../bin/quarantine_migration.php.inc:97
+#, fuzzy
+msgid "Deleted"
+msgstr "Sil"
+
+#: ../../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 "Devam"
+
+#: ../../bin/quarantine_migration.php.inc:151
+#, fuzzy
+msgid "Error:  "
+msgstr "Hata"
+
+#: ../../bin/quarantine_migration.php.inc:152
+msgid "!\n"
+msgstr ""
+
+#: ../../templates/customize_catalog.inc:24
+msgid "Settings for catalog in"
+msgstr "Katalog ayarlarý:"
+
+#: ../../templates/customize_catalog.inc:32 ../../templates/add_catalog.inc:39
 msgid "Auto-inserted Fields"
 msgstr "Özdevimli Alanlar"
 
-#: ../../templates/add_catalog.inc:40
-#: ../../templates/customize_catalog.inc:33
+#: ../../templates/customize_catalog.inc:33 ../../templates/add_catalog.inc:40
 msgid "album name"
 msgstr "albüm ismi"
 
-#: ../../templates/add_catalog.inc:41
-#: ../../templates/customize_catalog.inc:34
+#: ../../templates/customize_catalog.inc:34 ../../templates/add_catalog.inc:41
 msgid "artist name"
 msgstr "sanatçý ismi"
 
-#: ../../templates/add_catalog.inc:42
-#: ../../templates/customize_catalog.inc:36
+#: ../../templates/customize_catalog.inc:35
+msgid "catalog path"
+msgstr "katalog yolu"
+
+#: ../../templates/customize_catalog.inc:36 ../../templates/add_catalog.inc:42
 msgid "id3 comment"
 msgstr "id3 açýklamasý"
 
-#: ../../templates/add_catalog.inc:43
-#: ../../templates/customize_catalog.inc:37
+#: ../../templates/customize_catalog.inc:37 ../../templates/add_catalog.inc:43
 msgid "genre"
 msgstr "kategori"
 
-#: ../../templates/add_catalog.inc:44
-#: ../../templates/customize_catalog.inc:38
+#: ../../templates/customize_catalog.inc:38 ../../templates/add_catalog.inc:44
 msgid "track number (padded with leading 0)"
 msgstr "þarký numarasý (0 ile baþlar)"
 
-#: ../../templates/add_catalog.inc:45
-#: ../../templates/customize_catalog.inc:39
+#: ../../templates/customize_catalog.inc:39 ../../templates/add_catalog.inc:45
 msgid "song title"
 msgstr "þarký adý"
 
-#: ../../templates/add_catalog.inc:46
-#: ../../templates/customize_catalog.inc:40
+#: ../../templates/customize_catalog.inc:40 ../../templates/add_catalog.inc:46
 msgid "year"
 msgstr "yýl"
 
-#: ../../templates/add_catalog.inc:47
-#: ../../templates/customize_catalog.inc:41
+#: ../../templates/customize_catalog.inc:41 ../../templates/add_catalog.inc:47
 msgid "other"
 msgstr "baþka"
 
+#: ../../templates/customize_catalog.inc:45
+msgid "ID3 set command"
+msgstr "ID3 ayarlama komutu"
+
+#: ../../templates/customize_catalog.inc:51
+msgid "Filename pattern"
+msgstr "Dosya adý deseni"
+
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
+msgid "Folder Pattern"
+msgstr "Klasör adý deseni"
+
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
+msgid "(no leading or ending '/')"
+msgstr "(baþýnda yada sonuna '/' olmaksýzýn)"
+
+#: ../../templates/customize_catalog.inc:69
+msgid "Save Catalog Settings"
+msgstr "Katalog ayarlarýný kaydet"
+
+#: ../../templates/show_admin_index.inc:27
+#, fuzzy
+msgid "User Management"
+msgstr "Kullanýcý adý"
+
+#: ../../templates/show_admin_index.inc:28
+msgid "E-mail Management"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:29
+#, fuzzy
+msgid "Catalog Managment"
+msgstr "Kalalog Ýsmi"
+
+#: ../../templates/show_admin_index.inc:30 ../../templates/admin_menu.inc:36
+msgid "Admin Preferences"
+msgstr "Yönetici tercihleri"
+
+#: ../../templates/show_admin_index.inc:31 ../../templates/catalog.inc:98
+#: ../../templates/admin_menu.inc:37
+msgid "Access Lists"
+msgstr "Eriþim listesi"
+
+#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:97
+msgid "Add a catalog"
+msgstr "Katalog ekle"
+
+#: ../../templates/show_admin_index.inc:35 ../../templates/catalog.inc:102
+msgid "Clear Now Playing"
+msgstr "Þu anda çalanlarý sil"
+
+#: ../../templates/show_admin_index.inc:36
+#, fuzzy
+msgid "Add Access List Entry"
+msgstr "Eriþim listesi"
+
+#: ../../templates/show_admin_index.inc:40
+#, fuzzy
+msgid "Common Functions"
+msgstr "Veritabaný baðlantýsý"
+
+#: ../../templates/show_admin_index.inc:43
+#, fuzzy
+msgid "Admin Sections"
+msgstr "Yönetici Kýsmý"
+
+#: ../../templates/show_test.inc:29
+msgid "Ampache Debug"
+msgstr "Ampache Hata Ayýklamasý"
+
+#: ../../templates/show_test.inc:30
+msgid ""
+"You've reached this page because a configuration error has occured. Debug "
+"Information below"
+msgstr ""
+"Bir yapýlandýrma hatasý yüzünden bu sayfaya yönlendirildiniz. Hata "
+"ayýklamasýný asaðýda görebilirsiniz"
+
+#: ../../templates/show_test.inc:34
+msgid "CHECK"
+msgstr ""
+
+#: ../../templates/show_test.inc:36
+msgid "STATUS"
+msgstr "Durum"
+
+#: ../../templates/show_test.inc:38
+msgid "DESCRIPTION"
+msgstr ""
+
+#: ../../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 ""
+"Bu test PHP'nin Ampache ile uyuþan bir sürümünün kullanýldýðýný tasdik "
+"ediyor."
+
+#: ../../templates/show_test.inc:60
+msgid "Mysql for PHP"
+msgstr "Mysql for 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 ""
+"Bu testler PHP'nin mysql uzantýlarýnýn varlýðýný kontrol ediyor. Bu "
+"uzantýlar olmazsa Ampache calýþmaz."
+
+#: ../../templates/show_test.inc:79
+msgid "PHP Session Support"
+msgstr "PHP Session Support"
+
+#: ../../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 ""
+"Bu testler PHP'nin oturum desteðinin varlýðýný kontrol ediyor. Oturum "
+"desteði olmazsa Ampache calýþmaz."
+
+#: ../../templates/show_test.inc:98
+msgid "PHP ICONV Support"
+msgstr "PHP ICONV desteði"
+
+#: ../../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 ""
+"Bu testler PHP'nin ICONV desteðinin varlýðýný kontrol ediyor. ICONV "
+"Ampache'nin çalýþmasý icin gerekli olmasada tavsiyemizdir"
+
+#: ../../templates/show_test.inc:116
+#: ../../templates/show_install_config.inc:87
+#, fuzzy
+msgid "Ampache.cfg.php Exists"
+msgstr "Ampache.cfg bulundu"
+
+#: ../../templates/show_test.inc:131
+#, fuzzy
+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 ""
+"Þimdi ampache.cfg okunmaya calýþýlacak. Eger baþarýsýz olunursa ya doðru "
+"yerde deðildir yada  web sunucunuz tarafýndan okunamýyordur."
+
+#: ../../templates/show_test.inc:137
+#: ../../templates/show_install_config.inc:104
+#, fuzzy
+msgid "Ampache.cfg.php Configured?"
+msgstr "Ampache.cfg'yi yapýlandýrdýnýzmý ?"
+
+#: ../../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 ""
+"Bu test gerekli tüm yapýlandýrma deðiþkenlerinin ayarlandýðýný ve "
+"yapýlandýrma dosyasýnýn ayrýþtýrýlabileceðini doðrulamak içindir"
+
+#: ../../templates/show_test.inc:160
+#, fuzzy
+msgid "Ampache.cfg.php Up to Date?"
+msgstr "Ampache.cfg güncel mi?"
+
+#: ../../templates/show_test.inc:180
+msgid "Ampache.cfg.php is missing the following:"
+msgstr ""
+
+#: ../../templates/show_test.inc:181
+msgid "Under CONF"
+msgstr ""
+
+#: ../../templates/show_test.inc:185
+msgid "Under LIBGLUE"
+msgstr ""
+
+#: ../../templates/show_test.inc:196
+msgid "DB Connection"
+msgstr "Veritabaný baðlantýsý"
+
+#: ../../templates/show_test.inc:212
+#, fuzzy
+msgid ""
+"This attempts to connect to your database using the values from your ampache."
+"cfg.php"
+msgstr "Þimdi ampache.cfg'deki verilerle veritabanýnýza ulaþmaya calýsýlacak"
+
+#: ../../templates/show_localplay.inc:30
+msgid "Local Play Control"
+msgstr "Yerel Çalma Düzeni"
+
+#: ../../templates/show_localplay.inc:35
+msgid "Playback"
+msgstr "Çal"
+
+#: ../../templates/show_localplay.inc:39 ../../templates/list_header.inc:71
+#: ../../templates/show_mpdplay.inc:48
+msgid "Prev"
+msgstr "Önceki"
+
+#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:49
+msgid "Stop"
+msgstr "Dur"
+
+#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:51
+msgid "Pause"
+msgstr "Durakla"
+
+#: ../../templates/show_localplay.inc:43 ../../templates/list_header.inc:94
+#: ../../templates/show_mpdplay.inc:52
+msgid "Next"
+msgstr "Sonraki"
+
+#: ../../templates/show_localplay.inc:49
+msgid "Volume"
+msgstr "Ses"
+
+#: ../../templates/show_localplay.inc:53 ../../templates/show_localplay.inc:54
+msgid "Increase Volume"
+msgstr "Ses aç"
+
+#: ../../templates/show_localplay.inc:55 ../../templates/show_localplay.inc:56
+msgid "Decrease Volume"
+msgstr "Ses kapa"
+
+#: ../../templates/show_localplay.inc:62
+msgid "Clear queue"
+msgstr "Kuyruðu sil"
+
+#: ../../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 ""
+"Aþaðidaki forma ya yerel bir yol girin (örn. /data/muzik) yada uzak bir "
+"Ampache Sunucusunun adresini (örn. http://benimampachem.com)"
+
+#: ../../templates/add_catalog.inc:36
+msgid "Catalog Name"
+msgstr "Kalalog Ýsmi"
+
 #: ../../templates/add_catalog.inc:53
 msgid "Path"
 msgstr "Yol"
@@ -1456,17 +1522,7 @@ msgstr "ID3 ayarlama komutu"
 msgid "Filename Pattern"
 msgstr "Dosya adý deseni"
 
-#: ../../templates/add_catalog.inc:74
-#: ../../templates/customize_catalog.inc:58
-msgid "Folder Pattern"
-msgstr "Klasör adý deseni"
-
-#: ../../templates/add_catalog.inc:74
-#: ../../templates/customize_catalog.inc:58
-msgid "(no leading or ending '/')"
-msgstr "(baþýnda yada sonuna '/' olmaksýzýn)"
-
-#: ../../templates/add_catalog.inc:78
+#: ../../templates/add_catalog.inc:78 ../../templates/catalog.inc:104
 msgid "Gather Album Art"
 msgstr "Albüm kapaklarýný topla"
 
@@ -1482,10 +1538,140 @@ msgstr "Amazon"
 msgid "File Folder"
 msgstr "Dosya klasörü"
 
-#: ../../templates/add_catalog.inc:98
+#: ../../templates/add_catalog.inc:95
+msgid "Build Playlists from m3u Files"
+msgstr ""
+
+#: ../../templates/add_catalog.inc:102
 msgid "Add Catalog"
 msgstr "Kataloðu ekle"
 
+#: ../../templates/list_flagged.inc:41 ../../templates/flag.inc:58
+#: ../../templates/show_uploads.inc:34
+msgid "Song"
+msgstr "Þarký"
+
+#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:41
+msgid "Flag"
+msgstr "Ýþaret"
+
+#: ../../templates/list_flagged.inc:43
+msgid "New Flag"
+msgstr "Yeni iþaret"
+
+#: ../../templates/list_flagged.inc:44
+msgid "Flagged by"
+msgstr "Ýþaretleyen"
+
+#: ../../templates/list_flagged.inc:45
+msgid "ID3 Update"
+msgstr "ID3 Güncelleme"
+
+#: ../../templates/list_flagged.inc:69
+msgid "Accept"
+msgstr "Kabul"
+
+#: ../../templates/list_flagged.inc:70
+msgid "Reject"
+msgstr "Red"
+
+#: ../../templates/show_artists.inc:55 ../../templates/show_albums.inc:58
+#: ../../templates/show_random_play.inc:46
+msgid "All"
+msgstr "Hepsi"
+
+#: ../../templates/show_songs.inc:33 ../../templates/show_mpdpl.inc:62
+msgid "Song title"
+msgstr "þarký adý"
+
+#: ../../templates/show_songs.inc:38 ../../templates/show_uploads.inc:40
+msgid "Size"
+msgstr "Boyut"
+
+#: ../../templates/show_songs.inc:113
+msgid "Direct Link"
+msgstr "Doðrudan Eriþim"
+
+#: ../../templates/show_songs.inc:131
+msgid "Total"
+msgstr "Tüm"
+
+#: ../../templates/show_install_config.inc:41
+#: ../../templates/show_install.inc:40
+#, fuzzy
+msgid ""
+"Your webserver has read access to the /sql/ampache.sql file and the /config/"
+"ampache.cfg.php.dist file"
+msgstr ""
+"Web Sunucunuz /sql/ampache.sql ve /config/ampache.cfg.dist dosyalarýný "
+"okuyabilmeli "
+
+#: ../../templates/show_install_config.inc:49
+#: ../../templates/show_install.inc:50
+#, fuzzy
+msgid "Step 2 - Creating the Ampache.cfg.php file"
+msgstr "Ýkinci Adým - amapche.cfg'nin kurulmasý"
+
+#: ../../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 ""
+"Bu adýmda temel veriler sorgulanýp, web sunucunuza ilk yazma denemesi "
+"yapýlacaktýr. Eðer baþarýsýz olunursa size sunulacak olan yapýlandýrma "
+"dosyasýný /config klasörüne kaydedin. "
+
+#: ../../templates/show_install_config.inc:59
+msgid "Web Path"
+msgstr "Web Yolu"
+
+#: ../../templates/show_install_config.inc:63
+#: ../../templates/show_install.inc:57
+msgid "Desired Database Name"
+msgstr "Düþünülen Veritabaný ismi"
+
+#: ../../templates/show_install_config.inc:67
+#: ../../templates/show_install.inc:61
+msgid "MySQL Hostname"
+msgstr "MySQL makine ismi"
+
+#: ../../templates/show_install_config.inc:71
+msgid "MySQL Username"
+msgstr "MySQL kullanýcý adý"
+
+#: ../../templates/show_install_config.inc:75
+msgid "MySQL Password"
+msgstr "MySQL parolasý"
+
+#: ../../templates/show_install_config.inc:80
+msgid "Write Config"
+msgstr "Yapýlandýrmayý kaydet"
+
+#: ../../templates/show_install_config.inc:124
+msgid "Check for Config"
+msgstr "Yapýlandýrma doðrula"
+
+#: ../../templates/show_album.inc:53
+msgid "Play Album"
+msgstr "Albümü çal"
+
+#: ../../templates/show_album.inc:54
+msgid "Play Random from Album"
+msgstr "Albümden rasgele çal"
+
+#: ../../templates/show_album.inc:55
+msgid "Reset Album Art"
+msgstr "Albüm kapaðý silinsin"
+
+#: ../../templates/show_album.inc:56
+msgid "Find Album Art"
+msgstr "Albüm kapaðý ara"
+
+#: ../../templates/show_album.inc:58 ../../templates/show_artist.inc:37
+msgid "Update from tags"
+msgstr "Etiketlerden güncelle"
+
 #: ../../templates/show_preferences.inc:31
 msgid "Editing"
 msgstr "Düzenleme"
@@ -1514,47 +1700,114 @@ msgstr "Türü"
 msgid "Apply to All"
 msgstr "Hersine uygula"
 
-#: ../../templates/show_preferences.inc:58
+#: ../../templates/show_preferences.inc:83
 msgid "Update Preferences"
 msgstr "Tercihleri güncelle"
 
-#: ../../templates/show_preferences.inc:62
+#: ../../templates/show_preferences.inc:87
 msgid "Cancel"
 msgstr "Ýptal"
 
-#: ../../templates/show_install.inc:40
-msgid "Your webserver configured so that <ampache_root>/docs is your webroot"
-msgstr "Web sunucunuz <ampache_root>/docs 'u temel olarak kullanmalý"
+#: ../../templates/userform.inc:25
+msgid "Adding a New User"
+msgstr "Kullanýcý ekle"
 
-#: ../../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 "Bu adýmda Ampache veritabaný oluþturuluyor. Bunun için veritabaný kurma izni olan bir mysql giriþi gerekli. Bu adýmýn süresi bilgisayarýnýzýn hýzýna baðlýdýr "
+#: ../../templates/userform.inc:29
+msgid "Editing existing User"
+msgstr "Kullanýcýyý düzenle"
 
-#: ../../templates/show_install.inc:58
-#: ../../templates/show_install_config.inc:64
-msgid "Desired Database Name"
-msgstr "Düþünülen Veritabaný ismi"
+#: ../../templates/userform.inc:80
+msgid "User Access Level"
+msgstr "Kullanýcý eriþim düzeyi"
 
-#: ../../templates/show_install.inc:62
-#: ../../templates/show_install_config.inc:68
-msgid "MySQL Hostname"
-msgstr "MySQL makine ismi"
+#: ../../templates/userform.inc:96
+msgid "Add User"
+msgstr "Kullanýcý ekle"
+
+#: ../../templates/userform.inc:101
+msgid "Update User"
+msgstr "Kullanýcý güncelle"
+
+#: ../../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 ""
+"Bu adýmda Ampache veritabaný oluþturuluyor. Bunun için veritabaný kurma izni "
+"olan bir mysql giriþi gerekli. Bu adýmýn süresi bilgisayarýnýzýn hýzýna "
+"baðlýdýr "
 
-#: ../../templates/show_install.inc:66
+#: ../../templates/show_install.inc:65
 msgid "MySQL Administrative Username"
 msgstr "MySQL yönetici ismi"
 
-#: ../../templates/show_install.inc:70
+#: ../../templates/show_install.inc:69
 msgid "MySQL Administrative Password"
 msgstr "MySQL yönetici parolasý"
 
-#: ../../templates/show_install.inc:75
+#: ../../templates/show_install.inc:74
 msgid "Insert Database"
 msgstr "Veritabanýný ekle"
 
+#: ../../templates/flag.inc:43
+msgid "Flag song"
+msgstr "Þarkýyý iþaretle"
+
+#: ../../templates/flag.inc:45
+msgid ""
+"Flag the following song as having one of the problems listed below.  Site "
+"admins will then take the appropriate action for the flagged files."
+msgstr ""
+"Þarkýyý aþaðýda gösterilen sorunlardan biriyle iliþkili olarak iþaretle. "
+"Site yöneticileri bu iþaretli dosyalar hakkýnda gereken iþlemleri yaparlar."
+
+#: ../../templates/flag.inc:62
+msgid "Reason to flag"
+msgstr "Ýþaretleme nedeni"
+
+#: ../../templates/flag.inc:73
+msgid "Flag Song"
+msgstr "Þarkýyý iþaretle"
+
+#: ../../templates/show_add_access.inc:31
+msgid "Add Access for a Host"
+msgstr "Eriþim listesine makine ekle"
+
+#: ../../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 ""
+"Aþaðýdaki formu kullanarak Ampache kataloðuna eriþmesini istediðiniz "
+"makineleri ekleyebilirsiniz."
+
+#: ../../templates/show_add_access.inc:46
+msgid "Start IP Address"
+msgstr "Ýlk ÝP-Adresi"
+
+#: ../../templates/show_add_access.inc:52
+msgid "End IP Address"
+msgstr "Son ÝP-Adresi"
+
+#: ../../templates/show_add_access.inc:58
+#: ../../templates/show_access_list.inc:50
+msgid "Level"
+msgstr "Düzey"
+
+#: ../../templates/show_add_access.inc:72
+msgid "Add Host"
+msgstr "Makine ekle"
+
 #: ../../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 "Hata: ICONV bulunamadý, ID3V2 etiketleri doðru þekilde ithal edilemeyecek. Bu adresten <a href=\"http://php.oregonstate.edu/iconv\">Iconv</a> ICONV hakkýnda bilgi alabilirsiniz."
+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 ""
+"Hata: ICONV bulunamadý, ID3V2 etiketleri doðru þekilde ithal edilemeyecek. "
+"Bu adresten <a href=\"http://php.oregonstate.edu/iconv\">Iconv</a> ICONV "
+"hakkýnda bilgi alabilirsiniz."
 
 #: ../../templates/catalog.inc:42
 msgid "Update Catalogs"
@@ -1572,10 +1825,6 @@ msgstr "Çabuk güncelle"
 msgid "You don't have any catalogs."
 msgstr "Sizin hiç kataloðunuz yok."
 
-#: ../../templates/catalog.inc:97
-msgid "Add a catalog"
-msgstr "Katalog ekle"
-
 #: ../../templates/catalog.inc:99
 msgid "Show Duplicate Songs"
 msgstr "Duble þarkýlarý görüntüle"
@@ -1588,279 +1837,378 @@ msgstr "Edilgenleþtirilmiþ þarkýlarý görüntüle"
 msgid "Clear Catalog Stats"
 msgstr "Katalog istatistiklerini sil"
 
-#: ../../templates/catalog.inc:102
-msgid "Clear Now Playing"
-msgstr "Þu anda çalanlarý sil"
-
 #: ../../templates/catalog.inc:103
 msgid "Dump Album Art"
 msgstr "Albüm kapaðý boþalt"
 
-#: ../../templates/catalog.inc:104
+#: ../../templates/catalog.inc:105
 msgid "View flagged songs"
 msgstr "Ýþaretlenmiþ þarkýlarý görüntüle"
 
-#: ../../templates/catalog.inc:105
+#: ../../templates/catalog.inc:106
 msgid "Catalog Tools"
 msgstr "Katalog araçlarý"
 
-#: ../../templates/show_login_form.inc:40
-#: ../../templates/show_login_form.inc:54
-msgid "Login"
-msgstr "Giriþ"
-
-#: ../../templates/show_login_form.inc:50
-msgid "Remember Me"
-msgstr "Beni hatýrla"
-
-#: ../../templates/show_add_access.inc:31
-msgid "Add Access for a Host"
-msgstr "Eriþim listesine makine ekle"
-
-#: ../../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 "Aþaðýdaki formu kullanarak Ampache kataloðuna eriþmesini istediðiniz makineleri ekleyebilirsiniz."
-
-#: ../../templates/show_add_access.inc:46
-msgid "Start IP Address"
-msgstr "Ýlk ÝP-Adresi"
-
-#: ../../templates/show_add_access.inc:52
-msgid "End IP Address"
-msgstr "Son ÝP-Adresi"
-
-#: ../../templates/show_add_access.inc:72
-msgid "Add Host"
-msgstr "Makine ekle"
-
-#: ../../templates/customize_catalog.inc:24
-msgid "Settings for catalog in"
-msgstr "Katalog ayarlarý:"
-
-#: ../../templates/customize_catalog.inc:35
-msgid "catalog path"
-msgstr "katalog yolu"
-
-#: ../../templates/customize_catalog.inc:45
-msgid "ID3 set command"
-msgstr "ID3 ayarlama komutu"
-
-#: ../../templates/customize_catalog.inc:51
-msgid "Filename pattern"
-msgstr "Dosya adý deseni"
+#: ../../templates/admin_menu.inc:33
+msgid "Users"
+msgstr "Kullanýcýlar"
 
-#: ../../templates/customize_catalog.inc:69
-msgid "Save Catalog Settings"
-msgstr "Katalog ayarlarýný kaydet"
+#: ../../templates/admin_menu.inc:34
+msgid "Mail Users"
+msgstr "Kullanýcýlara mesaj"
 
-#: ../../templates/menu.inc:31
+#: ../../templates/menu.inc:29
 msgid "Home"
 msgstr "Ýlk Sayfa"
 
-#: ../../templates/menu.inc:34
+#: ../../templates/menu.inc:32
+#, fuzzy
+msgid "Local Play"
+msgstr "Yerel Çalma Düzeni"
+
+#: ../../templates/menu.inc:38
 msgid "Playlists"
 msgstr "Þarký listeleri"
 
-#: ../../templates/menu.inc:35
-#: ../../templates/show_search.inc:38
-#: ../../templates/show_search.inc:84
-msgid "Search"
-msgstr "Ara"
-
-#: ../../templates/menu.inc:36
+#: ../../templates/menu.inc:40
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: ../../templates/menu.inc:57
-#: ../../templates/menu.inc:60
+#: ../../templates/menu.inc:43 ../../templates/show_upload.inc:73
+msgid "Upload"
+msgstr "Yükleme"
+
+#: ../../templates/menu.inc:63 ../../templates/menu.inc:66
 msgid "Admin"
 msgstr "Yönetici"
 
-#: ../../templates/menu.inc:69
-#: ../../templates/menu.inc:76
+#: ../../templates/menu.inc:73 ../../templates/menu.inc:79
 msgid "Account"
 msgstr "Hesap"
 
-#: ../../templates/menu.inc:70
-#: ../../templates/menu.inc:77
+#: ../../templates/menu.inc:74 ../../templates/menu.inc:80
 msgid "Stats"
 msgstr "Ýstatistikler"
 
-#: ../../templates/menu.inc:71
-#: ../../templates/menu.inc:78
-#: ../../templates/menu.inc:83
+#: ../../templates/menu.inc:75 ../../templates/menu.inc:81
+#: ../../templates/menu.inc:85
 msgid "Logout"
 msgstr "Oturum Sonu"
 
-#: ../../templates/show_albums.inc:59
-#: ../../templates/show_artists.inc:56
-msgid "Random"
-msgstr "Rasgele"
+#: ../../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 (azami_yükleme_hacmi)"
+
+#: ../../templates/show_now_playing.inc:31
+msgid "Now Playing"
+msgstr "Þu anda çalan"
+
+#: ../../templates/show_login_form.inc:49
+#: ../../templates/show_login_form.inc:63
+msgid "Login"
+msgstr "Giriþ"
+
+#: ../../templates/show_login_form.inc:59
+msgid "Remember Me"
+msgstr "Beni hatýrla"
 
-#: ../../templates/show_users.inc:42
+#: ../../templates/show_access_list.inc:34
+msgid "Host Access to Your Catalog"
+msgstr "Kataloða makine eriþimi"
+
+#: ../../templates/show_access_list.inc:43
+msgid "Add Entry"
+msgstr "Giriþ ekle"
+
+#: ../../templates/show_access_list.inc:48
+msgid "Start Address"
+msgstr "Ýlk Adres"
+
+#: ../../templates/show_access_list.inc:49
+msgid "End Address"
+msgstr "Son Adres"
+
+#: ../../templates/show_access_list.inc:65
+msgid "Revoke"
+msgstr "Ýptal"
+
+#: ../../templates/show_users.inc:43
 msgid "Fullname"
 msgstr "Tam Ýsim"
 
-#: ../../templates/show_users.inc:47
+#: ../../templates/show_users.inc:48
 msgid "Last Seen"
 msgstr "Son giriþ"
 
-#: ../../templates/show_users.inc:54
+#: ../../templates/show_users.inc:55 ../../templates/show_users.inc:91
 msgid "Prefs"
 msgstr "Tercihler"
 
-#: ../../templates/show_users.inc:60
-msgid "Set Access"
+#: ../../templates/show_users.inc:58
+#, fuzzy
+msgid "Access"
 msgstr "Eriþim Ayarý"
 
-#: ../../templates/show_users.inc:66
+#: ../../templates/show_users.inc:64
 msgid "On-line"
 msgstr "Çevrimiçi"
 
-#: ../../templates/show_users.inc:88
-msgid "edit"
-msgstr "düzenle"
-
-#: ../../templates/show_users.inc:93
-msgid "prefs"
-msgstr "tercihler"
-
-#: ../../templates/show_users.inc:98
+#: ../../templates/show_users.inc:105
 msgid "delete"
 msgstr "sil"
 
-#: ../../templates/show_users.inc:104
-#: ../../templates/show_users.inc:113
-#: ../../templates/show_users.inc:116
-msgid "set to user"
-msgstr "Kullanýcý haline getir"
+#: ../../templates/show_search.inc:34 ../../templates/show_search_bar.inc:36
+msgid "Search Ampache"
+msgstr "Ampache içinde ara"
 
-#: ../../templates/show_users.inc:105
-#: ../../templates/show_users.inc:109
-#: ../../templates/show_users.inc:117
-msgid "disable"
-msgstr "edilgenleþtir"
+#: ../../templates/show_search.inc:41
+msgid "Object Type"
+msgstr "Nesne türü"
 
-#: ../../templates/show_users.inc:108
-#: ../../templates/show_users.inc:112
-msgid "set to admin"
-msgstr "'admin' yap"
+#: ../../templates/show_artist.inc:31
+msgid "Albums by"
+msgstr "Albümler"
 
-#: ../../templates/userform.inc:25
-msgid "Adding a New User"
-msgstr "Kullanýcý ekle"
+#: ../../templates/show_artist.inc:33
+msgid "Show All Songs By"
+msgstr "Tüm þarkýlarýný görüntüle: "
 
-#: ../../templates/userform.inc:29
-msgid "Editing existing User"
-msgstr "Kullanýcýyý düzenle"
+#: ../../templates/show_artist.inc:34
+msgid "Play All Songs By"
+msgstr "Tüm þarkýlarýný çal: "
 
-#: ../../templates/userform.inc:81
-msgid "User Access Level"
-msgstr "Kullanýcý eriþim düzeyi"
+#: ../../templates/show_artist.inc:35
+msgid "Play Random Songs By"
+msgstr "Rasgele þarkýlarýný çal: "
 
-#: ../../templates/userform.inc:98
-msgid "Add User"
-msgstr "Kullanýcý ekle"
+#: ../../templates/show_artist.inc:49
+msgid "Select"
+msgstr "Seçim"
 
-#: ../../templates/userform.inc:103
-msgid "Update User"
-msgstr "Kullanýcý güncelle"
+#: ../../templates/show_artist.inc:51
+msgid "Cover"
+msgstr "Kapak"
 
-#: ../../templates/show_songs.inc:33
-msgid "Song title"
-msgstr "þarký adý"
+#: ../../templates/show_artist.inc:52
+msgid "Album Name"
+msgstr "Albüm adý"
 
-#: ../../templates/show_songs.inc:114
-msgid "Direct Link"
-msgstr "Doðrudan Eriþim"
+#: ../../templates/show_artist.inc:53
+msgid "Album Year"
+msgstr "Albüm yýlý"
 
-#: ../../templates/show_songs.inc:133
-msgid "Total"
-msgstr "Tüm"
+#: ../../templates/show_artist.inc:54
+msgid "Total Tracks"
+msgstr "Tüm parçalar"
 
-#: ../../templates/show_songs.inc:159
-msgid "Set Track Numbers"
-msgstr "Parça numaralarýný iþle"
+#: ../../templates/show_mpdplay.inc:38
+msgid "MPD Play Control"
+msgstr "MPD Kontrol"
 
-#: ../../templates/show_songs.inc:160
-msgid "Remove Selected Tracks"
-msgstr "Seçilmiþ parçalarý sil"
+#: ../../templates/show_mpdplay.inc:71
+msgid "Loop"
+msgstr "Döngü"
 
-#: ../../templates/show_album.inc:53
-msgid "Play Album"
-msgstr "Albümü çal"
+#: ../../templates/show_mpdplay.inc:78 ../../templates/show_mpdplay.inc:91
+msgid "On"
+msgstr ""
 
-#: ../../templates/show_album.inc:54
-msgid "Play Random from Album"
-msgstr "Albümden rasgele çal"
+#: ../../templates/show_mpdplay.inc:79 ../../templates/show_mpdplay.inc:92
+msgid "Off"
+msgstr ""
 
-#: ../../templates/show_album.inc:55
-msgid "Reset Album Art"
-msgstr "Albüm kapaðý silinsin"
+#: ../../templates/show_mpdplay.inc:114
+#, fuzzy
+msgid "Now Playing :"
+msgstr "Þu anda çalan"
 
-#: ../../templates/show_album.inc:56
-msgid "Find Album Art"
-msgstr "Albüm kapaðý ara"
+#: ../../templates/show_mpdplay.inc:138
+msgid "On Deck "
+msgstr ""
 
-#: ../../templates/show_search.inc:35
-msgid "Search Ampache"
-msgstr "Ampache içinde ara"
+#: ../../templates/show_mpdplay.inc:138
+msgid "(in "
+msgstr ""
 
-#: ../../templates/show_search.inc:42
-msgid "Object Type"
-msgstr "Nesne türü"
+#: ../../templates/show_mpdpl.inc:45
+#, fuzzy
+msgid "MPD Server Playlist"
+msgstr "Sunucu þarký listesi"
 
-#: ../../templates/show_search.inc:75
-msgid "Search Type"
-msgstr "Arama türü"
+#: ../../templates/show_mpdpl.inc:46 ../../templates/show_mpdpl.inc:184
+msgid "Refresh the Playlist Window"
+msgstr "Þarký Listesi görüntüsünü yenile"
 
-#: ../../templates/show_install_config.inc:52
-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 "Bu adýmda temel veriler sorgulanýp, web sunucunuza ilk yazma denemesi yapýlacaktýr. Eðer baþarýsýz olunursa size sunulacak olan yapýlandýrma dosyasýný /config klasörüne kaydedin. "
+#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:189
+msgid "Click to shuffle (randomize) the playlist"
+msgstr "Þarký Listesini karýþtýrmak (rasgele) icin týkla"
 
-#: ../../templates/show_install_config.inc:60
-msgid "Web Path"
-msgstr "Web Yolu"
+#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:189
+msgid "shuffle"
+msgstr "rasgele"
 
-#: ../../templates/show_install_config.inc:72
-msgid "MySQL Username"
-msgstr "MySQL kullanýcý adý"
+#: ../../templates/show_mpdpl.inc:49 ../../templates/show_mpdpl.inc:190
+#, fuzzy
+msgid "Click to the clear the playlist"
+msgstr "Þarký listesini silmek için týkla"
 
-#: ../../templates/show_install_config.inc:76
-msgid "MySQL Password"
-msgstr "MySQL parolasý"
+#: ../../templates/show_mpdpl.inc:53 ../../templates/show_mpdpl.inc:194
+msgid "Click to the remove all except the Now Playing"
+msgstr ""
 
-#: ../../templates/show_install_config.inc:81
-msgid "Write Config"
-msgstr "Yapýlandýrmayý kaydet"
+#: ../../templates/show_uploads.inc:33
+#, fuzzy
+msgid "Status"
+msgstr "Ýstatistikler"
 
-#: ../../templates/show_install_config.inc:125
-msgid "Check for Config"
-msgstr "Yapýlandýrma doðrula"
+#: ../../templates/show_uploads.inc:42
+msgid "User"
+msgstr "Kullanýcý"
 
-#: ../../templates/show_localplay.inc:30
-msgid "Local Play Control"
-msgstr "Yerel Çalma Düzeni"
+#: ../../templates/show_uploads.inc:43
+msgid "Date"
+msgstr "Tarih"
 
-#: ../../templates/show_localplay.inc:35
-msgid "Playback"
-msgstr "Çal"
+#: ../../templates/show_uploads.inc:49
+msgid "Add"
+msgstr "Ekle"
 
-#: ../../templates/show_localplay.inc:49
-msgid "Volume"
-msgstr "Ses"
+#: ../../templates/show_random_play.inc:28
+msgid "Play Random Selection"
+msgstr "Rasgele seçilenleri çal"
 
-#: ../../templates/show_localplay.inc:53
-#: ../../templates/show_localplay.inc:54
-msgid "Increase Volume"
-msgstr "Ses aç"
+#: ../../templates/show_random_play.inc:34
+msgid "Item count"
+msgstr "Öðe sayýsý"
 
-#: ../../templates/show_localplay.inc:55
-#: ../../templates/show_localplay.inc:56
-msgid "Decrease Volume"
-msgstr "Ses kapa"
+#: ../../templates/show_random_play.inc:49
+msgid "From genre"
+msgstr "Kategoriden"
 
-#: ../../templates/show_localplay.inc:62
-msgid "Clear queue"
-msgstr "Kuyruðu sil"
+#: ../../templates/show_random_play.inc:58
+msgid "Standard"
+msgstr ""
+
+#: ../../templates/show_random_play.inc:59
+msgid "Favor Unplayed"
+msgstr "Çalýnmamýþlardan"
+
+#: ../../templates/show_random_play.inc:60
+msgid "Full Albums"
+msgstr "Tüm Albümler"
+
+#: ../../templates/show_random_play.inc:61
+msgid "Full Artist"
+msgstr "Tüm Sanatçýlar"
+
+#: ../../templates/show_random_play.inc:66
+msgid "from catalog"
+msgstr "Katalogdan"
+
+#: ../../templates/show_random_play.inc:75
+msgid "Play Random Songs"
+msgstr "Rasgele þarký çal"
+
+#~ msgid "An Unknown Error has occured."
+#~ msgstr "Bilinmeyen bir hata oluþtu."
+
+#~ msgid "Successfully-Quarantined"
+#~ msgstr "Baþarýyla karantinaya alýndý"
+
+#~ msgid "Successfully-Cataloged"
+#~ msgstr "Baþarýyla kataloglaþtýrýldý"
+
+#~ msgid "Unknown"
+#~ msgstr "Bilinmeyen"
+
+#~ msgid "Quarantined"
+#~ msgstr "Karantinaya alýnmýþ"
+
+#~ msgid "All Albums"
+#~ msgstr "Tüm albümler"
+
+#~ msgid "<u>S</u>how all albums"
+#~ msgstr "Tüm albümleri göster"
+
+#~ msgid "Albums with no artwork"
+#~ msgstr "Kapaksýz Albümler"
+
+#~ msgid "Select a starting letter or Show all"
+#~ msgstr "Baþlangýç harfini seç yada hepsini görüntüle"
+
+#~ msgid ""
+#~ "Your webserver configured so that your config directory is not visable to "
+#~ "the web"
+#~ msgstr ""
+#~ "Web Sunucunuz yapýlandýrma klasörünüzün görünmeyeceði þekilde ayarlanmýþ "
+#~ "olmalý"
+
+#~ msgid "View Limit"
+#~ msgstr "Sýnýrlarý görüntüle"
+
+#~ msgid "Loop is off"
+#~ msgstr "Döngü kapalý"
+
+#~ msgid "Loop is on"
+#~ msgstr "Döngü açýk"
+
+#~ msgid "refresh now"
+#~ msgstr "þimdi yenile"
+
+#~ msgid "clear"
+#~ msgstr "sil"
+
+#~ msgid "Create/Modify User Accounts for Ampache"
+#~ msgstr "Ampache kullanýcý hesabý ekle/güncelle"
+
+#~ msgid "Mail your users to notfiy them of changes"
+#~ msgstr "Kullanýcýlara mail ile yenilikleri bildir"
+
+#~ msgid "Create/Update/Clean your catalog here"
+#~ msgstr "Buradan katalog ekle/güncelleþtir/sil"
+
+#~ msgid "Modify Site-wide preferences"
+#~ msgstr "Site genelinde geçerli olan tercihleri düzenle"
+
+#~ msgid "Modify Access List Permissions"
+#~ msgstr "Eriþim listesindeki izinleri düzenle"
+
+#~ msgid "Must have access_control=true in ampache.cfg"
+#~ msgstr "Ampache.cfg'de 'access_control=true' nun bulunmasý zorunludur"
+
+#~ msgid "Please Ensure All Files Are Tagged Correctly"
+#~ msgstr "Lütfen tüm dosyalarýn doðru etiketlendirilmesini saðlayýn"
+
+#~ msgid ""
+#~ "Ampache relies on id3 tags to sort data.  If your file is not tagged it "
+#~ "may be deleted."
+#~ msgstr ""
+#~ "Ampache sýralama için ID3 etiketlerini kullanýr. Dosyanýz etiketsizse "
+#~ "silinebilir."
+
+#~ msgid ""
+#~ "Your webserver configured so that <ampache_root>/docs is your webroot"
+#~ msgstr "Web sunucunuz <ampache_root>/docs 'u temel olarak kullanmalý"
+
+#~ msgid "edit"
+#~ msgstr "düzenle"
+
+#~ msgid "prefs"
+#~ msgstr "tercihler"
+
+#~ msgid "set to user"
+#~ msgstr "Kullanýcý haline getir"
+
+#~ msgid "disable"
+#~ msgstr "edilgenleþtir"
 
+#~ msgid "set to admin"
+#~ msgstr "'admin' yap"
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 9b3c0cee..5597dbe5 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: v1.0a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-11 09:08-0600\n"
+"POT-Creation-Date: 2005-08-14 16:23-0700\n"
 "PO-Revision-Date: 2005-07-11 09:08-0600\n"
 "Last-Translator: Hongyi_Gao <hongyi_gao@hotmail.com>\n"
 "Language-Team: CHINESE <hongyi_gao@hotmail.com>\n"
@@ -16,769 +16,581 @@ msgstr ""
 "Content-Type: text/plain; charset=GBK\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../lib/duplicates.php:80
-msgid "Find Duplicates"
-msgstr "²éÕÒÖظ´Îļþ"
-
-#: ../../lib/duplicates.php:83 ../../templates/show_search.inc:74
-msgid "Search Type"
-msgstr "ËÑË÷·½Ê½"
-
-#: ../../lib/duplicates.php:91 ../../modules/class/song.php:253
-msgid "Title"
-msgstr "¸èÃû"
-
-#: ../../lib/duplicates.php:97
-msgid "Artist and Title"
-msgstr "¸èÊֺ͸èÃû"
-
-#: ../../lib/duplicates.php:102
-msgid "Artist, Album and Title"
-msgstr "¸èÊÖ£¬¸èÃûºÍר¼­"
-
-#: ../../lib/duplicates.php:110 ../../templates/menu.inc:38
-#: ../../templates/show_search.inc:37 ../../templates/show_search.inc:83
-msgid "Search"
-msgstr "ËÑË÷"
-
-#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
-#: ../../modules/class/catalog.php:902
-msgid "Error"
-msgstr "´íÎó"
-
-#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
-msgid "Could not add"
-msgstr "ÎÞ·¨Ìí¼Ó"
-
-#: ../../lib/Browser.php:867
-msgid "file"
-msgstr "Îļþ"
-
-#: ../../lib/Browser.php:871
-msgid "File uploads not supported."
-msgstr "²»Ö§³ÖÎļþÉÏ´«"
-
-#: ../../lib/Browser.php:889
-msgid "No file uploaded"
-msgstr "ûÓÐÉÏ´«Îļþ"
-
-#: ../../lib/Browser.php:896
-#, php-format
-msgid "There was a problem with the file upload: No %s was uploaded."
-msgstr "ÎļþÉÏ´«´íÎó£ºÃ»ÓÐÉÏ´« %s"
-
-#: ../../lib/Browser.php:901
-#, php-format
-msgid ""
-"There was a problem with the file upload: The %s was larger than the maximum "
-"allowed size (%d bytes)."
-msgstr ""
-"ÎļþÉÏ´«´íÎó£º%s ´óÓÚ×î´óÔÊÐíÉÏ´«´óС£¨%d ×Ö½Ú£©"
-
-#: ../../lib/Browser.php:903
-#, php-format
-msgid ""
-"There was a problem with the file upload: The %s was only partially uploaded."
-msgstr ""
-"ÎļþÉÏ´«´íÎó£º%s Ö»ÉÏ´«Á˲¿·ÖÎļþ"
-
-#: ../../lib/ui.php:180
-msgid "Playlist Actions"
-msgstr "×ÔÑ¡¸èÇúÁбí²Ù×÷"
-
-#: ../../lib/ui.php:180
-msgid "New"
-msgstr "н¨"
-
-#: ../../lib/ui.php:181
-msgid "View All"
-msgstr "È«²¿ÏÔʾ"
-
-#: ../../lib/ui.php:182
-msgid "Import"
-msgstr "µ¼Èë"
-
-#: ../../lib/ui.php:282
-msgid "Browse"
-msgstr "ä¯ÀÀ"
-
-#: ../../lib/ui.php:284
-msgid "Show w/o art"
-msgstr "²»ÏÔʾ¸èÊÖ"
-
-#: ../../lib/ui.php:287
-msgid "Show all"
-msgstr "È«²¿ÏÔʾ"
-
-#: ../../lib/ui.php:393
-msgid "No songs in this playlist."
-msgstr "´Ë×ÔÑ¡ÁбíûÓиèÇú"
-
-#: ../../lib/search.php:52 ../../lib/search.php:68 ../../lib/search.php:84
-#: ../../lib/search.php:100 ../../lib/search.php:116 ../../lib/search.php:133
-#: ../../lib/search.php:145 ../../lib/search.php:161 ../../lib/search.php:177
-msgid "No Results Found"
-msgstr "ûÓÐÕÒµ½"
+#: ../../play/index.php:50
+msgid "Session Expired: please log in again at"
+msgstr "»á»°¹ýÆÚ£ºÇëÖØеǼ"
 
-#: ../../lib/preferences.php:210 ../../templates/show_users.inc:97
+#: ../../lib/preferences.php:211 ../../templates/show_users.inc:97
 msgid "Enable"
 msgstr "ÔÊÐí"
 
-#: ../../lib/preferences.php:211 ../../templates/show_users.inc:100
+#: ../../lib/preferences.php:212 ../../templates/show_users.inc:100
 msgid "Disable"
 msgstr "½ûÖ¹"
 
-#: ../../lib/preferences.php:223 ../../templates/add_catalog.inc:60
+#: ../../lib/preferences.php:224 ../../templates/add_catalog.inc:60
 msgid "Local"
 msgstr ""
 
-#: ../../lib/preferences.php:226
+#: ../../lib/preferences.php:227
 msgid "Stream"
 msgstr ""
 
-#: ../../lib/preferences.php:229
+#: ../../lib/preferences.php:230
 msgid "IceCast"
 msgstr ""
 
-#: ../../lib/preferences.php:232
+#: ../../lib/preferences.php:233
 msgid "Downsample"
 msgstr ""
 
-#: ../../lib/preferences.php:235
+#: ../../lib/preferences.php:236
 msgid "Music Player Daemon"
 msgstr ""
 
-#: ../../lib/preferences.php:238
+#: ../../lib/preferences.php:239
 msgid "SlimServer"
 msgstr ""
 
-#: ../../lib/preferences.php:247
+#: ../../lib/preferences.php:248
 msgid "M3U"
 msgstr ""
 
-#: ../../lib/preferences.php:248
+#: ../../lib/preferences.php:249
 msgid "Simple M3U"
 msgstr ""
 
-#: ../../lib/preferences.php:249
+#: ../../lib/preferences.php:250
 msgid "PLS"
 msgstr ""
 
-#: ../../lib/preferences.php:250
+#: ../../lib/preferences.php:251
 msgid "Asx"
 msgstr ""
 
-#: ../../lib/preferences.php:257
+#: ../../lib/preferences.php:258
 msgid "English"
 msgstr "Ó¢ÎÄ"
 
-#: ../../lib/preferences.php:258
+#: ../../lib/preferences.php:259
+#, fuzzy
+msgid "British English"
+msgstr "Ó¢ÎÄ"
+
+#: ../../lib/preferences.php:260
 msgid "German"
 msgstr "µÂÎÄ"
 
-#: ../../lib/preferences.php:259
+#: ../../lib/preferences.php:261
 msgid "French"
 msgstr "·¨ÎÄ"
 
-#: ../../lib/preferences.php:260
+#: ../../lib/preferences.php:262
 msgid "Turkish"
 msgstr "ÍÁ¶úÆäÓï"
 
-#: ../../localplay.php:79
-msgid "Unknown action requested"
-msgstr "δ֪²Ù×÷"
-
-#: ../../play/index.php:46
-msgid "Session Expired: please log in again at"
-msgstr "»á»°¹ýÆÚ£ºÇëÖØеǼ"
-
-#: ../../admin/song.php:70
-msgid "Songs Disabled"
-msgstr "¸èÇú±»½ûÖ¹²¥·Å"
-
-#: ../../admin/song.php:70
-msgid "The requested song(s) have been disabled"
-msgstr "ÇëÇóµÄ¸èÇú±»½ûÖ¹²¥·Å"
-
-#: ../../admin/song.php:80
-msgid "Songs Enabled"
-msgstr "¸èÇú±»ÔÊÐí²¥·Å"
-
-#: ../../admin/song.php:80
-msgid "The requested song(s) have been enabled"
-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:76 ../../templates/catalog.inc:73
-msgid "Update Catalog(s)"
-msgstr "¸üÐÂÇú¿â"
-
-#: ../../admin/catalog.php:87 ../../templates/catalog.inc:74
-msgid "Update All Catalogs"
-msgstr "¸üÐÂËùÓÐÇú¿â"
-
-#: ../../admin/catalog.php:119 ../../templates/catalog.inc:80
-msgid "Clean Catalog(s)"
-msgstr "Çå³ýÇú¿â"
-
-#: ../../admin/catalog.php:149 ../../templates/catalog.inc:81
-msgid "Clean All Catalogs"
-msgstr "Çå³ýËùÓÐÇú¿â"
-
-#: ../../admin/catalog.php:198
-msgid "Now Playing Cleared"
-msgstr "ÕýÔÚ²¥·Å±»È¡Ïû"
-
-#: ../../admin/catalog.php:198
-msgid "All now playing data has been cleared"
-msgstr "ËùÓÐÕýÔÚ²¥·ÅµÄÊý¾Ý±»È¡Ïû"
-
-#: ../../admin/catalog.php:203
-msgid "Do you really want to clear your catalog?"
-msgstr "ÕæµÄÒªÇå³ýÇú¿âÂð£¿"
-
-#: ../../admin/catalog.php:210
-msgid "Do you really want to clear the statistics for this catalog?"
-msgstr "ÕæµÄÒªÇå³ýÕâ¸öÇú¿âµÄͳ¼ÆÐÅÏ¢Âð£¿"
-
-#: ../../admin/catalog.php:228
-msgid "Do you really want to delete this catalog?"
-msgstr "ÕæµÄҪɾ³ýÇú¿âÂð£¿"
-
-#: ../../admin/catalog.php:251 ../../modules/class/catalog.php:723
-#: ../../modules/class/catalog.php:869
-msgid "Starting Album Art Search"
-msgstr "¿ªÊ¼ËÑË÷¸èÇú¸èÊÖ"
-
-#: ../../admin/catalog.php:259
-msgid "Album Art Search Finished"
-msgstr "¸èÇú¸èÊÖËÑË÷½áÊø"
-
-#: ../../admin/mail.php:98
-msgid "Mail to"
-msgstr "·¢µç×ÓÓʼþ¸ø"
-
-#: ../../admin/mail.php:109
-msgid "Subject"
-msgstr "±êÌâ"
-
-#: ../../admin/mail.php:116
-msgid "Message"
-msgstr "ÕýÎÄ"
-
-#: ../../admin/mail.php:126
-msgid "Send Mail"
-msgstr "·¢ËÍ"
-
-#: ../../admin/access.php:43
-msgid "Do you really want to delete this Access Record?"
-msgstr "ÕæµÄҪɾ³ýÕâ¸ö·ÃÎÊÐí¿ÉÂð£¿"
-
-#: ../../admin/access.php:51
-msgid "Entry Deleted"
-msgstr "Êý¾Ý±»É¾³ý"
-
-#: ../../admin/access.php:51
-msgid "Your Access List Entry has been removed"
-msgstr "·ÃÎÊÐí¿É±»É¾³ý"
-
-#: ../../admin/access.php:61
-msgid "Entry Added"
-msgstr "¼Ç¼±»Ìí¼Ó"
-
-#: ../../admin/access.php:61
-msgid "Your new Access List Entry has been created"
-msgstr "зÃÎÊÐí¿É±»Ìí¼Ó"
-
-#: ../../admin/users.php:77 ../../admin/users.php:124
-msgid "Error Username Required"
-msgstr "´íÎó£ºÇëÊäÈëÓû§Ãû"
-
-#: ../../admin/users.php:80 ../../admin/users.php:121
-msgid "Error Passwords don't match"
-msgstr "´íÎó£ºÃÜÂ벻ƥÅä"
-
-#: ../../admin/users.php:138
-msgid "Are you sure you want to permanently delete"
-msgstr "È·¶¨ÒªÓÀ¾Ãɾ³ý£¿"
-
-#: ../../admin/users.php:145 ../../templates/show_confirm_action.inc.php:29
-msgid "No"
-msgstr "·ñ"
-
-#: ../../admin/users.php:147
-msgid "User Deleted"
-msgstr "Óû§ÒÑɾ³ý"
-
-#: ../../admin/users.php:150
-msgid "Delete Error"
-msgstr "ɾ³ý´íÎó"
+#: ../../lib/preferences.php:263
+msgid "Spanish"
+msgstr ""
 
-#: ../../admin/users.php:150
-msgid "Unable to delete last Admin User"
-msgstr "²»ÄÜɾ³ýΨһµÄ¹ÜÀíÔ±"
+#: ../../lib/preferences.php:264
+msgid "Norwegian"
+msgstr ""
 
-#: ../../amp-mpd.php:41
-msgid "Error Connecting"
-msgstr "Á¬½Ó´íÎó"
+#: ../../lib/preferences.php:265
+msgid "Simplified Chinese"
+msgstr ""
 
-#: ../../albums.php:43
-msgid "Album Art Cleared"
-msgstr "¸èÇú¸èÊÖ±»É¾³ý"
+#: ../../lib/duplicates.php:80
+msgid "Find Duplicates"
+msgstr "²éÕÒÖظ´Îļþ"
 
-#: ../../albums.php:43
-msgid "Album Art information has been removed form the database"
-msgstr "¸èÇú¸èÊÖÐÅÏ¢±»´ÓÊý¾Ý¿âÏû³ý"
+#: ../../lib/duplicates.php:83 ../../templates/show_search.inc:74
+msgid "Search Type"
+msgstr "ËÑË÷·½Ê½"
 
-#: ../../albums.php:77
-msgid "Album Art Located"
-msgstr "ÕÒµ½¸èÇú¸èÊÖÐÅÏ¢"
+#: ../../lib/duplicates.php:91 ../../lib/class/song.class.php:275
+msgid "Title"
+msgstr "¸èÃû"
 
-#: ../../albums.php:77
-msgid ""
-"Album Art information has been located in Amazon. If incorrect, click "
-"\"Reset Album Art\" below to remove the artwork."
-msgstr ""
-"ÔÚAmazonÕÒµ½¸èÇú¸èÊÖÐÅÏ¢¡£Èç¹ûÕýÈ·£¬Çë°´ÏÂÃæµÄ"
-"\"ÖØÖøèÇú¸èÊÖ\""
+#: ../../lib/duplicates.php:97
+msgid "Artist and Title"
+msgstr "¸èÊֺ͸èÃû"
 
-#: ../../albums.php:85 ../../albums.php:95
-msgid "Get Art"
-msgstr "»ñÈ¡¸èÊÖÐÅÏ¢"
+#: ../../lib/duplicates.php:102
+msgid "Artist, Album and Title"
+msgstr "¸èÊÖ£¬¸èÃûºÍר¼­"
 
-#: ../../albums.php:89
-msgid "Album Art Not Located"
-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 "ËÑË÷"
 
-#: ../../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."
+#: ../../lib/general.lib.php:640
+msgid "Not Enough Data"
 msgstr ""
-"ÏÖÔÚÎÞ·¨ÕÒµ½¸èÇú¸èÊÖÐÅÏ¢¡£"
 
-#: ../../albums.php:105 ../../artists.php:56
-msgid "Starting Update from Tags"
-msgstr "¿ªÊ¼´ÓÎļþ±ê¼Ç»ñÈ¡ÐÅÏ¢"
-
-#: ../../albums.php:110 ../../artists.php:61
-msgid "Update From Tags Complete"
-msgstr "´Ó±ê¼ÇÐÅÏ¢¸üнáÊø"
-
-#: ../../albums.php:111 ../../modules/class/catalog.php:642
-#: ../../artists.php:62
-msgid "Return"
-msgstr "·µ»Ø"
+#: ../../lib/search.php:52 ../../lib/search.php:68 ../../lib/search.php:84
+#: ../../lib/search.php:100 ../../lib/search.php:116 ../../lib/search.php:133
+#: ../../lib/search.php:145 ../../lib/search.php:161 ../../lib/search.php:177
+msgid "No Results Found"
+msgstr "ûÓÐÕÒµ½"
 
-#: ../../albums.php:126 ../../albums.php:132
-msgid "<u>S</u>how all albums"
-msgstr "<u>S</u>ÏÔʾËùÓÐר¼­"
+#: ../../lib/class/genre.class.php:278
+#, fuzzy
+msgid "Show Genres starting with"
+msgstr "<u>S</u>ÏÔʾ¸èÊÖÃû×ÖÇ°¼¸Î»×Ö·ûÊÇ"
 
-#: ../../albums.php:139 ../../albums.php:146 ../../albums.php:151
-msgid "<u>S</u>how only albums starting with"
-msgstr "<u>S</u>Ö»ÏÔʾÈçÏ¿ªÍ·µÄר¼­£º"
+#: ../../lib/class/album.class.php:126
+msgid "Various"
+msgstr "ȺÐÇ"
 
-#: ../../albums.php:145
-msgid "Select a starting letter or Show all"
-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 "´íÎó£ºÎÞ·¨´ò¿ª"
 
-#: ../../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
+#: ../../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 "¸üÐÂ"
 
-#: ../../modules/class/song.php:257 ../../upload.php:235
-#: ../../templates/show_songs.inc:39
+#: ../../lib/class/song.class.php:279 ../../templates/show_songs.inc:39
+#: ../../templates/show_uploads.inc:39
 msgid "Bitrate"
 msgstr "ÂëÂÊ"
 
-#: ../../modules/class/song.php:261
+#: ../../lib/class/song.class.php:283
 msgid "Rate"
 msgstr "¼¶±ð"
 
-#: ../../modules/class/song.php:265
+#: ../../lib/class/song.class.php:287
 msgid "Mode"
 msgstr "ģʽ"
 
-#: ../../modules/class/song.php:269 ../../upload.php:234
-#: ../../templates/show_songs.inc:37
+#: ../../lib/class/song.class.php:291 ../../templates/show_songs.inc:37
+#: ../../templates/show_mpdpl.inc:66 ../../templates/show_uploads.inc:38
 msgid "Time"
 msgstr "ʱ¼ä"
 
-#: ../../modules/class/song.php:273 ../../templates/show_songs.inc:32
-#: ../../templates/show_songs.inc:36
+#: ../../lib/class/song.class.php:295 ../../templates/show_songs.inc:32
+#: ../../templates/show_songs.inc:36 ../../templates/show_mpdpl.inc:65
 msgid "Track"
 msgstr "Òô¹ì"
 
-#: ../../modules/class/song.php:277
+#: ../../lib/class/song.class.php:299
 msgid "Filesize"
 msgstr "Îļþ´óС"
 
-#: ../../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
+#: ../../lib/class/song.class.php:304 ../../templates/show_artists.inc:39
+#: ../../templates/show_artists.inc:62 ../../templates/show_songs.inc:34
+#: ../../templates/show_albums.inc:40 ../../templates/show_albums.inc:70
+#: ../../templates/show_mpdpl.inc:63 ../../templates/show_uploads.inc:35
 msgid "Artist"
 msgstr "¸èÊÖ"
 
-#: ../../modules/class/song.php:287 ../../upload.php:232
-#: ../../templates/show_songs.inc:35 ../../templates/show_albums.inc:38
-#: ../../templates/show_albums.inc:68
+#: ../../lib/class/song.class.php:309 ../../templates/show_songs.inc:35
+#: ../../templates/show_albums.inc:38 ../../templates/show_albums.inc:68
+#: ../../templates/show_mpdpl.inc:64 ../../templates/show_uploads.inc:36
 msgid "Album"
 msgstr "ר¼­"
 
-#: ../../modules/class/song.php:291 ../../templates/show_albums.inc:43
+#: ../../lib/class/song.class.php:313 ../../templates/show_albums.inc:43
 #: ../../templates/show_albums.inc:73
 msgid "Year"
 msgstr "Äê´ú"
 
-#: ../../modules/class/song.php:295 ../../templates/list_flagged.inc:46
+#: ../../lib/class/song.class.php:317 ../../templates/list_flagged.inc:46
 #: ../../templates/flag.inc:66
 msgid "Comment"
 msgstr "˵Ã÷"
 
-#: ../../modules/class/song.php:300 ../../upload.php:233
-#: ../../templates/show_songs.inc:40
+#: ../../lib/class/song.class.php:322 ../../templates/show_genres.inc.php:36
+#: ../../templates/show_genre.inc.php:32 ../../templates/show_songs.inc:40
+#: ../../templates/show_browse_menu.inc:37 ../../templates/show_mpdpl.inc:67
+#: ../../templates/show_uploads.inc:37
 msgid "Genre"
 msgstr "Àà±ð"
 
-#: ../../modules/class/catalog.php:267 ../../modules/class/catalog.php:552
-#: ../../modules/class/album.php:241
-msgid "Error: Unable to open"
-msgstr "´íÎó£ºÎÞ·¨´ò¿ª"
+#: ../../lib/class/stream.class.php:198
+#, fuzzy
+msgid "Opened for writing"
+msgstr "×¼±¸Ð´Èë"
 
-#: ../../modules/class/catalog.php:290
+#: ../../lib/class/stream.class.php:203
+msgid "Error, cannot write"
+msgstr "´íÎó£ºÎÞ·¨Ð´Èë"
+
+#: ../../lib/class/stream.class.php:214
+msgid "Error, cannot write song in file"
+msgstr "´íÎó£ºÎÞ·¨Ð´ÈëÎļþ"
+
+#: ../../lib/class/stream.class.php:220
+msgid "Closed after write"
+msgstr "¹Ø±Õ"
+
+#: ../../lib/class/catalog.class.php:298
 msgid "Error: Unable to change to directory"
 msgstr "´íÎó£ºÎÞ·¨²Ù×÷Ŀ¼"
 
-#: ../../modules/class/catalog.php:313
+#: ../../lib/class/catalog.class.php:321
 msgid "Error: Unable to get filesize for"
 msgstr "´íÎó£ºÎÞ·¨»ñµÃÎļþ´óС"
 
-#: ../../modules/class/catalog.php:332
+#: ../../lib/class/catalog.class.php:340
 msgid "Added Playlist From"
 msgstr "Ìí¼Ó×Ô¶¨Òå¸èÇúÁбí"
 
-#: ../../modules/class/catalog.php:351
+#: ../../lib/class/catalog.class.php:359
 msgid "Added"
 msgstr "ÒÑÌí¼Ó"
 
-#: ../../modules/class/catalog.php:363
+#: ../../lib/class/catalog.class.php:371
 msgid "is not readable by ampache"
 msgstr "ÎÞ·¨¶ÁÈ¡"
 
-#: ../../modules/class/catalog.php:427
+#: ../../lib/class/catalog.class.php:435
 msgid "Found in ID3"
 msgstr "ÔÚID3ÖÐÕÒµ½"
 
-#: ../../modules/class/catalog.php:431
+#: ../../lib/class/catalog.class.php:439
 msgid "Found on Amazon"
 msgstr "ÔÚAmazonÕÒµ½"
 
-#: ../../modules/class/catalog.php:435
+#: ../../lib/class/catalog.class.php:443
 msgid "Found in Folder"
 msgstr "ÔÚĿ¼ÀïÕÒµ½"
 
-#: ../../modules/class/catalog.php:439
+#: ../../lib/class/catalog.class.php:447
 msgid "Found"
 msgstr "ÕÒµ½"
 
-#: ../../modules/class/catalog.php:442
+#: ../../lib/class/catalog.class.php:450
 msgid "Not Found"
 msgstr "ûÓÐÕÒµ½"
 
-#: ../../modules/class/catalog.php:450
+#: ../../lib/class/catalog.class.php:458
 msgid "Searched"
 msgstr "ÒÑËÑË÷"
 
-#: ../../modules/class/catalog.php:605
+#: ../../lib/class/catalog.class.php:613
 msgid "Starting Dump Album Art"
 msgstr "¿ªÊ¼µ¼³ö¸èÇú¸èÊÖ"
 
-#: ../../modules/class/catalog.php:625
+#: ../../lib/class/catalog.class.php:633
 msgid "Written"
 msgstr "ÒÑдÈë"
 
-#: ../../modules/class/catalog.php:634
+#: ../../lib/class/catalog.class.php:642
 msgid "Error unable to open file for writting"
 msgstr "´íÎó£ºÎÞ·¨Ð´ÈëÎļþ"
 
-#: ../../modules/class/catalog.php:641
+#: ../../lib/class/catalog.class.php:649
 msgid "Album Art Dump Complete"
 msgstr "¸èÇú¸èÊÖµ¼³ö½áÊø"
 
-#: ../../modules/class/catalog.php:708
+#: ../../lib/class/catalog.class.php:650 ../../artists.php:63
+#: ../../albums.php:112
+msgid "Return"
+msgstr "·µ»Ø"
+
+#: ../../lib/class/catalog.class.php:719
 msgid "Starting Catalog Build"
 msgstr "¿ªÊ¼Öؽ¨Çú¿â"
 
-#: ../../modules/class/catalog.php:713
+#: ../../lib/class/catalog.class.php:724
 msgid "Running Remote Sync"
 msgstr "ÔËÐÐÔ¶³Ìͬ²½"
 
-#: ../../modules/class/catalog.php:733
+#: ../../lib/class/catalog.class.php:734 ../../lib/class/catalog.class.php:880
+#: ../../admin/catalog.php:264
+msgid "Starting Album Art Search"
+msgstr "¿ªÊ¼ËÑË÷¸èÇú¸èÊÖ"
+
+#: ../../lib/class/catalog.class.php:744
 msgid "Catalog Finished"
 msgstr "Çú¿â½¨Á¢½áÊø"
 
-#: ../../modules/class/catalog.php:733 ../../modules/class/catalog.php:888
+#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:899
 msgid "Total Time"
 msgstr "×Üʱ¼ä"
 
-#: ../../modules/class/catalog.php:733 ../../modules/class/catalog.php:889
+#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:900
 msgid "Total Songs"
 msgstr "È«²¿¸èÇú"
 
-#: ../../modules/class/catalog.php:734 ../../modules/class/catalog.php:889
+#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:900
 msgid "Songs Per Seconds"
 msgstr "Ê׸裯Ãë"
 
-#: ../../modules/class/catalog.php:768 ../../modules/class/catalog.php:1379
+#: ../../lib/class/catalog.class.php:779
+#: ../../lib/class/catalog.class.php:1476
 msgid "Updated"
 msgstr "ÒѸüÐÂ"
 
-#: ../../modules/class/catalog.php:775
+#: ../../lib/class/catalog.class.php:786
 msgid "No Update Needed"
 msgstr "²»ÓøüÐÂ"
 
-#: ../../modules/class/catalog.php:849
+#: ../../lib/class/catalog.class.php:860
 msgid "Starting New Song Search on"
 msgstr "¿ªÊ¼ËÑË÷иèÇú"
 
-#: ../../modules/class/catalog.php:849
+#: ../../lib/class/catalog.class.php:860
 msgid "catalog"
 msgstr "Çú¿â"
 
-#: ../../modules/class/catalog.php:853
+#: ../../lib/class/catalog.class.php:864
 msgid "Running Remote Update"
 msgstr "ÔËÐÐÔ¶³Ì¸üÐÂ"
 
-#: ../../modules/class/catalog.php:888
+#: ../../lib/class/catalog.class.php:899
 msgid "Catalog Update Finished"
 msgstr "Çú¿â¸üнáÊø"
 
-#: ../../modules/class/catalog.php:902
+#: ../../lib/class/catalog.class.php:919 ../../lib/mpd.php:40
+#: ../../lib/mpd.php:49
+msgid "Error"
+msgstr "´íÎó"
+
+#: ../../lib/class/catalog.class.php:919
 msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
 msgstr "ÎÞ·¨ÔØÈëXMLRPC¿â£¬ÇëÈ·ÈÏÊÇ·ñÔÊÐíXML-RPC"
 
-#: ../../modules/class/catalog.php:934 ../../modules/class/catalog.php:949
+#: ../../lib/class/catalog.class.php:958
+#: ../../lib/class/catalog.class.php:1009
 msgid "Error connecting to"
 msgstr "´íÎó£ºÁ¬½Ó"
 
-#: ../../modules/class/catalog.php:934 ../../modules/class/catalog.php:949
+#: ../../lib/class/catalog.class.php:958
+#: ../../lib/class/catalog.class.php:1009
 msgid "Code"
 msgstr "´úÂë"
 
-#: ../../modules/class/catalog.php:934 ../../modules/class/catalog.php:949
+#: ../../lib/class/catalog.class.php:958
+#: ../../lib/class/catalog.class.php:1009
 msgid "Reason"
 msgstr "Ô­Òò"
 
-#: ../../modules/class/catalog.php:954
+#: ../../lib/class/catalog.class.php:974
 msgid "Completed updating remote catalog(s)"
 msgstr "Ô¶³ÌÇú¿â¸üнáÊø"
 
-#: ../../modules/class/catalog.php:1042
+#: ../../lib/class/catalog.class.php:1105
 msgid "Checking"
 msgstr "¼ì²é"
 
-#: ../../modules/class/catalog.php:1099
+#: ../../lib/class/catalog.class.php:1163
 msgid "Catalog Clean Done"
 msgstr "Çú¿â±»Çå¿Õ"
 
-#: ../../modules/class/catalog.php:1099
+#: ../../lib/class/catalog.class.php:1163
 msgid "files removed"
 msgstr "Îļþ±»É¾³ý"
 
-#: ../../modules/class/catalog.php:1339
+#: ../../lib/class/catalog.class.php:1436
 msgid "Updating the"
 msgstr "¸üÐÂ"
 
-#: ../../modules/class/catalog.php:1339
-#: ../../templates/show_admin_index.inc:31 ../../templates/admin_menu.inc:35
+#: ../../lib/class/catalog.class.php:1436 ../../templates/admin_menu.inc:35
 msgid "Catalog"
 msgstr "Çú¿â"
 
-#: ../../modules/class/catalog.php:1340
+#: ../../lib/class/catalog.class.php:1437
 msgid "songs found checking tag information."
 msgstr "ÕÒµ½¸èÇú¼ì²é±ê¼ÇÐÅÏ¢"
 
-#: ../../modules/class/catalog.php:1387
+#: ../../lib/class/catalog.class.php:1484
 msgid " FOUND"
 msgstr "ÕÒµ½"
 
-#: ../../modules/class/catalog.php:1388
+#: ../../lib/class/catalog.class.php:1485
 msgid "Searching for new Album Art"
 msgstr "²éÕÒиèÇú¸èÊÖ"
 
-#: ../../modules/class/catalog.php:1392
+#: ../../lib/class/catalog.class.php:1489
 msgid "Album Art Already Found"
 msgstr "ÒÑÕÒµ½¸èÇú¸èÊÖ"
 
-#: ../../modules/class/stream.php:198
-msgid "Opened for writting"
-msgstr "×¼±¸Ð´Èë"
+#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
+msgid "Could not add"
+msgstr "ÎÞ·¨Ìí¼Ó"
 
-#: ../../modules/class/stream.php:203
-msgid "Error, cannot write"
-msgstr "´íÎó£ºÎÞ·¨Ð´Èë"
+#: ../../lib/Browser.php:867
+msgid "file"
+msgstr "Îļþ"
 
-#: ../../modules/class/stream.php:214
-msgid "Error, cannot write song in file"
-msgstr "´íÎó£ºÎÞ·¨Ð´ÈëÎļþ"
+#: ../../lib/Browser.php:871
+msgid "File uploads not supported."
+msgstr "²»Ö§³ÖÎļþÉÏ´«"
 
-#: ../../modules/class/stream.php:220
-msgid "Closed after write"
-msgstr "¹Ø±Õ"
+#: ../../lib/Browser.php:889
+msgid "No file uploaded"
+msgstr "ûÓÐÉÏ´«Îļþ"
 
-#: ../../modules/class/album.php:126
-msgid "Various"
-msgstr "ȺÐÇ"
+#: ../../lib/Browser.php:896
+#, php-format
+msgid "There was a problem with the file upload: No %s was uploaded."
+msgstr "ÎļþÉÏ´«´íÎó£ºÃ»ÓÐÉÏ´« %s"
 
-#: ../../modules/lib.php:53
-msgid "day"
-msgstr "Ìì"
+#: ../../lib/Browser.php:901
+#, php-format
+msgid ""
+"There was a problem with the file upload: The %s was larger than the maximum "
+"allowed size (%d bytes)."
+msgstr "ÎļþÉÏ´«´íÎó£º%s ´óÓÚ×î´óÔÊÐíÉÏ´«´óС£¨%d ×Ö½Ú£©"
 
-#: ../../modules/lib.php:53
-msgid "days"
-msgstr "Ìì"
+#: ../../lib/Browser.php:903
+#, php-format
+msgid ""
+"There was a problem with the file upload: The %s was only partially uploaded."
+msgstr "ÎļþÉÏ´«´íÎó£º%s Ö»ÉÏ´«Á˲¿·ÖÎļþ"
 
-#: ../../modules/lib.php:55
-msgid "hour"
-msgstr "Сʱ"
+#: ../../lib/ui.lib.php:199
+msgid "Playlist Actions"
+msgstr "×ÔÑ¡¸èÇúÁбí²Ù×÷"
 
-#: ../../modules/lib.php:55
-msgid "hours"
-msgstr "Сʱ"
+#: ../../lib/ui.lib.php:199
+msgid "New"
+msgstr "н¨"
 
-#: ../../modules/lib.php:70
-msgid "Catalog Statistics"
-msgstr "Çú¿âͳ¼ÆÐÅÏ¢"
+#: ../../lib/ui.lib.php:200
+msgid "View All"
+msgstr "È«²¿ÏÔʾ"
 
-#: ../../modules/lib.php:73
-msgid "Total Users"
-msgstr "Óû§×ÜÊý"
+#: ../../lib/ui.lib.php:201
+msgid "Import"
+msgstr "µ¼Èë"
 
-#: ../../modules/lib.php:77
-msgid "Connected Users"
-msgstr "ÔÚÏßÓû§"
+#: ../../lib/ui.lib.php:301 ../../templates/menu.inc:35
+msgid "Browse"
+msgstr "ä¯ÀÀ"
 
-#: ../../modules/lib.php:81 ../../templates/menu.inc:35
-#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:65
-msgid "Albums"
-msgstr "ר¼­"
+#: ../../lib/ui.lib.php:303
+msgid "Show w/o art"
+msgstr "²»ÏÔʾ¸èÊÖ"
 
-#: ../../modules/lib.php:85 ../../templates/menu.inc:36
-msgid "Artists"
-msgstr "¸èÊÖ"
+#: ../../lib/ui.lib.php:306
+msgid "Show all"
+msgstr "È«²¿ÏÔʾ"
 
-#: ../../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 "¸èÇú"
+#: ../../lib/ui.lib.php:446
+msgid "No songs in this playlist."
+msgstr "´Ë×ÔÑ¡ÁбíûÓиèÇú"
 
-#: ../../modules/lib.php:93
-msgid "Catalog Size"
-msgstr "Çú¿â´óС"
+#: ../../lib/ui.lib.php:592
+#, fuzzy
+msgid "No Catalogs Found!"
+msgstr "ûÓÐÕÒµ½"
 
-#: ../../modules/lib.php:97
-msgid "Catalog Time"
-msgstr "Çú¿âʱ¼ä"
+#: ../../lib/ui.lib.php:593 ../../templates/add_catalog.inc:28
+msgid "Add a Catalog"
+msgstr "Ìí¼ÓÇú¿â"
 
-#: ../../modules/lib.php:151
-msgid "Play Random Selection"
-msgstr "Ëæ»ú²¥·Å"
+#: ../../lib/ui.lib.php:594 ../../templates/show_local_catalog_info.inc.php:7
+msgid "Catalog Statistics"
+msgstr "Çú¿âͳ¼ÆÐÅÏ¢"
 
-#: ../../modules/lib.php:158
-msgid "Item count"
-msgstr "ÊýÁ¿"
+#: ../../lib/ui.lib.php:630
+msgid "day"
+msgstr "Ìì"
 
-#: ../../modules/lib.php:170 ../../templates/show_artists.inc:55
-#: ../../templates/show_albums.inc:58
-msgid "All"
-msgstr "È«²¿"
+#: ../../lib/ui.lib.php:630
+msgid "days"
+msgstr "Ìì"
 
-#: ../../modules/lib.php:172
-msgid "From genre"
-msgstr "ÀàÐÍ"
+#: ../../lib/ui.lib.php:632
+msgid "hour"
+msgstr "Сʱ"
 
-#: ../../modules/lib.php:182
-msgid "Favor Unplayed"
-msgstr "û²¥·Å¹ýµÄÓÅÏÈ"
+#: ../../lib/ui.lib.php:632
+msgid "hours"
+msgstr "Сʱ"
 
-#: ../../modules/lib.php:183
-msgid "Full Albums"
-msgstr "È«²¿×¨¼­"
+#: ../../lib/upload.php:225
+#, fuzzy
+msgid "The file uploaded successfully"
+msgstr "ûÓÐÉÏ´«Îļþ"
 
-#: ../../modules/lib.php:184
-msgid "Full Artist"
-msgstr "È«²¿¸èÊÖ"
+#: ../../lib/upload.php:226
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr "ÉÏ´«Îļþ´óС³¬¹ýphp.iniÀïÃæmax_filesizeµÄÏÞÖÆ"
 
-#: ../../modules/lib.php:193
-msgid "from catalog"
-msgstr "Çú¿â"
+#: ../../lib/upload.php:227
+#, fuzzy
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr "ÉÏ´«Îļþ´óС³¬¹ýHTML±íµ¥ÀïÃæMAX_FILE_SIZEµÄÏÞÖÆ"
 
-#: ../../modules/lib.php:204
-msgid "Play Random Songs"
-msgstr "Ëæ»ú²¥·Å"
+#: ../../lib/upload.php:228
+#, fuzzy
+msgid "The uploaded file was only partially uploaded"
+msgstr "Ö»ÉÏ´«ÁËÎļþµÄ²¿·ÖÄÚÈÝ"
 
-#: ../../modules/lib.php:912
+#: ../../lib/upload.php:229
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "ÎļþûÓÐÉÏ´«"
+
+#: ../../lib/upload.php:230
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ../../modules/lib.php:708
 msgid "Public"
 msgstr "¹«¿ª"
 
-#: ../../modules/lib.php:913
+#: ../../modules/lib.php:709
 msgid "Your Private"
 msgstr "˽ÈË"
 
-#: ../../modules/lib.php:914
+#: ../../modules/lib.php:710
 msgid "Other Private"
 msgstr "ÆäËû"
 
-#: ../../modules/lib.php:995 ../../templates/show_play_selected.inc.php:61
+#: ../../modules/lib.php:791 ../../templates/show_play_selected.inc.php:72
 msgid "View"
 msgstr "ÏÔʾ"
 
-#: ../../modules/lib.php:998 ../../templates/show_play_selected.inc.php:62
+#: ../../modules/lib.php:794 ../../templates/show_play_selected.inc.php:73
 #: ../../templates/show_users.inc:52 ../../templates/show_users.inc:86
 msgid "Edit"
 msgstr "±à¼­"
 
-#: ../../modules/lib.php:999 ../../upload.php:290
-#: ../../templates/show_users.inc:61 ../../templates/catalog.inc:60
+#: ../../modules/lib.php:795 ../../templates/catalog.inc:60
+#: ../../templates/show_users.inc:61 ../../templates/show_uploads.inc:50
 msgid "Delete"
 msgstr "ɾ³ý"
 
-#: ../../modules/lib.php:1007 ../../templates/show_localplay.inc:41
-#: ../../templates/show_artists.inc:54 ../../templates/show_artist.inc:79
-#: ../../templates/show_mpdplay.inc:45 ../../templates/show_albums.inc:57
+#: ../../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 "²¥·Å"
 
-#: ../../modules/lib.php:1008 ../../templates/show_artists.inc:56
-#: ../../templates/show_mpdplay.inc:67 ../../templates/show_albums.inc:59
+#: ../../modules/lib.php:804 ../../templates/show_artists.inc:56
+#: ../../templates/show_albums.inc:59 ../../templates/show_mpdplay.inc:85
 msgid "Random"
 msgstr "Ëæ»ú"
 
-#: ../../modules/lib.php:1014 ../../templates/show_artist.inc:81
-#: ../../templates/show_songs.inc:110 ../../templates/show_albums.inc:61
-#: ../../templates/show_album.inc:61
+#: ../../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 "ÏÂÔØ"
 
-#: ../../modules/lib.php:1025
+#: ../../modules/lib.php:821
 msgid "There are no playlists of this type"
 msgstr "ûÓÐ×Ô¶¨Òå²¥·ÅÁбí"
 
-#: ../../modules/lib.php:1060
+#: ../../modules/lib.php:856
 msgid "Create a new playlist"
 msgstr "н¨×Ô¶¨Òå²¥·ÅÁбí"
 
@@ -786,240 +598,172 @@ msgstr "н¨×Ô¶¨Òå²¥·ÅÁбí"
 msgid "Manage Users"
 msgstr "¹ÜÀíÓû§"
 
-#: ../../modules/admin.php:48
+#: ../../modules/admin.php:48 ../../templates/show_admin_index.inc:34
 msgid "Add a new user"
 msgstr "Ìí¼ÓÐÂÓû§"
 
-#: ../../index.php:38
-msgid "Welcome to"
-msgstr "»¶Ó­À´µ½"
-
-#: ../../index.php:40
-msgid "you are currently logged in as"
-msgstr "ÄãµÇ¼ΪÓû§"
-
-#: ../../index.php:65
-msgid "Most Popular Albums"
-msgstr "×îÁ÷ÐеÄר¼­"
+#: ../../admin/catalog.php:55 ../../templates/catalog.inc:66
+msgid "Add to Catalog(s)"
+msgstr "Ìí¼Óµ½Çú¿â"
 
-#: ../../index.php:75
-msgid "Most Popular Artists"
-msgstr "×îÁ÷ÐеĸèÊÖ"
+#: ../../admin/catalog.php:66 ../../templates/catalog.inc:67
+msgid "Add to all Catalogs"
+msgstr "Ìí¼ÓËùÓе½Çú¿â"
 
-#: ../../index.php:82
-msgid "Most Popular Songs"
-msgstr "×îÁ÷ÐеĸèÇú"
+#: ../../admin/catalog.php:75
+msgid "Error Connecting"
+msgstr "Á¬½Ó´íÎó"
 
-#: ../../index.php:92
-msgid "Newest Artist Additions"
-msgstr "×îÐÂÌí¼ÓµÄ¸èÊÖ"
+#: ../../admin/catalog.php:89 ../../templates/catalog.inc:73
+msgid "Update Catalog(s)"
+msgstr "¸üÐÂÇú¿â"
 
-#: ../../index.php:99
-msgid "Newest Album Additions"
-msgstr "×îÐÂÌí¼ÓµÄר¼­"
+#: ../../admin/catalog.php:100 ../../templates/catalog.inc:74
+msgid "Update All Catalogs"
+msgstr "¸üÐÂËùÓÐÇú¿â"
 
-#: ../../upload.php:124
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr "ÉÏ´«Îļþ´óС³¬¹ýphp.iniÀïÃæmax_filesizeµÄÏÞÖÆ"
+#: ../../admin/catalog.php:132 ../../templates/catalog.inc:80
+msgid "Clean Catalog(s)"
+msgstr "Çå³ýÇú¿â"
 
-#: ../../upload.php:127
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-"ÉÏ´«Îļþ´óС³¬¹ýHTML±íµ¥ÀïÃæMAX_FILE_SIZEµÄÏÞÖÆ"
+#: ../../admin/catalog.php:162 ../../templates/catalog.inc:81
+msgid "Clean All Catalogs"
+msgstr "Çå³ýËùÓÐÇú¿â"
 
-#: ../../upload.php:130
-msgid "The uploaded file was only partially uploaded."
-msgstr "Ö»ÉÏ´«ÁËÎļþµÄ²¿·ÖÄÚÈÝ"
+#: ../../admin/catalog.php:211
+msgid "Now Playing Cleared"
+msgstr "ÕýÔÚ²¥·Å±»È¡Ïû"
 
-#: ../../upload.php:133
-msgid "No file was uploaded."
-msgstr "ÎļþûÓÐÉÏ´«"
+#: ../../admin/catalog.php:211
+msgid "All now playing data has been cleared"
+msgstr "ËùÓÐÕýÔÚ²¥·ÅµÄÊý¾Ý±»È¡Ïû"
 
-#: ../../upload.php:136
-msgid "An Unknown Error has occured."
-msgstr "·¢Éúδ֪´íÎó"
+#: ../../admin/catalog.php:216
+msgid "Do you really want to clear your catalog?"
+msgstr "ÕæµÄÒªÇå³ýÇú¿âÂð£¿"
 
-#: ../../upload.php:157
-msgid "Successfully-Quarantined"
-msgstr "³É¹¦£­µÈ´ýÅú×¼"
+#: ../../admin/catalog.php:223
+msgid "Do you really want to clear the statistics for this catalog?"
+msgstr "ÕæµÄÒªÇå³ýÕâ¸öÇú¿âµÄͳ¼ÆÐÅÏ¢Âð£¿"
 
-#: ../../upload.php:167
-msgid "Successfully-Cataloged"
-msgstr "³É¹¦£­¼ÓÈëÇú¿â"
+#: ../../admin/catalog.php:241
+msgid "Do you really want to delete this catalog?"
+msgstr "ÕæµÄҪɾ³ýÇú¿âÂð£¿"
 
-#: ../../upload.php:229 ../../templates/show_access_list.inc:51
-#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:67
-#: ../../templates/show_artist.inc:56 ../../templates/show_songs.inc:42
-#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:75
-msgid "Action"
-msgstr "²Ù×÷"
+#: ../../admin/catalog.php:272
+msgid "Album Art Search Finished"
+msgstr "¸èÇú¸èÊÖËÑË÷½áÊø"
 
-#: ../../upload.php:230 ../../templates/list_flagged.inc:41
-#: ../../templates/flag.inc:58
-msgid "Song"
-msgstr "¸èÇú"
+#: ../../admin/users.php:76 ../../admin/users.php:122
+msgid "Error Username Required"
+msgstr "´íÎó£ºÇëÊäÈëÓû§Ãû"
 
-#: ../../upload.php:236 ../../templates/show_songs.inc:38
-msgid "Size"
-msgstr "´óС"
+#: ../../admin/users.php:79 ../../admin/users.php:119
+msgid "Error Passwords don't match"
+msgstr "´íÎó£ºÃÜÂ벻ƥÅä"
 
-#: ../../upload.php:237 ../../templates/show_import_playlist.inc.php:29
-msgid "Filename"
-msgstr "ÎļþÃû"
+#: ../../admin/users.php:136
+msgid "Are you sure you want to permanently delete"
+msgstr "È·¶¨ÒªÓÀ¾Ãɾ³ý£¿"
 
-#: ../../upload.php:238
-msgid "User"
-msgstr "Óû§"
+#: ../../admin/users.php:143 ../../templates/show_confirm_action.inc.php:29
+msgid "No"
+msgstr "·ñ"
 
-#: ../../upload.php:239
-msgid "Date"
-msgstr "ÈÕÆÚ"
+#: ../../admin/users.php:145
+msgid "User Deleted"
+msgstr "Óû§ÒÑɾ³ý"
 
-#: ../../upload.php:267
-msgid "Unknown"
-msgstr "δ֪"
+#: ../../admin/users.php:148
+msgid "Delete Error"
+msgstr "ɾ³ý´íÎó"
 
-#: ../../upload.php:289
-msgid "Add"
-msgstr "Ìí¼Ó"
+#: ../../admin/users.php:148
+msgid "Unable to delete last Admin User"
+msgstr "²»ÄÜɾ³ýΨһµÄ¹ÜÀíÔ±"
 
-#: ../../upload.php:294
-msgid "Quarantined"
-msgstr "¸ôÀë"
+#: ../../admin/access.php:43
+msgid "Do you really want to delete this Access Record?"
+msgstr "ÕæµÄҪɾ³ýÕâ¸ö·ÃÎÊÐí¿ÉÂð£¿"
 
-#: ../../flag.php:35
-msgid "Flagging song completed."
-msgstr "±ê¼ÇÍê³É"
+#: ../../admin/access.php:51
+msgid "Entry Deleted"
+msgstr "Êý¾Ý±»É¾³ý"
 
-#: ../../playlist.php:77 ../../templates/show_play_selected.inc.php:44
-msgid "Flag Selected"
-msgstr "±ê¼ÇÑ¡Ôñ"
+#: ../../admin/access.php:51
+msgid "Your Access List Entry has been removed"
+msgstr "·ÃÎÊÐí¿É±»É¾³ý"
 
-#: ../../playlist.php:83 ../../templates/show_play_selected.inc.php:45
-msgid "Edit Selected"
-msgstr "±à¼­Ñ¡Ôñ"
+#: ../../admin/access.php:61
+msgid "Entry Added"
+msgstr "¼Ç¼±»Ìí¼Ó"
 
-#: ../../playlist.php:115
-msgid "owned by"
-msgstr "ËùÓÐÕß "
+#: ../../admin/access.php:61
+msgid "Your new Access List Entry has been created"
+msgstr "зÃÎÊÐí¿É±»Ìí¼Ó"
 
-#: ../../playlist.php:118
-msgid "Edit Playlist"
-msgstr "±à¼­×Ô¶¨Òå²¥·ÅÁбí"
+#: ../../admin/mail.php:98
+msgid "Mail to"
+msgstr "·¢µç×ÓÓʼþ¸ø"
 
-#: ../../playlist.php:121
-msgid "Play Full Playlist"
-msgstr "²¥·Å×Ô¶¨ÒåÁбí"
+#: ../../admin/mail.php:109
+msgid "Subject"
+msgstr "±êÌâ"
 
-#: ../../playlist.php:122
-msgid "Play Random"
-msgstr "Ëæ»ú²¥·Å"
+#: ../../admin/mail.php:116
+msgid "Message"
+msgstr "ÕýÎÄ"
 
-#: ../../playlist.php:135
-msgid "New Playlist"
-msgstr "н¨×Ô¶¨Òå²¥·ÅÁбí"
+#: ../../admin/mail.php:126
+msgid "Send Mail"
+msgstr "·¢ËÍ"
 
-#: ../../playlist.php:192
-msgid "Playlist updated."
-msgstr "×Ô¶¨Òå²¥·ÅÁбíÒѸüÐÂ"
+#: ../../admin/song.php:68
+msgid "Songs Disabled"
+msgstr "¸èÇú±»½ûÖ¹²¥·Å"
 
-#: ../../user.php:45
-msgid "Error: Password Does Not Match or Empty"
-msgstr "´íÎó£ºÎÞЧ»ò¿ÕÃÜÂë"
+#: ../../admin/song.php:68
+msgid "The requested song(s) have been disabled"
+msgstr "ÇëÇóµÄ¸èÇú±»½ûÖ¹²¥·Å"
 
-#: ../../user.php:51 ../../user.php:62
-msgid "Error: Insufficient Rights"
-msgstr "´íÎó£ºÃ»ÓÐ×㹻ȨÏÞ"
+#: ../../admin/song.php:78
+msgid "Songs Enabled"
+msgstr "¸èÇú±»ÔÊÐí²¥·Å"
 
-#: ../../artists.php:47
-msgid "All songs by"
-msgstr "È«²¿¸èÇú"
+#: ../../admin/song.php:78
+msgid "The requested song(s) have been enabled"
+msgstr "ÇëÇóµÄ¸èÇú±»ÔÊÐí²¥·Å"
 
-#: ../../artists.php:73 ../../artists.php:82 ../../artists.php:94
-#: ../../artists.php:111
-msgid "<u>S</u>how artists starting with"
-msgstr "<u>S</u>ÏÔʾ¸èÊÖÃû×ÖÇ°¼¸Î»×Ö·ûÊÇ"
+#: ../../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.inc.php:31
-#: ../../templates/show_access_list.inc:47
-#: ../../templates/customize_catalog.inc:29
-#: ../../templates/show_add_access.inc:40
-msgid "Name"
-msgstr "Ãû×Ö"
+#: ../../templates/show_user_registration.inc.php:36
+#: ../../templates/userform.inc:48
+msgid "Full Name"
+msgstr "È«Ãû"
 
-#: ../../templates/show_user.inc.php:40
 #: ../../templates/show_user_registration.inc.php:44
-#: ../../templates/userform.inc:56
+#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:55
 msgid "E-mail"
 msgstr "µç×ÓÓʼþ"
 
-#: ../../templates/show_user.inc.php:48
-msgid "View Limit"
-msgstr "ÏÔʾÏÞÖÆ"
-
-#: ../../templates/show_user.inc.php:56
-msgid "Update Profile"
-msgstr "¸ü¸ÄÐÅÏ¢"
-
-#: ../../templates/show_user.inc.php:67
-msgid "Enter password"
-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.inc.php:75
 #: ../../templates/show_user_registration.inc.php:60
-#: ../../templates/userform.inc:73
+#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
 msgid "Confirm Password"
 msgstr "È·ÈÏÃÜÂë"
 
-#: ../../templates/show_user.inc.php:83
-msgid "Change Password"
-msgstr "¸ü¸ÄÃÜÂë"
-
-#: ../../templates/show_user.inc.php:91
-msgid "Clear Stats"
-msgstr "Çå³ý״̬"
-
-#: ../../templates/show_import_playlist.inc.php:26
-msgid "Importing a Playlist from a File"
-msgstr "´ÓÎļþµ¼Èë×Ô¶¨Òå²¥·ÅÁбí"
-
-#: ../../templates/show_import_playlist.inc.php:36
-msgid "Playlist Type"
-msgstr "×Ô¶¨Òå²¥·ÅÁбíÀàÐÍ"
-
-#: ../../templates/show_import_playlist.inc.php:49
-msgid "Import Playlist"
-msgstr "µ¼Èë²¥·ÅÁбí"
-
-#: ../../templates/show_confirm_action.inc.php:28
-msgid "Yes"
-msgstr "ÊÇ"
-
-#: ../../templates/show_confirmation.inc.php:30
-msgid "Continue"
-msgstr "¼ÌÐø"
-
-#: ../../templates/show_play_selected.inc.php:43
-msgid "Play Selected"
-msgstr "²¥·ÅÑ¡ÔñµÄ¸èÇú"
-
-#: ../../templates/show_play_selected.inc.php:52
-msgid "Set Track Numbers"
-msgstr "ÉèÖÃÒô¹ìºÅ"
-
-#: ../../templates/show_play_selected.inc.php:53
-msgid "Remove Selected Tracks"
-msgstr "Çå³ýÒô¹ìºÅ"
-
-#: ../../templates/show_play_selected.inc.php:59
-msgid "Playlist"
-msgstr "²¥·ÅÁбí"
-
-#: ../../templates/show_play_selected.inc.php:59
-msgid "Add to"
-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
@@ -1030,28 +774,29 @@ msgstr "Ampache °²×°"
 #: ../../templates/show_install_account.inc.php:37
 #: ../../templates/show_install_config.inc:37
 #: ../../templates/show_install.inc:36
+#, fuzzy
 msgid ""
-"This Page handles the installation of the ampache database and the creation "
+"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"
+"have the following pre-requisites"
 msgstr ""
-"±¾Ò³¸ºÔðampacheÊý¾Ý¿âµÄ°²×°ºÍampache.cfg.phpÅäÖÃÎļþµÄ½¨Á¢¡£"
-"ÔÚ¼ÌÐøÏÂÒ»²½ÒÔÇ°£¬ÇëÈ·ÈÏÄãÂú×ãÒÔÏÂÏȾöÌõ¼þ"
+"±¾Ò³¸ºÔðampacheÊý¾Ý¿âµÄ°²×°ºÍampache.cfg.phpÅäÖÃÎļþµÄ½¨Á¢¡£ÔÚ¼ÌÐøÏÂÒ»²½ÒÔ"
+"Ç°£¬ÇëÈ·ÈÏÄãÂú×ãÒÔÏÂÏȾöÌõ¼þ"
 
 #: ../../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 ""
-"ÒÑ°²×°MySQLÊý¾Ý¿â£¬ÓÐÄÜ´´½¨ºÍ¸ü¸ÄÊý¾Ý¿âµÄÓû§ÕʺÅ"
+msgstr "ÒÑ°²×°MySQLÊý¾Ý¿â£¬ÓÐÄÜ´´½¨ºÍ¸ü¸ÄÊý¾Ý¿âµÄÓû§ÕʺÅ"
 
 #: ../../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 ""
-"ÄãµÄWWW·þÎñÆ÷ÄÜÓÃÖ»¶Á·½Ê½·ÃÎÊ/sql/ampache.sqlÎļþ£¬ÒÔ¼°/config/ampache.cfg.dist.phpÎļþ"
+"ÄãµÄWWW·þÎñÆ÷ÄÜÓÃÖ»¶Á·½Ê½·ÃÎÊ/sql/ampache.sqlÎļþ£¬ÒÔ¼°/config/ampache.cfg."
+"dist.phpÎļþ"
 
 #: ../../templates/show_install_account.inc.php:43
 #: ../../templates/show_install_config.inc:43
@@ -1062,8 +807,8 @@ msgid ""
 "values. If you would like to make changes to your ampache install at a later "
 "date simply edit /config/ampache.cfg.php"
 msgstr ""
-"Èç¹ûÄãÈ·ÐÅÂú×ãÒÔÉÏÒªÇó£¬ÇëÌîдÒÔÏÂÐÅÏ¢¡£ÒÔÏÂÖ»ÊDZØÐëµÄÅäÖ᣸üÏêϸµÄÉèÖÃ"
-"¿ÉÒÔͨ¹ýÖ±½ÓÐÞ¸Ä /config/ampache.cfg.php À´ÊµÏÖ"
+"Èç¹ûÄãÈ·ÐÅÂú×ãÒÔÉÏÒªÇó£¬ÇëÌîдÒÔÏÂÐÅÏ¢¡£ÒÔÏÂÖ»ÊDZØÐëµÄÅäÖ᣸üÏêϸµÄÉèÖÿÉÒÔ"
+"ͨ¹ýÖ±½ÓÐÞ¸Ä /config/ampache.cfg.php À´ÊµÏÖ"
 
 #: ../../templates/show_install_account.inc.php:48
 #: ../../templates/show_install_config.inc:48
@@ -1085,374 +830,454 @@ msgstr "µÚÈý²½ - ³õʼ»¯ÕʺÅ"
 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 ""
-"ÕâÒ»²½´´½¨³õʼ¹ÜÀíÔ±Õʺš£ÕʺŴ´½¨Íê±Ï»áתµ½µÇ¼ҳ"
-
-#: ../../templates/show_install_account.inc.php:59
-#: ../../templates/show_user_registration.inc.php:28
-#: ../../templates/show_users.inc:40 ../../templates/userform.inc:41
-msgid "Username"
-msgstr "̞"
-
-#: ../../templates/show_install_account.inc.php:63
-#: ../../templates/show_user_registration.inc.php:52
-#: ../../templates/show_login_form.inc:53 ../../templates/userform.inc:64
-msgid "Password"
-msgstr "ÃÜÂë"
+msgstr "ÕâÒ»²½´´½¨³õʼ¹ÜÀíÔ±Õʺš£ÕʺŴ´½¨Íê±Ï»áתµ½µÇ¼ҳ"
 
 #: ../../templates/show_install_account.inc.php:68
 msgid "Create Account"
 msgstr "н¨ÕʺÅ"
 
-#: ../../templates/show_user_registration.inc.php:36
-#: ../../templates/userform.inc:49
-msgid "Full Name"
-msgstr "È«Ãû"
+#: ../../templates/show_confirm_action.inc.php:28
+msgid "Yes"
+msgstr "ÊÇ"
 
-#: ../../templates/show_user_registration.inc.php:69
-msgid "Register User"
-msgstr "×¢²áÓû§"
+#: ../../templates/show_import_playlist.inc.php:26
+msgid "Importing a Playlist from a File"
+msgstr "´ÓÎļþµ¼Èë×Ô¶¨Òå²¥·ÅÁбí"
 
-#: ../../templates/menu.inc:29
-msgid "Home"
-msgstr "Ê×Ò³"
+#: ../../templates/show_import_playlist.inc.php:29
+#: ../../templates/show_uploads.inc:41
+msgid "Filename"
+msgstr "ÎļþÃû"
 
-#: ../../templates/menu.inc:32
-msgid "Local Play"
-msgstr "±¾µØ²¥·Å"
+#: ../../templates/show_import_playlist.inc.php:36
+msgid "Playlist Type"
+msgstr "×Ô¶¨Òå²¥·ÅÁбíÀàÐÍ"
 
-#: ../../templates/menu.inc:37
-msgid "Playlists"
-msgstr "×Ô¶¨ÒåÎļþÁбí"
+#: ../../templates/show_import_playlist.inc.php:49
+msgid "Import Playlist"
+msgstr "µ¼Èë²¥·ÅÁбí"
 
-#: ../../templates/menu.inc:39
-msgid "Preferences"
-msgstr "ÉèÖÃ"
+#: ../../templates/show_user.inc.php:26
+msgid "Changing User Information for"
+msgstr ""
 
-#: ../../templates/menu.inc:42 ../../templates/show_upload.inc:59
-msgid "Upload"
-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 "Ãû×Ö"
 
-#: ../../templates/menu.inc:62 ../../templates/menu.inc:65
-msgid "Admin"
-msgstr "¹ÜÀí"
+#: ../../templates/show_user.inc.php:48
+msgid "Results Per Page"
+msgstr ""
 
-#: ../../templates/menu.inc:72 ../../templates/menu.inc:78
-msgid "Account"
-msgstr "ÕʺÅ"
+#: ../../templates/show_user.inc.php:56
+msgid "Update Profile"
+msgstr "¸ü¸ÄÐÅÏ¢"
 
-#: ../../templates/menu.inc:73 ../../templates/menu.inc:79
-msgid "Stats"
-msgstr "״̬"
+#: ../../templates/show_user.inc.php:67
+msgid "Enter password"
+msgstr "ÊäÈëÃÜÂë"
 
-#: ../../templates/menu.inc:74 ../../templates/menu.inc:80
-#: ../../templates/menu.inc:84
-msgid "Logout"
-msgstr "Í˳ö"
+#: ../../templates/show_user.inc.php:83
+msgid "Change Password"
+msgstr "¸ü¸ÄÃÜÂë"
 
-#: ../../templates/show_access_list.inc:34
-msgid "Host Access to Your Catalog"
-msgstr "Çú¿â·ÃÎÊȨÏÞ"
+#: ../../templates/show_user.inc.php:89
+msgid "Delete Your Personal Statistics"
+msgstr ""
 
-#: ../../templates/show_access_list.inc:43
-msgid "Add Entry"
-msgstr "Ìí¼Ó"
+#: ../../templates/show_user.inc.php:91
+msgid "Clear Stats"
+msgstr "Çå³ý״̬"
 
-#: ../../templates/show_access_list.inc:48
-msgid "Start Address"
-msgstr "¿ªÊ¼µØÖ·"
+#: ../../templates/show_confirmation.inc.php:30
+msgid "Continue"
+msgstr "¼ÌÐø"
 
-#: ../../templates/show_access_list.inc:49
-msgid "End Address"
-msgstr "½áÊøµØÖ·"
+#: ../../templates/show_play_selected.inc.php:49
+msgid "Play Selected"
+msgstr "²¥·ÅÑ¡ÔñµÄ¸èÇú"
 
-#: ../../templates/show_access_list.inc:50
-#: ../../templates/show_add_access.inc:58
-msgid "Level"
-msgstr "µÈ¼¶"
+#: ../../templates/show_play_selected.inc.php:52
+#, fuzzy
+msgid "Download Selected"
+msgstr "²¥·ÅÑ¡ÔñµÄ¸èÇú"
 
-#: ../../templates/show_access_list.inc:65
-msgid "Revoke"
-msgstr "ÊÕ»Ø"
+#: ../../templates/show_play_selected.inc.php:55 ../../playlist.php:77
+msgid "Flag Selected"
+msgstr "±ê¼ÇÑ¡Ôñ"
 
-#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:41
-msgid "Flag"
-msgstr "񈬀"
+#: ../../templates/show_play_selected.inc.php:56 ../../playlist.php:83
+msgid "Edit Selected"
+msgstr "±à¼­Ñ¡Ôñ"
 
-#: ../../templates/list_flagged.inc:43
-msgid "New Flag"
-msgstr "бê¼Ç"
+#: ../../templates/show_play_selected.inc.php:63
+msgid "Set Track Numbers"
+msgstr "ÉèÖÃÒô¹ìºÅ"
 
-#: ../../templates/list_flagged.inc:44
-msgid "Flagged by"
-msgstr "±ê¼ÇΪ"
+#: ../../templates/show_play_selected.inc.php:64
+msgid "Remove Selected Tracks"
+msgstr "Çå³ýÒô¹ìºÅ"
 
-#: ../../templates/list_flagged.inc:45
-msgid "ID3 Update"
-msgstr "ID3 ¸üÐÂ"
+#: ../../templates/show_play_selected.inc.php:70
+msgid "Playlist"
+msgstr "²¥·ÅÁбí"
 
-#: ../../templates/list_flagged.inc:69
-msgid "Accept"
-msgstr "½ÓÊÜ"
+#: ../../templates/show_play_selected.inc.php:70
+msgid "Add to"
+msgstr "Ìí¼Óµ½"
 
-#: ../../templates/list_flagged.inc:70
-msgid "Reject"
-msgstr "¾Ü¾ø"
+#: ../../templates/show_all_popular.inc.php:27 ../../index.php:98
+msgid "Most Popular Artists"
+msgstr "×îÁ÷ÐеĸèÊÖ"
 
-#: ../../templates/show_localplay.inc:30
-msgid "Local Play Control"
-msgstr "±¾µØ²¥·Å¿ØÖÆ"
+#: ../../templates/show_all_popular.inc.php:30 ../../index.php:71
+msgid "Most Popular Albums"
+msgstr "×îÁ÷ÐеÄר¼­"
 
-#: ../../templates/show_localplay.inc:35
-msgid "Playback"
-msgstr "²¥·Å"
+#: ../../templates/show_all_popular.inc.php:37
+#, fuzzy
+msgid "Most Popular Genres"
+msgstr "×îÁ÷ÐеĸèÇú"
 
-#: ../../templates/show_localplay.inc:39 ../../templates/show_mpdplay.inc:43
-#: ../../templates/list_header.inc:71
-msgid "Prev"
-msgstr "ºóÍË"
+#: ../../templates/show_all_popular.inc.php:40 ../../index.php:105
+msgid "Most Popular Songs"
+msgstr "×îÁ÷ÐеĸèÇú"
 
-#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:44
-msgid "Stop"
-msgstr "Í£Ö¹"
+#: ../../templates/show_local_catalog_info.inc.php:10
+msgid "Total Users"
+msgstr "Óû§×ÜÊý"
 
-#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:46
-msgid "Pause"
-msgstr "ÔÝÍ£"
+#: ../../templates/show_local_catalog_info.inc.php:14
+msgid "Connected Users"
+msgstr "ÔÚÏßÓû§"
 
-#: ../../templates/show_localplay.inc:43 ../../templates/show_mpdplay.inc:47
-#: ../../templates/list_header.inc:94
-msgid "Next"
-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 "ר¼­"
 
-#: ../../templates/show_localplay.inc:49
-msgid "Volume"
-msgstr "ÒôÁ¿"
+#: ../../templates/show_local_catalog_info.inc.php:22
+#: ../../templates/show_genre.inc.php:41
+#: ../../templates/show_browse_menu.inc:35
+msgid "Artists"
+msgstr "¸èÊÖ"
 
-#: ../../templates/show_localplay.inc:53 ../../templates/show_localplay.inc:54
-msgid "Increase Volume"
-msgstr "Ôö¼ÓÒôÁ¿"
+#: ../../templates/show_local_catalog_info.inc.php:26
+#: ../../templates/show_genres.inc.php:37
+#: ../../templates/show_genre.inc.php:46 ../../templates/show_artists.inc:41
+#: ../../templates/show_artists.inc:64 ../../templates/show_albums.inc:41
+#: ../../templates/show_albums.inc:71
+msgid "Songs"
+msgstr "¸èÇú"
 
-#: ../../templates/show_localplay.inc:55 ../../templates/show_localplay.inc:56
-msgid "Decrease Volume"
-msgstr "¼õÉÙÒôÁ¿"
+#: ../../templates/show_local_catalog_info.inc.php:30
+msgid "Catalog Size"
+msgstr "Çú¿â´óС"
 
-#: ../../templates/show_localplay.inc:62
-msgid "Clear queue"
-msgstr "Çå³ý¶ÓÁÐ"
+#: ../../templates/show_local_catalog_info.inc.php:34
+msgid "Catalog Time"
+msgstr "Çú¿âʱ¼ä"
 
-#: ../../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 ""
-"ÄãµÄWWW·þÎñÆ÷ÄܶÁÈ¡/sql/ampache.sqlÎļþ£¬ÒÔ¼°/config/ampache.cfg.php.distÎļþ"
+#: ../../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 "²Ù×÷"
 
-#: ../../templates/show_install_config.inc:49
-#: ../../templates/show_install.inc:50
-msgid "Step 2 - Creating the Ampache.cfg.php file"
-msgstr "µÚ¶þ²½ - ´´½¨ampache.cfg.phpÅäÖÃÎļþ"
+#: ../../templates/show_genre.inc.php:32
+#, fuzzy
+msgid "Viewing"
+msgstr "ÏÔʾ"
 
-#: ../../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 ""
-"ÕâÒ»²½´´½¨»ù±¾ÅäÖÃÐÅÏ¢¡£»áÊ×Ïȳ¢ÊÔÖ±½Óдµ½ÄãµÄWWW·þÎñÆ÷ÉÏ¡£"
-"Èç¹û·ÃÎʾܾø£¬»áÌáʾÄãÏÂÔØÕâ¸öÅäÖÃÎļþ±£´æµ½/configĿ¼ȥ¡£"
+#: ../../templates/show_all_recent.inc.php:27 ../../index.php:115
+msgid "Newest Artist Additions"
+msgstr "×îÐÂÌí¼ÓµÄ¸èÊÖ"
 
-#: ../../templates/show_install_config.inc:59
-msgid "Web Path"
-msgstr "Íøҳ·¾¶"
+#: ../../templates/show_all_recent.inc.php:30 ../../index.php:122
+msgid "Newest Album Additions"
+msgstr "×îÐÂÌí¼ÓµÄר¼­"
 
-#: ../../templates/show_install_config.inc:63
-#: ../../templates/show_install.inc:57
-msgid "Desired Database Name"
-msgstr "Êý¾Ý¿âÃû"
+#: ../../localplay.php:79
+msgid "Unknown action requested"
+msgstr "δ֪²Ù×÷"
 
-#: ../../templates/show_install_config.inc:67
-#: ../../templates/show_install.inc:61
-msgid "MySQL Hostname"
-msgstr "MySQLÖ÷»ú"
+#: ../../artists.php:48
+msgid "All songs by"
+msgstr "È«²¿¸èÇú"
 
-#: ../../templates/show_install_config.inc:71
-msgid "MySQL Username"
-msgstr "MySQLÓû§"
+#: ../../artists.php:57 ../../albums.php:106
+msgid "Starting Update from Tags"
+msgstr "¿ªÊ¼´ÓÎļþ±ê¼Ç»ñÈ¡ÐÅÏ¢"
 
-#: ../../templates/show_install_config.inc:75
-msgid "MySQL Password"
-msgstr "MySQLÃÜÂë"
+#: ../../artists.php:62 ../../albums.php:111
+msgid "Update From Tags Complete"
+msgstr "´Ó±ê¼ÇÐÅÏ¢¸üнáÊø"
 
-#: ../../templates/show_install_config.inc:80
-msgid "Write Config"
-msgstr "дÈëÅäÖÃ"
+#: ../../artists.php:72 ../../artists.php:76 ../../artists.php:82
+#: ../../artists.php:95
+#, fuzzy
+msgid "Show Artists starting with"
+msgstr "<u>S</u>ÏÔʾ¸èÊÖÃû×ÖÇ°¼¸Î»×Ö·ûÊÇ"
 
-#: ../../templates/show_install_config.inc:87
-#: ../../templates/show_test.inc:116
-msgid "Ampache.cfg.php Exists"
-msgstr "Ampache.cfg.phpÒÑ´æÔÚ"
+#: ../../amp-mpd.php:176 ../../playlist.php:135
+msgid "New Playlist"
+msgstr "н¨×Ô¶¨Òå²¥·ÅÁбí"
 
-#: ../../templates/show_install_config.inc:104
-#: ../../templates/show_test.inc:137
-msgid "Ampache.cfg.php Configured?"
-msgstr "Ampache.cfg.phpÒÑÅäÖã¿"
+#: ../../playlist.php:115
+msgid "owned by"
+msgstr "ËùÓÐÕß "
 
-#: ../../templates/show_install_config.inc:124
-msgid "Check for Config"
-msgstr "¼ì²éÅäÖÃ"
+#: ../../playlist.php:118
+msgid "Edit Playlist"
+msgstr "±à¼­×Ô¶¨Òå²¥·ÅÁбí"
 
-#: ../../templates/show_admin_index.inc:27
-msgid "Admin Section"
-msgstr "¹ÜÀíÇø"
+#: ../../playlist.php:121
+msgid "Play Full Playlist"
+msgstr "²¥·Å×Ô¶¨ÒåÁбí"
 
-#: ../../templates/show_admin_index.inc:29 ../../templates/admin_menu.inc:33
-msgid "Users"
-msgstr "Óû§"
+#: ../../playlist.php:122
+msgid "Play Random"
+msgstr "Ëæ»ú²¥·Å"
 
-#: ../../templates/show_admin_index.inc:29
-msgid "Create/Modify User Accounts for Ampache"
-msgstr "´´½¨£¯ÐÞ¸ÄÓû§ÕʺÅ"
+#: ../../playlist.php:192
+msgid "Playlist updated."
+msgstr "×Ô¶¨Òå²¥·ÅÁбíÒѸüÐÂ"
 
-#: ../../templates/show_admin_index.inc:30
-msgid "Mail"
-msgstr "Óʼþ"
+#: ../../index.php:41
+msgid "Welcome to"
+msgstr "»¶Ó­À´µ½"
 
-#: ../../templates/show_admin_index.inc:30
-msgid "Mail your users to notfiy them of changes"
-msgstr "¸øÄãµÄÓû§·¢ÓʼþÌáÐÑ"
+#: ../../index.php:43
+msgid "you are currently logged in as"
+msgstr "ÄãµÇ¼ΪÓû§"
 
-#: ../../templates/show_admin_index.inc:31
-msgid "Create/Update/Clean your catalog here"
-msgstr "Ìí¼Ó£¯¸üУ¯Çå³ýÇú¿â"
+#: ../../user.php:45
+msgid "Error: Password Does Not Match or Empty"
+msgstr "´íÎó£ºÎÞЧ»ò¿ÕÃÜÂë"
 
-#: ../../templates/show_admin_index.inc:32 ../../templates/admin_menu.inc:36
-msgid "Admin Preferences"
-msgstr "¹ÜÀíÔ±ÉèÖÃ"
+#: ../../user.php:51 ../../user.php:62
+msgid "Error: Insufficient Rights"
+msgstr "´íÎó£ºÃ»ÓÐ×㹻ȨÏÞ"
 
-#: ../../templates/show_admin_index.inc:32
-msgid "Modify Site-wide preferences"
-msgstr "È«Õ¾ÉèÖÃÐÞ¸Ä"
+#: ../../flag.php:35
+msgid "Flagging song completed."
+msgstr "±ê¼ÇÍê³É"
 
-#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:98
-#: ../../templates/admin_menu.inc:37
-msgid "Access Lists"
-msgstr "·ÃÎÊ¿ØÖÆÁбí"
+#: ../../albums.php:44
+msgid "Album Art Cleared"
+msgstr "¸èÇú¸èÊÖ±»É¾³ý"
 
-#: ../../templates/show_admin_index.inc:33
-msgid "Modify Access List Permissions"
-msgstr "Ð޸ķÃÎÊȨÏÞÁбí"
+#: ../../albums.php:44
+msgid "Album Art information has been removed form the database"
+msgstr "¸èÇú¸èÊÖÐÅÏ¢±»´ÓÊý¾Ý¿âÏû³ý"
 
-#: ../../templates/show_admin_index.inc:33
-msgid "Must have access_control=true in ampache.cfg"
-msgstr "±ØÐëÔÚampache.cfgÀïÓÐaccess_control=true"
+#: ../../albums.php:78
+msgid "Album Art Located"
+msgstr "ÕÒµ½¸èÇú¸èÊÖÐÅÏ¢"
 
-#: ../../templates/show_users.inc:43
-msgid "Fullname"
-msgstr "È«Ãû"
+#: ../../albums.php:78
+msgid ""
+"Album Art information has been located in Amazon. If incorrect, click "
+"\"Reset Album Art\" below to remove the artwork."
+msgstr "ÔÚAmazonÕÒµ½¸èÇú¸èÊÖÐÅÏ¢¡£Èç¹ûÕýÈ·£¬Çë°´ÏÂÃæµÄ\"ÖØÖøèÇú¸èÊÖ\""
 
-#: ../../templates/show_users.inc:48
-msgid "Last Seen"
-msgstr "×îºóÒ»´Î"
+#: ../../albums.php:86 ../../albums.php:96
+msgid "Get Art"
+msgstr "»ñÈ¡¸èÊÖÐÅÏ¢"
 
-#: ../../templates/show_users.inc:55 ../../templates/show_users.inc:91
-msgid "Prefs"
-msgstr "ÉèÖÃ"
+#: ../../albums.php:90
+msgid "Album Art Not Located"
+msgstr "ÕÒ²»µ½¸èÇú¸èÊÖÐÅÏ¢"
 
-#: ../../templates/show_users.inc:58
-msgid "Access"
-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."
+msgstr "ÏÖÔÚÎÞ·¨ÕÒµ½¸èÇú¸èÊÖÐÅÏ¢¡£"
 
-#: ../../templates/show_users.inc:64
-msgid "On-line"
-msgstr "ÔÚÏß"
+#: ../../albums.php:127 ../../albums.php:133 ../../albums.php:140
+#: ../../albums.php:145 ../../albums.php:150
+#, fuzzy
+msgid "Show Albums starting with"
+msgstr "<u>S</u>Ö»ÏÔʾÈçÏ¿ªÍ·µÄר¼­£º"
 
-#: ../../templates/show_users.inc:105
-msgid "delete"
+#: ../../bin/quarantine_migration.php.inc:49
+#, fuzzy
+msgid "Error: Unable to write to"
+msgstr "´íÎó£ºÎÞ·¨´ò¿ª"
+
+#: ../../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 "ģʽ"
+
+#: ../../bin/quarantine_migration.php.inc:78
+#, fuzzy
+msgid "Adding"
+msgstr "¹ÜÀí"
+
+#: ../../bin/quarantine_migration.php.inc:78
+#, fuzzy
+msgid "to database"
+msgstr "Ìí¼ÓÊý¾Ý¿â"
+
+#: ../../bin/quarantine_migration.php.inc:86
+msgid "Move Failed"
+msgstr ""
+
+#: ../../bin/quarantine_migration.php.inc:97
+#, fuzzy
+msgid "Deleted"
 msgstr "ɾ³ý"
 
-#: ../../templates/catalog.inc:33
+#: ../../bin/quarantine_migration.php.inc:113
 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"
+"\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 ""
 
-#: ../../templates/catalog.inc:42
-msgid "Update Catalogs"
-msgstr "¸üÐÂÇú¿â"
+#: ../../bin/quarantine_migration.php.inc:127
+#, fuzzy
+msgid "Continue?  (Y/N):"
+msgstr "¼ÌÐø"
 
-#: ../../templates/catalog.inc:68
-msgid "Fast Add"
-msgstr "¿ìËÙÌí¼Ó"
+#: ../../bin/quarantine_migration.php.inc:151
+#, fuzzy
+msgid "Error:  "
+msgstr "´íÎó"
 
-#: ../../templates/catalog.inc:75
-msgid "Fast Update"
-msgstr "¿ìËÙ¸üÐÂ"
+#: ../../bin/quarantine_migration.php.inc:152
+msgid "!\n"
+msgstr ""
 
-#: ../../templates/catalog.inc:88
-msgid "You don't have any catalogs."
-msgstr "ÄãûÓÐÈκÎÇú¿â"
+#: ../../templates/customize_catalog.inc:24
+msgid "Settings for catalog in"
+msgstr "Çú¿âÉèÖÃÔÚ"
 
-#: ../../templates/catalog.inc:97
-msgid "Add a catalog"
-msgstr "Ìí¼ÓÇú¿â"
+#: ../../templates/customize_catalog.inc:32 ../../templates/add_catalog.inc:39
+msgid "Auto-inserted Fields"
+msgstr "×Ô¶¯Ìí¼ÓµÄ×Ö¶Î"
 
-#: ../../templates/catalog.inc:99
-msgid "Show Duplicate Songs"
-msgstr "ÏÔʾÖظ´µÄ¸èÇú"
+#: ../../templates/customize_catalog.inc:33 ../../templates/add_catalog.inc:40
+msgid "album name"
+msgstr "ר¼­Ãû"
 
-#: ../../templates/catalog.inc:100
-msgid "Show Disabled Songs"
-msgstr "ÏÔʾ±»½ûÖ¹µÄ¸èÇú"
+#: ../../templates/customize_catalog.inc:34 ../../templates/add_catalog.inc:41
+msgid "artist name"
+msgstr "¸èÊÖÃû"
 
-#: ../../templates/catalog.inc:101
-msgid "Clear Catalog Stats"
-msgstr "Çå³ýÇú¿âͳ¼ÆÐÅÏ¢"
+#: ../../templates/customize_catalog.inc:35
+msgid "catalog path"
+msgstr "Çú¿â·¾¶"
 
-#: ../../templates/catalog.inc:102
-msgid "Clear Now Playing"
-msgstr "Çå³ýÕýÔÚ²¥·ÅÐÅÏ¢"
+#: ../../templates/customize_catalog.inc:36 ../../templates/add_catalog.inc:42
+msgid "id3 comment"
+msgstr "id3 ˵Ã÷"
 
-#: ../../templates/catalog.inc:103
-msgid "Dump Album Art"
-msgstr "ɾ³ý¸èÇú¸èÊÖ"
+#: ../../templates/customize_catalog.inc:37 ../../templates/add_catalog.inc:43
+msgid "genre"
+msgstr "ÀàÐÍ"
 
-#: ../../templates/catalog.inc:104 ../../templates/add_catalog.inc:78
-msgid "Gather Album Art"
-msgstr "ËѼ¯¸èÇú¸èÊÖ"
+#: ../../templates/customize_catalog.inc:38 ../../templates/add_catalog.inc:44
+msgid "track number (padded with leading 0)"
+msgstr "Òô¹ìºÅ£¨Ç°ÃæÓÃ0²¹×㣩"
 
-#: ../../templates/catalog.inc:105
-msgid "View flagged songs"
-msgstr "ÏÔʾÒѱê¼ÇµÄ¸èÇú"
+#: ../../templates/customize_catalog.inc:39 ../../templates/add_catalog.inc:45
+msgid "song title"
+msgstr "¸èÇúÃû"
 
-#: ../../templates/catalog.inc:106
-msgid "Catalog Tools"
-msgstr "Çú¿â¹¤¾ß"
+#: ../../templates/customize_catalog.inc:40 ../../templates/add_catalog.inc:46
+msgid "year"
+msgstr "Äê´ú"
 
-#: ../../templates/show_upload.inc:27
-msgid "Please Ensure All Files Are Tagged Correctly"
-msgstr "ÇëÈ·¶¨ËùÓÐÎļþ¶¼ÕýÈ·±ê¼ÇÁË"
+#: ../../templates/customize_catalog.inc:41 ../../templates/add_catalog.inc:47
+msgid "other"
+msgstr "ÆäËû"
 
-#: ../../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 ""
-"ϵͳÀûÓÃid3ÐÅÏ¢À´Ë÷ÒýÎļþ£¬Èç¹ûÄãµÄÎļþûÓбê¼Ç£¬¿ÉÄܻᱻɾ³ý¡£"
+#: ../../templates/customize_catalog.inc:45
+msgid "ID3 set command"
+msgstr "ID3 ÉèÖÃÃüÁî"
 
-#: ../../templates/show_upload.inc:34
-msgid "max_upload_size"
+#: ../../templates/customize_catalog.inc:51
+msgid "Filename pattern"
+msgstr "ÎļþÄ£°å"
+
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
+msgid "Folder Pattern"
+msgstr "Ŀ¼ģ°å"
+
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
+msgid "(no leading or ending '/')"
+msgstr "(¿ªÍ·ºÍ½áÊø²»Òª´ø'/')"
+
+#: ../../templates/customize_catalog.inc:69
+msgid "Save Catalog Settings"
+msgstr "±£´æÇú¿âÉèÖÃÐÅÏ¢"
+
+#: ../../templates/show_admin_index.inc:27
+#, fuzzy
+msgid "User Management"
+msgstr "̞"
+
+#: ../../templates/show_admin_index.inc:28
+msgid "E-mail Management"
 msgstr ""
 
-#: ../../templates/show_search.inc:34
-msgid "Search Ampache"
-msgstr "ËÑË÷"
+#: ../../templates/show_admin_index.inc:29
+#, fuzzy
+msgid "Catalog Managment"
+msgstr "Çú¿âÃû"
 
-#: ../../templates/show_search.inc:41
-msgid "Object Type"
-msgstr "Ä¿±êÀàÐÍ"
+#: ../../templates/show_admin_index.inc:30 ../../templates/admin_menu.inc:36
+msgid "Admin Preferences"
+msgstr "¹ÜÀíÔ±ÉèÖÃ"
+
+#: ../../templates/show_admin_index.inc:31 ../../templates/catalog.inc:98
+#: ../../templates/admin_menu.inc:37
+msgid "Access Lists"
+msgstr "·ÃÎÊ¿ØÖÆÁбí"
+
+#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:97
+msgid "Add a catalog"
+msgstr "Ìí¼ÓÇú¿â"
+
+#: ../../templates/show_admin_index.inc:35 ../../templates/catalog.inc:102
+msgid "Clear Now Playing"
+msgstr "Çå³ýÕýÔÚ²¥·ÅÐÅÏ¢"
+
+#: ../../templates/show_admin_index.inc:36
+#, fuzzy
+msgid "Add Access List Entry"
+msgstr "·ÃÎÊ¿ØÖÆÁбí"
+
+#: ../../templates/show_admin_index.inc:40
+msgid "Common Functions"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:43
+#, fuzzy
+msgid "Admin Sections"
+msgstr "¹ÜÀíÇø"
 
 #: ../../templates/show_test.inc:29
 msgid "Ampache Debug"
@@ -1516,6 +1341,11 @@ msgid ""
 "support is not required for Ampache, but it is highly recommended"
 msgstr ""
 
+#: ../../templates/show_test.inc:116
+#: ../../templates/show_install_config.inc:87
+msgid "Ampache.cfg.php Exists"
+msgstr "Ampache.cfg.phpÒÑ´æÔÚ"
+
 #: ../../templates/show_test.inc:131
 msgid ""
 "This attempts to read /config/ampache.cfg.php If this fails either the "
@@ -1523,11 +1353,16 @@ msgid ""
 "\tit is not currently readable by your webserver."
 msgstr ""
 
+#: ../../templates/show_test.inc:137
+#: ../../templates/show_install_config.inc:104
+msgid "Ampache.cfg.php Configured?"
+msgstr "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"
+"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 ""
 
 #: ../../templates/show_test.inc:160
@@ -1556,57 +1391,59 @@ msgid ""
 "cfg.php"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:28
-msgid "Add a Catalog"
-msgstr "Ìí¼ÓÇú¿â"
+#: ../../templates/show_localplay.inc:30
+msgid "Local Play Control"
+msgstr "±¾µØ²¥·Å¿ØÖÆ"
 
-#: ../../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 ""
-"ÇëÔÚÈçÏÂ±íµ¥ÀïÃæÌîÈë±¾µØ·¾¶£¨ÀýÈç /data/music£©£¬»òÕß"
-"Ö¸ÏòÔ¶³ÌAmpacheµÄÒ»¸öURL£¨ÀýÈç http://theotherampache.com£©"
+#: ../../templates/show_localplay.inc:35
+msgid "Playback"
+msgstr "²¥·Å"
 
-#: ../../templates/add_catalog.inc:36
-msgid "Catalog Name"
-msgstr "Çú¿âÃû"
+#: ../../templates/show_localplay.inc:39 ../../templates/list_header.inc:71
+#: ../../templates/show_mpdplay.inc:48
+msgid "Prev"
+msgstr "ºóÍË"
 
-#: ../../templates/add_catalog.inc:39 ../../templates/customize_catalog.inc:32
-msgid "Auto-inserted Fields"
-msgstr "×Ô¶¯Ìí¼ÓµÄ×Ö¶Î"
+#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:49
+msgid "Stop"
+msgstr "Í£Ö¹"
 
-#: ../../templates/add_catalog.inc:40 ../../templates/customize_catalog.inc:33
-msgid "album name"
-msgstr "ר¼­Ãû"
+#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:51
+msgid "Pause"
+msgstr "ÔÝÍ£"
 
-#: ../../templates/add_catalog.inc:41 ../../templates/customize_catalog.inc:34
-msgid "artist name"
-msgstr "¸èÊÖÃû"
+#: ../../templates/show_localplay.inc:43 ../../templates/list_header.inc:94
+#: ../../templates/show_mpdplay.inc:52
+msgid "Next"
+msgstr "Ç°½ø"
 
-#: ../../templates/add_catalog.inc:42 ../../templates/customize_catalog.inc:36
-msgid "id3 comment"
-msgstr "id3 ˵Ã÷"
+#: ../../templates/show_localplay.inc:49
+msgid "Volume"
+msgstr "ÒôÁ¿"
 
-#: ../../templates/add_catalog.inc:43 ../../templates/customize_catalog.inc:37
-msgid "genre"
-msgstr "ÀàÐÍ"
+#: ../../templates/show_localplay.inc:53 ../../templates/show_localplay.inc:54
+msgid "Increase Volume"
+msgstr "Ôö¼ÓÒôÁ¿"
 
-#: ../../templates/add_catalog.inc:44 ../../templates/customize_catalog.inc:38
-msgid "track number (padded with leading 0)"
-msgstr "Òô¹ìºÅ£¨Ç°ÃæÓÃ0²¹×㣩"
+#: ../../templates/show_localplay.inc:55 ../../templates/show_localplay.inc:56
+msgid "Decrease Volume"
+msgstr "¼õÉÙÒôÁ¿"
 
-#: ../../templates/add_catalog.inc:45 ../../templates/customize_catalog.inc:39
-msgid "song title"
-msgstr "¸èÇúÃû"
+#: ../../templates/show_localplay.inc:62
+msgid "Clear queue"
+msgstr "Çå³ý¶ÓÁÐ"
 
-#: ../../templates/add_catalog.inc:46 ../../templates/customize_catalog.inc:40
-msgid "year"
-msgstr "Äê´ú"
+#: ../../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 ""
+"ÇëÔÚÈçÏÂ±íµ¥ÀïÃæÌîÈë±¾µØ·¾¶£¨ÀýÈç /data/music£©£¬»òÕßÖ¸ÏòÔ¶³ÌAmpacheµÄÒ»¸ö"
+"URL£¨ÀýÈç http://theotherampache.com£©"
 
-#: ../../templates/add_catalog.inc:47 ../../templates/customize_catalog.inc:41
-msgid "other"
-msgstr "ÆäËû"
+#: ../../templates/add_catalog.inc:36
+msgid "Catalog Name"
+msgstr "Çú¿âÃû"
 
 #: ../../templates/add_catalog.inc:53
 msgid "Path"
@@ -1628,13 +1465,9 @@ msgstr "ID3 ÉèÖÃÃüÁî"
 msgid "Filename Pattern"
 msgstr "ÎļþÄ£°å"
 
-#: ../../templates/add_catalog.inc:74 ../../templates/customize_catalog.inc:58
-msgid "Folder Pattern"
-msgstr "Ŀ¼ģ°å"
-
-#: ../../templates/add_catalog.inc:74 ../../templates/customize_catalog.inc:58
-msgid "(no leading or ending '/')"
-msgstr "(¿ªÍ·ºÍ½áÊø²»Òª´ø'/')"
+#: ../../templates/add_catalog.inc:78 ../../templates/catalog.inc:104
+msgid "Gather Album Art"
+msgstr "ËѼ¯¸èÇú¸èÊÖ"
 
 #: ../../templates/add_catalog.inc:82
 msgid "ID3V2 Tags"
@@ -1656,74 +1489,163 @@ msgstr "´Óm3uÎļþ½¨Á¢×Ô¶¨Òå²¥·ÅÁбí"
 msgid "Add Catalog"
 msgstr "Ìí¼ÓÇú¿â"
 
-#: ../../templates/show_login_form.inc:49
-#: ../../templates/show_login_form.inc:63
-msgid "Login"
-msgstr "怬"
+#: ../../templates/list_flagged.inc:41 ../../templates/flag.inc:58
+#: ../../templates/show_uploads.inc:34
+msgid "Song"
+msgstr "¸èÇú"
 
-#: ../../templates/show_login_form.inc:59
-msgid "Remember Me"
-msgstr "µÇ¼±£ÁôÖ±µ½¹Ø±Õ"
+#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:41
+msgid "Flag"
+msgstr "񈬀"
 
-#: ../../templates/customize_catalog.inc:24
-msgid "Settings for catalog in"
-msgstr "Çú¿âÉèÖÃÔÚ"
+#: ../../templates/list_flagged.inc:43
+msgid "New Flag"
+msgstr "бê¼Ç"
 
-#: ../../templates/customize_catalog.inc:35
-msgid "catalog path"
-msgstr "Çú¿â·¾¶"
+#: ../../templates/list_flagged.inc:44
+msgid "Flagged by"
+msgstr "±ê¼ÇΪ"
 
-#: ../../templates/customize_catalog.inc:45
-msgid "ID3 set command"
-msgstr "ID3 ÉèÖÃÃüÁî"
+#: ../../templates/list_flagged.inc:45
+msgid "ID3 Update"
+msgstr "ID3 ¸üÐÂ"
 
-#: ../../templates/customize_catalog.inc:51
-msgid "Filename pattern"
-msgstr "ÎļþÄ£°å"
+#: ../../templates/list_flagged.inc:69
+msgid "Accept"
+msgstr "½ÓÊÜ"
 
-#: ../../templates/customize_catalog.inc:69
-msgid "Save Catalog Settings"
-msgstr "±£´æÇú¿âÉèÖÃÐÅÏ¢"
+#: ../../templates/list_flagged.inc:70
+msgid "Reject"
+msgstr "¾Ü¾ø"
 
-#: ../../templates/show_artist.inc:31
-msgid "Albums by"
-msgstr "ר¼­"
+#: ../../templates/show_artists.inc:55 ../../templates/show_albums.inc:58
+#: ../../templates/show_random_play.inc:46
+msgid "All"
+msgstr "È«²¿"
 
-#: ../../templates/show_artist.inc:33
-msgid "Show All Songs By"
-msgstr "ÏÔʾËùÓиèÇú"
+#: ../../templates/show_songs.inc:33 ../../templates/show_mpdpl.inc:62
+msgid "Song title"
+msgstr "¸èÇúÃû"
 
-#: ../../templates/show_artist.inc:34
-msgid "Play All Songs By"
-msgstr "²¥·ÅËùÓиèÇú"
+#: ../../templates/show_songs.inc:38 ../../templates/show_uploads.inc:40
+msgid "Size"
+msgstr "´óС"
 
-#: ../../templates/show_artist.inc:35
-msgid "Play Random Songs By"
-msgstr "Ëæ»ú²¥·Å¸èÇú"
+#: ../../templates/show_songs.inc:113
+msgid "Direct Link"
+msgstr "Ö±½ÓÏÂÔØ"
+
+#: ../../templates/show_songs.inc:131
+msgid "Total"
+msgstr "×ܹ²"
+
+#: ../../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 ""
+"ÄãµÄWWW·þÎñÆ÷ÄܶÁÈ¡/sql/ampache.sqlÎļþ£¬ÒÔ¼°/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 "µÚ¶þ²½ - ´´½¨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 ""
+"ÕâÒ»²½´´½¨»ù±¾ÅäÖÃÐÅÏ¢¡£»áÊ×Ïȳ¢ÊÔÖ±½Óдµ½ÄãµÄWWW·þÎñÆ÷ÉÏ¡£Èç¹û·ÃÎʾܾø£¬»áÌá"
+"ʾÄãÏÂÔØÕâ¸öÅäÖÃÎļþ±£´æµ½/configĿ¼ȥ¡£"
+
+#: ../../templates/show_install_config.inc:59
+msgid "Web Path"
+msgstr "Íøҳ·¾¶"
 
-#: ../../templates/show_artist.inc:37 ../../templates/show_album.inc:58
+#: ../../templates/show_install_config.inc:63
+#: ../../templates/show_install.inc:57
+msgid "Desired Database Name"
+msgstr "Êý¾Ý¿âÃû"
+
+#: ../../templates/show_install_config.inc:67
+#: ../../templates/show_install.inc:61
+msgid "MySQL Hostname"
+msgstr "MySQLÖ÷»ú"
+
+#: ../../templates/show_install_config.inc:71
+msgid "MySQL Username"
+msgstr "MySQLÓû§"
+
+#: ../../templates/show_install_config.inc:75
+msgid "MySQL Password"
+msgstr "MySQLÃÜÂë"
+
+#: ../../templates/show_install_config.inc:80
+msgid "Write Config"
+msgstr "дÈëÅäÖÃ"
+
+#: ../../templates/show_install_config.inc:124
+msgid "Check for Config"
+msgstr "¼ì²éÅäÖÃ"
+
+#: ../../templates/show_album.inc:53
+msgid "Play Album"
+msgstr "²¥·Åר¼­"
+
+#: ../../templates/show_album.inc:54
+msgid "Play Random from Album"
+msgstr "Ëæ»ú´Óר¼­²¥·Å"
+
+#: ../../templates/show_album.inc:55
+msgid "Reset Album Art"
+msgstr "ÖØÖøèÇú¸èÊÖ"
+
+#: ../../templates/show_album.inc:56
+msgid "Find Album Art"
+msgstr "²éÕÒ¸èÇú¸èÊÖ"
+
+#: ../../templates/show_album.inc:58 ../../templates/show_artist.inc:37
 msgid "Update from tags"
 msgstr "´Ó±ê¼Ç¸üÐÂ"
 
-#: ../../templates/show_artist.inc:50
-msgid "Select"
-msgstr "Ñ¡Ôñ"
+#: ../../templates/show_preferences.inc:31
+msgid "Editing"
+msgstr "±à¼­ÖÐ"
 
-#: ../../templates/show_artist.inc:52
-msgid "Cover"
-msgstr "·âÃæ"
+#: ../../templates/show_preferences.inc:31
+msgid "preferences"
+msgstr "ÉèÖÃ"
 
-#: ../../templates/show_artist.inc:53
-msgid "Album Name"
-msgstr "ר¼­Ãû"
+#: ../../templates/show_preferences.inc:33
+msgid "Rebuild Preferences"
+msgstr "Öؽ¨ÉèÖÃ"
 
-#: ../../templates/show_artist.inc:54
-msgid "Album Year"
-msgstr "ר¼­Äê´ú"
+#: ../../templates/show_preferences.inc:39
+msgid "Preference"
+msgstr "ÉèÖÃ"
 
-#: ../../templates/show_artist.inc:55
-msgid "Total Tracks"
-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
+msgid "Update Preferences"
+msgstr "¸üÐÂÉèÖÃ"
+
+#: ../../templates/show_preferences.inc:87
+msgid "Cancel"
+msgstr "È¡Ïû"
 
 #: ../../templates/userform.inc:25
 msgid "Adding a New User"
@@ -1733,18 +1655,39 @@ msgstr "Ìí¼ÓÐÂÓû§"
 msgid "Editing existing User"
 msgstr "±à¼­ÒÑÓÐÓû§"
 
-#: ../../templates/userform.inc:81
+#: ../../templates/userform.inc:80
 msgid "User Access Level"
 msgstr "Óû§·ÃÎÊ¿ØÖƼ¶±ð"
 
-#: ../../templates/userform.inc:97
+#: ../../templates/userform.inc:96
 msgid "Add User"
 msgstr "Ìí¼ÓÓû§"
 
-#: ../../templates/userform.inc:102
+#: ../../templates/userform.inc:101
 msgid "Update User"
 msgstr "¸üÐÂÓû§"
 
+#: ../../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 ""
+"ÕâÒ»²½´´½¨AmpacheÊý¾Ý¿â²¢³õʼ»¯Êý¾Ý¡£ÇëÌṩһ¸öÓн¨Á¢Êý¾Ý¿âȨÏÞµÄMySQLÕʺš£"
+"ÕâÒ»²½¿ÉÄÜ»áÐèÒª±È½Ï³¤Ò»¶Îʱ¼ä£¬¾Í¿´Äã»úÆ÷¿ì²»¿ìÁË"
+
+#: ../../templates/show_install.inc:65
+msgid "MySQL Administrative Username"
+msgstr "MySQL¹ÜÀíÓû§Ãû"
+
+#: ../../templates/show_install.inc:69
+msgid "MySQL Administrative Password"
+msgstr "MySQL¹ÜÀíÓû§ÃÜÂë"
+
+#: ../../templates/show_install.inc:74
+msgid "Insert Database"
+msgstr "Ìí¼ÓÊý¾Ý¿â"
+
 #: ../../templates/flag.inc:43
 msgid "Flag song"
 msgstr "±ê¼Ç¸èÇú"
@@ -1753,8 +1696,7 @@ msgstr "±ê¼Ç¸èÇú"
 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 ""
-"°ÑÏÂÃæµÄ¸èÇú±ê¼Ç³Éij¸öÈçÏÂÁбíÏÔʾµÄÎÊÌâÖ®Ò»£¬ÒÔ±ã¹ÜÀíÔ±²ÉÈ¡ÏàÓ¦¶¯×÷¡£"
+msgstr "°ÑÏÂÃæµÄ¸èÇú±ê¼Ç³Éij¸öÈçÏÂÁбíÏÔʾµÄÎÊÌâÖ®Ò»£¬ÒÔ±ã¹ÜÀíÔ±²ÉÈ¡ÏàÓ¦¶¯×÷¡£"
 
 #: ../../templates/flag.inc:62
 msgid "Reason to flag"
@@ -1764,162 +1706,401 @@ msgstr "±ê¼ÇÔ­Òò"
 msgid "Flag Song"
 msgstr "±ê¼Ç¸èÇú"
 
-#: ../../templates/show_songs.inc:33
-msgid "Song title"
-msgstr "¸èÇúÃû"
+#: ../../templates/show_add_access.inc:31
+msgid "Add Access for a Host"
+msgstr "Ìí¼Ó·ÃÎÊ¿ØÖÆ"
 
-#: ../../templates/show_songs.inc:113
-msgid "Direct Link"
-msgstr "Ö±½ÓÏÂÔØ"
+#: ../../templates/show_add_access.inc:33
+msgid ""
+"Use the form below to add a host that you want to have access to your "
+"Ampache catalog."
+msgstr "ÓÃÏÂÃæµÄ±íµ¥Ìí¼ÓÄãÐèÒªÔÊÐí·ÃÎÊÇú¿âµÄ»úÆ÷µØÖ·"
 
-#: ../../templates/show_songs.inc:131
-msgid "Total"
-msgstr "×ܹ²"
+#: ../../templates/show_add_access.inc:46
+msgid "Start IP Address"
+msgstr "ÆðʼIPµØÖ·"
+
+#: ../../templates/show_add_access.inc:52
+msgid "End IP Address"
+msgstr "½áÊøIPµØÖ·"
+
+#: ../../templates/show_add_access.inc:58
+#: ../../templates/show_access_list.inc:50
+msgid "Level"
+msgstr "µÈ¼¶"
+
+#: ../../templates/show_add_access.inc:72
+msgid "Add Host"
+msgstr "Ìí¼ÓÖ÷»ú"
+
+#: ../../templates/catalog.inc:33
+msgid ""
+"Error: ICONV not found, ID3V2 Tags will not import correctly. See <a href="
+"\"http://php.oregonstate.edu/iconv\">Iconv</a> for information on getting "
+"ICONV"
+msgstr ""
+
+#: ../../templates/catalog.inc:42
+msgid "Update Catalogs"
+msgstr "¸üÐÂÇú¿â"
+
+#: ../../templates/catalog.inc:68
+msgid "Fast Add"
+msgstr "¿ìËÙÌí¼Ó"
+
+#: ../../templates/catalog.inc:75
+msgid "Fast Update"
+msgstr "¿ìËÙ¸üÐÂ"
+
+#: ../../templates/catalog.inc:88
+msgid "You don't have any catalogs."
+msgstr "ÄãûÓÐÈκÎÇú¿â"
+
+#: ../../templates/catalog.inc:99
+msgid "Show Duplicate Songs"
+msgstr "ÏÔʾÖظ´µÄ¸èÇú"
+
+#: ../../templates/catalog.inc:100
+msgid "Show Disabled Songs"
+msgstr "ÏÔʾ±»½ûÖ¹µÄ¸èÇú"
+
+#: ../../templates/catalog.inc:101
+msgid "Clear Catalog Stats"
+msgstr "Çå³ýÇú¿âͳ¼ÆÐÅÏ¢"
+
+#: ../../templates/catalog.inc:103
+msgid "Dump Album Art"
+msgstr "ɾ³ý¸èÇú¸èÊÖ"
+
+#: ../../templates/catalog.inc:105
+msgid "View flagged songs"
+msgstr "ÏÔʾÒѱê¼ÇµÄ¸èÇú"
+
+#: ../../templates/catalog.inc:106
+msgid "Catalog Tools"
+msgstr "Çú¿â¹¤¾ß"
+
+#: ../../templates/admin_menu.inc:33
+msgid "Users"
+msgstr "Óû§"
+
+#: ../../templates/admin_menu.inc:34
+msgid "Mail Users"
+msgstr "ÏòÓû§·¢ËÍÓʼþ"
+
+#: ../../templates/menu.inc:29
+msgid "Home"
+msgstr "Ê×Ò³"
+
+#: ../../templates/menu.inc:32
+msgid "Local Play"
+msgstr "±¾µØ²¥·Å"
+
+#: ../../templates/menu.inc:38
+msgid "Playlists"
+msgstr "×Ô¶¨ÒåÎļþÁбí"
+
+#: ../../templates/menu.inc:40
+msgid "Preferences"
+msgstr "ÉèÖÃ"
+
+#: ../../templates/menu.inc:43 ../../templates/show_upload.inc:73
+msgid "Upload"
+msgstr "ÉÏ´«"
+
+#: ../../templates/menu.inc:63 ../../templates/menu.inc:66
+msgid "Admin"
+msgstr "¹ÜÀí"
+
+#: ../../templates/menu.inc:73 ../../templates/menu.inc:79
+msgid "Account"
+msgstr "ÕʺÅ"
+
+#: ../../templates/menu.inc:74 ../../templates/menu.inc:80
+msgid "Stats"
+msgstr "״̬"
+
+#: ../../templates/menu.inc:75 ../../templates/menu.inc:81
+#: ../../templates/menu.inc:85
+msgid "Logout"
+msgstr "Í˳ö"
+
+#: ../../templates/show_upload.inc:30
+msgid "Uploading Music to Ampache"
+msgstr ""
+
+#: ../../templates/show_upload.inc:32
+msgid "The following Audio file formats are supported"
+msgstr ""
+
+#: ../../templates/show_upload.inc:72
+msgid "max_upload_size"
+msgstr ""
+
+#: ../../templates/show_now_playing.inc:31
+msgid "Now Playing"
+msgstr "ÕýÔÚ²¥·Å"
+
+#: ../../templates/show_login_form.inc:49
+#: ../../templates/show_login_form.inc:63
+msgid "Login"
+msgstr "怬"
+
+#: ../../templates/show_login_form.inc:59
+msgid "Remember Me"
+msgstr "µÇ¼±£ÁôÖ±µ½¹Ø±Õ"
+
+#: ../../templates/show_access_list.inc:34
+msgid "Host Access to Your Catalog"
+msgstr "Çú¿â·ÃÎÊȨÏÞ"
+
+#: ../../templates/show_access_list.inc:43
+msgid "Add Entry"
+msgstr "Ìí¼Ó"
+
+#: ../../templates/show_access_list.inc:48
+msgid "Start Address"
+msgstr "¿ªÊ¼µØÖ·"
+
+#: ../../templates/show_access_list.inc:49
+msgid "End Address"
+msgstr "½áÊøµØÖ·"
+
+#: ../../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 "ȨÏÞ"
+
+#: ../../templates/show_users.inc:64
+msgid "On-line"
+msgstr "ÔÚÏß"
+
+#: ../../templates/show_users.inc:105
+msgid "delete"
+msgstr "ɾ³ý"
+
+#: ../../templates/show_search.inc:34 ../../templates/show_search_bar.inc:36
+msgid "Search Ampache"
+msgstr "ËÑË÷"
+
+#: ../../templates/show_search.inc:41
+msgid "Object Type"
+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_mpdplay.inc:33
+#: ../../templates/show_artist.inc:51
+msgid "Cover"
+msgstr "·âÃæ"
+
+#: ../../templates/show_artist.inc:52
+msgid "Album Name"
+msgstr "ר¼­Ãû"
+
+#: ../../templates/show_artist.inc:53
+msgid "Album Year"
+msgstr "ר¼­Äê´ú"
+
+#: ../../templates/show_artist.inc:54
+msgid "Total Tracks"
+msgstr "×ÜÒô¹ìÊý"
+
+#: ../../templates/show_mpdplay.inc:38
 msgid "MPD Play Control"
 msgstr "MPD²¥·Å¿ØÖÆ"
 
-#: ../../templates/show_mpdplay.inc:53
+#: ../../templates/show_mpdplay.inc:71
 msgid "Loop"
 msgstr "Ñ­»·"
 
-#: ../../templates/show_mpdplay.inc:60 ../../templates/show_mpdplay.inc:73
+#: ../../templates/show_mpdplay.inc:78 ../../templates/show_mpdplay.inc:91
 msgid "On"
 msgstr "¿ª"
 
-#: ../../templates/show_mpdplay.inc:61 ../../templates/show_mpdplay.inc:74
+#: ../../templates/show_mpdplay.inc:79 ../../templates/show_mpdplay.inc:92
 msgid "Off"
 msgstr "¹Ø"
 
-#: ../../templates/show_mpdplay.inc:90 ../../templates/show_now_playing.inc:31
-msgid "Now Playing"
+#: ../../templates/show_mpdplay.inc:114
+#, fuzzy
+msgid "Now Playing :"
 msgstr "ÕýÔÚ²¥·Å"
 
-#: ../../templates/show_mpdplay.inc:103
-msgid "Refresh the Playlist Window"
-msgstr "Ë¢ÐÂÁÐ±í´°¿Ú"
+#: ../../templates/show_mpdplay.inc:138
+msgid "On Deck "
+msgstr ""
 
-#: ../../templates/show_mpdplay.inc:103
-msgid "refresh now"
-msgstr "Á¢¼´Ë¢ÐÂ"
+#: ../../templates/show_mpdplay.inc:138
+msgid "(in "
+msgstr ""
 
-#: ../../templates/show_mpdplay.inc:111
-msgid "Server Playlist"
+#: ../../templates/show_mpdpl.inc:45
+#, fuzzy
+msgid "MPD Server Playlist"
 msgstr "·þÎñÆ÷²¥·ÅÁбí"
 
-#: ../../templates/show_mpdplay.inc:146
+#: ../../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:189
 msgid "Click to shuffle (randomize) the playlist"
 msgstr "µã»÷Ëæ»ú£¨ÂÒÐò£©²¥·ÅÁбí"
 
-#: ../../templates/show_mpdplay.inc:146
+#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:189
 msgid "shuffle"
 msgstr "ÂÒÐò"
 
-#: ../../templates/show_mpdplay.inc:147
-msgid "Click the clear the playlist"
+#: ../../templates/show_mpdpl.inc:49 ../../templates/show_mpdpl.inc:190
+#, fuzzy
+msgid "Click to the clear the playlist"
 msgstr "µã»÷Çå³ý²¥·ÅÁбí"
 
-#: ../../templates/show_mpdplay.inc:147
-msgid "clear"
-msgstr "Çå³ý"
-
-#: ../../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"
+#: ../../templates/show_mpdpl.inc:53 ../../templates/show_mpdpl.inc:194
+msgid "Click to the remove all except the Now Playing"
 msgstr ""
-"ÕâÒ»²½´´½¨AmpacheÊý¾Ý¿â²¢³õʼ»¯Êý¾Ý¡£ÇëÌṩһ¸öÓн¨Á¢Êý¾Ý¿âȨÏÞµÄMySQLÕʺš£"
-"ÕâÒ»²½¿ÉÄÜ»áÐèÒª±È½Ï³¤Ò»¶Îʱ¼ä£¬¾Í¿´Äã»úÆ÷¿ì²»¿ìÁË"
 
-#: ../../templates/show_install.inc:65
-msgid "MySQL Administrative Username"
-msgstr "MySQL¹ÜÀíÓû§Ãû"
+#: ../../templates/show_uploads.inc:33
+#, fuzzy
+msgid "Status"
+msgstr "״̬"
 
-#: ../../templates/show_install.inc:69
-msgid "MySQL Administrative Password"
-msgstr "MySQL¹ÜÀíÓû§ÃÜÂë"
+#: ../../templates/show_uploads.inc:42
+msgid "User"
+msgstr "Óû§"
 
-#: ../../templates/show_install.inc:74
-msgid "Insert Database"
-msgstr "Ìí¼ÓÊý¾Ý¿â"
+#: ../../templates/show_uploads.inc:43
+msgid "Date"
+msgstr "ÈÕÆÚ"
 
-#: ../../templates/show_add_access.inc:31
-msgid "Add Access for a Host"
-msgstr "Ìí¼Ó·ÃÎÊ¿ØÖÆ"
+#: ../../templates/show_uploads.inc:49
+msgid "Add"
+msgstr "Ìí¼Ó"
 
-#: ../../templates/show_add_access.inc:33
-msgid ""
-"Use the form below to add a host that you want to have access to your "
-"Ampache catalog."
+#: ../../templates/show_random_play.inc:28
+msgid "Play Random Selection"
+msgstr "Ëæ»ú²¥·Å"
+
+#: ../../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_add_access.inc:46
-msgid "Start IP Address"
-msgstr "ÆðʼIPµØÖ·"
+#: ../../templates/show_random_play.inc:59
+msgid "Favor Unplayed"
+msgstr "û²¥·Å¹ýµÄÓÅÏÈ"
 
-#: ../../templates/show_add_access.inc:52
-msgid "End IP Address"
-msgstr "½áÊøIPµØÖ·"
+#: ../../templates/show_random_play.inc:60
+msgid "Full Albums"
+msgstr "È«²¿×¨¼­"
 
-#: ../../templates/show_add_access.inc:72
-msgid "Add Host"
-msgstr "Ìí¼ÓÖ÷»ú"
+#: ../../templates/show_random_play.inc:61
+msgid "Full Artist"
+msgstr "È«²¿¸èÊÖ"
 
-#: ../../templates/show_preferences.inc:31
-msgid "Editing"
-msgstr "±à¼­ÖÐ"
+#: ../../templates/show_random_play.inc:66
+msgid "from catalog"
+msgstr "Çú¿â"
 
-#: ../../templates/show_preferences.inc:31
-msgid "preferences"
-msgstr "ÉèÖÃ"
+#: ../../templates/show_random_play.inc:75
+msgid "Play Random Songs"
+msgstr "Ëæ»ú²¥·Å"
 
-#: ../../templates/show_preferences.inc:33
-msgid "Rebuild Preferences"
-msgstr "Öؽ¨ÉèÖÃ"
+#~ msgid "<u>S</u>how all albums"
+#~ msgstr "<u>S</u>ÏÔʾËùÓÐר¼­"
 
-#: ../../templates/show_preferences.inc:39
-msgid "Preference"
-msgstr "ÉèÖÃ"
+#~ msgid "Select a starting letter or Show all"
+#~ msgstr "Ñ¡ÔñÊ××Ö·û»òÕßÏÔʾËùÓеÄ"
 
-#: ../../templates/show_preferences.inc:40
-msgid "Value"
-msgstr "Öµ"
+#~ msgid "An Unknown Error has occured."
+#~ msgstr "·¢Éúδ֪´íÎó"
 
-#: ../../templates/show_preferences.inc:42
-msgid "Type"
-msgstr "ÀàÐÍ"
+#~ msgid "Successfully-Quarantined"
+#~ msgstr "³É¹¦£­µÈ´ýÅú×¼"
 
-#: ../../templates/show_preferences.inc:43
-msgid "Apply to All"
-msgstr "È«²¿Ó¦ÓÃ"
+#~ msgid "Successfully-Cataloged"
+#~ msgstr "³É¹¦£­¼ÓÈëÇú¿â"
 
-#: ../../templates/show_preferences.inc:83
-msgid "Update Preferences"
-msgstr "¸üÐÂÉèÖÃ"
+#~ msgid "Unknown"
+#~ msgstr "δ֪"
 
-#: ../../templates/show_preferences.inc:87
-msgid "Cancel"
-msgstr "È¡Ïû"
+#~ msgid "Quarantined"
+#~ msgstr "¸ôÀë"
 
-#: ../../templates/admin_menu.inc:34
-msgid "Mail Users"
-msgstr "ÏòÓû§·¢ËÍÓʼþ"
+#~ msgid "View Limit"
+#~ msgstr "ÏÔʾÏÞÖÆ"
 
-#: ../../templates/show_album.inc:53
-msgid "Play Album"
-msgstr "²¥·Åר¼­"
+#~ msgid "Create/Modify User Accounts for Ampache"
+#~ msgstr "´´½¨£¯ÐÞ¸ÄÓû§ÕʺÅ"
 
-#: ../../templates/show_album.inc:54
-msgid "Play Random from Album"
-msgstr "Ëæ»ú´Óר¼­²¥·Å"
+#~ msgid "Mail"
+#~ msgstr "Óʼþ"
 
-#: ../../templates/show_album.inc:55
-msgid "Reset Album Art"
-msgstr "ÖØÖøèÇú¸èÊÖ"
+#~ msgid "Mail your users to notfiy them of changes"
+#~ msgstr "¸øÄãµÄÓû§·¢ÓʼþÌáÐÑ"
 
-#: ../../templates/show_album.inc:56
-msgid "Find Album Art"
-msgstr "²éÕÒ¸èÇú¸èÊÖ"
+#~ msgid "Create/Update/Clean your catalog here"
+#~ msgstr "Ìí¼Ó£¯¸üУ¯Çå³ýÇú¿â"
+
+#~ msgid "Modify Site-wide preferences"
+#~ msgstr "È«Õ¾ÉèÖÃÐÞ¸Ä"
+
+#~ msgid "Modify Access List Permissions"
+#~ msgstr "Ð޸ķÃÎÊȨÏÞÁбí"
+
+#~ msgid "Must have access_control=true in ampache.cfg"
+#~ msgstr "±ØÐëÔÚampache.cfgÀïÓÐaccess_control=true"
+
+#~ msgid "Please Ensure All Files Are Tagged Correctly"
+#~ msgstr "ÇëÈ·¶¨ËùÓÐÎļþ¶¼ÕýÈ·±ê¼ÇÁË"
+
+#~ msgid ""
+#~ "Ampache relies on id3 tags to sort data.  If your file is not tagged it "
+#~ "may be deleted."
+#~ msgstr "ϵͳÀûÓÃid3ÐÅÏ¢À´Ë÷ÒýÎļþ£¬Èç¹ûÄãµÄÎļþûÓбê¼Ç£¬¿ÉÄܻᱻɾ³ý¡£"
+
+#~ msgid "refresh now"
+#~ msgstr "Á¢¼´Ë¢ÐÂ"
+
+#~ msgid "clear"
+#~ msgstr "Çå³ý"
diff --git a/modules/init.php b/modules/init.php
index c733e92c..053aeb92 100644
--- a/modules/init.php
+++ b/modules/init.php
@@ -83,7 +83,7 @@ if (!$results['conf']['allow_stream_playback']) {
 }
 
 $results['conf']['web_path']		= $http_type . $_SERVER['HTTP_HOST'] . $results['conf']['web_path'];
-$results['conf']['version']		= '3.3.2-Alpha2 Build (005)';
+$results['conf']['version']		= '3.3.2-Alpha2';
 $results['conf']['catalog_file_pattern']= 'mp3|mpc|m4p|m4a|mp4|aac|ogg|rm|wma|asf|flac|spx';
 $results['libglue']['local_table']	= 'session';
 $results['libglue']['local_sid']	= 'id';
@@ -257,11 +257,11 @@ if (!conf('use_auth')) {
 	$auth['success'] = 1;
 	$auth['info']['username'] = "Ampache";
 	$auth['info']['fullname'] = "Ampache User";
-	$auth['info']['id'] = 0;
+	$auth['info']['id'] = -1;
 	$auth['info']['access'] = "admin";
 	$auth['info']['offset_limit'] = 50;
 	if (!check_session()) { make_local_session_only($auth); }
-	$user 			= new User(0);
+	$user 			= new User(-1);
 	$user->fullname 	= $auth['info']['fullname'];
 	$user->offset_limit 	= $auth['info']['offset_limit'];
 	$user->username 	= $auth['info']['username'];
diff --git a/templates/menu.inc b/templates/menu.inc
index 2ae05faf..bd084e2f 100644
--- a/templates/menu.inc
+++ b/templates/menu.inc
@@ -33,8 +33,8 @@ if ($GLOBALS['user']->prefs['play_type'] == 'mpd' && conf('localplay_menu')) {
 }
 
 $items += array(_("Browse")	=> htmlspecialchars(conf('web_path') . "/browse.php"),
-		_("Albums")	=> htmlspecialchars(conf('web_path') . "/albums.php"),
-		_("Artists")	=> htmlspecialchars(conf('web_path') . "/artists.php"),
+//		_("Albums")	=> htmlspecialchars(conf('web_path') . "/albums.php"),
+//		_("Artists")	=> htmlspecialchars(conf('web_path') . "/artists.php"),
 		_("Playlists")	=> htmlspecialchars(conf('web_path') . "/playlist.php"),
 		_("Search")	=> htmlspecialchars(conf('web_path') . "/search.php"),
 		_("Preferences") => htmlspecialchars(conf('web_path') . "/preferences.php")
@@ -81,7 +81,7 @@ if ($GLOBALS['user']->prefs['upload']) {
 	            " <a href=\"".conf('web_path')."/logout.php\">" . _("Logout") . "</a> </li>\n";
 		} // else
 	}  // if use_auth
-	elseif ( $GLOBALS['user']->id != '0') { 
+	elseif ( $_SESSION['userdata']['id'] != '-1') { 
 		print("\t\t<li><a href=\"".conf('web_path')."/logout.php\">" . _("Logout") . "</a> </li>\n");
 	} // else no user
 ?>
diff --git a/templates/show_all_popular.inc.php b/templates/show_all_popular.inc.php
index 1c472949..1b1c9987 100644
--- a/templates/show_all_popular.inc.php
+++ b/templates/show_all_popular.inc.php
@@ -27,16 +27,17 @@
 		<?php show_info_box(_("Most Popular Artists"), 'artist', $artists); ?>
 	</td>
 	<td valign="top" align="left">
-		<?php show_info_box(_("Most Popular Songs"), 'song', $songs); ?>
-	</td>
-	<td valign="top" align="right">
 		<?php show_info_box(_("Most Popular Albums"), '', $albums); ?>
 	</td>
+
 </tr>
-<tr><td colspan="3">&nbsp;</td></tr>
+<tr><td colspan="2">&nbsp;</td></tr>
 <tr>
 	<td valign="top" align="left">
 		<?php show_info_box(_("Most Popular Genres"), '', $genres); ?>
 	</td>
+	<td valign="top" align="right">
+		<?php show_info_box(_("Most Popular Songs"), 'song', $songs); ?>
+	</td>
 </tr>
 </table>
diff --git a/templates/show_all_recent.inc.php b/templates/show_all_recent.inc.php
new file mode 100644
index 00000000..28339c89
--- /dev/null
+++ b/templates/show_all_recent.inc.php
@@ -0,0 +1,33 @@
+<?php
+/*
+ 
+ Copyright (c) 2001 - 2005 Ampache.org
+ All rights reserved. 
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ 
+*/
+
+?>
+<table class="tabledata">
+<tr>
+	<td valign="top" align="right">
+		<?php show_info_box(_("Newest Artist Additions"), '', $artists); ?>
+	</td>
+	<td valign="top" align="left">
+		<?php show_info_box(_("Newest Album Additions"), '', $albums); ?>
+	</td>
+</tr>
+</table>
diff --git a/templates/show_browse_menu.inc b/templates/show_browse_menu.inc
index 6edafcfe..bdef2e2a 100644
--- a/templates/show_browse_menu.inc
+++ b/templates/show_browse_menu.inc
@@ -32,7 +32,7 @@
 $web_path = conf('web_path');
 
 $items = array(
-	        _("Artist")      => "$web_path/artists.php",
+	        _("Artists")      => "$web_path/artists.php",
 		_("Albums")      => "$web_path/albums.php",
 		_("Genre")       => "$web_path/browse.php?action=genre",
         );
diff --git a/templates/show_play_selected.inc.php b/templates/show_play_selected.inc.php
index dab5369d..b89e7d47 100644
--- a/templates/show_play_selected.inc.php
+++ b/templates/show_play_selected.inc.php
@@ -46,12 +46,13 @@ function ToBatch(action)
 <table border="0" cellpadding="14" cellspacing="0" class="text-box">
 <tr align="left">
         <td>
-                <input class="button" type="button" name="super_action" value="<?php echo _("Play Selected"); ?>" onclick="return ToSong('play_selected');" />
+               <input class="button" type="button" name="super_action" value="<?php echo _("Play Selected"); ?>" onclick="return ToSong('play_selected');" />
 		<?php if (batch_ok()) { ?>
 		&nbsp;&nbsp;
 		<input class="button" type="button" name="super_action" value="<?php echo _("Download Selected"); ?>" onclick="return ToBatch('download_selected');" />
 		<? } ?>
-<!--                <input class="button" type="button" name="super_action" value="<?php echo _("Flag Selected"); ?>" />
+<!--
+                <input class="button" type="button" name="super_action" value="<?php echo _("Flag Selected"); ?>" />
                 <input class="button" type="button" name="super_action" value="<?php echo _("Edit Selected"); ?>" />
 -->
         </td>
diff --git a/templates/show_songs.inc b/templates/show_songs.inc
index c8d75ae4..0702a157 100644
--- a/templates/show_songs.inc
+++ b/templates/show_songs.inc
@@ -98,7 +98,7 @@ $web_path = conf('web_path');
             <td>
               <?php if ($user->has_access('100')) { ?>
                 <a href="<?php echo $web_path; ?>/admin/song.php?action=edit&amp;song=<?php echo $song->id; ?>">Edit</a> | <a href="<?php echo $web_path; ?>/flag.php?song=<?php echo $song->id; ?>&amp;action=flag">Flag</a> | 
-                  <?php if ($song->status === 'enabled') { ?>
+                  <?php if ($song->enabled) { ?>
                     <a href="<?php echo $web_path; ?>/admin/song.php?action=disable&amp;song_ids=<?php echo $song->id; ?>">Disable</a>
                   <?php } else { ?>
                     <a href="<?php echo $web_path; ?>/admin/song.php?action=enabled&amp;song_ids=<?php echo $song->id; ?>">Enable</a>