slight improvement, I hope to french translation, still a few missing translations and translations that need improvement plus populaire --> les plus populaire

14 files changed, 4424 insertions, 4419 deletions

diff --git a/download/index.php b/download/index.php
index b3158ed3..d390d778 100644
--- a/download/index.php
+++ b/download/index.php
@@ -5,9 +5,8 @@
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/class/localplay.class.php b/lib/class/localplay.class.php
index 8729b2df..4c12aaef 100644
--- a/lib/class/localplay.class.php
+++ b/lib/class/localplay.class.php
@@ -331,8 +331,7 @@ class Localplay {
 	 * get
 	 * This calls the get function of the player and then returns
 	 * the array of current songs for display or whatever
-	 * Null is returned on failure here because the PHP count() 
-	 * function will return 1 on a value of 'false'
+	 * an empty array is passed on failure
 	 */
 	function get() { 
 
@@ -342,7 +341,7 @@ class Localplay {
 
 		if (!count($data) OR !is_array($data)) { 
 			debug_event('localplay','Error Unable to get song info, check ' . $this->type . ' controller','1');
-			return NULL; 
+			return array(); 
 		}
 		
 		return $data;
diff --git a/locale/base/merge-messages.sh b/locale/base/merge-messages.sh
index 0d8546b6..0d3525db 100755
--- a/locale/base/merge-messages.sh
+++ b/locale/base/merge-messages.sh
@@ -1,13 +1,12 @@
 #!/bin/sh
 
-
-msgmerge ../de_DE/LC_MESSAGES/messages.po ./messages.po --output-file=../de_DE/LC_MESSAGES/messages.po
-msgmerge ../es_ES/LC_MESSAGES/messages.po ./messages.po --output-file=../es_ES/LC_MESSAGES/messages.po
-msgmerge ../en_GB/LC_MESSAGES/messages.po ./messages.po --output-file=../en_GB/LC_MESSAGES/messages.po
-msgmerge ../fr_FR/LC_MESSAGES/messages.po ./messages.po --output-file=../fr_FR/LC_MESSAGES/messages.po
-msgmerge ../it_IT/LC_MESSAGES/messages.po ./messages.po --output-file=../it_IT/LC_MESSAGES/messages.po
-msgmerge ../nl_NL/LC_MESSAGES/messages.po ./messages.po --output-file=../nl_NL/LC_MESSAGES/messages.po
-msgmerge ../tr_TR/LC_MESSAGES/messages.po ./messages.po --output-file=../tr_TR/LC_MESSAGES/messages.po
-msgmerge ../zh_CN/LC_MESSAGES/messages.po ./messages.po --output-file=../zh_CN/LC_MESSAGES/messages.po
-msgmerge ../ru_RU/LC_MESSAGES/messages.po ./messages.po --output-file=../ru_RU/LC_MESSAGES/messages.po
-msgmerge ../is_IS/LC_MESSAGES/messages.po ./messages.po --output-file=../is_IS/LC_MESSAGES/messages.po
+msgmerge -N ../de_DE/LC_MESSAGES/messages.po ./messages.po --output-file=../de_DE/LC_MESSAGES/messages.po
+msgmerge -N ../es_ES/LC_MESSAGES/messages.po ./messages.po --output-file=../es_ES/LC_MESSAGES/messages.po
+msgmerge -N ../en_GB/LC_MESSAGES/messages.po ./messages.po --output-file=../en_GB/LC_MESSAGES/messages.po
+msgmerge -N ../fr_FR/LC_MESSAGES/messages.po ./messages.po --output-file=../fr_FR/LC_MESSAGES/messages.po
+msgmerge -N ../it_IT/LC_MESSAGES/messages.po ./messages.po --output-file=../it_IT/LC_MESSAGES/messages.po
+msgmerge -N ../nl_NL/LC_MESSAGES/messages.po ./messages.po --output-file=../nl_NL/LC_MESSAGES/messages.po
+msgmerge -N ../tr_TR/LC_MESSAGES/messages.po ./messages.po --output-file=../tr_TR/LC_MESSAGES/messages.po
+msgmerge -N ../zh_CN/LC_MESSAGES/messages.po ./messages.po --output-file=../zh_CN/LC_MESSAGES/messages.po
+msgmerge -N ../ru_RU/LC_MESSAGES/messages.po ./messages.po --output-file=../ru_RU/LC_MESSAGES/messages.po
+msgmerge -N ../is_IS/LC_MESSAGES/messages.po ./messages.po --output-file=../is_IS/LC_MESSAGES/messages.po
diff --git a/locale/base/messages.po b/locale/base/messages.po
index 16ad575d..05b19ea8 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: 2007-01-01 20:33-0800\n"
+"POT-Creation-Date: 2007-01-22 19:07-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../play/index.php:64 ../../download/index.php:62
+#: ../../play/index.php:64 ../../download/index.php:61
 msgid "Session Expired: please log in again at"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:299 ../../lib/class/catalog.class.php:592
-#: ../../lib/class/album.class.php:325
+#: ../../lib/class/catalog.class.php:303 ../../lib/class/catalog.class.php:621
+#: ../../lib/class/album.class.php:328
 msgid "Error: Unable to open"
 msgstr ""
 
@@ -29,182 +29,187 @@ msgstr ""
 msgid "Error: Unable to change to directory"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:375
+#: ../../lib/class/catalog.class.php:374
 msgid "Error: Unable to get filesize for"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:412
+#: ../../lib/class/catalog.class.php:411
 msgid "is not readable by ampache"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:501
+#: ../../lib/class/catalog.class.php:530
 msgid "album's with art"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:772
+#: ../../lib/class/catalog.class.php:812
 msgid "Starting Catalog Build"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:776
+#: ../../lib/class/catalog.class.php:816
 msgid "Running Remote Sync"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:781 ../../lib/class/catalog.class.php:947
+#: ../../lib/class/catalog.class.php:821 ../../lib/class/catalog.class.php:992
 msgid "Found"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:781 ../../lib/class/catalog.class.php:804
-#: ../../lib/class/catalog.class.php:947 ../../lib/class/catalog.class.php:977
-#: ../../lib/preferences.php:269 ../../lib/preferences.php:319
-#: ../../lib/ui.lib.php:1186 ../../admin/catalog.php:259
+#: ../../lib/class/catalog.class.php:821 ../../lib/class/catalog.class.php:848
+#: ../../lib/class/catalog.class.php:992
+#: ../../lib/class/catalog.class.php:1025 ../../lib/preferences.php:269
+#: ../../lib/preferences.php:319 ../../lib/ui.lib.php:1194
+#: ../../admin/catalog.php:259
 msgid "None"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:796 ../../lib/class/catalog.class.php:965
+#: ../../lib/class/catalog.class.php:840
+#: ../../lib/class/catalog.class.php:1014
 msgid "Added Playlist From"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:803 ../../lib/class/catalog.class.php:976
-#: ../../admin/catalog.php:258
+#: ../../lib/class/catalog.class.php:847
+#: ../../lib/class/catalog.class.php:1024 ../../admin/catalog.php:258
 msgid "Starting Album Art Search"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:804 ../../lib/class/catalog.class.php:977
-#: ../../admin/catalog.php:259
+#: ../../lib/class/catalog.class.php:848
+#: ../../lib/class/catalog.class.php:1025 ../../admin/catalog.php:259
 msgid "Searched"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:814
+#: ../../lib/class/catalog.class.php:858
 msgid "Catalog Finished"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:814 ../../lib/class/catalog.class.php:997
+#: ../../lib/class/catalog.class.php:858
+#: ../../lib/class/catalog.class.php:1044
 msgid "Total Time"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:814 ../../lib/class/catalog.class.php:998
+#: ../../lib/class/catalog.class.php:858
+#: ../../lib/class/catalog.class.php:1045
 msgid "Total Songs"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:815 ../../lib/class/catalog.class.php:998
+#: ../../lib/class/catalog.class.php:859
+#: ../../lib/class/catalog.class.php:1045
 msgid "Songs Per Seconds"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:849
-#: ../../lib/class/catalog.class.php:1634
+#: ../../lib/class/catalog.class.php:894
+#: ../../lib/class/catalog.class.php:1565
 msgid "Updated"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:856
+#: ../../lib/class/catalog.class.php:901
 msgid "No Update Needed"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:938
+#: ../../lib/class/catalog.class.php:983
 msgid "Starting New Song Search on"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:938
+#: ../../lib/class/catalog.class.php:983
 msgid "catalog"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:942
+#: ../../lib/class/catalog.class.php:987
 msgid "Running Remote Update"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:997
+#: ../../lib/class/catalog.class.php:1044
 msgid "Catalog Update Finished"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1017
+#: ../../lib/class/catalog.class.php:1064
 msgid "Error"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1017
+#: ../../lib/class/catalog.class.php:1064
 msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Error connecting to"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Code"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Reason"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1076
+#: ../../lib/class/catalog.class.php:1123
 msgid "Completed updating remote catalog(s)"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1111
+#: ../../lib/class/catalog.class.php:1158
 msgid "Added"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1193
+#: ../../lib/class/catalog.class.php:1240
 msgid "Cleaning the"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1193
-#: ../../lib/class/catalog.class.php:1589 ../../templates/sidebar.inc.php:30
+#: ../../lib/class/catalog.class.php:1240
+#: ../../lib/class/catalog.class.php:1520 ../../templates/sidebar.inc.php:30
 #: ../../ampache/templates/sidebar.inc.php:30
 msgid "Catalog"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1194
+#: ../../lib/class/catalog.class.php:1241
 msgid "Checking"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1265
+#: ../../lib/class/catalog.class.php:1313
 msgid "Catalog Clean Done"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1265
+#: ../../lib/class/catalog.class.php:1313
 msgid "files removed"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1589
+#: ../../lib/class/catalog.class.php:1520
 msgid "Updating the"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1590
+#: ../../lib/class/catalog.class.php:1521
 msgid "songs found checking tag information."
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1591
+#: ../../lib/class/catalog.class.php:1522
 msgid "Verifed"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1643
+#: ../../lib/class/catalog.class.php:1574
 msgid " FOUND"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1645
+#: ../../lib/class/catalog.class.php:1576
 msgid "Searching for new Album Art"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1649
+#: ../../lib/class/catalog.class.php:1580
 msgid "Album Art Already Found"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 msgid "Update Finished."
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 msgid "Checked"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 msgid "songs updated."
 msgstr ""
 
-#: ../../lib/class/song.class.php:360
+#: ../../lib/class/song.class.php:361
 #: ../../templates/show_duplicates.inc.php:35
 #: ../../templates/show_edit_song.inc.php:31
 #: ../../templates/show_disabled_songs.inc:26
@@ -212,53 +217,53 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
-#: ../../lib/class/song.class.php:360 ../../lib/class/song.class.php:364
-#: ../../lib/class/song.class.php:368 ../../lib/class/song.class.php:372
-#: ../../lib/class/song.class.php:376 ../../lib/class/song.class.php:380
-#: ../../lib/class/song.class.php:384 ../../lib/class/song.class.php:389
-#: ../../lib/class/song.class.php:394 ../../lib/class/song.class.php:398
-#: ../../lib/class/song.class.php:402 ../../lib/class/song.class.php:407
+#: ../../lib/class/song.class.php:361 ../../lib/class/song.class.php:365
+#: ../../lib/class/song.class.php:369 ../../lib/class/song.class.php:373
+#: ../../lib/class/song.class.php:377 ../../lib/class/song.class.php:381
+#: ../../lib/class/song.class.php:385 ../../lib/class/song.class.php:390
+#: ../../lib/class/song.class.php:395 ../../lib/class/song.class.php:399
+#: ../../lib/class/song.class.php:403 ../../lib/class/song.class.php:408
 msgid "updated to"
 msgstr ""
 
-#: ../../lib/class/song.class.php:364
+#: ../../lib/class/song.class.php:365
 #: ../../templates/show_list_duplicates.inc.php:35
 #: ../../templates/show_songs.inc:53
 msgid "Bitrate"
 msgstr ""
 
-#: ../../lib/class/song.class.php:368
+#: ../../lib/class/song.class.php:369
 msgid "Rate"
 msgstr ""
 
-#: ../../lib/class/song.class.php:372
+#: ../../lib/class/song.class.php:373
 msgid "Mode"
 msgstr ""
 
-#: ../../lib/class/song.class.php:376
+#: ../../lib/class/song.class.php:377
 #: ../../templates/show_tv_playlist.inc.php:46
 #: ../../templates/show_songs.inc:51
 msgid "Time"
 msgstr ""
 
-#: ../../lib/class/song.class.php:380
+#: ../../lib/class/song.class.php:381
 #: ../../templates/show_edit_song.inc.php:61
 #: ../../templates/show_localplay_playlist.inc.php:27
 #: ../../templates/show_songs.inc:45 ../../templates/show_songs.inc:50
 msgid "Track"
 msgstr ""
 
-#: ../../lib/class/song.class.php:384
+#: ../../lib/class/song.class.php:385
 msgid "Filesize"
 msgstr ""
 
-#: ../../lib/class/song.class.php:389
+#: ../../lib/class/song.class.php:390
 #: ../../templates/show_edit_song.inc.php:45
 #: ../../templates/show_get_albumart.inc.php:30
 #: ../../templates/show_play_selected.inc.php:60
 #: ../../templates/show_list_duplicates.inc.php:32
 #: ../../templates/show_recently_played.inc.php:32
-#: ../../templates/show_artists.inc:40 ../../templates/show_artists.inc:65
+#: ../../templates/show_artists.inc:40 ../../templates/show_artists.inc:71
 #: ../../templates/show_disabled_songs.inc:28
 #: ../../templates/show_songs.inc:48 ../../templates/show_albums.inc:41
 #: ../../templates/show_albums.inc:84
@@ -267,7 +272,7 @@ msgstr ""
 msgid "Artist"
 msgstr ""
 
-#: ../../lib/class/song.class.php:394
+#: ../../lib/class/song.class.php:395
 #: ../../templates/show_edit_song.inc.php:37
 #: ../../templates/show_get_albumart.inc.php:38
 #: ../../templates/show_play_selected.inc.php:59
@@ -279,7 +284,7 @@ msgstr ""
 msgid "Album"
 msgstr ""
 
-#: ../../lib/class/song.class.php:398
+#: ../../lib/class/song.class.php:399
 #: ../../templates/show_edit_song.inc.php:67
 #: ../../templates/show_play_selected.inc.php:61
 #: ../../templates/show_edit_album.inc.php:33
@@ -288,13 +293,13 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
-#: ../../lib/class/song.class.php:402 ../../templates/show_flag.inc.php:64
+#: ../../lib/class/song.class.php:403 ../../templates/show_flag.inc.php:64
 #: ../../templates/show_edit_song.inc.php:73
 #: ../../templates/show_search.inc:37
 msgid "Comment"
 msgstr ""
 
-#: ../../lib/class/song.class.php:407 ../../lib/ui.lib.php:843
+#: ../../lib/class/song.class.php:408 ../../lib/ui.lib.php:851
 #: ../../templates/sidebar.inc.php:36
 #: ../../templates/show_edit_song.inc.php:53
 #: ../../templates/show_genre.inc.php:29
@@ -309,33 +314,33 @@ msgstr ""
 msgid "Error: Name Identical"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:263
+#: ../../lib/class/flag.class.php:264
 msgid "Approved"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:264
+#: ../../lib/class/flag.class.php:265
 msgid "Pending"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:276 ../../templates/show_flag.inc.php:56
+#: ../../lib/class/flag.class.php:277 ../../templates/show_flag.inc.php:56
 #: ../../templates/show_playlists.inc.php:57
 #: ../../templates/show_admin_tools.inc.php:50
 msgid "Delete"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:279
+#: ../../lib/class/flag.class.php:280
 msgid "Re-Tag"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:282 ../../templates/show_flag.inc.php:58
+#: ../../lib/class/flag.class.php:283 ../../templates/show_flag.inc.php:58
 msgid "Re-encode"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:285 ../../templates/show_flag.inc.php:59
+#: ../../lib/class/flag.class.php:286 ../../templates/show_flag.inc.php:59
 msgid "Other"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:288 ../../lib/class/localplay.class.php:569
+#: ../../lib/class/flag.class.php:289 ../../lib/class/localplay.class.php:570
 #: ../../lib/general.lib.php:890
 #: ../../modules/localplay/icecast.controller.php:292
 #: ../../modules/localplay/mpd.controller.php:354
@@ -343,24 +348,24 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: ../../lib/class/localplay.class.php:560 ../../templates/show_tv.inc.php:81
+#: ../../lib/class/localplay.class.php:561 ../../templates/show_tv.inc.php:64
 #: ../../templates/show_now_playing.inc:32
 msgid "Now Playing"
 msgstr ""
 
-#: ../../lib/class/localplay.class.php:563
+#: ../../lib/class/localplay.class.php:564
 msgid "Stopped"
 msgstr ""
 
-#: ../../lib/class/localplay.class.php:566
+#: ../../lib/class/localplay.class.php:567
 msgid "Paused"
 msgstr ""
 
-#: ../../lib/class/album.class.php:162
+#: ../../lib/class/album.class.php:163
 msgid "Various"
 msgstr ""
 
-#: ../../lib/class/genre.class.php:284
+#: ../../lib/class/genre.class.php:285
 msgid "Show Genres starting with"
 msgstr ""
 
@@ -402,30 +407,30 @@ msgid "Disable"
 msgstr ""
 
 #: ../../lib/preferences.php:271 ../../templates/show_tv_adminctl.inc.php:41
-#: ../../templates/show_playtype_switch.inc.php:9
+#: ../../templates/show_playtype_switch.inc.php:30
 msgid "Stream"
 msgstr ""
 
 #: ../../lib/preferences.php:274 ../../templates/show_tv_adminctl.inc.php:42
-#: ../../templates/show_playtype_switch.inc.php:13
+#: ../../templates/show_playtype_switch.inc.php:34
 msgid "Downsample"
 msgstr ""
 
 #: ../../lib/preferences.php:277
-#: ../../templates/show_playtype_switch.inc.php:15
+#: ../../templates/show_playtype_switch.inc.php:36
 msgid "Democratic"
 msgstr ""
 
-#: ../../lib/preferences.php:280 ../../templates/sidebar.inc.php:170
+#: ../../lib/preferences.php:280 ../../templates/sidebar.inc.php:168
 #: ../../templates/show_tv_adminctl.inc.php:40
 #: ../../templates/show_localplay.inc.php:26
-#: ../../templates/show_playtype_switch.inc.php:11
+#: ../../templates/show_playtype_switch.inc.php:32
 #: ../../ampache/templates/sidebar.inc.php:170
 msgid "Localplay"
 msgstr ""
 
 #: ../../lib/preferences.php:282
-#: ../../templates/show_playtype_switch.inc.php:17
+#: ../../templates/show_playtype_switch.inc.php:38
 msgid "XSPF Player"
 msgstr ""
 
@@ -469,11 +474,11 @@ msgstr ""
 msgid "No songs in this playlist."
 msgstr ""
 
-#: ../../lib/playlist.lib.php:191 ../../lib/ui.lib.php:892
-#: ../../templates/sidebar.inc.php:150
+#: ../../lib/playlist.lib.php:191 ../../lib/ui.lib.php:900
+#: ../../templates/sidebar.inc.php:148
 #: ../../templates/show_admin_tools.inc.php:48
 #: ../../ampache/templates/sidebar.inc.php:150
-#: ../../templates/show_artists.inc:55 ../../templates/show_random_play.inc:40
+#: ../../templates/show_random_play.inc:40
 #: ../../templates/show_add_access.inc:59
 #: ../../templates/show_edit_access.inc:69
 msgid "All"
@@ -487,7 +492,7 @@ msgstr ""
 msgid "Error Access Denied"
 msgstr ""
 
-#: ../../lib/ui.lib.php:194 ../../templates/sidebar.inc.php:89
+#: ../../lib/ui.lib.php:194 ../../templates/sidebar.inc.php:87
 #: ../../ampache/templates/sidebar.inc.php:89
 msgid "Browse"
 msgstr ""
@@ -500,134 +505,128 @@ msgstr ""
 msgid "Show all"
 msgstr ""
 
-#: ../../lib/ui.lib.php:538 ../../admin/mail.php:80
+#: ../../lib/ui.lib.php:539 ../../admin/mail.php:81
 msgid "No Catalogs Found!"
 msgstr ""
 
-#: ../../lib/ui.lib.php:539 ../../admin/mail.php:81
-#: ../../templates/show_admin_tools.inc.php:67
+#: ../../lib/ui.lib.php:540 ../../admin/mail.php:82
+#: ../../templates/show_admin_tools.inc.php:75
 #: ../../templates/show_add_catalog.inc.php:28
 msgid "Add a Catalog"
 msgstr ""
 
-#: ../../lib/ui.lib.php:540 ../../admin/mail.php:82
-#: ../../templates/show_mail_users.inc.php:41
-#: ../../templates/show_local_catalog_info.inc.php:23
-msgid "Catalog Statistics"
-msgstr ""
-
-#: ../../lib/ui.lib.php:576 ../../admin/mail.php:119
+#: ../../lib/ui.lib.php:578 ../../admin/mail.php:120
 msgid "day"
 msgstr ""
 
-#: ../../lib/ui.lib.php:576 ../../admin/mail.php:119
+#: ../../lib/ui.lib.php:578 ../../admin/mail.php:120
 msgid "days"
 msgstr ""
 
-#: ../../lib/ui.lib.php:578 ../../admin/mail.php:121
+#: ../../lib/ui.lib.php:580 ../../admin/mail.php:122
 msgid "hour"
 msgstr ""
 
-#: ../../lib/ui.lib.php:578 ../../admin/mail.php:121
+#: ../../lib/ui.lib.php:580 ../../admin/mail.php:122
 msgid "hours"
 msgstr ""
 
-#: ../../lib/ui.lib.php:782 ../../templates/show_tv.inc.php:58
-#: ../../templates/sidebar.inc.php:50
+#: ../../lib/ui.lib.php:790 ../../templates/sidebar.inc.php:48
 #: ../../ampache/templates/sidebar.inc.php:50
 msgid "Home"
 msgstr ""
 
-#: ../../lib/ui.lib.php:785
+#: ../../lib/ui.lib.php:793
 msgid "Upload"
 msgstr ""
 
-#: ../../lib/ui.lib.php:788
+#: ../../lib/ui.lib.php:796
 msgid "Local Play"
 msgstr ""
 
-#: ../../lib/ui.lib.php:791
+#: ../../lib/ui.lib.php:799
 msgid "Random Play"
 msgstr ""
 
-#: ../../lib/ui.lib.php:794 ../../templates/show_play_selected.inc.php:47
+#: ../../lib/ui.lib.php:802 ../../templates/show_play_selected.inc.php:47
 msgid "Playlist"
 msgstr ""
 
-#: ../../lib/ui.lib.php:797 ../../templates/show_duplicates.inc.php:51
-#: ../../templates/sidebar.inc.php:118 ../../templates/sidebar.inc.php:124
+#: ../../lib/ui.lib.php:805 ../../templates/show_duplicates.inc.php:51
+#: ../../templates/sidebar.inc.php:116 ../../templates/sidebar.inc.php:122
 #: ../../ampache/templates/sidebar.inc.php:118
 #: ../../ampache/templates/sidebar.inc.php:124
 #: ../../templates/show_search_bar.inc:31 ../../templates/show_search.inc:133
 msgid "Search"
 msgstr ""
 
-#: ../../lib/ui.lib.php:800 ../../templates/sidebar.inc.php:81
+#: ../../lib/ui.lib.php:808 ../../templates/sidebar.inc.php:79
 #: ../../ampache/templates/sidebar.inc.php:81
 msgid "Preferences"
 msgstr ""
 
-#: ../../lib/ui.lib.php:803 ../../lib/ui.lib.php:807
+#: ../../lib/ui.lib.php:811 ../../lib/ui.lib.php:815
 msgid "Admin-Catalog"
 msgstr ""
 
-#: ../../lib/ui.lib.php:811
+#: ../../lib/ui.lib.php:819
 msgid "Admin-User Management"
 msgstr ""
 
-#: ../../lib/ui.lib.php:815
+#: ../../lib/ui.lib.php:823
 msgid "Admin-Mail Users"
 msgstr ""
 
-#: ../../lib/ui.lib.php:819
+#: ../../lib/ui.lib.php:827
 msgid "Admin-Manage Access Lists"
 msgstr ""
 
-#: ../../lib/ui.lib.php:823
+#: ../../lib/ui.lib.php:831
 msgid "Admin-Site Preferences"
 msgstr ""
 
-#: ../../lib/ui.lib.php:827
+#: ../../lib/ui.lib.php:835
 msgid "Admin-Manage Modules"
 msgstr ""
 
-#: ../../lib/ui.lib.php:831
+#: ../../lib/ui.lib.php:839
 msgid "Browse Music"
 msgstr ""
 
-#: ../../lib/ui.lib.php:835 ../../admin/mail.php:133
-#: ../../templates/sidebar.inc.php:34 ../../templates/sidebar.inc.php:158
+#: ../../lib/ui.lib.php:843 ../../admin/mail.php:134
+#: ../../templates/sidebar.inc.php:34 ../../templates/sidebar.inc.php:156
 #: ../../templates/show_genre.inc.php:32
-#: ../../templates/show_local_catalog_info.inc.php:34
+#: ../../templates/show_local_catalog_info.inc.php:28
 #: ../../ampache/templates/sidebar.inc.php:34
 #: ../../ampache/templates/sidebar.inc.php:158
-#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:68
+#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:74
 msgid "Albums"
 msgstr ""
 
-#: ../../lib/ui.lib.php:839 ../../admin/mail.php:134
-#: ../../templates/sidebar.inc.php:35 ../../templates/sidebar.inc.php:157
+#: ../../lib/ui.lib.php:847 ../../admin/mail.php:135
+#: ../../templates/sidebar.inc.php:35 ../../templates/sidebar.inc.php:155
 #: ../../templates/show_genre.inc.php:35
-#: ../../templates/show_local_catalog_info.inc.php:38
+#: ../../templates/show_local_catalog_info.inc.php:29
 #: ../../ampache/templates/sidebar.inc.php:35
 #: ../../ampache/templates/sidebar.inc.php:157
 msgid "Artists"
 msgstr ""
 
-#: ../../lib/ui.lib.php:847 ../../templates/sidebar.inc.php:112
+#: ../../lib/ui.lib.php:855 ../../templates/sidebar.inc.php:110
 #: ../../ampache/templates/sidebar.inc.php:112
 msgid "Statistics"
 msgstr ""
 
-#: ../../lib/ui.lib.php:1421
+#: ../../lib/ui.lib.php:1429
 msgid "Manage Users"
 msgstr ""
 
-#: ../../lib/ui.lib.php:1422
+#: ../../lib/ui.lib.php:1430
 msgid "Add a new user"
 msgstr ""
 
-#: ../../lib/general.lib.php:670 ../../templates/show_user_stats.inc.php:32
+#: ../../lib/general.lib.php:670 ../../templates/show_box.inc.php:30
+#: ../../templates/show_user_stats.inc.php:32
 #: ../../templates/show_user_stats.inc.php:43
 #: ../../templates/show_user_stats.inc.php:54
 #: ../../templates/show_user_recommendations.inc.php:32
@@ -749,7 +748,7 @@ msgstr ""
 msgid "Do you really want to clear the statistics for this catalog?"
 msgstr ""
 
-#: ../../admin/catalog.php:230 ../../templates/show_admin_tools.inc.php:68
+#: ../../admin/catalog.php:230 ../../templates/show_admin_tools.inc.php:76
 msgid "Clear Catalog Stats"
 msgstr ""
 
@@ -797,27 +796,31 @@ msgstr ""
 msgid "Flag Removed from"
 msgstr ""
 
-#: ../../admin/flag.php:274
+#: ../../admin/flag.php:270
+msgid "Flags Updated"
+msgstr ""
+
+#: ../../admin/flag.php:289
 msgid "Songs Disabled"
 msgstr ""
 
-#: ../../admin/flag.php:274
+#: ../../admin/flag.php:289
 msgid "The requested song(s) have been disabled"
 msgstr ""
 
-#: ../../admin/flag.php:285
+#: ../../admin/flag.php:300
 msgid "Songs Enabled"
 msgstr ""
 
-#: ../../admin/flag.php:285
+#: ../../admin/flag.php:300
 msgid "The requested song(s) have been enabled"
 msgstr ""
 
-#: ../../admin/flag.php:290
+#: ../../admin/flag.php:305
 msgid "Flagged Records"
 msgstr ""
 
-#: ../../admin/preferences.php:59 ../../admin/preferences.php:82
+#: ../../admin/preferences.php:60 ../../admin/preferences.php:83
 msgid "Site"
 msgstr ""
 
@@ -861,66 +864,71 @@ msgstr ""
 msgid "Error Passwords don't match"
 msgstr ""
 
-#: ../../admin/users.php:117 ../../register.php:138
+#: ../../admin/users.php:120 ../../register.php:138
 msgid "Error Username already exists"
 msgstr ""
 
-#: ../../admin/users.php:139
+#: ../../admin/users.php:142
 msgid "Deletion Request"
 msgstr ""
 
-#: ../../admin/users.php:140
+#: ../../admin/users.php:143
 msgid "Are you sure you want to permanently delete"
 msgstr ""
 
-#: ../../admin/users.php:145 ../../templates/show_confirm_action.inc.php:29
+#: ../../admin/users.php:148 ../../templates/show_confirm_action.inc.php:29
 #: ../../templates/show_search.inc:78
 msgid "No"
 msgstr ""
 
-#: ../../admin/users.php:147
+#: ../../admin/users.php:150
 msgid "User Deleted"
 msgstr ""
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:153
 msgid "Delete Error"
 msgstr ""
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:153
 msgid "Unable to delete last Admin User"
 msgstr ""
 
-#: ../../admin/mail.php:131 ../../templates/show_local_catalog_info.inc.php:26
+#: ../../admin/mail.php:83 ../../templates/show_mail_users.inc.php:41
+#: ../../templates/show_local_catalog_info.inc.php:23
+msgid "Catalog Statistics"
+msgstr ""
+
+#: ../../admin/mail.php:132 ../../templates/show_local_catalog_info.inc.php:27
 msgid "Total Users"
 msgstr ""
 
-#: ../../admin/mail.php:132 ../../templates/show_local_catalog_info.inc.php:30
+#: ../../admin/mail.php:133 ../../templates/show_local_catalog_info.inc.php:26
 msgid "Connected Users"
 msgstr ""
 
-#: ../../admin/mail.php:135 ../../templates/sidebar.inc.php:155
+#: ../../admin/mail.php:136 ../../templates/sidebar.inc.php:153
 #: ../../templates/show_genre.inc.php:38
-#: ../../templates/show_local_catalog_info.inc.php:42
+#: ../../templates/show_local_catalog_info.inc.php:30
 #: ../../templates/show_genres.inc.php:37
 #: ../../ampache/templates/sidebar.inc.php:155
-#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:67
+#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:73
 #: ../../templates/show_albums.inc:43 ../../templates/show_albums.inc:86
 msgid "Songs"
 msgstr ""
 
-#: ../../admin/mail.php:136 ../../templates/show_local_catalog_info.inc.php:46
+#: ../../admin/mail.php:137 ../../templates/show_local_catalog_info.inc.php:31
 msgid "Catalog Size"
 msgstr ""
 
-#: ../../admin/mail.php:137 ../../templates/show_local_catalog_info.inc.php:50
+#: ../../admin/mail.php:138 ../../templates/show_local_catalog_info.inc.php:32
 msgid "Catalog Time"
 msgstr ""
 
-#: ../../admin/mail.php:219
+#: ../../admin/mail.php:252
 msgid "E-mail Sent"
 msgstr ""
 
-#: ../../admin/mail.php:220
+#: ../../admin/mail.php:253
 msgid "Your E-mail was successfully sent."
 msgstr ""
 
@@ -974,21 +982,21 @@ msgid "Incorrect Tags"
 msgstr ""
 
 #: ../../templates/show_flag.inc.php:70
-#: ../../templates/show_flagged.inc.php:27
+#: ../../templates/show_flagged.inc.php:30
 msgid "Flag"
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:36
-#: ../../templates/show_install_lang.inc.php:10
+#: ../../templates/show_install_lang.inc.php:32
 #: ../../templates/show_install_config.inc:36
-#: ../../templates/show_install.inc:10
+#: ../../templates/show_install.inc:32
 msgid "Ampache Installation"
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:43
-#: ../../templates/show_install_lang.inc.php:17
+#: ../../templates/show_install_lang.inc.php:39
 #: ../../templates/show_install_config.inc:42
-#: ../../templates/show_install.inc:18
+#: ../../templates/show_install.inc:40
 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 "
@@ -996,9 +1004,9 @@ msgid ""
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:46
-#: ../../templates/show_install_lang.inc.php:20
+#: ../../templates/show_install_lang.inc.php:42
 #: ../../templates/show_install_config.inc:45
-#: ../../templates/show_install.inc:21
+#: ../../templates/show_install.inc:43
 msgid ""
 "A MySQL Server with a username and password that can create/modify databases"
 msgstr ""
@@ -1010,9 +1018,9 @@ msgid ""
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:49
-#: ../../templates/show_install_lang.inc.php:24
+#: ../../templates/show_install_lang.inc.php:46
 #: ../../templates/show_install_config.inc:48
-#: ../../templates/show_install.inc:25
+#: ../../templates/show_install.inc:47
 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 "
@@ -1022,7 +1030,7 @@ msgstr ""
 
 #: ../../templates/show_install_account.inc.php:53
 #: ../../templates/show_install_config.inc:52
-#: ../../templates/show_install.inc:30
+#: ../../templates/show_install.inc:52
 msgid "Step 1 - Creating and Inserting the Ampache Database"
 msgstr ""
 
@@ -1032,7 +1040,7 @@ msgstr ""
 
 #: ../../templates/show_install_account.inc.php:55
 #: ../../templates/show_install_config.inc:57
-#: ../../templates/show_install.inc:35
+#: ../../templates/show_install.inc:57
 msgid "Step 3 - Setup Initial Account"
 msgstr ""
 
@@ -1047,7 +1055,7 @@ msgid "Create Admin Account"
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:65
-#: ../../templates/show_user_registration.inc.php:99
+#: ../../templates/show_user_registration.inc.php:98
 #: ../../templates/show_edit_user.inc.php:40
 #: ../../templates/show_recently_played.inc.php:29
 #: ../../templates/show_users.inc:43
@@ -1055,7 +1063,7 @@ msgid "Username"
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:69
-#: ../../templates/show_user_registration.inc.php:127
+#: ../../templates/show_user_registration.inc.php:126
 #: ../../templates/show_edit_user.inc.php:63
 #: ../../templates/show_login_form.inc:37
 msgid "Password"
@@ -1066,7 +1074,7 @@ msgid "Create Account"
 msgstr ""
 
 #: ../../templates/show_playlists.inc.php:28
-#: ../../templates/sidebar.inc.php:106
+#: ../../templates/sidebar.inc.php:104
 #: ../../ampache/templates/sidebar.inc.php:106
 msgid "Playlists"
 msgstr ""
@@ -1098,22 +1106,20 @@ msgstr ""
 
 #: ../../templates/show_playlists.inc.php:55
 #: ../../templates/show_play_selected.inc.php:50
-#: ../../templates/show_artists.inc:58 ../../templates/show_access_list.inc:67
+#: ../../templates/show_access_list.inc:67
 msgid "Edit"
 msgstr ""
 
 #: ../../templates/show_playlists.inc.php:61
 #: ../../templates/show_tv_adminctl.inc.php:44
-#: ../../templates/show_genres.inc.php:47 ../../templates/show_artists.inc:54
 #: ../../templates/show_random_play.inc:82
 msgid "Play"
 msgstr ""
 
 #: ../../templates/show_playlists.inc.php:63
-#: ../../templates/sidebar.inc.php:135
+#: ../../templates/sidebar.inc.php:133
 #: ../../templates/show_localplay_status.inc.php:62
 #: ../../ampache/templates/sidebar.inc.php:135
-#: ../../templates/show_artists.inc:56
 msgid "Random"
 msgstr ""
 
@@ -1151,11 +1157,11 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: ../../templates/show_tv.inc.php:56
+#: ../../templates/show_tv.inc.php:42
 msgid "Controls"
 msgstr ""
 
-#: ../../templates/show_tv.inc.php:74
+#: ../../templates/show_tv.inc.php:57
 #: ../../templates/show_localplay.inc.php:42
 msgid "Current Playlist"
 msgstr ""
@@ -1181,7 +1187,7 @@ msgstr ""
 
 #: ../../templates/show_playlist_edit.inc.php:36
 #: ../../templates/show_add_playlist.inc.php:32
-#: ../../templates/show_random_play.inc:50
+#: ../../templates/show_random_play.inc:49
 #: ../../templates/show_access_list.inc:51
 msgid "Type"
 msgstr ""
@@ -1196,6 +1202,7 @@ msgstr ""
 
 #: ../../templates/show_playlist_edit.inc.php:48
 #: ../../templates/show_tv_adminctl.inc.php:51
+#: ../../templates/show_flagged.inc.php:66
 #: ../../templates/show_play_selected.inc.php:64
 #: ../../templates/show_preference_admin.inc.php:47
 #: ../../templates/show_edit_access.inc:78
@@ -1227,41 +1234,36 @@ msgstr ""
 msgid "Song Title"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:38
-#: ../../ampache/templates/sidebar.inc.php:38
-msgid "Lists"
-msgstr ""
-
-#: ../../templates/sidebar.inc.php:62
+#: ../../templates/sidebar.inc.php:60
 #: ../../templates/show_tv_playlist.inc.php:48
 #: ../../templates/show_preference_admin.inc.php:39
 #: ../../ampache/templates/sidebar.inc.php:62
 msgid "Admin"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:156
+#: ../../templates/sidebar.inc.php:154
 #: ../../ampache/templates/sidebar.inc.php:156
 #: ../../templates/show_random_play.inc:56
 msgid "Minutes"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:159
+#: ../../templates/sidebar.inc.php:157
 #: ../../ampache/templates/sidebar.inc.php:159
 #: ../../templates/show_random_play.inc:53
 msgid "Less Played"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:164
+#: ../../templates/sidebar.inc.php:162
 #: ../../ampache/templates/sidebar.inc.php:164
 msgid "Enqueue"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:187
+#: ../../templates/sidebar.inc.php:185
 #: ../../ampache/templates/sidebar.inc.php:187
 msgid "Democratic View"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:191
+#: ../../templates/sidebar.inc.php:189
 #: ../../ampache/templates/sidebar.inc.php:191
 msgid "Logout"
 msgstr ""
@@ -1275,9 +1277,9 @@ msgstr ""
 #: ../../templates/show_modules.inc.php:42
 #: ../../templates/show_modules.inc.php:75
 #: ../../templates/show_genres.inc.php:38
-#: ../../templates/show_flagged.inc.php:29
+#: ../../templates/show_flagged.inc.php:32
 #: ../../templates/show_localplay_playlist.inc.php:29
-#: ../../templates/show_artists.inc:44 ../../templates/show_artists.inc:69
+#: ../../templates/show_artists.inc:44 ../../templates/show_artists.inc:75
 #: ../../templates/show_songs.inc:55 ../../templates/show_albums.inc:47
 #: ../../templates/show_albums.inc:90 ../../templates/show_access_list.inc:52
 #: ../../templates/show_artist.inc:39
@@ -1296,56 +1298,64 @@ msgstr ""
 msgid "Clean"
 msgstr ""
 
+#: ../../templates/show_admin_tools.inc.php:56
+msgid "Fast"
+msgstr ""
+
 #: ../../templates/show_admin_tools.inc.php:57
+msgid "Gather Art"
+msgstr ""
+
+#: ../../templates/show_admin_tools.inc.php:65
 msgid "No Catalogs Found"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:63
+#: ../../templates/show_admin_tools.inc.php:71
 msgid "Clean All"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:64
+#: ../../templates/show_admin_tools.inc.php:72
 msgid "Verify All"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:65
+#: ../../templates/show_admin_tools.inc.php:73
 msgid "Add to All"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:66
+#: ../../templates/show_admin_tools.inc.php:74
 msgid "Update All"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:69
+#: ../../templates/show_admin_tools.inc.php:77
 #: ../../templates/show_add_catalog.inc.php:78
 msgid "Gather Album Art"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:73
+#: ../../templates/show_admin_tools.inc.php:81
 msgid "Other Tools"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:75
+#: ../../templates/show_admin_tools.inc.php:83
 msgid "Show Duplicate Songs"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:76
+#: ../../templates/show_admin_tools.inc.php:84
 msgid "Clear Now Playing"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:78
+#: ../../templates/show_admin_tools.inc.php:85 ../../templates/header.inc:75
 msgid "Generate New Config"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:79
+#: ../../templates/show_admin_tools.inc.php:86
 msgid "Preferences Permissions"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:81
+#: ../../templates/show_admin_tools.inc.php:87
 msgid "Export To Itunes DB"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:82
+#: ../../templates/show_admin_tools.inc.php:88
 msgid "Check for New Version"
 msgstr ""
 
@@ -1379,7 +1389,7 @@ msgid "Find duplicate artists"
 msgstr ""
 
 #: ../../templates/show_user.inc.php:30
-#: ../../templates/show_user_registration.inc.php:118
+#: ../../templates/show_user_registration.inc.php:117
 #: ../../templates/show_edit_user.inc.php:55
 msgid "E-mail"
 msgstr ""
@@ -1393,7 +1403,7 @@ msgid "New Password"
 msgstr ""
 
 #: ../../templates/show_user.inc.php:49
-#: ../../templates/show_user_registration.inc.php:136
+#: ../../templates/show_user_registration.inc.php:135
 #: ../../templates/show_edit_user.inc.php:72
 msgid "Confirm Password"
 msgstr ""
@@ -1453,49 +1463,49 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:55
+#: ../../templates/show_user_registration.inc.php:54
 msgid "Ampache New User Registration"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:70
+#: ../../templates/show_user_registration.inc.php:69
 msgid "User Agreement"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:80
+#: ../../templates/show_user_registration.inc.php:79
 msgid "I Accept"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:94
+#: ../../templates/show_user_registration.inc.php:93
 msgid "User Information"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:109
+#: ../../templates/show_user_registration.inc.php:108
 #: ../../templates/show_edit_user.inc.php:48
 msgid "Full Name"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:156
+#: ../../templates/show_user_registration.inc.php:155
 msgid "Clear Info"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:157
+#: ../../templates/show_user_registration.inc.php:156
 msgid "Register User"
 msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:15
-#: ../../templates/show_install.inc:16
+#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install.inc:38
 msgid "Requirements"
 msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:21
+#: ../../templates/show_install_lang.inc.php:43
 #: ../../templates/show_install_config.inc:46
-#: ../../templates/show_install.inc:22
+#: ../../templates/show_install.inc:44
 msgid ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
 "ampache.cfg.php.dist file"
 msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:50
+#: ../../templates/show_install_lang.inc.php:72
 msgid "Start configuration"
 msgstr ""
 
@@ -1520,7 +1530,7 @@ msgstr ""
 
 #: ../../templates/show_modules.inc.php:61
 #: ../../templates/show_modules.inc.php:96
-#: ../../templates/show_flagged.inc.php:50
+#: ../../templates/show_flagged.inc.php:57
 #: ../../templates/show_list_duplicates.inc.php:81
 #: ../../templates/show_localplay_playlist.inc.php:51
 #: ../../templates/show_disabled_songs.inc:44
@@ -1593,7 +1603,7 @@ msgid "Mail to"
 msgstr ""
 
 #: ../../templates/show_mail_users.inc.php:45
-#: ../../templates/show_all_popular.inc.php:30 ../../index.php:66
+#: ../../templates/show_all_popular.inc.php:29
 msgid "Most Popular Albums"
 msgstr ""
 
@@ -1602,7 +1612,7 @@ msgid "Latest Artist Additions"
 msgstr ""
 
 #: ../../templates/show_mail_users.inc.php:56
-#: ../../templates/show_all_popular.inc.php:27 ../../index.php:75
+#: ../../templates/show_all_popular.inc.php:26
 msgid "Most Popular Artists"
 msgstr ""
 
@@ -1611,36 +1621,41 @@ msgid "Latest Album Additions"
 msgstr ""
 
 #: ../../templates/show_mail_users.inc.php:67
-#: ../../templates/show_all_popular.inc.php:40
+#: ../../templates/show_all_popular.inc.php:38
 msgid "Most Popular Songs"
 msgstr ""
 
 #: ../../templates/show_mail_users.inc.php:73
+msgid "Flagged Songs"
+msgstr ""
+
+#: ../../templates/show_mail_users.inc.php:77
+#: ../../templates/show_admin_info.inc.php:36
+msgid "Disabled Songs"
+msgstr ""
+
+#: ../../templates/show_mail_users.inc.php:85
 msgid "Most Popular Threshold in days"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:84
+#: ../../templates/show_mail_users.inc.php:96
 msgid "Subject"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:91
+#: ../../templates/show_mail_users.inc.php:103
 msgid "Message"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:101
+#: ../../templates/show_mail_users.inc.php:113
 msgid "Send Mail"
 msgstr ""
 
-#: ../../templates/show_admin_info.inc.php:33
+#: ../../templates/show_admin_info.inc.php:32
 msgid "Last Ten Flagged Records"
 msgstr ""
 
-#: ../../templates/show_admin_info.inc.php:37
-msgid "Disabled Songs"
-msgstr ""
-
-#: ../../templates/show_admin_info.inc.php:41
-#: ../../templates/show_flagged.inc.php:57
+#: ../../templates/show_admin_info.inc.php:40
+#: ../../templates/show_flagged.inc.php:73
 #: ../../templates/show_ip_history.inc.php:28
 msgid "Show All"
 msgstr ""
@@ -1672,24 +1687,38 @@ msgid "Continue"
 msgstr ""
 
 #: ../../templates/show_confirmation.inc.php:28
-#: ../../templates/show_preferences.inc:95
+#: ../../templates/show_preferences.inc:96
 #: ../../templates/show_similar_artists.inc:74
 msgid "Cancel"
 msgstr ""
 
-#: ../../templates/show_flagged.inc.php:26
-msgid "Object"
+#: ../../templates/show_flagged.inc.php:27
+#: ../../templates/show_disabled_songs.inc:25
+#: ../../templates/show_artist.inc:33
+msgid "Select"
 msgstr ""
 
 #: ../../templates/show_flagged.inc.php:28
+msgid "Object"
+msgstr ""
+
+#: ../../templates/show_flagged.inc.php:29
+#: ../../templates/show_preference_admin.inc.php:38
+#: ../../templates/show_add_access.inc:47
+#: ../../templates/show_access_list.inc:49
+#: ../../templates/show_edit_access.inc:47
+msgid "User"
+msgstr ""
+
+#: ../../templates/show_flagged.inc.php:31
 msgid "Status"
 msgstr ""
 
-#: ../../templates/show_flagged.inc.php:39
+#: ../../templates/show_flagged.inc.php:63
 msgid "Reject"
 msgstr ""
 
-#: ../../templates/show_flagged.inc.php:43
+#: ../../templates/show_flagged.inc.php:64
 msgid "Approve"
 msgstr ""
 
@@ -1706,14 +1735,18 @@ msgstr ""
 msgid "Update id3 tags"
 msgstr ""
 
-#: ../../templates/show_all_recent.inc.php:27
+#: ../../templates/show_all_recent.inc.php:25
 msgid "Newest Artist Additions"
 msgstr ""
 
-#: ../../templates/show_all_recent.inc.php:30 ../../index.php:82
+#: ../../templates/show_all_recent.inc.php:28
 msgid "Newest Album Additions"
 msgstr ""
 
+#: ../../templates/show_all_recent.inc.php:31
+msgid "Newest Live Stream Additions"
+msgstr ""
+
 #: ../../templates/show_get_albumart.inc.php:23
 msgid "Customize Search"
 msgstr ""
@@ -1766,10 +1799,18 @@ msgstr ""
 msgid "Delete Empty Playlists"
 msgstr ""
 
-#: ../../templates/show_all_popular.inc.php:37
+#: ../../templates/show_all_popular.inc.php:32
 msgid "Most Popular Genres"
 msgstr ""
 
+#: ../../templates/show_all_popular.inc.php:41
+msgid "Most Popular Live Streams"
+msgstr ""
+
+#: ../../templates/show_all_popular.inc.php:44
+msgid "Most Popular Tags"
+msgstr ""
+
 #: ../../templates/show_play_selected.inc.php:28
 msgid "Play Selected"
 msgstr ""
@@ -1910,22 +1951,10 @@ msgid "Filename Pattern"
 msgstr ""
 
 #: ../../templates/show_add_catalog.inc.php:82
-msgid "ID3V2 Tags"
-msgstr ""
-
-#: ../../templates/show_add_catalog.inc.php:86
-msgid "Amazon"
-msgstr ""
-
-#: ../../templates/show_add_catalog.inc.php:90
-msgid "File Folder"
-msgstr ""
-
-#: ../../templates/show_add_catalog.inc.php:98
 msgid "Build Playlists from m3u Files"
 msgstr ""
 
-#: ../../templates/show_add_catalog.inc.php:106
+#: ../../templates/show_add_catalog.inc.php:90
 msgid "Add Catalog"
 msgstr ""
 
@@ -1987,7 +2016,7 @@ msgid "Recommendations"
 msgstr ""
 
 #: ../../templates/show_user_recommendations.inc.php:29
-msgid "Recommended Aritsts"
+msgid "Recommended Artists"
 msgstr ""
 
 #: ../../templates/show_user_recommendations.inc.php:40
@@ -2013,13 +2042,6 @@ msgstr ""
 msgid "Guest"
 msgstr ""
 
-#: ../../templates/show_preference_admin.inc.php:38
-#: ../../templates/show_add_access.inc:47
-#: ../../templates/show_access_list.inc:49
-#: ../../templates/show_edit_access.inc:47
-msgid "User"
-msgstr ""
-
 #: ../../templates/show_edit_album.inc.php:23
 msgid "Edit Album"
 msgstr ""
@@ -2061,10 +2083,18 @@ msgstr ""
 msgid "Recently Played"
 msgstr ""
 
+#: ../../templates/show_recently_played.inc.php:33
+msgid "Last Played"
+msgstr ""
+
 #: ../../templates/show_edit_artist.inc.php:23
 msgid "Edit Artist"
 msgstr ""
 
+#: ../../templates/show_random_albums.inc.php:23
+msgid "Albums of the Moment"
+msgstr ""
+
 #: ../../localplay.php:50 ../../localplay.php:58
 msgid "Song(s) Removed from Playlist"
 msgstr ""
@@ -2073,7 +2103,7 @@ msgstr ""
 msgid "Localplay Init Failed"
 msgstr ""
 
-#: ../../browse.php:48 ../../albums.php:191
+#: ../../browse.php:48 ../../albums.php:213
 msgid "Show Albums starting with"
 msgstr ""
 
@@ -2081,7 +2111,7 @@ msgstr ""
 msgid "Show Artists starting with"
 msgstr ""
 
-#: ../../browse.php:123
+#: ../../browse.php:124
 msgid "Show Titles Starting With"
 msgstr ""
 
@@ -2089,6 +2119,10 @@ msgstr ""
 msgid "Error: No Keyword Entered"
 msgstr ""
 
+#: ../../ampache/templates/sidebar.inc.php:38
+msgid "Lists"
+msgstr ""
+
 #: ../../ratings.php:33
 msgid "Rating Updated"
 msgstr ""
@@ -2109,7 +2143,7 @@ msgstr ""
 msgid "No local account found"
 msgstr ""
 
-#: ../../login.php:177
+#: ../../login.php:176
 msgid "Message of the Day"
 msgstr ""
 
@@ -2125,35 +2159,35 @@ msgstr ""
 msgid "Ampache Update"
 msgstr ""
 
-#: ../../tv.php:61
+#: ../../tv.php:62
 msgid "Playlist Cleared"
 msgstr ""
 
-#: ../../artists.php:91 ../../albums.php:169
+#: ../../artists.php:91 ../../albums.php:191
 msgid "Starting Update from Tags"
 msgstr ""
 
-#: ../../artists.php:96 ../../albums.php:174
+#: ../../artists.php:96 ../../albums.php:196
 msgid "Update From Tags Complete"
 msgstr ""
 
-#: ../../artists.php:97 ../../albums.php:175
+#: ../../artists.php:97 ../../albums.php:197
 msgid "Return"
 msgstr ""
 
-#: ../../activate.php:44
+#: ../../activate.php:43
 msgid "No user with this name registered"
 msgstr ""
 
-#: ../../activate.php:48
+#: ../../activate.php:47
 msgid "The validation key used isn't correct."
 msgstr ""
 
-#: ../../activate.php:53
+#: ../../activate.php:52
 msgid "User activated"
 msgstr ""
 
-#: ../../activate.php:53
+#: ../../activate.php:52
 msgid "This User ID is activated and can be used"
 msgstr ""
 
@@ -2217,17 +2251,17 @@ msgstr ""
 msgid "Album Art information has been removed from the database"
 msgstr ""
 
-#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:133
+#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:159
 msgid "Album Art Not Located"
 msgstr ""
 
-#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:133
+#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:159
 msgid ""
 "Album Art could not be located at this time. This may be due to write access "
 "error, or the file is not received corectly."
 msgstr ""
 
-#: ../../albums.php:79 ../../albums.php:162
+#: ../../albums.php:79 ../../albums.php:106 ../../albums.php:185
 msgid "Album Art Inserted"
 msgstr ""
 
@@ -2263,11 +2297,11 @@ msgstr ""
 msgid "Error: Insert Failed"
 msgstr ""
 
-#: ../../register.php:170
+#: ../../register.php:169
 msgid "Registration Complete"
 msgstr ""
 
-#: ../../bin/print_tags.php.inc:63
+#: ../../bin/print_tags.php.inc:64
 msgid ""
 "[print_tags.php.inc]\n"
 "This commandline script will display the tag information for the specified "
@@ -2276,7 +2310,7 @@ msgid ""
 "        \n"
 msgstr ""
 
-#: ../../bin/print_tags.php.inc:69
+#: ../../bin/print_tags.php.inc:70
 msgid "Filename:"
 msgstr ""
 
@@ -2336,16 +2370,11 @@ msgstr ""
 msgid "Click to close window"
 msgstr ""
 
-#: ../../templates/show_disabled_songs.inc:25
-#: ../../templates/show_artist.inc:33
-msgid "Select"
-msgstr ""
-
 #: ../../templates/show_disabled_songs.inc:30
 msgid "Addition Time"
 msgstr ""
 
-#: ../../templates/show_disabled_songs.inc:48
+#: ../../templates/show_disabled_songs.inc:49
 msgid "Remove"
 msgstr ""
 
@@ -2357,10 +2386,14 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: ../../templates/header.inc:64 ../../ampache/templates/header.inc:64
+#: ../../templates/header.inc:63 ../../ampache/templates/header.inc:64
 msgid "You are currently logged in as"
 msgstr ""
 
+#: ../../templates/header.inc:74
+msgid "Error Config File Out of Date"
+msgstr ""
+
 #: ../../templates/show_songs.inc:47
 msgid "Song title"
 msgstr ""
@@ -2369,16 +2402,12 @@ msgstr ""
 msgid "Rating"
 msgstr ""
 
-#: ../../templates/show_songs.inc:176
+#: ../../templates/show_songs.inc:183
 msgid "Total"
 msgstr ""
 
-#: ../../templates/show_songs.inc:194
-msgid "** Indicates flagged songs"
-msgstr ""
-
 #: ../../templates/show_install_config.inc:53
-#: ../../templates/show_install.inc:34
+#: ../../templates/show_install.inc:56
 msgid "Step 2 - Creating the Ampache.cfg.php file"
 msgstr ""
 
@@ -2394,12 +2423,12 @@ msgid "Web Path"
 msgstr ""
 
 #: ../../templates/show_install_config.inc:68
-#: ../../templates/show_install.inc:42
+#: ../../templates/show_install.inc:64
 msgid "Desired Database Name"
 msgstr ""
 
 #: ../../templates/show_install_config.inc:72
-#: ../../templates/show_install.inc:46
+#: ../../templates/show_install.inc:68
 msgid "MySQL Hostname"
 msgstr ""
 
@@ -2445,43 +2474,43 @@ msgstr ""
 msgid "Find Album Art"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:52
+#: ../../templates/show_preferences.inc:53
 msgid "Editing"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:52
+#: ../../templates/show_preferences.inc:53
 msgid "preferences"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:54
+#: ../../templates/show_preferences.inc:55
 msgid "Rebuild Preferences"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:61
+#: ../../templates/show_preferences.inc:62
 msgid "Interface"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:64
+#: ../../templates/show_preferences.inc:65
 msgid "Streaming"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:67
+#: ../../templates/show_preferences.inc:68
 msgid "Options"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:71
+#: ../../templates/show_preferences.inc:72
 msgid "Account"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:75
+#: ../../templates/show_preferences.inc:76
 msgid "System"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:78
+#: ../../templates/show_preferences.inc:79
 msgid "Modules"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:91
+#: ../../templates/show_preferences.inc:92
 msgid "Update Preferences"
 msgstr ""
 
@@ -2521,34 +2550,34 @@ msgstr ""
 msgid "Unlimited"
 msgstr ""
 
-#: ../../templates/show_install.inc:32
+#: ../../templates/show_install.inc:54
 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:50
+#: ../../templates/show_install.inc:72
 msgid "MySQL Administrative Username"
 msgstr ""
 
-#: ../../templates/show_install.inc:54
+#: ../../templates/show_install.inc:76
 msgid "MySQL Administrative Password"
 msgstr ""
 
-#: ../../templates/show_install.inc:58
+#: ../../templates/show_install.inc:80
 msgid "Create Database User for New Database"
 msgstr ""
 
-#: ../../templates/show_install.inc:62
+#: ../../templates/show_install.inc:84
 msgid "Ampache Database Username"
 msgstr ""
 
-#: ../../templates/show_install.inc:66
+#: ../../templates/show_install.inc:88
 msgid "Ampache Database User Password"
 msgstr ""
 
-#: ../../templates/show_install.inc:71
+#: ../../templates/show_install.inc:93
 msgid "Insert Database"
 msgstr ""
 
@@ -2656,11 +2685,11 @@ msgstr ""
 msgid "Activity"
 msgstr ""
 
-#: ../../templates/show_users.inc:60
+#: ../../templates/show_users.inc:61
 msgid "Last Ip"
 msgstr ""
 
-#: ../../templates/show_users.inc:65
+#: ../../templates/show_users.inc:66
 msgid "On-line"
 msgstr ""
 
diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po
index 1007b2e9..3ffb8b6f 100644
--- a/locale/de_DE/LC_MESSAGES/messages.po
+++ b/locale/de_DE/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ampache de_DE v 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-04 10:14+0100\n"
+"POT-Creation-Date: 2007-01-22 19:07-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,22 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../play/index.php:58
-#: ../../download/index.php:62
+#: ../../play/index.php:64 ../../download/index.php:61
 msgid "Session Expired: please log in again at"
 msgstr "Sitzung abgelaufen: Bitte erneut einloggen"
 
-#: ../../lib/class/genre.class.php:284
-msgid "Show Genres starting with"
-msgstr "Zeige Genres mit folgendem Beginn"
-
-#: ../../lib/class/album.class.php:153
-msgid "Various"
-msgstr "Verschiedene"
-
-#: ../../lib/class/album.class.php:265
-#: ../../lib/class/catalog.class.php:299
-#: ../../lib/class/catalog.class.php:595
+#: ../../lib/class/catalog.class.php:303 ../../lib/class/catalog.class.php:621
+#: ../../lib/class/album.class.php:328
 msgid "Error: Unable to open"
 msgstr "Fehler: kann nicht öffnen"
 
@@ -38,398 +28,348 @@ msgstr "Fehler: kann nicht öffnen"
 msgid "Error: Unable to change to directory"
 msgstr "Fehler: Kann nicht zu Verzeichnis wechseln"
 
-#: ../../lib/class/catalog.class.php:375
+#: ../../lib/class/catalog.class.php:374
 msgid "Error: Unable to get filesize for"
 msgstr "Fehler: Kann Dateigröße nicht bestimmen für"
 
-#: ../../lib/class/catalog.class.php:412
+#: ../../lib/class/catalog.class.php:411
 msgid "is not readable by ampache"
 msgstr "ist von Ampache nicht lesbar"
 
-#: ../../lib/class/catalog.class.php:468
-msgid "Found in ID3"
-msgstr "Gefunden im ID3"
-
-#: ../../lib/class/catalog.class.php:472
-msgid "Found on Amazon"
-msgstr "Gefunden bei Amazon"
-
-#: ../../lib/class/catalog.class.php:476
-msgid "Found in Folder"
-msgstr "Gefunden im Verzeichnis"
-
-#: ../../lib/class/catalog.class.php:480
-#: ../../lib/class/catalog.class.php:785
-#: ../../lib/class/catalog.class.php:951
-msgid "Found"
-msgstr "gefunden"
-
-#: ../../lib/class/catalog.class.php:483
-msgid "Not Found"
-msgstr "Nicht gefunden"
-
-#: ../../lib/class/catalog.class.php:504
+#: ../../lib/class/catalog.class.php:530
 msgid "album's with art"
 msgstr "Alben mit Cover"
 
-#: ../../lib/class/catalog.class.php:651
-msgid "Starting Dump Album Art"
-msgstr "Starte Ablum-Cover Dump"
-
-#: ../../lib/class/catalog.class.php:671
-msgid "Written"
-msgstr "Geschrieben"
-
-#: ../../lib/class/catalog.class.php:680
-msgid "Error unable to open file for writting"
-msgstr "Fehler: Kann Datei zum Schreiben nicht öffnen"
-
-#: ../../lib/class/catalog.class.php:687
-msgid "Album Art Dump Complete"
-msgstr "Album Cover-Dump komplett"
-
-#: ../../lib/class/catalog.class.php:688
-#: ../../artists.php:97
-#: ../../albums.php:179
-msgid "Return"
-msgstr "Zurück"
-
-#: ../../lib/class/catalog.class.php:776
+#: ../../lib/class/catalog.class.php:812
 msgid "Starting Catalog Build"
 msgstr "Starte Katalogerstellung"
 
-#: ../../lib/class/catalog.class.php:780
+#: ../../lib/class/catalog.class.php:816
 msgid "Running Remote Sync"
 msgstr "Starte Remote Sync"
 
-#: ../../lib/class/catalog.class.php:785
-#: ../../lib/class/catalog.class.php:808
-#: ../../lib/class/catalog.class.php:951
-#: ../../lib/class/catalog.class.php:981
-#: ../../lib/preferences.php:269
-#: ../../lib/preferences.php:319
-#: ../../lib/ui.lib.php:1232
-#: ../../admin/catalog.php:260
+#: ../../lib/class/catalog.class.php:821 ../../lib/class/catalog.class.php:992
+msgid "Found"
+msgstr "gefunden"
+
+#: ../../lib/class/catalog.class.php:821 ../../lib/class/catalog.class.php:848
+#: ../../lib/class/catalog.class.php:992
+#: ../../lib/class/catalog.class.php:1025 ../../lib/preferences.php:269
+#: ../../lib/preferences.php:319 ../../lib/ui.lib.php:1194
+#: ../../admin/catalog.php:259
 msgid "None"
 msgstr "Kein"
 
-#: ../../lib/class/catalog.class.php:800
-#: ../../lib/class/catalog.class.php:969
+#: ../../lib/class/catalog.class.php:840
+#: ../../lib/class/catalog.class.php:1014
 msgid "Added Playlist From"
 msgstr "Wiedergabeliste hinzugefügt von"
 
-#: ../../lib/class/catalog.class.php:807
-#: ../../lib/class/catalog.class.php:980
-#: ../../admin/catalog.php:259
+#: ../../lib/class/catalog.class.php:847
+#: ../../lib/class/catalog.class.php:1024 ../../admin/catalog.php:258
 msgid "Starting Album Art Search"
 msgstr "Starte Cover Suche"
 
-#: ../../lib/class/catalog.class.php:808
-#: ../../lib/class/catalog.class.php:981
-#: ../../admin/catalog.php:260
+#: ../../lib/class/catalog.class.php:848
+#: ../../lib/class/catalog.class.php:1025 ../../admin/catalog.php:259
 msgid "Searched"
 msgstr "Gesucht"
 
-#: ../../lib/class/catalog.class.php:818
+#: ../../lib/class/catalog.class.php:858
 msgid "Catalog Finished"
 msgstr "Katalog fertig"
 
-#: ../../lib/class/catalog.class.php:818
-#: ../../lib/class/catalog.class.php:1001
+#: ../../lib/class/catalog.class.php:858
+#: ../../lib/class/catalog.class.php:1044
 msgid "Total Time"
 msgstr "Spielzeit"
 
-#: ../../lib/class/catalog.class.php:818
-#: ../../lib/class/catalog.class.php:1002
+#: ../../lib/class/catalog.class.php:858
+#: ../../lib/class/catalog.class.php:1045
 msgid "Total Songs"
 msgstr "Alle Stücke"
 
-#: ../../lib/class/catalog.class.php:819
-#: ../../lib/class/catalog.class.php:1002
+#: ../../lib/class/catalog.class.php:859
+#: ../../lib/class/catalog.class.php:1045
 msgid "Songs Per Seconds"
 msgstr "Stücke pro Sekunde"
 
-#: ../../lib/class/catalog.class.php:853
-#: ../../lib/class/catalog.class.php:1638
+#: ../../lib/class/catalog.class.php:894
+#: ../../lib/class/catalog.class.php:1565
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: ../../lib/class/catalog.class.php:860
+#: ../../lib/class/catalog.class.php:901
 msgid "No Update Needed"
 msgstr "Keine Aktualisierung benötigt"
 
-#: ../../lib/class/catalog.class.php:942
+#: ../../lib/class/catalog.class.php:983
 msgid "Starting New Song Search on"
 msgstr "Starte neue Stück-Suche in"
 
-#: ../../lib/class/catalog.class.php:942
+#: ../../lib/class/catalog.class.php:983
 msgid "catalog"
 msgstr "Katalog"
 
-#: ../../lib/class/catalog.class.php:946
+#: ../../lib/class/catalog.class.php:987
 msgid "Running Remote Update"
 msgstr "Starte entferntes Update"
 
-#: ../../lib/class/catalog.class.php:1001
+#: ../../lib/class/catalog.class.php:1044
 msgid "Catalog Update Finished"
 msgstr "Katalog-Aktualisierung beendet"
 
-#: ../../lib/class/catalog.class.php:1021
-#: ../../albums.php:71
+#: ../../lib/class/catalog.class.php:1064
 msgid "Error"
 msgstr "Fehler"
 
-#: ../../lib/class/catalog.class.php:1021
+#: ../../lib/class/catalog.class.php:1064
 msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
-msgstr "Kann XMLRPC Library nicht laden, bitte sicherstellen dass XML-RPC aktiviert ist"
+msgstr ""
+"Kann XMLRPC Library nicht laden, bitte sicherstellen dass XML-RPC aktiviert "
+"ist"
 
-#: ../../lib/class/catalog.class.php:1064
-#: ../../lib/class/catalog.class.php:1119
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Error connecting to"
 msgstr "Kann nicht verbinden zu"
 
-#: ../../lib/class/catalog.class.php:1064
-#: ../../lib/class/catalog.class.php:1119
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Code"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1064
-#: ../../lib/class/catalog.class.php:1119
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Reason"
 msgstr "Grund"
 
-#: ../../lib/class/catalog.class.php:1080
+#: ../../lib/class/catalog.class.php:1123
 msgid "Completed updating remote catalog(s)"
 msgstr "Aktualisierung der fernen Kataloge abgeschlossen"
 
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1158
 msgid "Added"
 msgstr "Hinzugefügt"
 
-#: ../../lib/class/catalog.class.php:1197
+#: ../../lib/class/catalog.class.php:1240
 msgid "Cleaning the"
 msgstr "Leere den"
 
-#: ../../lib/class/catalog.class.php:1197
-#: ../../lib/class/catalog.class.php:1593
-#: ../../templates/sidebar.inc.php:30
+#: ../../lib/class/catalog.class.php:1240
+#: ../../lib/class/catalog.class.php:1520 ../../templates/sidebar.inc.php:30
+#: ../../ampache/templates/sidebar.inc.php:30
 msgid "Catalog"
 msgstr "Katalog"
 
-#: ../../lib/class/catalog.class.php:1198
+#: ../../lib/class/catalog.class.php:1241
 msgid "Checking"
 msgstr "Prüfe"
 
-#: ../../lib/class/catalog.class.php:1269
+#: ../../lib/class/catalog.class.php:1313
 msgid "Catalog Clean Done"
 msgstr "Bereinigen des Kataloges beendet"
 
-#: ../../lib/class/catalog.class.php:1269
+#: ../../lib/class/catalog.class.php:1313
 msgid "files removed"
 msgstr "Dateien gelöscht"
 
-#: ../../lib/class/catalog.class.php:1593
+#: ../../lib/class/catalog.class.php:1520
 msgid "Updating the"
 msgstr "Aktualisiere den"
 
-#: ../../lib/class/catalog.class.php:1594
+#: ../../lib/class/catalog.class.php:1521
 msgid "songs found checking tag information."
 msgstr "Stücke gefunden prüfe TAG Informationen"
 
-#: ../../lib/class/catalog.class.php:1595
+#: ../../lib/class/catalog.class.php:1522
 msgid "Verifed"
 msgstr "Geprüft"
 
-#: ../../lib/class/catalog.class.php:1646
+#: ../../lib/class/catalog.class.php:1574
 msgid " FOUND"
 msgstr "GEFUNDEN"
 
-#: ../../lib/class/catalog.class.php:1647
+#: ../../lib/class/catalog.class.php:1576
 msgid "Searching for new Album Art"
 msgstr "Neue Cover finden"
 
-#: ../../lib/class/catalog.class.php:1651
+#: ../../lib/class/catalog.class.php:1580
 msgid "Album Art Already Found"
 msgstr "Album Cover bereits gefunden"
 
-#: ../../lib/class/catalog.class.php:1703
+#: ../../lib/class/catalog.class.php:1634
 msgid "Update Finished."
 msgstr "Aktualisierung beendet."
 
-#: ../../lib/class/catalog.class.php:1703
+#: ../../lib/class/catalog.class.php:1634
 msgid "Checked"
 msgstr "Geprüft"
 
-#: ../../lib/class/catalog.class.php:1703
+#: ../../lib/class/catalog.class.php:1634
 msgid "songs updated."
 msgstr "Stücke aktualisiert."
 
-#: ../../lib/class/artist.class.php:225
-msgid "Error: Name Identical"
-msgstr "Fehler: Name identisch"
-
-#: ../../lib/class/song.class.php:354
+#: ../../lib/class/song.class.php:361
+#: ../../templates/show_duplicates.inc.php:35
 #: ../../templates/show_edit_song.inc.php:31
-#: ../../templates/show_duplicates.inc.php:37
 #: ../../templates/show_disabled_songs.inc:26
 #: ../../templates/show_search.inc:43
 msgid "Title"
 msgstr "Titel"
 
-#: ../../lib/class/song.class.php:354
-#: ../../lib/class/song.class.php:358
-#: ../../lib/class/song.class.php:362
-#: ../../lib/class/song.class.php:366
-#: ../../lib/class/song.class.php:370
-#: ../../lib/class/song.class.php:374
-#: ../../lib/class/song.class.php:378
-#: ../../lib/class/song.class.php:383
-#: ../../lib/class/song.class.php:388
-#: ../../lib/class/song.class.php:392
-#: ../../lib/class/song.class.php:396
-#: ../../lib/class/song.class.php:401
+#: ../../lib/class/song.class.php:361 ../../lib/class/song.class.php:365
+#: ../../lib/class/song.class.php:369 ../../lib/class/song.class.php:373
+#: ../../lib/class/song.class.php:377 ../../lib/class/song.class.php:381
+#: ../../lib/class/song.class.php:385 ../../lib/class/song.class.php:390
+#: ../../lib/class/song.class.php:395 ../../lib/class/song.class.php:399
+#: ../../lib/class/song.class.php:403 ../../lib/class/song.class.php:408
 msgid "updated to"
 msgstr "aktualisiert zu"
 
-#: ../../lib/class/song.class.php:358
-#: ../../templates/show_list_duplicates.inc.php:37
+#: ../../lib/class/song.class.php:365
+#: ../../templates/show_list_duplicates.inc.php:35
 #: ../../templates/show_songs.inc:53
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: ../../lib/class/song.class.php:362
+#: ../../lib/class/song.class.php:369
 msgid "Rate"
 msgstr "Anteil"
 
-#: ../../lib/class/song.class.php:366
+#: ../../lib/class/song.class.php:373
 msgid "Mode"
 msgstr "Modus"
 
-#: ../../lib/class/song.class.php:370
+#: ../../lib/class/song.class.php:377
 #: ../../templates/show_tv_playlist.inc.php:46
 #: ../../templates/show_songs.inc:51
 msgid "Time"
 msgstr "Dauer"
 
-#: ../../lib/class/song.class.php:374
-#: ../../templates/show_localplay_playlist.inc.php:27
+#: ../../lib/class/song.class.php:381
 #: ../../templates/show_edit_song.inc.php:61
-#: ../../templates/show_songs.inc:45
-#: ../../templates/show_songs.inc:50
+#: ../../templates/show_localplay_playlist.inc.php:27
+#: ../../templates/show_songs.inc:45 ../../templates/show_songs.inc:50
 msgid "Track"
 msgstr "Stück"
 
-#: ../../lib/class/song.class.php:378
+#: ../../lib/class/song.class.php:385
 msgid "Filesize"
 msgstr "Dateigröße"
 
-#: ../../lib/class/song.class.php:383
+#: ../../lib/class/song.class.php:390
 #: ../../templates/show_edit_song.inc.php:45
-#: ../../templates/show_recently_played.inc.php:28
-#: ../../templates/show_list_duplicates.inc.php:34
 #: ../../templates/show_get_albumart.inc.php:30
+#: ../../templates/show_play_selected.inc.php:60
+#: ../../templates/show_list_duplicates.inc.php:32
+#: ../../templates/show_recently_played.inc.php:32
+#: ../../templates/show_artists.inc:40 ../../templates/show_artists.inc:71
 #: ../../templates/show_disabled_songs.inc:28
-#: ../../templates/show_artists.inc:40
-#: ../../templates/show_artists.inc:62
-#: ../../templates/show_songs.inc:48
-#: ../../templates/show_albums.inc:41
-#: ../../templates/show_albums.inc:73
+#: ../../templates/show_songs.inc:48 ../../templates/show_albums.inc:41
+#: ../../templates/show_albums.inc:84
 #: ../../templates/show_similar_artists.inc:29
 #: ../../templates/show_search.inc:47
 msgid "Artist"
 msgstr "Interpret"
 
-#: ../../lib/class/song.class.php:388
+#: ../../lib/class/song.class.php:395
 #: ../../templates/show_edit_song.inc.php:37
-#: ../../templates/show_recently_played.inc.php:27
-#: ../../templates/show_list_duplicates.inc.php:35
 #: ../../templates/show_get_albumart.inc.php:38
+#: ../../templates/show_play_selected.inc.php:59
+#: ../../templates/show_list_duplicates.inc.php:33
+#: ../../templates/show_recently_played.inc.php:31
 #: ../../templates/show_disabled_songs.inc:27
-#: ../../templates/show_songs.inc:49
-#: ../../templates/show_albums.inc:38
-#: ../../templates/show_albums.inc:70
-#: ../../templates/show_search.inc:53
+#: ../../templates/show_songs.inc:49 ../../templates/show_albums.inc:38
+#: ../../templates/show_albums.inc:81 ../../templates/show_search.inc:53
 msgid "Album"
 msgstr "Album"
 
-#: ../../lib/class/song.class.php:392
+#: ../../lib/class/song.class.php:399
 #: ../../templates/show_edit_song.inc.php:67
-#: ../../templates/show_albums.inc:45
-#: ../../templates/show_albums.inc:77
+#: ../../templates/show_play_selected.inc.php:61
+#: ../../templates/show_edit_album.inc.php:33
+#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:88
 #: ../../templates/show_search.inc:63
 msgid "Year"
 msgstr "Jahr"
 
-#: ../../lib/class/song.class.php:396
-#: ../../templates/show_flag.inc.php:64
+#: ../../lib/class/song.class.php:403 ../../templates/show_flag.inc.php:64
 #: ../../templates/show_edit_song.inc.php:73
 #: ../../templates/show_search.inc:37
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../../lib/class/song.class.php:401
-#: ../../lib/ui.lib.php:889
-#: ../../templates/sidebar.inc.php:37
+#: ../../lib/class/song.class.php:408 ../../lib/ui.lib.php:851
+#: ../../templates/sidebar.inc.php:36
 #: ../../templates/show_edit_song.inc.php:53
 #: ../../templates/show_genre.inc.php:29
 #: ../../templates/show_genres.inc.php:36
-#: ../../templates/show_songs.inc:54
-#: ../../templates/show_search.inc:57
+#: ../../templates/show_play_selected.inc.php:58
+#: ../../ampache/templates/sidebar.inc.php:36
+#: ../../templates/show_songs.inc:54 ../../templates/show_search.inc:57
 msgid "Genre"
 msgstr "Genre"
 
-#: ../../lib/class/flag.class.php:263
+#: ../../lib/class/artist.class.php:225
+msgid "Error: Name Identical"
+msgstr "Fehler: Name identisch"
+
+#: ../../lib/class/flag.class.php:264
 msgid "Approved"
 msgstr "Erlaubt"
 
-#: ../../lib/class/flag.class.php:264
+#: ../../lib/class/flag.class.php:265
 msgid "Pending"
 msgstr "Zu erledigen"
 
-#: ../../lib/class/flag.class.php:276
-#: ../../templates/show_flag.inc.php:56
+#: ../../lib/class/flag.class.php:277 ../../templates/show_flag.inc.php:56
 #: ../../templates/show_playlists.inc.php:57
-#: ../../templates/show_admin_tools.inc.php:51
-#: ../../templates/catalog.inc:66
+#: ../../templates/show_admin_tools.inc.php:50
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../../lib/class/flag.class.php:279
+#: ../../lib/class/flag.class.php:280
 msgid "Re-Tag"
 msgstr "TagNeuLesen"
 
-#: ../../lib/class/flag.class.php:282
-#: ../../templates/show_flag.inc.php:58
+#: ../../lib/class/flag.class.php:283 ../../templates/show_flag.inc.php:58
 msgid "Re-encode"
 msgstr "Neu einlesen"
 
-#: ../../lib/class/flag.class.php:285
-#: ../../templates/show_flag.inc.php:59
+#: ../../lib/class/flag.class.php:286 ../../templates/show_flag.inc.php:59
 msgid "Other"
 msgstr "Andere"
 
-#: ../../lib/class/flag.class.php:288
-#: ../../lib/class/localplay.class.php:569
+#: ../../lib/class/flag.class.php:289 ../../lib/class/localplay.class.php:570
 #: ../../lib/general.lib.php:890
 #: ../../modules/localplay/icecast.controller.php:292
 #: ../../modules/localplay/mpd.controller.php:354
+#: ../../modules/localplay/httpq.controller.php:350
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../../lib/class/localplay.class.php:560
-#: ../../templates/show_tv.inc.php:79
-#: ../../templates/show_now_playing.inc:40
+#: ../../lib/class/localplay.class.php:561 ../../templates/show_tv.inc.php:64
+#: ../../templates/show_now_playing.inc:32
 msgid "Now Playing"
 msgstr "Aktuell wird gespielt"
 
-#: ../../lib/class/localplay.class.php:563
+#: ../../lib/class/localplay.class.php:564
 msgid "Stopped"
 msgstr "Angehalten"
 
-#: ../../lib/class/localplay.class.php:566
+#: ../../lib/class/localplay.class.php:567
 msgid "Paused"
 msgstr "Pause"
 
+#: ../../lib/class/album.class.php:163
+msgid "Various"
+msgstr "Verschiedene"
+
+#: ../../lib/class/genre.class.php:285
+msgid "Show Genres starting with"
+msgstr "Zeige Genres mit folgendem Beginn"
+
 #: ../../lib/rating.lib.php:43
 msgid "Don't Play"
 msgstr "Nicht abspielen"
@@ -458,46 +398,40 @@ msgstr "Ist wahnsinnig"
 msgid "Off the Charts!"
 msgstr "Aus der Hitparade!"
 
-#: ../../lib/debug.lib.php:218
-msgid "You defined the option \"debug = on\" but didn't define a log path for the log to be stored"
-msgstr "Sie haben die Option \"debug = on\" definiert und keinen Pfad für die Logdatei angegeben"
-
 #: ../../lib/preferences.php:258
 msgid "Enable"
 msgstr "Aktivieren"
 
 #: ../../lib/preferences.php:259
-#: ../../templates/show_list_duplicates.inc.php:32
+#: ../../templates/show_list_duplicates.inc.php:30
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: ../../lib/preferences.php:271
-#: ../../templates/show_playtype_switch.inc.php:9
-#: ../../templates/show_tv_adminctl.inc.php:39
+#: ../../lib/preferences.php:271 ../../templates/show_tv_adminctl.inc.php:41
+#: ../../templates/show_playtype_switch.inc.php:30
 msgid "Stream"
 msgstr "Datenstrom"
 
-#: ../../lib/preferences.php:274
-#: ../../templates/show_playtype_switch.inc.php:13
-#: ../../templates/show_tv_adminctl.inc.php:40
+#: ../../lib/preferences.php:274 ../../templates/show_tv_adminctl.inc.php:42
+#: ../../templates/show_playtype_switch.inc.php:34
 msgid "Downsample"
 msgstr ""
 
 #: ../../lib/preferences.php:277
-#: ../../templates/show_playtype_switch.inc.php:15
+#: ../../templates/show_playtype_switch.inc.php:36
 msgid "Democratic"
 msgstr ""
 
-#: ../../lib/preferences.php:280
-#: ../../templates/sidebar.inc.php:172
-#: ../../templates/show_playtype_switch.inc.php:11
-#: ../../templates/show_tv_adminctl.inc.php:38
+#: ../../lib/preferences.php:280 ../../templates/sidebar.inc.php:168
+#: ../../templates/show_tv_adminctl.inc.php:40
 #: ../../templates/show_localplay.inc.php:26
+#: ../../templates/show_playtype_switch.inc.php:32
+#: ../../ampache/templates/sidebar.inc.php:170
 msgid "Localplay"
 msgstr "Lokal abspielen"
 
 #: ../../lib/preferences.php:282
-#: ../../templates/show_playtype_switch.inc.php:17
+#: ../../templates/show_playtype_switch.inc.php:38
 msgid "XSPF Player"
 msgstr ""
 
@@ -533,8 +467,7 @@ msgstr "Deaktiviert"
 msgid "Global"
 msgstr ""
 
-#: ../../lib/preferences.php:328
-#: ../../templates/show_add_catalog.inc.php:58
+#: ../../lib/preferences.php:328 ../../templates/show_add_catalog.inc.php:58
 msgid "Local"
 msgstr "Lokal"
 
@@ -542,64 +475,26 @@ msgstr "Lokal"
 msgid "No songs in this playlist."
 msgstr "Keine Stücke in dieser Wiedergabeliste"
 
-#: ../../lib/playlist.lib.php:191
-#: ../../lib/ui.lib.php:938
-#: ../../templates/sidebar.inc.php:152
-#: ../../templates/show_admin_tools.inc.php:49
-#: ../../templates/show_artists.inc:55
+#: ../../lib/playlist.lib.php:191 ../../lib/ui.lib.php:900
+#: ../../templates/sidebar.inc.php:148
+#: ../../templates/show_admin_tools.inc.php:48
+#: ../../ampache/templates/sidebar.inc.php:150
 #: ../../templates/show_random_play.inc:40
 #: ../../templates/show_add_access.inc:59
-#: ../../templates/show_albums.inc:60
 #: ../../templates/show_edit_access.inc:69
 msgid "All"
 msgstr "Alle"
 
-#: ../../lib/playlist.lib.php:194
-#: ../../playlist.php:63
+#: ../../lib/playlist.lib.php:194 ../../playlist.php:63
 msgid "New Playlist"
 msgstr "Neue Wiedergabeliste"
 
-#: ../../lib/general.lib.php:670
-#: ../../templates/show_user_stats.inc.php:32
-#: ../../templates/show_user_stats.inc.php:43
-#: ../../templates/show_user_stats.inc.php:54
-#: ../../templates/show_user_recommendations.inc.php:32
-#: ../../templates/show_user_recommendations.inc.php:43
-#: ../../templates/show_user_recommendations.inc.php:54
-msgid "Not Enough Data"
-msgstr "Nicht genügend Daten"
-
-#: ../../lib/general.lib.php:869
-#: ../../lib/general.lib.php:880
-msgid "English"
-msgstr "Englisch"
-
-#: ../../lib/general.lib.php:881
-msgid "British English"
-msgstr "Britisch Englisch"
-
-#: ../../lib/general.lib.php:887
-msgid "Turkish"
-msgstr "Türkisch"
-
-#: ../../lib/general.lib.php:888
-msgid "Simplified Chinese"
-msgstr "Vereinfachtes Chinesisch"
-
-#: ../../lib/general.lib.php:966
-msgid "On"
-msgstr "Ein"
-
-#: ../../lib/general.lib.php:969
-msgid "Off"
-msgstr "Aus"
-
 #: ../../lib/ui.lib.php:115
 msgid "Error Access Denied"
 msgstr "Fehler Zugriff verweigert"
 
-#: ../../lib/ui.lib.php:194
-#: ../../templates/sidebar.inc.php:91
+#: ../../lib/ui.lib.php:194 ../../templates/sidebar.inc.php:87
+#: ../../ampache/templates/sidebar.inc.php:89
 msgid "Browse"
 msgstr "Anzeigen..."
 
@@ -611,167 +506,167 @@ msgstr "Ohne Cover"
 msgid "Show all"
 msgstr "Zeige Alle"
 
-#: ../../lib/ui.lib.php:584
-#: ../../admin/mail.php:80
+#: ../../lib/ui.lib.php:539 ../../admin/mail.php:81
 msgid "No Catalogs Found!"
 msgstr "Keine Kataloge gefunden"
 
-#: ../../lib/ui.lib.php:585
-#: ../../admin/mail.php:81
+#: ../../lib/ui.lib.php:540 ../../admin/mail.php:82
+#: ../../templates/show_admin_tools.inc.php:75
 #: ../../templates/show_add_catalog.inc.php:28
-#: ../../templates/show_admin_tools.inc.php:68
 msgid "Add a Catalog"
 msgstr "Einen Katalog hinzufügen"
 
-#: ../../lib/ui.lib.php:586
-#: ../../admin/mail.php:82
-#: ../../templates/show_mail_users.inc.php:41
-#: ../../templates/show_local_catalog_info.inc.php:23
-msgid "Catalog Statistics"
-msgstr "Katalogstatistik"
-
-#: ../../lib/ui.lib.php:622
-#: ../../admin/mail.php:119
+#: ../../lib/ui.lib.php:578 ../../admin/mail.php:120
 msgid "day"
 msgstr "Tag"
 
-#: ../../lib/ui.lib.php:622
-#: ../../admin/mail.php:119
+#: ../../lib/ui.lib.php:578 ../../admin/mail.php:120
 msgid "days"
 msgstr "Tage"
 
-#: ../../lib/ui.lib.php:624
-#: ../../admin/mail.php:121
+#: ../../lib/ui.lib.php:580 ../../admin/mail.php:122
 msgid "hour"
 msgstr "Stunde"
 
-#: ../../lib/ui.lib.php:624
-#: ../../admin/mail.php:121
+#: ../../lib/ui.lib.php:580 ../../admin/mail.php:122
 msgid "hours"
 msgstr "Stunden"
 
-#: ../../lib/ui.lib.php:828
-#: ../../templates/show_tv.inc.php:57
-#: ../../templates/sidebar.inc.php:51
+#: ../../lib/ui.lib.php:790 ../../templates/sidebar.inc.php:48
+#: ../../ampache/templates/sidebar.inc.php:50
 msgid "Home"
 msgstr "Home"
 
-#: ../../lib/ui.lib.php:831
+#: ../../lib/ui.lib.php:793
 msgid "Upload"
 msgstr "hochladen"
 
-#: ../../lib/ui.lib.php:834
+#: ../../lib/ui.lib.php:796
 msgid "Local Play"
 msgstr "Lokal abspielen"
 
-#: ../../lib/ui.lib.php:837
+#: ../../lib/ui.lib.php:799
 msgid "Random Play"
 msgstr "Zufällig Apspielen"
 
-#: ../../lib/ui.lib.php:840
-#: ../../templates/show_play_selected.inc.php:47
+#: ../../lib/ui.lib.php:802 ../../templates/show_play_selected.inc.php:47
 msgid "Playlist"
 msgstr "Wiedergabeliste"
 
-#: ../../lib/ui.lib.php:843
-#: ../../templates/sidebar.inc.php:120
-#: ../../templates/sidebar.inc.php:126
-#: ../../templates/show_duplicates.inc.php:56
-#: ../../templates/show_search_bar.inc:31
-#: ../../templates/show_search.inc:133
+#: ../../lib/ui.lib.php:805 ../../templates/show_duplicates.inc.php:51
+#: ../../templates/sidebar.inc.php:116 ../../templates/sidebar.inc.php:122
+#: ../../ampache/templates/sidebar.inc.php:118
+#: ../../ampache/templates/sidebar.inc.php:124
+#: ../../templates/show_search_bar.inc:31 ../../templates/show_search.inc:133
 msgid "Search"
 msgstr "Suchen"
 
-#: ../../lib/ui.lib.php:846
-#: ../../templates/sidebar.inc.php:83
+#: ../../lib/ui.lib.php:808 ../../templates/sidebar.inc.php:79
+#: ../../ampache/templates/sidebar.inc.php:81
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../../lib/ui.lib.php:849
-#: ../../lib/ui.lib.php:853
+#: ../../lib/ui.lib.php:811 ../../lib/ui.lib.php:815
 msgid "Admin-Catalog"
 msgstr "Admin-Katalog"
 
-#: ../../lib/ui.lib.php:857
+#: ../../lib/ui.lib.php:819
 msgid "Admin-User Management"
 msgstr "Admin-Benutzer Verwaltung"
 
-#: ../../lib/ui.lib.php:861
+#: ../../lib/ui.lib.php:823
 msgid "Admin-Mail Users"
 msgstr "Admin-Mail Benutzer"
 
-#: ../../lib/ui.lib.php:865
+#: ../../lib/ui.lib.php:827
 msgid "Admin-Manage Access Lists"
 msgstr "Admin-Bearbeiten Zugriffslisten"
 
-#: ../../lib/ui.lib.php:869
+#: ../../lib/ui.lib.php:831
 msgid "Admin-Site Preferences"
 msgstr "Admin-Site Einstellungen"
 
-#: ../../lib/ui.lib.php:873
+#: ../../lib/ui.lib.php:835
 msgid "Admin-Manage Modules"
 msgstr "Admin-Bearbeiten Module"
 
-#: ../../lib/ui.lib.php:877
+#: ../../lib/ui.lib.php:839
 msgid "Browse Music"
 msgstr "Durchsuche Stücke"
 
-#: ../../lib/ui.lib.php:881
-#: ../../admin/mail.php:133
-#: ../../templates/sidebar.inc.php:35
-#: ../../templates/sidebar.inc.php:160
+#: ../../lib/ui.lib.php:843 ../../admin/mail.php:134
+#: ../../templates/sidebar.inc.php:34 ../../templates/sidebar.inc.php:156
 #: ../../templates/show_genre.inc.php:32
-#: ../../templates/show_local_catalog_info.inc.php:34
-#: ../../templates/show_artists.inc:43
-#: ../../templates/show_artists.inc:65
+#: ../../templates/show_local_catalog_info.inc.php:28
+#: ../../ampache/templates/sidebar.inc.php:34
+#: ../../ampache/templates/sidebar.inc.php:158
+#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:74
 msgid "Albums"
 msgstr "Alben"
 
-#: ../../lib/ui.lib.php:885
-#: ../../admin/mail.php:134
-#: ../../templates/sidebar.inc.php:36
-#: ../../templates/sidebar.inc.php:159
+#: ../../lib/ui.lib.php:847 ../../admin/mail.php:135
+#: ../../templates/sidebar.inc.php:35 ../../templates/sidebar.inc.php:155
 #: ../../templates/show_genre.inc.php:35
-#: ../../templates/show_local_catalog_info.inc.php:38
+#: ../../templates/show_local_catalog_info.inc.php:29
+#: ../../ampache/templates/sidebar.inc.php:35
+#: ../../ampache/templates/sidebar.inc.php:157
 msgid "Artists"
 msgstr "Interpreten"
 
-#: ../../lib/ui.lib.php:893
-#: ../../templates/sidebar.inc.php:114
+#: ../../lib/ui.lib.php:855 ../../templates/sidebar.inc.php:110
+#: ../../ampache/templates/sidebar.inc.php:112
 msgid "Statistics"
 msgstr "Statistik"
 
-#: ../../lib/ui.lib.php:1435
+#: ../../lib/ui.lib.php:1429
 msgid "Manage Users"
 msgstr "Benutzer verwalten"
 
-#: ../../lib/ui.lib.php:1436
+#: ../../lib/ui.lib.php:1430
 msgid "Add a new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: ../../lib/upload.php:231
-msgid "The file uploaded successfully"
-msgstr "Die Datei wurde erfolgreich hochgeladen"
+#: ../../lib/general.lib.php:670 ../../templates/show_box.inc.php:30
+#: ../../templates/show_user_stats.inc.php:32
+#: ../../templates/show_user_stats.inc.php:43
+#: ../../templates/show_user_stats.inc.php:54
+#: ../../templates/show_user_recommendations.inc.php:32
+#: ../../templates/show_user_recommendations.inc.php:43
+#: ../../templates/show_user_recommendations.inc.php:54
+msgid "Not Enough Data"
+msgstr "Nicht genügend Daten"
+
+#: ../../lib/general.lib.php:869 ../../lib/general.lib.php:880
+msgid "English"
+msgstr "Englisch"
+
+#: ../../lib/general.lib.php:881
+msgid "British English"
+msgstr "Britisch Englisch"
 
-#: ../../lib/upload.php:232
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr "Die Dateigröße der hochgeladenen Datei überschreitet die upload_max_filesize directive in der php.ini"
+#: ../../lib/general.lib.php:887
+msgid "Turkish"
+msgstr "Türkisch"
 
-#: ../../lib/upload.php:233
-msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
-msgstr "Die Dateigröße der hochgeladenen Datei überschreitet die MAX_FILE_SIZE Direktive, die im HTML-Formular bestimmt wurde"
+#: ../../lib/general.lib.php:888
+msgid "Simplified Chinese"
+msgstr "Vereinfachtes Chinesisch"
 
-#: ../../lib/upload.php:234
-msgid "The uploaded file was only partially uploaded"
-msgstr "Die hochgeladene Datei wurde nicht vollständig hochgeladen"
+#: ../../lib/general.lib.php:966
+msgid "On"
+msgstr "Ein"
 
-#: ../../lib/upload.php:235
-msgid "No file was uploaded"
-msgstr "Keine Datei wurde hochgeladen"
+#: ../../lib/general.lib.php:969
+msgid "Off"
+msgstr "Aus"
 
-#: ../../lib/upload.php:236
-msgid "Missing a temporary folder"
-msgstr "Vermisse ein temporäres Verzeichnis"
+#: ../../lib/debug.lib.php:218
+msgid ""
+"You defined the option \"debug = on\" but didn't define a log path for the "
+"log to be stored"
+msgstr ""
+"Sie haben die Option \"debug = on\" definiert und keinen Pfad für die "
+"Logdatei angegeben"
 
 #: ../../modules/horde/Browser.php:867
 msgid "file"
@@ -788,22 +683,29 @@ msgstr "Keine Datei hochgeladen"
 #: ../../modules/horde/Browser.php:896
 #, php-format
 msgid "There was a problem with the file upload: No %s was uploaded."
-msgstr "Ein Problem mit der hochgeladenen Datei wurde festgestellt: %s wurde nicht hochgeladen."
+msgstr ""
+"Ein Problem mit der hochgeladenen Datei wurde festgestellt: %s wurde nicht "
+"hochgeladen."
 
 #: ../../modules/horde/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 "Ein Problem mit der hochgeladenen Datei wurde festgestellt: %s ist größer als die maximal erlaubte Größe (%d bytes)."
+msgid ""
+"There was a problem with the file upload: The %s was larger than the maximum "
+"allowed size (%d bytes)."
+msgstr ""
+"Ein Problem mit der hochgeladenen Datei wurde festgestellt: %s ist größer "
+"als die maximal erlaubte Größe (%d bytes)."
 
 #: ../../modules/horde/Browser.php:903
 #, php-format
-msgid "There was a problem with the file upload: The %s was only partially uploaded."
-msgstr "Ein Problem mit der hochgeladenen Datei wurde festgestellt: %s wurde nur teilweise hochgeladen."
+msgid ""
+"There was a problem with the file upload: The %s was only partially uploaded."
+msgstr ""
+"Ein Problem mit der hochgeladenen Datei wurde festgestellt: %s wurde nur "
+"teilweise hochgeladen."
 
-#: ../../admin/catalog.php:62
-#: ../../admin/catalog.php:82
-#: ../../admin/catalog.php:107
-#: ../../admin/catalog.php:168
+#: ../../admin/catalog.php:62 ../../admin/catalog.php:82
+#: ../../admin/catalog.php:107 ../../admin/catalog.php:168
 msgid "Catalog Updated"
 msgstr "Katalog aktualisiert"
 
@@ -855,9 +757,7 @@ msgstr "Übersicht der aktuell abspielenden Stücke gelöscht"
 msgid "Do you really want to clear the statistics for this catalog?"
 msgstr "Wollen sie wirklich die Katalogstatistik dieses Kataloges löschen?"
 
-#: ../../admin/catalog.php:230
-#: ../../templates/show_admin_tools.inc.php:69
-#: ../../templates/catalog.inc:31
+#: ../../admin/catalog.php:230 ../../templates/show_admin_tools.inc.php:76
 msgid "Clear Catalog Stats"
 msgstr "Katalogstatistiken löschen"
 
@@ -873,93 +773,66 @@ msgstr "Katalog löschen"
 msgid "Do you really want to delete this catalog?"
 msgstr "Wollen sie wirklich diesen Katalog löschen?"
 
-#: ../../admin/catalog.php:262
-#: ../../admin/catalog.php:265
+#: ../../admin/catalog.php:261 ../../admin/catalog.php:264
 msgid "Album Art Search Finished"
 msgstr "Album Cover-Suche beendet"
 
-#: ../../admin/flag.php:98
+#: ../../admin/flag.php:97
 msgid "Song Updated"
 msgstr "Stück aktualisiert"
 
-#: ../../admin/flag.php:98
+#: ../../admin/flag.php:97
 msgid "The requested song has been updated"
 msgstr "Das gewünschte Stück wurde aktualisiert"
 
-#: ../../admin/flag.php:149
+#: ../../admin/flag.php:139
+msgid "Album Updated"
+msgstr ""
+
+#: ../../admin/flag.php:181
+msgid "Artist Updated"
+msgstr ""
+
+#: ../../admin/flag.php:246
+msgid "Songs Updated"
+msgstr ""
+
+#: ../../admin/flag.php:254
 msgid "Flag Removed"
 msgstr "Markierung entfernt"
 
-#: ../../admin/flag.php:150
+#: ../../admin/flag.php:255
 msgid "Flag Removed from"
 msgstr "Markierung entfernt von"
 
-#: ../../admin/flag.php:169
+#: ../../admin/flag.php:270
+msgid "Flags Updated"
+msgstr ""
+
+#: ../../admin/flag.php:289
 msgid "Songs Disabled"
 msgstr "Stücke gesperrt"
 
-#: ../../admin/flag.php:169
+#: ../../admin/flag.php:289
 msgid "The requested song(s) have been disabled"
 msgstr "Die gewünschten Stücke wurden gesperrt"
 
-#: ../../admin/flag.php:180
+#: ../../admin/flag.php:300
 msgid "Songs Enabled"
 msgstr "Stücke freigegeben"
 
-#: ../../admin/flag.php:180
+#: ../../admin/flag.php:300
 msgid "The requested song(s) have been enabled"
 msgstr "Die gewünschten Stücke wurden freigegeben"
 
-#: ../../admin/flag.php:185
+#: ../../admin/flag.php:305
 msgid "Flagged Records"
 msgstr "Markierte Datensätze"
 
-#: ../../admin/preferences.php:59
-#: ../../admin/preferences.php:82
+#: ../../admin/preferences.php:60 ../../admin/preferences.php:83
 msgid "Site"
 msgstr "Site"
 
-#: ../../admin/users.php:65
-#: ../../admin/users.php:112
-msgid "Error Username Required"
-msgstr "Fehler Benutzername benötigt"
-
-#: ../../admin/users.php:68
-#: ../../admin/users.php:108
-msgid "Error Passwords don't match"
-msgstr "Fehler Passwort falsch"
-
-#: ../../admin/users.php:117
-#: ../../register.php:138
-msgid "Error Username already exists"
-msgstr "Fehler Benutzername existiert"
-
-#: ../../admin/users.php:139
-msgid "Deletion Request"
-msgstr "Löschen Abfrage"
-
-#: ../../admin/users.php:140
-msgid "Are you sure you want to permanently delete"
-msgstr "Sind Sie sicher endgültig zu löschen"
-
-#: ../../admin/users.php:145
-#: ../../templates/show_confirm_action.inc.php:29
-#: ../../templates/show_search.inc:78
-msgid "No"
-msgstr "Nein"
-
-#: ../../admin/users.php:147
-msgid "User Deleted"
-msgstr "Benutzer-Eintrag gelöscht"
-
-#: ../../admin/users.php:150
-msgid "Delete Error"
-msgstr "Fehler beim löschen"
-
-#: ../../admin/users.php:150
-msgid "Unable to delete last Admin User"
-msgstr "Der letzte Admin Benutzer kann nicht gelöscht werden"
-
 #: ../../admin/access.php:42
 msgid "Confirm Delete"
 msgstr "Löschen bestätigen"
@@ -992,50 +865,82 @@ msgstr "Eintrag aktualisiert"
 msgid "Access List Entry updated"
 msgstr "Zugriffslisten-Eintrag aktualisiert"
 
-#: ../../admin/mail.php:131
-#: ../../templates/show_local_catalog_info.inc.php:26
+#: ../../admin/users.php:65 ../../admin/users.php:112
+msgid "Error Username Required"
+msgstr "Fehler Benutzername benötigt"
+
+#: ../../admin/users.php:68 ../../admin/users.php:108
+msgid "Error Passwords don't match"
+msgstr "Fehler Passwort falsch"
+
+#: ../../admin/users.php:120 ../../register.php:138
+msgid "Error Username already exists"
+msgstr "Fehler Benutzername existiert"
+
+#: ../../admin/users.php:142
+msgid "Deletion Request"
+msgstr "Löschen Abfrage"
+
+#: ../../admin/users.php:143
+msgid "Are you sure you want to permanently delete"
+msgstr "Sind Sie sicher endgültig zu löschen"
+
+#: ../../admin/users.php:148 ../../templates/show_confirm_action.inc.php:29
+#: ../../templates/show_search.inc:78
+msgid "No"
+msgstr "Nein"
+
+#: ../../admin/users.php:150
+msgid "User Deleted"
+msgstr "Benutzer-Eintrag gelöscht"
+
+#: ../../admin/users.php:153
+msgid "Delete Error"
+msgstr "Fehler beim löschen"
+
+#: ../../admin/users.php:153
+msgid "Unable to delete last Admin User"
+msgstr "Der letzte Admin Benutzer kann nicht gelöscht werden"
+
+#: ../../admin/mail.php:83 ../../templates/show_mail_users.inc.php:41
+#: ../../templates/show_local_catalog_info.inc.php:23
+msgid "Catalog Statistics"
+msgstr "Katalogstatistik"
+
+#: ../../admin/mail.php:132 ../../templates/show_local_catalog_info.inc.php:27
 msgid "Total Users"
 msgstr "Gesamtzahl Benutzer"
 
-#: ../../admin/mail.php:132
-#: ../../templates/show_local_catalog_info.inc.php:30
+#: ../../admin/mail.php:133 ../../templates/show_local_catalog_info.inc.php:26
 msgid "Connected Users"
 msgstr "Verbundene Benutzer"
 
-#: ../../admin/mail.php:135
-#: ../../templates/sidebar.inc.php:157
+#: ../../admin/mail.php:136 ../../templates/sidebar.inc.php:153
 #: ../../templates/show_genre.inc.php:38
+#: ../../templates/show_local_catalog_info.inc.php:30
 #: ../../templates/show_genres.inc.php:37
-#: ../../templates/show_local_catalog_info.inc.php:42
-#: ../../templates/show_artists.inc:42
-#: ../../templates/show_artists.inc:64
-#: ../../templates/show_albums.inc:43
-#: ../../templates/show_albums.inc:75
+#: ../../ampache/templates/sidebar.inc.php:155
+#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:73
+#: ../../templates/show_albums.inc:43 ../../templates/show_albums.inc:86
 msgid "Songs"
 msgstr "Stücke"
 
-#: ../../admin/mail.php:136
-#: ../../templates/show_local_catalog_info.inc.php:46
+#: ../../admin/mail.php:137 ../../templates/show_local_catalog_info.inc.php:31
 msgid "Catalog Size"
 msgstr "Kataloggröße"
 
-#: ../../admin/mail.php:137
-#: ../../templates/show_local_catalog_info.inc.php:50
+#: ../../admin/mail.php:138 ../../templates/show_local_catalog_info.inc.php:32
 msgid "Catalog Time"
 msgstr "Katalog Spielzeit"
 
-#: ../../admin/mail.php:219
+#: ../../admin/mail.php:252
 msgid "E-mail Sent"
 msgstr "E-mail gesendet"
 
-#: ../../admin/mail.php:220
+#: ../../admin/mail.php:253
 msgid "Your E-mail was successfully sent."
 msgstr "Ihre E-mail wurde gesendet"
 
-#: ../../admin/system.php:120
-msgid "Export Failed"
-msgstr "Export fehlgeschlagen"
-
 #: ../../admin/modules.php:41
 msgid "Module Activated"
 msgstr "Modul aktiviert"
@@ -1060,6 +965,10 @@ msgstr "Wollen sie wirklich das Plugin deaktivieren?"
 msgid "Plugin Deactivated"
 msgstr "Plugin deaktiviert"
 
+#: ../../admin/system.php:120
+msgid "Export Failed"
+msgstr "Export fehlgeschlagen"
+
 #: ../../templates/show_flag.inc.php:41
 msgid "Flag Song"
 msgstr "Stück markieren"
@@ -1082,61 +991,67 @@ msgid "Incorrect Tags"
 msgstr "Inkorrekte TAGs"
 
 #: ../../templates/show_flag.inc.php:70
-#: ../../templates/show_flagged.inc.php:29
+#: ../../templates/show_flagged.inc.php:30
 msgid "Flag"
 msgstr "Markierung"
 
-#: ../../templates/show_localplay_status.inc.php:58
-msgid "Volume"
-msgstr "Lautstärke"
-
-#: ../../templates/show_localplay_status.inc.php:62
-msgid "Repeat"
-msgstr "Wiederholen"
-
-#: ../../templates/show_localplay_status.inc.php:68
-#: ../../templates/show_playlists.inc.php:63
-#: ../../templates/sidebar.inc.php:137
-#: ../../templates/show_artists.inc:56
-#: ../../templates/show_albums.inc:61
-msgid "Random"
-msgstr "Zufällig"
-
 #: ../../templates/show_install_account.inc.php:36
-#: ../../templates/show_install_lang.inc.php:10
+#: ../../templates/show_install_lang.inc.php:32
 #: ../../templates/show_install_config.inc:36
-#: ../../templates/show_install.inc:10
+#: ../../templates/show_install.inc:32
 msgid "Ampache Installation"
 msgstr "Ampache Installation"
 
 #: ../../templates/show_install_account.inc.php:43
-#: ../../templates/show_install_lang.inc.php:17
+#: ../../templates/show_install_lang.inc.php:39
 #: ../../templates/show_install_config.inc:42
-#: ../../templates/show_install.inc:18
-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 "Diese Seite behandelt die Installation der Ampache Datenbank und der Erstellung der ampache.cfg.php Datei. Bevor Sie fortfahren stellen Sie bitte sicher, dass folgende Voraussetzungen erfüllt sind."
+#: ../../templates/show_install.inc:40
+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 ""
+"Diese Seite behandelt die Installation der Ampache Datenbank und der "
+"Erstellung der ampache.cfg.php Datei. Bevor Sie fortfahren stellen Sie bitte "
+"sicher, dass folgende Voraussetzungen erfüllt sind."
 
 #: ../../templates/show_install_account.inc.php:46
-#: ../../templates/show_install_lang.inc.php:20
+#: ../../templates/show_install_lang.inc.php:42
 #: ../../templates/show_install_config.inc:45
-#: ../../templates/show_install.inc:21
-msgid "A MySQL Server with a username and password that can create/modify databases"
-msgstr "Ein MySQL Server mit bekanntem Benutzername und Passwort auf dem Datenbanken erstellt/modifiziert werden können"
+#: ../../templates/show_install.inc:43
+msgid ""
+"A MySQL Server with a username and password that can create/modify databases"
+msgstr ""
+"Ein MySQL Server mit bekanntem Benutzername und Passwort auf dem Datenbanken "
+"erstellt/modifiziert werden können"
 
 #: ../../templates/show_install_account.inc.php:47
-msgid "Your webserver has read access to the /sql/ampache.sql file and the /config/ampache.cfg.dist.php file"
-msgstr "Ihr Webserver hat Leseberechtigung an folgenden Dateien: /sql/ampache.sql und /config/ampache.cfg.dist.php"
+msgid ""
+"Your webserver has read access to the /sql/ampache.sql file and the /config/"
+"ampache.cfg.dist.php file"
+msgstr ""
+"Ihr Webserver hat Leseberechtigung an folgenden Dateien: /sql/ampache.sql "
+"und /config/ampache.cfg.dist.php"
 
 #: ../../templates/show_install_account.inc.php:49
-#: ../../templates/show_install_lang.inc.php:24
+#: ../../templates/show_install_lang.inc.php:46
 #: ../../templates/show_install_config.inc:48
-#: ../../templates/show_install.inc:25
-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 "Wenn Sie sicher sind, dass die obenstehenden Voraussetzungen erfüllt werden, bitte die nachfolgenden Informationen eingeben. Sie werden nur nach den unbedingt benötigten Werten gefragt. Wenn Sie später Änderungen an Ihrer Ampache Installation durchführen möchten, editieren Sie einfach die /config/ampache.cfg.php"
+#: ../../templates/show_install.inc:47
+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 ""
+"Wenn Sie sicher sind, dass die obenstehenden Voraussetzungen erfüllt werden, "
+"bitte die nachfolgenden Informationen eingeben. Sie werden nur nach den "
+"unbedingt benötigten Werten gefragt. Wenn Sie später Änderungen an Ihrer "
+"Ampache Installation durchführen möchten, editieren Sie einfach die /config/"
+"ampache.cfg.php"
 
 #: ../../templates/show_install_account.inc.php:53
 #: ../../templates/show_install_config.inc:52
-#: ../../templates/show_install.inc:30
+#: ../../templates/show_install.inc:52
 msgid "Step 1 - Creating and Inserting the Ampache Database"
 msgstr "Schritt 1 - Erstellen der Ampache Datenbank"
 
@@ -1146,29 +1061,32 @@ msgstr "Schritt 2 - Erstellen der ampache.cfg.php Datei"
 
 #: ../../templates/show_install_account.inc.php:55
 #: ../../templates/show_install_config.inc:57
-#: ../../templates/show_install.inc:35
+#: ../../templates/show_install.inc:57
 msgid "Step 3 - Setup Initial Account"
 msgstr "Schritt 3 - Erstes Konto erstellen"
 
 #: ../../templates/show_install_account.inc.php:57
-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 "Dieser Schritt erstellt das initiale Admin Konto. Sobald Ihr Admin-Konto erstellt wurde, werden Sie zur Login-Seite geleitet"
+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 ""
+"Dieser Schritt erstellt das initiale Admin Konto. Sobald Ihr Admin-Konto "
+"erstellt wurde, werden Sie zur Login-Seite geleitet"
 
 #: ../../templates/show_install_account.inc.php:60
 msgid "Create Admin Account"
 msgstr "Admin Konto erstellen"
 
 #: ../../templates/show_install_account.inc.php:65
-#: ../../templates/show_user_registration.inc.php:99
-#: ../../templates/show_recently_played.inc.php:25
-#: ../../templates/show_users_info.inc.php:27
+#: ../../templates/show_user_registration.inc.php:98
 #: ../../templates/show_edit_user.inc.php:40
+#: ../../templates/show_recently_played.inc.php:29
 #: ../../templates/show_users.inc:43
 msgid "Username"
 msgstr "Benutzername"
 
 #: ../../templates/show_install_account.inc.php:69
-#: ../../templates/show_user_registration.inc.php:127
+#: ../../templates/show_user_registration.inc.php:126
 #: ../../templates/show_edit_user.inc.php:63
 #: ../../templates/show_login_form.inc:37
 msgid "Password"
@@ -1178,132 +1096,9 @@ msgstr "Passwort"
 msgid "Create Account"
 msgstr "Konto erstellen"
 
-#: ../../templates/show_add_catalog.inc.php: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 "Geben Sie bitte unten im Formular einen lokalen Pfad (z.B. /daten/musik) oder ein URL zu einer entfernten Ampache Installation (z.B. http://theotherampache.com) ein."
-
-#: ../../templates/show_add_catalog.inc.php:35
-msgid "Catalog Name"
-msgstr "Katalogname"
-
-#: ../../templates/show_add_catalog.inc.php:38
-#: ../../templates/show_edit_catalog.inc.php:29
-msgid "Auto-inserted Fields"
-msgstr "Automatisch eingefügte Felder"
-
-#: ../../templates/show_add_catalog.inc.php:39
-#: ../../templates/show_edit_catalog.inc.php:30
-msgid "album name"
-msgstr "Albumname"
-
-#: ../../templates/show_add_catalog.inc.php:40
-#: ../../templates/show_edit_catalog.inc.php:31
-msgid "artist name"
-msgstr "Interpretenname"
-
-#: ../../templates/show_add_catalog.inc.php:41
-#: ../../templates/show_edit_catalog.inc.php:32
-msgid "id3 comment"
-msgstr "id3-Kommentar"
-
-#: ../../templates/show_add_catalog.inc.php:42
-#: ../../templates/show_edit_catalog.inc.php:33
-msgid "genre"
-msgstr "Genre"
-
-#: ../../templates/show_add_catalog.inc.php:43
-#: ../../templates/show_edit_catalog.inc.php:34
-msgid "track number (padded with leading 0)"
-msgstr "Titelummer (Mit einer 0 am Anfang)"
-
-#: ../../templates/show_add_catalog.inc.php:44
-#: ../../templates/show_edit_catalog.inc.php:35
-msgid "song title"
-msgstr "Titel"
-
-#: ../../templates/show_add_catalog.inc.php:45
-#: ../../templates/show_edit_catalog.inc.php:36
-msgid "year"
-msgstr "Jahr"
-
-#: ../../templates/show_add_catalog.inc.php:46
-#: ../../templates/show_edit_catalog.inc.php:37
-msgid "other"
-msgstr "andere"
-
-#: ../../templates/show_add_catalog.inc.php:51
-msgid "Path"
-msgstr "Pfad"
-
-#: ../../templates/show_add_catalog.inc.php:55
-#: ../../templates/show_edit_catalog.inc.php:41
-msgid "Catalog Type"
-msgstr "Katalogtyp"
-
-#: ../../templates/show_add_catalog.inc.php:59
-msgid "Remote"
-msgstr "Entfernt"
-
-#: ../../templates/show_add_catalog.inc.php:64
-#: ../../templates/show_edit_catalog.inc.php:44
-msgid "XML-RPC Key"
-msgstr "XML-RPC Schlüssel"
-
-#: ../../templates/show_add_catalog.inc.php:65
-msgid "Required for Remote Catalogs"
-msgstr "Benötigt für entfernte Kataloge"
-
-#: ../../templates/show_add_catalog.inc.php:68
-msgid "Filename Pattern"
-msgstr "Dateinamenmuster"
-
-#: ../../templates/show_add_catalog.inc.php:73
-#: ../../templates/show_edit_catalog.inc.php:57
-msgid "Folder Pattern"
-msgstr "Verzeichnisnamenmuster"
-
-#: ../../templates/show_add_catalog.inc.php:73
-#: ../../templates/show_edit_catalog.inc.php:57
-msgid "(no leading or ending '/')"
-msgstr "(Ohne '/' an Anfang oder Ende"
-
-#: ../../templates/show_add_catalog.inc.php:78
-#: ../../templates/show_admin_tools.inc.php:70
-#: ../../templates/catalog.inc:34
-msgid "Gather Album Art"
-msgstr "Nach Covern suchen"
-
-#: ../../templates/show_add_catalog.inc.php:82
-msgid "ID3V2 Tags"
-msgstr "ID3V2 TAGs"
-
-#: ../../templates/show_add_catalog.inc.php:86
-msgid "Amazon"
-msgstr "Amazon"
-
-#: ../../templates/show_add_catalog.inc.php:90
-msgid "File Folder"
-msgstr "Datei Verzeichnis"
-
-#: ../../templates/show_add_catalog.inc.php:98
-msgid "Build Playlists from m3u Files"
-msgstr "Erstelle Wiedergabelisten von m3u Dateien"
-
-#: ../../templates/show_add_catalog.inc.php:106
-msgid "Add Catalog"
-msgstr "Katalog hinzufügen"
-
-#: ../../templates/show_tv.inc.php:56
-msgid "Controls"
-msgstr ""
-
-#: ../../templates/show_tv.inc.php:72
-#: ../../templates/show_localplay.inc.php:42
-msgid "Current Playlist"
-msgstr "Aktuelle Wiedergabeliste"
-
 #: ../../templates/show_playlists.inc.php:28
-#: ../../templates/sidebar.inc.php:108
+#: ../../templates/sidebar.inc.php:104
+#: ../../ampache/templates/sidebar.inc.php:106
 msgid "Playlists"
 msgstr "Wiedergabelisten"
 
@@ -1321,8 +1116,7 @@ msgstr "Eigentümer"
 
 #: ../../templates/show_playlists.inc.php:36
 #: ../../templates/show_artist_box.inc.php:32
-#: ../../templates/show_localplay.inc.php:30
-#: ../../templates/show_album.inc:54
+#: ../../templates/show_localplay.inc.php:30 ../../templates/show_album.inc:54
 msgid "Actions"
 msgstr "Aktionen"
 
@@ -1334,27 +1128,26 @@ msgid "View"
 msgstr "Anschauen"
 
 #: ../../templates/show_playlists.inc.php:55
-#: ../../templates/show_users_info.inc.php:46
 #: ../../templates/show_play_selected.inc.php:50
 #: ../../templates/show_access_list.inc:67
 msgid "Edit"
 msgstr "Editieren"
 
 #: ../../templates/show_playlists.inc.php:61
-#: ../../templates/show_genres.inc.php:47
-#: ../../templates/show_tv_adminctl.inc.php:42
-#: ../../templates/show_artists.inc:54
+#: ../../templates/show_tv_adminctl.inc.php:44
 #: ../../templates/show_random_play.inc:82
-#: ../../templates/show_albums.inc:59
-#: ../../templates/show_artist.inc:62
 msgid "Play"
 msgstr "Abspielen"
 
-#: ../../templates/show_playlists.inc.php:66
-#: ../../templates/show_album.inc:65
+#: ../../templates/show_playlists.inc.php:63
+#: ../../templates/sidebar.inc.php:133
+#: ../../templates/show_localplay_status.inc.php:62
+#: ../../ampache/templates/sidebar.inc.php:135
+msgid "Random"
+msgstr "Zufällig"
+
+#: ../../templates/show_playlists.inc.php:66 ../../templates/show_album.inc:65
 #: ../../templates/show_random_play.inc:84
-#: ../../templates/show_albums.inc:63
-#: ../../templates/show_artist.inc:64
 msgid "Download"
 msgstr "Download"
 
@@ -1362,38 +1155,53 @@ msgstr "Download"
 msgid "No Playlists Found"
 msgstr "Keine Wiedergabelisten gefunden"
 
+#: ../../templates/show_duplicates.inc.php:25
+msgid "Find Duplicates"
+msgstr "Duplikate suchen"
+
+#: ../../templates/show_duplicates.inc.php:29
+msgid "Search Type"
+msgstr "Suchart"
+
+#: ../../templates/show_duplicates.inc.php:36
+msgid "Artist and Title"
+msgstr "Interpret und Titel"
+
+#: ../../templates/show_duplicates.inc.php:37
+msgid "Artist, Album and Title"
+msgstr "Interpret, Album und Titel"
+
+#: ../../templates/show_duplicates.inc.php:44
+msgid "Select Best Guess"
+msgstr ""
+
 #: ../../templates/show_confirm_action.inc.php:28
 #: ../../templates/show_search.inc:77
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../templates/show_user_stats.inc.php:22
-msgid "Favorites"
-msgstr "Favoriten"
-
-#: ../../templates/show_user_stats.inc.php:29
-msgid "Favorite Artists"
-msgstr "Beliebteste Interpreten"
-
-#: ../../templates/show_user_stats.inc.php:40
-msgid "Favorite Albums"
-msgstr "Beliebteste Alben"
+#: ../../templates/show_tv.inc.php:42
+msgid "Controls"
+msgstr ""
 
-#: ../../templates/show_user_stats.inc.php:51
-msgid "Favorite Songs"
-msgstr "Beliebteste Stücke"
+#: ../../templates/show_tv.inc.php:57
+#: ../../templates/show_localplay.inc.php:42
+msgid "Current Playlist"
+msgstr "Aktuelle Wiedergabeliste"
 
 #: ../../templates/show_playlist_edit.inc.php:27
 msgid "Editing Playlist"
 msgstr "Wiedergabeliste editieren"
 
 #: ../../templates/show_playlist_edit.inc.php:30
-#: ../../templates/show_admin_tools.inc.php:31
+#: ../../templates/show_admin_tools.inc.php:30
 #: ../../templates/show_user.inc.php:24
-#: ../../templates/show_localplay_playlist.inc.php:28
-#: ../../templates/show_modules.inc.php:70
-#: ../../templates/show_add_playlist.inc.php:28
+#: ../../templates/show_modules.inc.php:72
 #: ../../templates/show_edit_catalog.inc.php:26
+#: ../../templates/show_add_playlist.inc.php:28
+#: ../../templates/show_edit_album.inc.php:27
+#: ../../templates/show_localplay_playlist.inc.php:28
+#: ../../templates/show_edit_artist.inc.php:27
 #: ../../templates/show_add_access.inc:29
 #: ../../templates/show_access_list.inc:45
 #: ../../templates/show_edit_access.inc:27
@@ -1402,7 +1210,7 @@ msgstr "Name"
 
 #: ../../templates/show_playlist_edit.inc.php:36
 #: ../../templates/show_add_playlist.inc.php:32
-#: ../../templates/show_random_play.inc:50
+#: ../../templates/show_random_play.inc:49
 #: ../../templates/show_access_list.inc:51
 msgid "Type"
 msgstr "Typ"
@@ -1416,163 +1224,164 @@ msgid "Private"
 msgstr "privat"
 
 #: ../../templates/show_playlist_edit.inc.php:48
+#: ../../templates/show_tv_adminctl.inc.php:51
+#: ../../templates/show_flagged.inc.php:66
+#: ../../templates/show_play_selected.inc.php:64
 #: ../../templates/show_preference_admin.inc.php:47
-#: ../../templates/show_tv_adminctl.inc.php:49
 #: ../../templates/show_edit_access.inc:78
 msgid "Update"
 msgstr "Aktualisieren"
 
 #: ../../templates/sidebar.inc.php:28
+#: ../../ampache/templates/sidebar.inc.php:28
 msgid "Users"
 msgstr "Benutzer"
 
 #: ../../templates/sidebar.inc.php:29
+#: ../../ampache/templates/sidebar.inc.php:29
 msgid "Mail Users"
 msgstr "Mail zu Benutzern"
 
 #: ../../templates/sidebar.inc.php:31
+#: ../../ampache/templates/sidebar.inc.php:31
 msgid "Config"
 msgstr "Konfiguration"
 
 #: ../../templates/sidebar.inc.php:32
+#: ../../ampache/templates/sidebar.inc.php:32
 msgid "Access List"
 msgstr "Zugriffsliste"
 
-#: ../../templates/sidebar.inc.php:33
-msgid "Modules"
-msgstr "Module"
-
-#: ../../templates/sidebar.inc.php:38
+#: ../../templates/sidebar.inc.php:37
+#: ../../ampache/templates/sidebar.inc.php:37
 msgid "Song Title"
 msgstr "Titel"
 
-#: ../../templates/sidebar.inc.php:39
-msgid "Lists"
-msgstr "Listen"
-
-#: ../../templates/sidebar.inc.php:64
-#: ../../templates/show_preference_admin.inc.php:39
+#: ../../templates/sidebar.inc.php:60
 #: ../../templates/show_tv_playlist.inc.php:48
+#: ../../templates/show_preference_admin.inc.php:39
+#: ../../ampache/templates/sidebar.inc.php:62
 msgid "Admin"
 msgstr "Admin"
 
-#: ../../templates/sidebar.inc.php:158
+#: ../../templates/sidebar.inc.php:154
+#: ../../ampache/templates/sidebar.inc.php:156
 #: ../../templates/show_random_play.inc:56
 msgid "Minutes"
 msgstr "Minuten"
 
-#: ../../templates/sidebar.inc.php:161
+#: ../../templates/sidebar.inc.php:157
+#: ../../ampache/templates/sidebar.inc.php:159
 #: ../../templates/show_random_play.inc:53
 msgid "Less Played"
 msgstr "Wenig gespielt"
 
-#: ../../templates/sidebar.inc.php:166
+#: ../../templates/sidebar.inc.php:162
+#: ../../ampache/templates/sidebar.inc.php:164
 msgid "Enqueue"
 msgstr "Abspielen"
 
-#: ../../templates/sidebar.inc.php:189
+#: ../../templates/sidebar.inc.php:185
+#: ../../ampache/templates/sidebar.inc.php:187
 msgid "Democratic View"
 msgstr "Demokratische Ansicht"
 
-#: ../../templates/sidebar.inc.php:193
+#: ../../templates/sidebar.inc.php:189
+#: ../../ampache/templates/sidebar.inc.php:191
 msgid "Logout"
 msgstr "Ausloggen"
 
-#: ../../templates/show_admin_tools.inc.php:28
+#: ../../templates/show_admin_tools.inc.php:27
 msgid "Catalogs"
 msgstr "Kataloge"
 
-#: ../../templates/show_admin_tools.inc.php:32
-#: ../../templates/show_localplay_playlist.inc.php:29
-#: ../../templates/show_modules.inc.php:40
-#: ../../templates/show_modules.inc.php:73
+#: ../../templates/show_admin_tools.inc.php:31
 #: ../../templates/show_tv_playlist.inc.php:43
-#: ../../templates/show_users_info.inc.php:30
+#: ../../templates/show_modules.inc.php:42
+#: ../../templates/show_modules.inc.php:75
 #: ../../templates/show_genres.inc.php:38
-#: ../../templates/show_flagged.inc.php:31
-#: ../../templates/show_artists.inc:44
-#: ../../templates/show_artists.inc:66
-#: ../../templates/show_songs.inc:55
-#: ../../templates/show_albums.inc:47
-#: ../../templates/show_albums.inc:79
-#: ../../templates/show_access_list.inc:52
+#: ../../templates/show_flagged.inc.php:32
+#: ../../templates/show_localplay_playlist.inc.php:29
+#: ../../templates/show_artists.inc:44 ../../templates/show_artists.inc:75
+#: ../../templates/show_songs.inc:55 ../../templates/show_albums.inc:47
+#: ../../templates/show_albums.inc:90 ../../templates/show_access_list.inc:52
 #: ../../templates/show_artist.inc:39
 msgid "Action"
 msgstr "Aktion"
 
-#: ../../templates/show_admin_tools.inc.php:43
+#: ../../templates/show_admin_tools.inc.php:42
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: ../../templates/show_admin_tools.inc.php:45
+#: ../../templates/show_admin_tools.inc.php:44
 msgid "Verify"
 msgstr "Prüfen"
 
-#: ../../templates/show_admin_tools.inc.php:47
+#: ../../templates/show_admin_tools.inc.php:46
 msgid "Clean"
 msgstr "Bereinigen"
 
-#: ../../templates/show_admin_tools.inc.php:58
+#: ../../templates/show_admin_tools.inc.php:56
+msgid "Fast"
+msgstr ""
+
+#: ../../templates/show_admin_tools.inc.php:57
+msgid "Gather Art"
+msgstr ""
+
+#: ../../templates/show_admin_tools.inc.php:65
 msgid "No Catalogs Found"
 msgstr "Keine Kataloge gefunden"
 
-#: ../../templates/show_admin_tools.inc.php:64
+#: ../../templates/show_admin_tools.inc.php:71
 msgid "Clean All"
 msgstr "Alle Bereinigen"
 
-#: ../../templates/show_admin_tools.inc.php:65
+#: ../../templates/show_admin_tools.inc.php:72
 msgid "Verify All"
 msgstr "Alle prüfen"
 
-#: ../../templates/show_admin_tools.inc.php:66
+#: ../../templates/show_admin_tools.inc.php:73
 msgid "Add to All"
 msgstr "Zu allen hinzufügen"
 
-#: ../../templates/show_admin_tools.inc.php:67
+#: ../../templates/show_admin_tools.inc.php:74
 msgid "Update All"
 msgstr "Alle aktualisieren"
 
-#: ../../templates/show_admin_tools.inc.php:74
+#: ../../templates/show_admin_tools.inc.php:77
+#: ../../templates/show_add_catalog.inc.php:78
+msgid "Gather Album Art"
+msgstr "Nach Covern suchen"
+
+#: ../../templates/show_admin_tools.inc.php:81
 msgid "Other Tools"
 msgstr "Andere Werkzeuge"
 
-#: ../../templates/show_admin_tools.inc.php:76
-#: ../../templates/catalog.inc:29
+#: ../../templates/show_admin_tools.inc.php:83
 msgid "Show Duplicate Songs"
 msgstr "Doppelte Stücke anzeigen"
 
-#: ../../templates/show_admin_tools.inc.php:77
-#: ../../templates/catalog.inc:32
+#: ../../templates/show_admin_tools.inc.php:84
 msgid "Clear Now Playing"
 msgstr "Momentan gespielte löschen"
 
-#: ../../templates/show_admin_tools.inc.php:79
+#: ../../templates/show_admin_tools.inc.php:85 ../../templates/header.inc:75
 msgid "Generate New Config"
 msgstr "Schreibe neue Konfiguration"
 
-#: ../../templates/show_admin_tools.inc.php:80
+#: ../../templates/show_admin_tools.inc.php:86
 msgid "Preferences Permissions"
 msgstr "Berechtigungen"
 
-#: ../../templates/show_admin_tools.inc.php:82
+#: ../../templates/show_admin_tools.inc.php:87
 msgid "Export To Itunes DB"
 msgstr "Export in Itunes DB"
 
-#: ../../templates/show_admin_tools.inc.php:83
+#: ../../templates/show_admin_tools.inc.php:88
 msgid "Check for New Version"
 msgstr "Prüfe auf neue Version"
 
-#: ../../templates/show_admin_tools.inc.php:86
-msgid "User Activity"
-msgstr "Benutzer Aktivität"
-
-#: ../../templates/show_admin_tools.inc.php:89
-#: ../../templates/show_ip_history.inc.php:28
-#: ../../templates/show_admin_info.inc.php:37
-#: ../../templates/show_admin_info.inc.php:45
-msgid "Show All"
-msgstr "Zeige Alle"
-
 #: ../../templates/show_artist_box.inc.php:23
 msgid "Albums by"
 msgstr "Alben von"
@@ -1603,7 +1412,7 @@ msgid "Find duplicate artists"
 msgstr "Doppelte Stücke anzeigen"
 
 #: ../../templates/show_user.inc.php:30
-#: ../../templates/show_user_registration.inc.php:118
+#: ../../templates/show_user_registration.inc.php:117
 #: ../../templates/show_edit_user.inc.php:55
 msgid "E-mail"
 msgstr ""
@@ -1617,7 +1426,7 @@ msgid "New Password"
 msgstr "Neues Passwort"
 
 #: ../../templates/show_user.inc.php:49
-#: ../../templates/show_user_registration.inc.php:136
+#: ../../templates/show_user_registration.inc.php:135
 #: ../../templates/show_edit_user.inc.php:72
 msgid "Confirm Password"
 msgstr "Passwort wiederholen"
@@ -1630,14 +1439,35 @@ msgstr "Statistiken löschen"
 msgid "Update Account"
 msgstr "Konto aktualisieren"
 
-#: ../../templates/show_localplay_playlist.inc.php:51
-#: ../../templates/show_modules.inc.php:59
-#: ../../templates/show_modules.inc.php:94
-#: ../../templates/show_users_info.inc.php:52
-#: ../../templates/show_flagged.inc.php:52
-#: ../../templates/show_disabled_songs.inc:44
-msgid "No Records Found"
-msgstr "Keine Datensätze gefunden"
+#: ../../templates/show_user_stats.inc.php:22
+msgid "Favorites"
+msgstr "Favoriten"
+
+#: ../../templates/show_user_stats.inc.php:29
+msgid "Favorite Artists"
+msgstr "Beliebteste Interpreten"
+
+#: ../../templates/show_user_stats.inc.php:40
+msgid "Favorite Albums"
+msgstr "Beliebteste Alben"
+
+#: ../../templates/show_user_stats.inc.php:51
+msgid "Favorite Songs"
+msgstr "Beliebteste Stücke"
+
+#: ../../templates/show_tv_playlist.inc.php:31
+msgid "Playing from base Playlist"
+msgstr "Spiele von Basis-Wiedergabeliste"
+
+#: ../../templates/show_tv_playlist.inc.php:44
+msgid "Votes"
+msgstr "Bewertungen"
+
+#: ../../templates/show_tv_playlist.inc.php:45
+#: ../../templates/show_list_duplicates.inc.php:31
+#: ../../templates/show_recently_played.inc.php:30
+msgid "Song"
+msgstr "Stück"
 
 #: ../../templates/show_preference_box.inc.php:42
 #: ../../templates/show_preference_admin.inc.php:26
@@ -1656,89 +1486,94 @@ msgstr "zu allen hinzufügen"
 msgid "description"
 msgstr "Beschreibung"
 
-#: ../../templates/show_user_registration.inc.php:55
+#: ../../templates/show_user_registration.inc.php:54
 msgid "Ampache New User Registration"
 msgstr "Ampache neuen Benutzer registrieren"
 
-#: ../../templates/show_user_registration.inc.php:70
+#: ../../templates/show_user_registration.inc.php:69
 msgid "User Agreement"
 msgstr "Benutzer-Vereinbarung"
 
-#: ../../templates/show_user_registration.inc.php:80
+#: ../../templates/show_user_registration.inc.php:79
 msgid "I Accept"
 msgstr "Ich Akzeptiere"
 
-#: ../../templates/show_user_registration.inc.php:94
+#: ../../templates/show_user_registration.inc.php:93
 msgid "User Information"
 msgstr "Benutzer Information"
 
-#: ../../templates/show_user_registration.inc.php:109
+#: ../../templates/show_user_registration.inc.php:108
 #: ../../templates/show_edit_user.inc.php:48
 msgid "Full Name"
 msgstr "Kompletter Name"
 
-#: ../../templates/show_user_registration.inc.php:156
+#: ../../templates/show_user_registration.inc.php:155
 msgid "Clear Info"
 msgstr "Info löschen"
 
-#: ../../templates/show_user_registration.inc.php:157
+#: ../../templates/show_user_registration.inc.php:156
 msgid "Register User"
 msgstr "Registriere Benutzer"
 
-#: ../../templates/show_install_lang.inc.php:15
-#: ../../templates/show_install.inc:16
+#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install.inc:38
 msgid "Requirements"
 msgstr "Benötigtes"
 
-#: ../../templates/show_install_lang.inc.php:21
+#: ../../templates/show_install_lang.inc.php:43
 #: ../../templates/show_install_config.inc:46
-#: ../../templates/show_install.inc:22
-msgid "Your webserver has read access to the /sql/ampache.sql file and the /config/ampache.cfg.php.dist file"
-msgstr "Ihr Websever hat Leserechte an der Datei /sql/ampache.sql und /config/ampache.cfg.php.dist"
+#: ../../templates/show_install.inc:44
+msgid ""
+"Your webserver has read access to the /sql/ampache.sql file and the /config/"
+"ampache.cfg.php.dist file"
+msgstr ""
+"Ihr Websever hat Leserechte an der Datei /sql/ampache.sql und /config/"
+"ampache.cfg.php.dist"
 
-#: ../../templates/show_install_lang.inc.php:50
+#: ../../templates/show_install_lang.inc.php:72
 msgid "Start configuration"
 msgstr "Starte Configuration"
 
-#: ../../templates/show_modules.inc.php:36
+#: ../../templates/show_modules.inc.php:38
 msgid "Localplay Modules"
 msgstr "Lokale Abspiel-Module"
 
-#: ../../templates/show_modules.inc.php:39
+#: ../../templates/show_modules.inc.php:41
 msgid "Module Name"
 msgstr "Modul Name"
 
-#: ../../templates/show_modules.inc.php:46
-#: ../../templates/show_modules.inc.php:79
+#: ../../templates/show_modules.inc.php:48
+#: ../../templates/show_modules.inc.php:81
 #: ../../templates/show_tv_adminctl.inc.php:28
 msgid "Activate"
 msgstr "Aktiviere"
 
-#: ../../templates/show_modules.inc.php:50
-#: ../../templates/show_modules.inc.php:83
+#: ../../templates/show_modules.inc.php:52
+#: ../../templates/show_modules.inc.php:85
 msgid "Deactivate"
 msgstr "Deaktiviere"
 
-#: ../../templates/show_modules.inc.php:67
+#: ../../templates/show_modules.inc.php:61
+#: ../../templates/show_modules.inc.php:96
+#: ../../templates/show_flagged.inc.php:57
+#: ../../templates/show_list_duplicates.inc.php:81
+#: ../../templates/show_localplay_playlist.inc.php:51
+#: ../../templates/show_disabled_songs.inc:44
+msgid "No Records Found"
+msgstr "Keine Datensätze gefunden"
+
+#: ../../templates/show_modules.inc.php:70
 msgid "Available Plugins"
 msgstr "Verfügbare Plugins"
 
-#: ../../templates/show_modules.inc.php:71
+#: ../../templates/show_modules.inc.php:73
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../../templates/show_modules.inc.php:72
+#: ../../templates/show_modules.inc.php:74
 msgid "Version"
 msgstr "Version"
 
-#: ../../templates/show_add_playlist.inc.php:24
-msgid "Create a new playlist"
-msgstr "Neue Wiedergabeliste erstellen"
-
-#: ../../templates/show_add_playlist.inc.php:42
-msgid "Create"
-msgstr "Erstellen"
-
 #: ../../templates/show_edit_song.inc.php:23
 msgid "Edit Song"
 msgstr "Stück editieren"
@@ -1752,6 +1587,8 @@ msgid "OR"
 msgstr "ODER"
 
 #: ../../templates/show_edit_song.inc.php:81
+#: ../../templates/show_edit_album.inc.php:41
+#: ../../templates/show_edit_artist.inc.php:35
 msgid "Flag for Retagging"
 msgstr "Markierung Retagging"
 
@@ -1759,66 +1596,12 @@ msgstr "Markierung Retagging"
 msgid "Update Song"
 msgstr "Stück aktualisieren"
 
-#: ../../templates/show_edit_catalog.inc.php:22
-msgid "Settings for"
-msgstr "Einstellungen für"
-
-#: ../../templates/show_edit_catalog.inc.php:50
-msgid "Filename pattern"
-msgstr "Dateinamenmuster"
-
-#: ../../templates/show_edit_catalog.inc.php:68
-msgid "Save Catalog Settings"
-msgstr "Katalogeinstellungen sichern"
-
-#: ../../templates/show_recently_played.inc.php:22
-msgid "Recently Played"
-msgstr "Zuletzt gespielt"
-
-#: ../../templates/show_recently_played.inc.php:26
-#: ../../templates/show_tv_playlist.inc.php:45
-#: ../../templates/show_list_duplicates.inc.php:33
-msgid "Song"
-msgstr "Stück"
-
-#: ../../templates/show_user_recommendations.inc.php:22
-msgid "Recommendations"
-msgstr "Empfehlungen"
-
-#: ../../templates/show_user_recommendations.inc.php:29
-msgid "Recommended Aritsts"
-msgstr "Empfohlene Interpreten"
-
-#: ../../templates/show_user_recommendations.inc.php:40
-msgid "Recommended Albums"
-msgstr "Empfohlene Alben"
-
-#: ../../templates/show_user_recommendations.inc.php:51
-msgid "Recommended Songs"
-msgstr "Empfohlene Stücke"
-
-#: ../../templates/show_ip_history.inc.php:23
-msgid "IP History"
-msgstr "IP Hostorie"
-
-#: ../../templates/show_ip_history.inc.php:26
-msgid "Show Unique"
-msgstr "Zeige Einmalige"
-
-#: ../../templates/show_ip_history.inc.php:34
-msgid "Date"
-msgstr "Datum"
-
-#: ../../templates/show_ip_history.inc.php:37
-msgid "IP Address"
-msgstr "IP Adresse"
-
 #: ../../templates/show_import_playlist.inc.php:24
 msgid "Importing a Playlist from a File"
 msgstr "Importiere eine Wiedergabeliste von einer Datei"
 
 #: ../../templates/show_import_playlist.inc.php:28
-#: ../../templates/show_list_duplicates.inc.php:39
+#: ../../templates/show_list_duplicates.inc.php:37
 #: ../../templates/show_disabled_songs.inc:29
 #: ../../templates/show_search.inc:67
 msgid "Filename"
@@ -1845,8 +1628,7 @@ msgid "Mail to"
 msgstr "Mail zu"
 
 #: ../../templates/show_mail_users.inc.php:45
-#: ../../templates/show_all_popular.inc.php:30
-#: ../../index.php:66
+#: ../../templates/show_all_popular.inc.php:29
 msgid "Most Popular Albums"
 msgstr "Meistgespielte Alben"
 
@@ -1855,8 +1637,7 @@ msgid "Latest Artist Additions"
 msgstr "Neuste Interpretenzugänge"
 
 #: ../../templates/show_mail_users.inc.php:56
-#: ../../templates/show_all_popular.inc.php:27
-#: ../../index.php:75
+#: ../../templates/show_all_popular.inc.php:26
 msgid "Most Popular Artists"
 msgstr "Meistgespielte Interpreten"
 
@@ -1865,55 +1646,44 @@ msgid "Latest Album Additions"
 msgstr "Neuste Albenzugänge"
 
 #: ../../templates/show_mail_users.inc.php:67
-#: ../../templates/show_all_popular.inc.php:40
+#: ../../templates/show_all_popular.inc.php:38
 msgid "Most Popular Songs"
 msgstr "Meistgespielte Stücke"
 
 #: ../../templates/show_mail_users.inc.php:73
+msgid "Flagged Songs"
+msgstr ""
+
+#: ../../templates/show_mail_users.inc.php:77
+#: ../../templates/show_admin_info.inc.php:36
+msgid "Disabled Songs"
+msgstr "Gesperrte Stücke"
+
+#: ../../templates/show_mail_users.inc.php:85
 msgid "Most Popular Threshold in days"
 msgstr "Meistgespielte Stücke in Tagen"
 
-#: ../../templates/show_mail_users.inc.php:84
+#: ../../templates/show_mail_users.inc.php:96
 msgid "Subject"
 msgstr "Betreff"
 
-#: ../../templates/show_mail_users.inc.php:91
+#: ../../templates/show_mail_users.inc.php:103
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../../templates/show_mail_users.inc.php:101
+#: ../../templates/show_mail_users.inc.php:113
 msgid "Send Mail"
 msgstr "Sende Mail"
 
-#: ../../templates/show_admin_info.inc.php:34
+#: ../../templates/show_admin_info.inc.php:32
 msgid "Last Ten Flagged Records"
 msgstr "Die letzten 10 markierten Stücke"
 
-#: ../../templates/show_admin_info.inc.php:41
-msgid "Disabled Songs"
-msgstr "Gesperrte Stücke"
-
-#: ../../templates/show_preference_admin.inc.php:22
-msgid "Preference Administration"
-msgstr "Administrations-Einstellungen"
-
-#: ../../templates/show_preference_admin.inc.php:27
-#: ../../templates/show_add_access.inc:53
-#: ../../templates/show_access_list.inc:48
-#: ../../templates/show_edit_access.inc:62
-msgid "Level"
-msgstr "Level"
-
-#: ../../templates/show_preference_admin.inc.php:37
-msgid "Guest"
-msgstr "Gast"
-
-#: ../../templates/show_preference_admin.inc.php:38
-#: ../../templates/show_add_access.inc:47
-#: ../../templates/show_access_list.inc:49
-#: ../../templates/show_edit_access.inc:47
-msgid "User"
-msgstr "Benutzer"
+#: ../../templates/show_admin_info.inc.php:40
+#: ../../templates/show_flagged.inc.php:73
+#: ../../templates/show_ip_history.inc.php:28
+msgid "Show All"
+msgstr "Zeige Alle"
 
 #: ../../templates/show_object_rating.inc.php:50
 #: ../../templates/show_object_rating.inc.php:53
@@ -1923,108 +1693,60 @@ msgstr "Benutzer"
 msgid "out of"
 msgstr ""
 
-#: ../../templates/show_tv_playlist.inc.php:31
-msgid "Playing from base Playlist"
-msgstr "Spiele von Basis-Wiedergabeliste"
-
-#: ../../templates/show_tv_playlist.inc.php:44
-msgid "Votes"
-msgstr "Bewertungen"
-
-#: ../../templates/show_users_info.inc.php:27
-#: ../../templates/show_users.inc:40
-msgid "Fullname"
-msgstr "Kompletter Name"
-
-#: ../../templates/show_users_info.inc.php:28
-#: ../../templates/show_users.inc:48
-msgid "Last Seen"
-msgstr "Zuletzt anwesend"
-
-#: ../../templates/show_users_info.inc.php:29
-#: ../../templates/show_users.inc:57
-msgid "Activity"
-msgstr "Aktivität"
-
-#: ../../templates/show_edit_user.inc.php:25
-msgid "Adding a New User"
-msgstr "Neuen Benutzer hinzufügen"
-
-#: ../../templates/show_edit_user.inc.php:29
-msgid "Editing existing User"
-msgstr "Existierenden Benutzer editieren"
-
-#: ../../templates/show_edit_user.inc.php:80
-msgid "User Access Level"
-msgstr "Benutzer Zugriffs-Level"
+#: ../../templates/show_tv_adminctl.inc.php:22
+msgid "Admin Controls"
+msgstr ""
 
-#: ../../templates/show_edit_user.inc.php:94
-msgid "Add User"
-msgstr "Benutzer hinzufügen"
+#: ../../templates/show_tv_adminctl.inc.php:25
+#: ../../templates/show_tv_adminctl.inc.php:47
+msgid "Base Playlist"
+msgstr "Basis Wiedergabeliste"
 
-#: ../../templates/show_edit_user.inc.php:98
-msgid "Update User"
-msgstr "Benutzer aktualisieren"
+#: ../../templates/show_tv_adminctl.inc.php:36
+#: ../../templates/show_localplay.inc.php:32
+msgid "Clear Playlist"
+msgstr "Wiedergabeliste leeren"
 
 #: ../../templates/show_confirmation.inc.php:26
 msgid "Continue"
 msgstr "Weiter"
 
 #: ../../templates/show_confirmation.inc.php:28
-#: ../../templates/show_preferences.inc:90
+#: ../../templates/show_preferences.inc:96
 #: ../../templates/show_similar_artists.inc:74
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../../templates/show_list_duplicates.inc.php:28
-msgid "Duplicate Songs"
-msgstr "Doppelte Stücke anzeigen"
-
-#: ../../templates/show_list_duplicates.inc.php:36
-msgid "Length"
-msgstr "Länge"
-
-#: ../../templates/show_list_duplicates.inc.php:38
-#: ../../templates/show_songs.inc:52
-msgid "Size"
-msgstr "Größe"
-
-#: ../../templates/show_list_duplicates.inc.php:71
-msgid "You don't have any duplicate songs."
-msgstr "Sie haben keine doppelten Stücke"
+#: ../../templates/show_flagged.inc.php:27
+#: ../../templates/show_disabled_songs.inc:25
+#: ../../templates/show_artist.inc:33
+msgid "Select"
+msgstr "Auswahl"
 
 #: ../../templates/show_flagged.inc.php:28
 msgid "Object"
 msgstr "Auswahl"
 
-#: ../../templates/show_flagged.inc.php:30
+#: ../../templates/show_flagged.inc.php:29
+#: ../../templates/show_preference_admin.inc.php:38
+#: ../../templates/show_add_access.inc:47
+#: ../../templates/show_access_list.inc:49
+#: ../../templates/show_edit_access.inc:47
+msgid "User"
+msgstr "Benutzer"
+
+#: ../../templates/show_flagged.inc.php:31
 msgid "Status"
 msgstr "Status"
 
-#: ../../templates/show_flagged.inc.php:41
+#: ../../templates/show_flagged.inc.php:63
 msgid "Reject"
 msgstr "Verwerfen"
 
-#: ../../templates/show_flagged.inc.php:45
+#: ../../templates/show_flagged.inc.php:64
 msgid "Approve"
 msgstr "Erlauben"
 
-#: ../../templates/show_duplicates.inc.php:25
-msgid "Find Duplicates"
-msgstr "Duplikate suchen"
-
-#: ../../templates/show_duplicates.inc.php:29
-msgid "Search Type"
-msgstr "Suchart"
-
-#: ../../templates/show_duplicates.inc.php:43
-msgid "Artist and Title"
-msgstr "Interpret und Titel"
-
-#: ../../templates/show_duplicates.inc.php:48
-msgid "Artist, Album and Title"
-msgstr "Interpret, Album und Titel"
-
 #: ../../templates/show_rename_artist.inc.php:29
 #: ../../templates/show_rename_artist.inc.php:38
 msgid "Rename"
@@ -2038,17 +1760,16 @@ msgstr ""
 msgid "Update id3 tags"
 msgstr "Aktuallisieren des id3 TAG"
 
-#: ../../templates/show_tv_adminctl.inc.php:22
-msgid "Admin Controls"
-msgstr ""
+#: ../../templates/show_all_recent.inc.php:25
+msgid "Newest Artist Additions"
+msgstr "Neuste Interpretenzugänge"
 
-#: ../../templates/show_tv_adminctl.inc.php:25
-#: ../../templates/show_tv_adminctl.inc.php:45
-msgid "Base Playlist"
-msgstr "Basis Wiedergabeliste"
+#: ../../templates/show_all_recent.inc.php:28
+msgid "Newest Album Additions"
+msgstr "Neuste Albenzugänge"
 
-#: ../../templates/show_tv_adminctl.inc.php:35
-msgid "Democratic Play Active"
+#: ../../templates/show_all_recent.inc.php:31
+msgid "Newest Live Stream Additions"
 msgstr ""
 
 #: ../../templates/show_get_albumart.inc.php:23
@@ -2067,15 +1788,6 @@ msgstr "Lokales Bild"
 msgid "Get Art"
 msgstr "Empfange Cover"
 
-#: ../../templates/show_all_recent.inc.php:27
-msgid "Newest Artist Additions"
-msgstr "Neuste Interpretenzugänge"
-
-#: ../../templates/show_all_recent.inc.php:30
-#: ../../index.php:82
-msgid "Newest Album Additions"
-msgstr "Neuste Albenzugänge"
-
 #: ../../templates/show_playlist_box.inc.php:29
 msgid "Playlist Actions"
 msgstr "Wiedergabelisten Aktionen"
@@ -2112,10 +1824,18 @@ msgstr "Neue Wiedergabeliste erstellen"
 msgid "Delete Empty Playlists"
 msgstr "Lösche leere Wiedergabelisten"
 
-#: ../../templates/show_all_popular.inc.php:37
+#: ../../templates/show_all_popular.inc.php:32
 msgid "Most Popular Genres"
 msgstr "Meistgespielte Genres"
 
+#: ../../templates/show_all_popular.inc.php:41
+msgid "Most Popular Live Streams"
+msgstr ""
+
+#: ../../templates/show_all_popular.inc.php:44
+msgid "Most Popular Tags"
+msgstr ""
+
 #: ../../templates/show_play_selected.inc.php:28
 msgid "Play Selected"
 msgstr "Ausgewählte abspielen"
@@ -2136,12 +1856,274 @@ msgstr "Ausgewählte Stücke entfernen"
 msgid "Add to"
 msgstr "Hinzufügen"
 
-#: ../../templates/show_localplay.inc.php:32
-msgid "Clear Playlist"
-msgstr "Wiedergabeliste leeren"
+#: ../../templates/show_edit_catalog.inc.php:22
+msgid "Settings for"
+msgstr "Einstellungen für"
+
+#: ../../templates/show_edit_catalog.inc.php:29
+#: ../../templates/show_add_catalog.inc.php:38
+msgid "Auto-inserted Fields"
+msgstr "Automatisch eingefügte Felder"
+
+#: ../../templates/show_edit_catalog.inc.php:30
+#: ../../templates/show_add_catalog.inc.php:39
+msgid "album name"
+msgstr "Albumname"
+
+#: ../../templates/show_edit_catalog.inc.php:31
+#: ../../templates/show_add_catalog.inc.php:40
+msgid "artist name"
+msgstr "Interpretenname"
+
+#: ../../templates/show_edit_catalog.inc.php:32
+#: ../../templates/show_add_catalog.inc.php:41
+msgid "id3 comment"
+msgstr "id3-Kommentar"
+
+#: ../../templates/show_edit_catalog.inc.php:33
+#: ../../templates/show_add_catalog.inc.php:42
+msgid "genre"
+msgstr "Genre"
+
+#: ../../templates/show_edit_catalog.inc.php:34
+#: ../../templates/show_add_catalog.inc.php:43
+msgid "track number (padded with leading 0)"
+msgstr "Titelummer (Mit einer 0 am Anfang)"
+
+#: ../../templates/show_edit_catalog.inc.php:35
+#: ../../templates/show_add_catalog.inc.php:44
+msgid "song title"
+msgstr "Titel"
+
+#: ../../templates/show_edit_catalog.inc.php:36
+#: ../../templates/show_add_catalog.inc.php:45
+msgid "year"
+msgstr "Jahr"
+
+#: ../../templates/show_edit_catalog.inc.php:37
+#: ../../templates/show_add_catalog.inc.php:46
+msgid "other"
+msgstr "andere"
+
+#: ../../templates/show_edit_catalog.inc.php:41
+#: ../../templates/show_add_catalog.inc.php:55
+msgid "Catalog Type"
+msgstr "Katalogtyp"
+
+#: ../../templates/show_edit_catalog.inc.php:44
+#: ../../templates/show_add_catalog.inc.php:64
+msgid "XML-RPC Key"
+msgstr "XML-RPC Schlüssel"
+
+#: ../../templates/show_edit_catalog.inc.php:50
+msgid "Filename pattern"
+msgstr "Dateinamenmuster"
+
+#: ../../templates/show_edit_catalog.inc.php:57
+#: ../../templates/show_add_catalog.inc.php:73
+msgid "Folder Pattern"
+msgstr "Verzeichnisnamenmuster"
+
+#: ../../templates/show_edit_catalog.inc.php:57
+#: ../../templates/show_add_catalog.inc.php:73
+msgid "(no leading or ending '/')"
+msgstr "(Ohne '/' an Anfang oder Ende"
+
+#: ../../templates/show_edit_catalog.inc.php:68
+msgid "Save Catalog Settings"
+msgstr "Katalogeinstellungen sichern"
+
+#: ../../templates/show_localplay_status.inc.php:52
+msgid "Volume"
+msgstr "Lautstärke"
+
+#: ../../templates/show_localplay_status.inc.php:56
+msgid "Repeat"
+msgstr "Wiederholen"
+
+#: ../../templates/show_add_playlist.inc.php:24
+msgid "Create a new playlist"
+msgstr "Neue Wiedergabeliste erstellen"
+
+#: ../../templates/show_add_playlist.inc.php:42
+msgid "Create"
+msgstr "Erstellen"
+
+#: ../../templates/show_add_catalog.inc.php: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 ""
+"Geben Sie bitte unten im Formular einen lokalen Pfad (z.B. /daten/musik) "
+"oder ein URL zu einer entfernten Ampache Installation (z.B. http://"
+"theotherampache.com) ein."
+
+#: ../../templates/show_add_catalog.inc.php:35
+msgid "Catalog Name"
+msgstr "Katalogname"
+
+#: ../../templates/show_add_catalog.inc.php:51
+msgid "Path"
+msgstr "Pfad"
+
+#: ../../templates/show_add_catalog.inc.php:59
+msgid "Remote"
+msgstr "Entfernt"
+
+#: ../../templates/show_add_catalog.inc.php:65
+msgid "Required for Remote Catalogs"
+msgstr "Benötigt für entfernte Kataloge"
+
+#: ../../templates/show_add_catalog.inc.php:68
+msgid "Filename Pattern"
+msgstr "Dateinamenmuster"
+
+#: ../../templates/show_add_catalog.inc.php:82
+msgid "Build Playlists from m3u Files"
+msgstr "Erstelle Wiedergabelisten von m3u Dateien"
+
+#: ../../templates/show_add_catalog.inc.php:90
+msgid "Add Catalog"
+msgstr "Katalog hinzufügen"
+
+#: ../../templates/show_edit_user.inc.php:25
+msgid "Adding a New User"
+msgstr "Neuen Benutzer hinzufügen"
+
+#: ../../templates/show_edit_user.inc.php:29
+msgid "Editing existing User"
+msgstr "Existierenden Benutzer editieren"
+
+#: ../../templates/show_edit_user.inc.php:80
+msgid "User Access Level"
+msgstr "Benutzer Zugriffs-Level"
+
+#: ../../templates/show_edit_user.inc.php:94
+msgid "Add User"
+msgstr "Benutzer hinzufügen"
+
+#: ../../templates/show_edit_user.inc.php:98
+msgid "Update User"
+msgstr "Benutzer aktualisieren"
+
+#: ../../templates/show_list_duplicates.inc.php:26
+msgid "Duplicate Songs"
+msgstr "Doppelte Stücke anzeigen"
+
+#: ../../templates/show_list_duplicates.inc.php:34
+msgid "Length"
+msgstr "Länge"
+
+#: ../../templates/show_list_duplicates.inc.php:36
+#: ../../templates/show_songs.inc:52
+msgid "Size"
+msgstr "Größe"
+
+#: ../../templates/show_list_duplicates.inc.php:75
+msgid "Disable Songs"
+msgstr ""
+
+#: ../../templates/show_ip_history.inc.php:23
+msgid "IP History"
+msgstr "IP Hostorie"
+
+#: ../../templates/show_ip_history.inc.php:26
+msgid "Show Unique"
+msgstr "Zeige Einmalige"
+
+#: ../../templates/show_ip_history.inc.php:34
+msgid "Date"
+msgstr "Datum"
+
+#: ../../templates/show_ip_history.inc.php:37
+msgid "IP Address"
+msgstr "IP Adresse"
+
+#: ../../templates/show_user_recommendations.inc.php:22
+msgid "Recommendations"
+msgstr "Empfehlungen"
+
+#: ../../templates/show_user_recommendations.inc.php:29
+msgid "Recommended Artists"
+msgstr ""
+
+#: ../../templates/show_user_recommendations.inc.php:40
+msgid "Recommended Albums"
+msgstr "Empfohlene Alben"
+
+#: ../../templates/show_user_recommendations.inc.php:51
+msgid "Recommended Songs"
+msgstr "Empfohlene Stücke"
+
+#: ../../templates/show_preference_admin.inc.php:22
+msgid "Preference Administration"
+msgstr "Administrations-Einstellungen"
+
+#: ../../templates/show_preference_admin.inc.php:27
+#: ../../templates/show_add_access.inc:53
+#: ../../templates/show_access_list.inc:48
+#: ../../templates/show_edit_access.inc:62
+msgid "Level"
+msgstr "Level"
+
+#: ../../templates/show_preference_admin.inc.php:37
+msgid "Guest"
+msgstr "Gast"
+
+#: ../../templates/show_edit_album.inc.php:23
+msgid "Edit Album"
+msgstr ""
+
+#: ../../templates/show_edit_album.inc.php:47
+#: ../../templates/show_edit_artist.inc.php:41
+msgid "Update Album"
+msgstr ""
+
+#: ../../templates/show_recently_played.inc.php:23
+msgid "seconds ago"
+msgstr ""
+
+#: ../../templates/show_recently_played.inc.php:23
+msgid "minutes ago"
+msgstr ""
+
+#: ../../templates/show_recently_played.inc.php:23
+msgid "hours ago"
+msgstr ""
+
+#: ../../templates/show_recently_played.inc.php:23
+msgid "days ago"
+msgstr ""
+
+#: ../../templates/show_recently_played.inc.php:23
+msgid "weeks ago"
+msgstr ""
+
+#: ../../templates/show_recently_played.inc.php:23
+msgid "months ago"
+msgstr ""
+
+#: ../../templates/show_recently_played.inc.php:23
+msgid "years ago"
+msgstr ""
+
+#: ../../templates/show_recently_played.inc.php:26
+msgid "Recently Played"
+msgstr "Zuletzt gespielt"
+
+#: ../../templates/show_recently_played.inc.php:33
+msgid "Last Played"
+msgstr ""
+
+#: ../../templates/show_edit_artist.inc.php:23
+msgid "Edit Artist"
+msgstr ""
+
+#: ../../templates/show_random_albums.inc.php:23
+msgid "Albums of the Moment"
+msgstr ""
 
-#: ../../localplay.php:50
-#: ../../localplay.php:58
+#: ../../localplay.php:50 ../../localplay.php:58
 msgid "Song(s) Removed from Playlist"
 msgstr "Stück(e) von der Wiedergabeliste gelöscht"
 
@@ -2149,18 +2131,15 @@ msgstr "Stück(e) von der Wiedergabeliste gelöscht"
 msgid "Localplay Init Failed"
 msgstr "Lokal abspielen fehlgeschlagen"
 
-#: ../../browse.php:48
-#: ../../albums.php:196
+#: ../../browse.php:48 ../../albums.php:213
 msgid "Show Albums starting with"
 msgstr "Zeige Alben beginnend mit"
 
-#: ../../browse.php:78
-#: ../../artists.php:230
-#: ../../artists.php:252
+#: ../../browse.php:78 ../../artists.php:230 ../../artists.php:252
 msgid "Show Artists starting with"
 msgstr "Zeige Interpreten mit folgendem Beginn"
 
-#: ../../browse.php:123
+#: ../../browse.php:124
 msgid "Show Titles Starting With"
 msgstr "Zeige Titel mit folgendem Beginn"
 
@@ -2168,6 +2147,10 @@ msgstr "Zeige Titel mit folgendem Beginn"
 msgid "Error: No Keyword Entered"
 msgstr "Fehler: Kein Schlüsselwort eingegeben"
 
+#: ../../ampache/templates/sidebar.inc.php:38
+msgid "Lists"
+msgstr "Listen"
+
 #: ../../ratings.php:33
 msgid "Rating Updated"
 msgstr "Bewertung Aktualisiert"
@@ -2188,7 +2171,7 @@ msgstr "Kann neues Konto nicht erstellen"
 msgid "No local account found"
 msgstr "Keine lokales Konto gefunden"
 
-#: ../../login.php:177
+#: ../../login.php:176
 msgid "Message of the Day"
 msgstr "Nachricht des Tages"
 
@@ -2204,29 +2187,35 @@ msgstr "Passwort aktualisiert"
 msgid "Ampache Update"
 msgstr "Ampache Update"
 
-#: ../../artists.php:91
-#: ../../albums.php:173
+#: ../../tv.php:62
+msgid "Playlist Cleared"
+msgstr ""
+
+#: ../../artists.php:91 ../../albums.php:191
 msgid "Starting Update from Tags"
 msgstr "Starte Aktuallisierung von TAGs"
 
-#: ../../artists.php:96
-#: ../../albums.php:178
+#: ../../artists.php:96 ../../albums.php:196
 msgid "Update From Tags Complete"
 msgstr "Aktuallisierung von den TAGs vollständig"
 
-#: ../../activate.php:44
+#: ../../artists.php:97 ../../albums.php:197
+msgid "Return"
+msgstr "Zurück"
+
+#: ../../activate.php:43
 msgid "No user with this name registered"
 msgstr "Kein Benutzer mit diesem Namen registriert"
 
-#: ../../activate.php:48
+#: ../../activate.php:47
 msgid "The validation key used isn't correct."
 msgstr "Die Prüfung des Schlüssels ergab dass diese nicht korrekt ist"
 
-#: ../../activate.php:53
+#: ../../activate.php:52
 msgid "User activated"
 msgstr "Benutzer aktiviert"
 
-#: ../../activate.php:53
+#: ../../activate.php:52
 msgid "This User ID is activated and can be used"
 msgstr "Diese Benutzer-ID ist aktiviert und kann benutzt werden"
 
@@ -2282,36 +2271,28 @@ msgstr "Eintrag markiert"
 msgid "The specified item has been flagged"
 msgstr "Der gewählte Eintrag wurde markiert"
 
-#: ../../albums.php:42
+#: ../../albums.php:48
 msgid "Album Art Cleared"
 msgstr "Album Cover gelöscht"
 
-#: ../../albums.php:42
+#: ../../albums.php:48
 msgid "Album Art information has been removed from the database"
 msgstr "Information des Covers wurde aus der Datenbank gelöscht"
 
-#: ../../albums.php:71
-msgid "No Amazon Developer Key set, amazon album art searching will not work"
-msgstr "Kein Amazon Entwickler Schlüssel gesetzt, Amazon Cover Suche wird nicht arbeiten"
-
-#: ../../albums.php:105
-#: ../../albums.php:138
+#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:159
 msgid "Album Art Not Located"
 msgstr "Cover nicht vorhanden"
 
-#: ../../albums.php:105
-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 Cover kann momentan nicht gefunden werden. Entweder der Amazon-Server ist nicht erreichbar, oder das Album konnte nicht gefunden werden."
+#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:159
+msgid ""
+"Album Art could not be located at this time. This may be due to write access "
+"error, or the file is not received corectly."
+msgstr ""
 
-#: ../../albums.php:135
-#: ../../albums.php:163
+#: ../../albums.php:79 ../../albums.php:106 ../../albums.php:185
 msgid "Album Art Inserted"
 msgstr "Album Cover hinzugefügt"
 
-#: ../../albums.php:138
-msgid "Album Art could not be located at this time. This may be due to write acces error, or the file is not received corectly."
-msgstr "Album Cover kann momentan nicht gefunden werden. Entweder ein Schreibfehler, oder die Datei wurde nicht korrekt empfangen."
-
 #: ../../register.php:81
 msgid "Error Captcha Required"
 msgstr "Fehler Captcha benötigt"
@@ -2344,23 +2325,25 @@ msgstr "Passwort falsch"
 msgid "Error: Insert Failed"
 msgstr "Fehler: einfügen fehlgeschlagen"
 
-#: ../../register.php:170
+#: ../../register.php:169
 msgid "Registration Complete"
 msgstr "Registration komplett"
 
-#: ../../bin/print_tags.php.inc:63
+#: ../../bin/print_tags.php.inc:64
 msgid ""
 "[print_tags.php.inc]\n"
-"This commandline script will display the tag information for the specified filename as it will \n"
+"This commandline script will display the tag information for the specified "
+"filename as it will \n"
 "appear to Ampache. \n"
 "        \n"
 msgstr ""
 "[print_tags.php.inc]\n"
-"Dieses Kommandozeilen Skript zeigt die TAG Information der gewählten Datei wie sie \n"
+"Dieses Kommandozeilen Skript zeigt die TAG Information der gewählten Datei "
+"wie sie \n"
 "in Ampache erscheinen. \n"
 "        \n"
 
-#: ../../bin/print_tags.php.inc:69
+#: ../../bin/print_tags.php.inc:70
 msgid "Filename:"
 msgstr "Dateiname:"
 
@@ -2406,8 +2389,10 @@ msgstr ""
 "verschieben potentiell löschen.\n"
 "************* WARNUNG *************\n"
 "\n"
-"Alle zum hinzufügen markierten Dateien werden in das Upload-Verzeichnis verschoben. Alle zum löschen \n"
-"markierten Dateien werden gelöscht. Dieses Skript muss unter einem Benutzer laufen der ausreichende Rechte \n"
+"Alle zum hinzufügen markierten Dateien werden in das Upload-Verzeichnis "
+"verschoben. Alle zum löschen \n"
+"markierten Dateien werden gelöscht. Dieses Skript muss unter einem Benutzer "
+"laufen der ausreichende Rechte \n"
 "besitzt die beiden oben genannten Funktionen auszuführen. \n"
 "\n"
 "\t\n"
@@ -2424,77 +2409,78 @@ msgstr "Fehler:"
 msgid "!\n"
 msgstr ""
 
-#: ../../templates/show_big_art.inc:31
+#: ../../templates/show_big_art.inc:29
 msgid "Album Art"
 msgstr "Album Cover"
 
-#: ../../templates/show_big_art.inc:35
+#: ../../templates/show_big_art.inc:33
 msgid "Click to close window"
 msgstr "Klick um Fenster zu schließen"
 
-#: ../../templates/list_header.inc:102
-msgid "Prev"
-msgstr "Vorherige"
-
-#: ../../templates/list_header.inc:148
-msgid "Next"
-msgstr "Nächste"
-
-#: ../../templates/show_disabled_songs.inc:25
-#: ../../templates/show_songs.inc:43
-#: ../../templates/show_artist.inc:33
-msgid "Select"
-msgstr "Auswahl"
-
 #: ../../templates/show_disabled_songs.inc:30
 msgid "Addition Time"
 msgstr "Zusätzliche Zeit"
 
-#: ../../templates/show_disabled_songs.inc:48
+#: ../../templates/show_disabled_songs.inc:49
 msgid "Remove"
 msgstr "Löschen"
 
-#: ../../templates/header.inc:58
+#: ../../templates/list_header.inc:110
+msgid "Prev"
+msgstr "Vorherige"
+
+#: ../../templates/list_header.inc:156
+msgid "Next"
+msgstr "Nächste"
+
+#: ../../templates/header.inc:63 ../../ampache/templates/header.inc:64
 msgid "You are currently logged in as"
 msgstr "Sie sind momentan angemeldet als"
 
+#: ../../templates/header.inc:74
+msgid "Error Config File Out of Date"
+msgstr ""
+
 #: ../../templates/show_songs.inc:47
 msgid "Song title"
 msgstr "Titel"
 
-#: ../../templates/show_songs.inc:57
-#: ../../templates/show_search.inc:92
+#: ../../templates/show_songs.inc:57 ../../templates/show_search.inc:92
 msgid "Rating"
 msgstr "Bewertung"
 
-#: ../../templates/show_songs.inc:176
+#: ../../templates/show_songs.inc:183
 msgid "Total"
 msgstr "Insgesamt"
 
-#: ../../templates/show_songs.inc:194
-msgid "** Indicates flagged songs"
-msgstr "** Markierte Stücke"
-
 #: ../../templates/show_install_config.inc:53
-#: ../../templates/show_install.inc:34
+#: ../../templates/show_install.inc:56
 msgid "Step 2 - Creating the Ampache.cfg.php file"
 msgstr "Schritt 2 - Erstellen der Ampache.cfg.php Datei"
 
 #: ../../templates/show_install_config.inc:55
-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 "In diesem Schritt werden die Werte für die  Basis-Konfiguration benötigt, und versucht die Konfiguration direkt in Konfigurationsdatei zu schreiben. Ist der Zugriff nicht erlaubt, erhalten Sie eine Meldung die Konfigurationsdatei herunterzuladen. Bitte speichern Sie dann die editierte Konfigurationsdatei im Verzeichnis /config"
+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 ""
+"In diesem Schritt werden die Werte für die  Basis-Konfiguration benötigt, "
+"und versucht die Konfiguration direkt in Konfigurationsdatei zu schreiben. "
+"Ist der Zugriff nicht erlaubt, erhalten Sie eine Meldung die "
+"Konfigurationsdatei herunterzuladen. Bitte speichern Sie dann die editierte "
+"Konfigurationsdatei im Verzeichnis /config"
 
 #: ../../templates/show_install_config.inc:64
 msgid "Web Path"
 msgstr "Web Pfad"
 
 #: ../../templates/show_install_config.inc:68
-#: ../../templates/show_install.inc:42
+#: ../../templates/show_install.inc:64
 msgid "Desired Database Name"
 msgstr "Gewünschter Datenbank Name"
 
 #: ../../templates/show_install_config.inc:72
-#: ../../templates/show_install.inc:46
+#: ../../templates/show_install.inc:68
 msgid "MySQL Hostname"
 msgstr ""
 
@@ -2524,53 +2510,61 @@ msgstr "Ampache.cfg.php konfiguriert?"
 msgid "Check for Config"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:52
+#: ../../templates/show_album.inc:55
+msgid "Play Album"
+msgstr "Album abspielen"
+
+#: ../../templates/show_album.inc:56
+msgid "Play Random from Album"
+msgstr "Spiele zufällig vom Album"
+
+#: ../../templates/show_album.inc:58
+msgid "Reset Album Art"
+msgstr "Cover zurücksetzen"
+
+#: ../../templates/show_album.inc:60
+msgid "Find Album Art"
+msgstr "Cover finden"
+
+#: ../../templates/show_preferences.inc:53
 msgid "Editing"
 msgstr "Editieren der"
 
-#: ../../templates/show_preferences.inc:52
+#: ../../templates/show_preferences.inc:53
 msgid "preferences"
 msgstr "Einstellungen"
 
-#: ../../templates/show_preferences.inc:54
+#: ../../templates/show_preferences.inc:55
 msgid "Rebuild Preferences"
 msgstr "Einstellungen neu erstellen"
 
-#: ../../templates/show_preferences.inc:61
+#: ../../templates/show_preferences.inc:62
 msgid "Interface"
 msgstr "Grundeinstellungen"
 
-#: ../../templates/show_preferences.inc:64
+#: ../../templates/show_preferences.inc:65
 msgid "Streaming"
 msgstr "Datenstrom"
 
-#: ../../templates/show_preferences.inc:67
+#: ../../templates/show_preferences.inc:68
 msgid "Options"
 msgstr "Optionen"
 
-#: ../../templates/show_preferences.inc:71
+#: ../../templates/show_preferences.inc:72
 msgid "Account"
 msgstr "Konto"
 
-#: ../../templates/show_preferences.inc:86
-msgid "Update Preferences"
-msgstr "Einstellungen aktualisieren"
-
-#: ../../templates/show_album.inc:55
-msgid "Play Album"
-msgstr "Album abspielen"
-
-#: ../../templates/show_album.inc:56
-msgid "Play Random from Album"
-msgstr "Spiele zufällig vom Album"
+#: ../../templates/show_preferences.inc:76
+msgid "System"
+msgstr ""
 
-#: ../../templates/show_album.inc:58
-msgid "Reset Album Art"
-msgstr "Cover zurücksetzen"
+#: ../../templates/show_preferences.inc:79
+msgid "Modules"
+msgstr "Module"
 
-#: ../../templates/show_album.inc:60
-msgid "Find Album Art"
-msgstr "Cover finden"
+#: ../../templates/show_preferences.inc:92
+msgid "Update Preferences"
+msgstr "Einstellungen aktualisieren"
 
 #: ../../templates/show_random_play.inc:25
 msgid "Play Random Selection"
@@ -2604,36 +2598,41 @@ msgstr "Von Katalog"
 msgid "Size Limit"
 msgstr "Größenbegrenzung"
 
-#: ../../templates/show_random_play.inc:70
-#: ../../templates/show_search.inc:122
+#: ../../templates/show_random_play.inc:70 ../../templates/show_search.inc:122
 msgid "Unlimited"
 msgstr "Unbegrenzt"
 
-#: ../../templates/show_install.inc:32
-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 "Dieser Schritt erstellt die Ampache Datenbank und die Tabellen, Sie benötigen ein MySQL Konto mit dem Recht eine Datenbank zu erstellen. Dies kann einige Zeit dauern, abhängig von der Geschwindigkeit Ihres Computers"
+#: ../../templates/show_install.inc:54
+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 ""
+"Dieser Schritt erstellt die Ampache Datenbank und die Tabellen, Sie "
+"benötigen ein MySQL Konto mit dem Recht eine Datenbank zu erstellen. Dies "
+"kann einige Zeit dauern, abhängig von der Geschwindigkeit Ihres Computers"
 
-#: ../../templates/show_install.inc:50
+#: ../../templates/show_install.inc:72
 msgid "MySQL Administrative Username"
 msgstr "MySQL Administration Benutzername"
 
-#: ../../templates/show_install.inc:54
+#: ../../templates/show_install.inc:76
 msgid "MySQL Administrative Password"
 msgstr "MySQL Administration Passwort"
 
-#: ../../templates/show_install.inc:58
+#: ../../templates/show_install.inc:80
 msgid "Create Database User for New Database"
 msgstr "Erstelle Datenbank Benutzer für die neue Datenbank"
 
-#: ../../templates/show_install.inc:62
+#: ../../templates/show_install.inc:84
 msgid "Ampache Database Username"
 msgstr "Ampache Datenbank Benutzername"
 
-#: ../../templates/show_install.inc:66
+#: ../../templates/show_install.inc:88
 msgid "Ampache Database User Password"
 msgstr "Ampache Datenbank Benutzer Passwort"
 
-#: ../../templates/show_install.inc:71
+#: ../../templates/show_install.inc:93
 msgid "Insert Database"
 msgstr "Datenbank einfügen"
 
@@ -2642,8 +2641,12 @@ msgid "Add Access for a Host"
 msgstr "Zugang für einen Rechner einrichten"
 
 #: ../../templates/show_add_access.inc:23
-msgid "Use the form below to add a host that you want to have access to your Ampache catalog."
-msgstr "Um einem Rechner den Zugang zu Ihrem Katalog zu gewähren, füllen sie das folgende Formular aus."
+msgid ""
+"Use the form below to add a host that you want to have access to your "
+"Ampache catalog."
+msgstr ""
+"Um einem Rechner den Zugang zu Ihrem Katalog zu gewähren, füllen sie das "
+"folgende Formular aus."
 
 #: ../../templates/show_add_access.inc:35
 #: ../../templates/show_edit_access.inc:35
@@ -2699,74 +2702,6 @@ msgstr "Remote Key"
 msgid "Create ACL"
 msgstr "Erstelle ACL"
 
-#: ../../templates/catalog.inc:27
-msgid "Add a catalog"
-msgstr "Katalog hinzufügen"
-
-#: ../../templates/catalog.inc:28
-msgid "Access Lists"
-msgstr "Zugriffsliste"
-
-#: ../../templates/catalog.inc:30
-msgid "Show Disabled Songs"
-msgstr "Gesperrte Stücke anzeigen"
-
-#: ../../templates/catalog.inc:33
-msgid "Dump Album Art"
-msgstr "Cover Dump"
-
-#: ../../templates/catalog.inc:35
-msgid "View flagged songs"
-msgstr "Markierte Stücke anzeigen"
-
-#: ../../templates/catalog.inc:40
-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 "Fehler: ICONV nicht gefunden, die ID3V Tags werden nicht korrekt importiert werden. Besuchen sie die <a href=\"http://php.oregonstate.edu/iconv\">Iconv</a> um an Informationen zu ICONV zu gelangen."
-
-#: ../../templates/catalog.inc:49
-msgid "Update Catalogs"
-msgstr "Kataloge aktualisieren"
-
-#: ../../templates/catalog.inc:72
-msgid "Add to Catalog(s)"
-msgstr "Zu Katalog(en) hinzufügen"
-
-#: ../../templates/catalog.inc:73
-msgid "Add to all Catalogs"
-msgstr "Zu allen Katalogen hinzufügen"
-
-#: ../../templates/catalog.inc:74
-msgid "Fast Add"
-msgstr "Schnelles Hinzufügen"
-
-#: ../../templates/catalog.inc:79
-msgid "Update Catalog(s)"
-msgstr "Katalog(e) aktualisieren"
-
-#: ../../templates/catalog.inc:80
-msgid "Update All Catalogs"
-msgstr "Alle Kataloge aktualisieren"
-
-#: ../../templates/catalog.inc:81
-msgid "Fast Update"
-msgstr "Schnelle Aktualisierung"
-
-#: ../../templates/catalog.inc:86
-msgid "Clean Catalog(s)"
-msgstr "Katalog(e) leeren"
-
-#: ../../templates/catalog.inc:87
-msgid "Clean All Catalogs"
-msgstr "Alle Kataloge leeren"
-
-#: ../../templates/catalog.inc:93
-msgid "You don't have any catalogs."
-msgstr "Sie haben keine Kataloge"
-
-#: ../../templates/catalog.inc:100
-msgid "Catalog Tools"
-msgstr "Katalogwerkzeuge"
-
 #: ../../templates/show_access_list.inc:29
 msgid "Host Access to Your Catalog"
 msgstr "Host Zugriff zu Ihrem Katalog"
@@ -2791,15 +2726,27 @@ msgstr "Schlüssel"
 msgid "Revoke"
 msgstr "Zurückziehen"
 
+#: ../../templates/show_users.inc:40
+msgid "Fullname"
+msgstr "Kompletter Name"
+
+#: ../../templates/show_users.inc:48
+msgid "Last Seen"
+msgstr "Zuletzt anwesend"
+
 #: ../../templates/show_users.inc:53
 msgid "Registration Date"
 msgstr "Registrations-Datum"
 
-#: ../../templates/show_users.inc:60
+#: ../../templates/show_users.inc:57
+msgid "Activity"
+msgstr "Aktivität"
+
+#: ../../templates/show_users.inc:61
 msgid "Last Ip"
 msgstr "Letzte IP-Adr."
 
-#: ../../templates/show_users.inc:65
+#: ../../templates/show_users.inc:66
 msgid "On-line"
 msgstr "Verbunden"
 
@@ -2816,8 +2763,8 @@ msgid "Album Year"
 msgstr "Album Jahr"
 
 #: ../../templates/show_artist.inc:38
-msgid "Total Tracks"
-msgstr "Anzahl Stücke"
+msgid "Tracks"
+msgstr ""
 
 #: ../../templates/show_edit_access.inc:23
 msgid "Edit Access List"
@@ -2828,8 +2775,12 @@ msgid "Ampache Debug"
 msgstr "Ampache Debug"
 
 #: ../../templates/show_test.inc:35
-msgid "You've reached this page because a configuration error has occured. Debug Information below"
-msgstr "Sie sind auf dieser Seite gelangt, weil ein Konfigurationsfehler aufgetreten ist. Debuginformationen siehe unten."
+msgid ""
+"You've reached this page because a configuration error has occured. Debug "
+"Information below"
+msgstr ""
+"Sie sind auf dieser Seite gelangt, weil ein Konfigurationsfehler aufgetreten "
+"ist. Debuginformationen siehe unten."
 
 #: ../../templates/show_test.inc:39
 msgid "CHECK"
@@ -2848,63 +2799,94 @@ msgid "PHP Version"
 msgstr "PHP Version"
 
 #: ../../templates/show_test.inc:61
-msgid "This tests to make sure that you are running a version of PHP that is known to work with Ampache."
-msgstr "Dieser Test überprüft, ob sie eine PHP Version benutzen, mit der Ampache funktioniert."
+msgid ""
+"This tests to make sure that you are running a version of PHP that is known "
+"to work with Ampache."
+msgstr ""
+"Dieser Test überprüft, ob sie eine PHP Version benutzen, mit der Ampache "
+"funktioniert."
 
 #: ../../templates/show_test.inc:65
 msgid "Mysql for PHP"
 msgstr "MySQL für PHP"
 
 #: ../../templates/show_test.inc:80
-msgid "This test checks to see if you have the mysql extensions loaded for PHP. These are required for Ampache to work."
-msgstr "Dieser Test prüft ob Sie die MySQL Erweiterungen für PHP geladen haben. Dies wird benötigt damit Ampache arbeitet."
+msgid ""
+"This test checks to see if you have the mysql extensions loaded for PHP. "
+"These are required for Ampache to work."
+msgstr ""
+"Dieser Test prüft ob Sie die MySQL Erweiterungen für PHP geladen haben. Dies "
+"wird benötigt damit Ampache arbeitet."
 
 #: ../../templates/show_test.inc:84
 msgid "PHP Session Support"
 msgstr "PHP Session Unterstützung"
 
 #: ../../templates/show_test.inc:99
-msgid "This test checks to make sure that you have PHP session support enabled. Sessions are required for Ampache to work."
-msgstr "Dieser Test prüft ob Sie PHP Session Unterstützung aktiviert haben. Session Unterstützung wird benötigt für die Funktion von Ampache."
+msgid ""
+"This test checks to make sure that you have PHP session support enabled. "
+"Sessions are required for Ampache to work."
+msgstr ""
+"Dieser Test prüft ob Sie PHP Session Unterstützung aktiviert haben. Session "
+"Unterstützung wird benötigt für die Funktion von Ampache."
 
 #: ../../templates/show_test.inc:103
 msgid "PHP ICONV Support"
 msgstr "PHP ICONV Unterstützung"
 
 #: ../../templates/show_test.inc:117
-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 "Dieser Test prüft ob Iconv Unterstützung installiert wurde. Icionv Unterstützung wird nicht unbedingt benötigt für Ampache, aber es wird dringend empfohlen"
+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 ""
+"Dieser Test prüft ob Iconv Unterstützung installiert wurde. Icionv "
+"Unterstützung wird nicht unbedingt benötigt für Ampache, aber es wird "
+"dringend empfohlen"
 
 #: ../../templates/show_test.inc:121
 msgid "PHP PCRE Support"
 msgstr "PHP PCRE Unterstützung"
 
 #: ../../templates/show_test.inc:134
-msgid "This test makes sure you have PCRE support compiled into your version of PHP, this is required for Ampache."
-msgstr "Dieser Test überprüft, ob sie PCRE Unterstützung in Ihrer PHP Version eingebaut haben, dies wird für die Funktion von Ampache benötigt."
+msgid ""
+"This test makes sure you have PCRE support compiled into your version of "
+"PHP, this is required for Ampache."
+msgstr ""
+"Dieser Test überprüft, ob sie PCRE Unterstützung in Ihrer PHP Version "
+"eingebaut haben, dies wird für die Funktion von Ampache benötigt."
 
 #: ../../templates/show_test.inc:138
 msgid "PHP PutENV Support"
 msgstr "PHP PutENV Unterstützung"
 
 #: ../../templates/show_test.inc:151
-msgid "This test makes sure that PHP isn't running in SafeMode and that we are able to modify the memory limits. While not required, without these abilities some features of ampache may not work correctly"
-msgstr "Dieser Test prüft, dass PHP nicht im SafeMode läuft und dass wir die Speicherbegrenzung modifizieren können. Ohne diese Fähigkeit werden manche Dinge von Ampache nicht korrekt arbeiten"
+msgid ""
+"This test makes sure that PHP isn't running in SafeMode and that we are able "
+"to modify the memory limits. While not required, without these abilities "
+"some features of ampache may not work correctly"
+msgstr ""
+"Dieser Test prüft, dass PHP nicht im SafeMode läuft und dass wir die "
+"Speicherbegrenzung modifizieren können. Ohne diese Fähigkeit werden manche "
+"Dinge von Ampache nicht korrekt arbeiten"
 
 #: ../../templates/show_test.inc:170
 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"
+"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.php zu lesen. Wenn dies fehlschläft ist die Datei entweder nicht an der richtigen Stelle,\n"
+"Hier versuchen wir /config/ampache.cfg.php zu lesen. Wenn dies fehlschläft "
+"ist die Datei entweder nicht an der richtigen Stelle,\n"
 "\toder sie ist nicht korrekt lesbar"
 
 #: ../../templates/show_test.inc:193
 msgid ""
-"This test makes sure that you have set all of the required configuration variables and that we are able to \n"
+"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 testen wir, dass alle erforderlichen Konfigurationsvariablen gesetzt sind, und dass \n"
+"Hier testen wir, dass alle erforderlichen Konfigurationsvariablen gesetzt "
+"sind, und dass \n"
 "wir ihre Konfigurationsdatei lesen können."
 
 #: ../../templates/show_test.inc:203
@@ -2920,11 +2902,14 @@ msgid "DB Connection"
 msgstr "Datenbank Verbindung"
 
 #: ../../templates/show_test.inc:256
-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."
+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_search_bar.inc:26
-#: ../../templates/show_search.inc:26
+#: ../../templates/show_search_bar.inc:26 ../../templates/show_search.inc:26
 msgid "Search Ampache"
 msgstr "In Ampache suchen"
 
@@ -2934,7 +2919,8 @@ msgstr "Ähnliche Interpreten"
 
 #: ../../templates/show_similar_artists.inc:25
 msgid "Please check the artists you want to merge with the current one"
-msgstr "Bitte den Interpreten markieren, den Sie mit dem aktuellen verbinden möchten"
+msgstr ""
+"Bitte den Interpreten markieren, den Sie mit dem aktuellen verbinden möchten"
 
 #: ../../templates/show_similar_artists.inc:62
 msgid "Back"
@@ -3033,3 +3019,152 @@ msgstr "Sichere Suchergebnis in"
 msgid "Save"
 msgstr "Speichern"
 
+#~ msgid "Found in ID3"
+#~ msgstr "Gefunden im ID3"
+
+#~ msgid "Found on Amazon"
+#~ msgstr "Gefunden bei Amazon"
+
+#~ msgid "Found in Folder"
+#~ msgstr "Gefunden im Verzeichnis"
+
+#~ msgid "Not Found"
+#~ msgstr "Nicht gefunden"
+
+#~ msgid "Starting Dump Album Art"
+#~ msgstr "Starte Ablum-Cover Dump"
+
+#~ msgid "Written"
+#~ msgstr "Geschrieben"
+
+#~ msgid "Error unable to open file for writting"
+#~ msgstr "Fehler: Kann Datei zum Schreiben nicht öffnen"
+
+#~ msgid "Album Art Dump Complete"
+#~ msgstr "Album Cover-Dump komplett"
+
+#~ msgid "The file uploaded successfully"
+#~ msgstr "Die Datei wurde erfolgreich hochgeladen"
+
+#~ msgid ""
+#~ "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+#~ msgstr ""
+#~ "Die Dateigröße der hochgeladenen Datei überschreitet die "
+#~ "upload_max_filesize directive in der php.ini"
+
+#~ msgid ""
+#~ "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified "
+#~ "in the HTML form"
+#~ msgstr ""
+#~ "Die Dateigröße der hochgeladenen Datei überschreitet die MAX_FILE_SIZE "
+#~ "Direktive, die im HTML-Formular bestimmt wurde"
+
+#~ msgid "The uploaded file was only partially uploaded"
+#~ msgstr "Die hochgeladene Datei wurde nicht vollständig hochgeladen"
+
+#~ msgid "No file was uploaded"
+#~ msgstr "Keine Datei wurde hochgeladen"
+
+#~ msgid "Missing a temporary folder"
+#~ msgstr "Vermisse ein temporäres Verzeichnis"
+
+#~ msgid "ID3V2 Tags"
+#~ msgstr "ID3V2 TAGs"
+
+#~ msgid "Amazon"
+#~ msgstr "Amazon"
+
+#~ msgid "File Folder"
+#~ msgstr "Datei Verzeichnis"
+
+#~ msgid "User Activity"
+#~ msgstr "Benutzer Aktivität"
+
+#~ msgid "Recommended Aritsts"
+#~ msgstr "Empfohlene Interpreten"
+
+#~ msgid "You don't have any duplicate songs."
+#~ msgstr "Sie haben keine doppelten Stücke"
+
+#~ msgid ""
+#~ "No Amazon Developer Key set, amazon album art searching will not work"
+#~ msgstr ""
+#~ "Kein Amazon Entwickler Schlüssel gesetzt, Amazon Cover Suche wird nicht "
+#~ "arbeiten"
+
+#~ 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 Cover kann momentan nicht gefunden werden. Entweder der Amazon-"
+#~ "Server ist nicht erreichbar, oder das Album konnte nicht gefunden werden."
+
+#~ msgid ""
+#~ "Album Art could not be located at this time. This may be due to write "
+#~ "acces error, or the file is not received corectly."
+#~ msgstr ""
+#~ "Album Cover kann momentan nicht gefunden werden. Entweder ein "
+#~ "Schreibfehler, oder die Datei wurde nicht korrekt empfangen."
+
+#~ msgid "** Indicates flagged songs"
+#~ msgstr "** Markierte Stücke"
+
+#~ msgid "Add a catalog"
+#~ msgstr "Katalog hinzufügen"
+
+#~ msgid "Access Lists"
+#~ msgstr "Zugriffsliste"
+
+#~ msgid "Show Disabled Songs"
+#~ msgstr "Gesperrte Stücke anzeigen"
+
+#~ msgid "Dump Album Art"
+#~ msgstr "Cover Dump"
+
+#~ msgid "View flagged songs"
+#~ msgstr "Markierte Stücke anzeigen"
+
+#~ 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 ""
+#~ "Fehler: ICONV nicht gefunden, die ID3V Tags werden nicht korrekt "
+#~ "importiert werden. Besuchen sie die <a href=\"http://php.oregonstate.edu/"
+#~ "iconv\">Iconv</a> um an Informationen zu ICONV zu gelangen."
+
+#~ msgid "Update Catalogs"
+#~ msgstr "Kataloge aktualisieren"
+
+#~ msgid "Add to Catalog(s)"
+#~ msgstr "Zu Katalog(en) hinzufügen"
+
+#~ msgid "Add to all Catalogs"
+#~ msgstr "Zu allen Katalogen hinzufügen"
+
+#~ msgid "Fast Add"
+#~ msgstr "Schnelles Hinzufügen"
+
+#~ msgid "Update Catalog(s)"
+#~ msgstr "Katalog(e) aktualisieren"
+
+#~ msgid "Update All Catalogs"
+#~ msgstr "Alle Kataloge aktualisieren"
+
+#~ msgid "Fast Update"
+#~ msgstr "Schnelle Aktualisierung"
+
+#~ msgid "Clean Catalog(s)"
+#~ msgstr "Katalog(e) leeren"
+
+#~ msgid "Clean All Catalogs"
+#~ msgstr "Alle Kataloge leeren"
+
+#~ msgid "You don't have any catalogs."
+#~ msgstr "Sie haben keine Kataloge"
+
+#~ msgid "Catalog Tools"
+#~ msgstr "Katalogwerkzeuge"
+
+#~ msgid "Total Tracks"
+#~ msgstr "Anzahl Stücke"
diff --git a/locale/en_GB/LC_MESSAGES/messages.po b/locale/en_GB/LC_MESSAGES/messages.po
index f9010828..4c21842e 100644
--- a/locale/en_GB/LC_MESSAGES/messages.po
+++ b/locale/en_GB/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ampache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-01 20:33-0800\n"
+"POT-Creation-Date: 2007-01-22 19:07-0800\n"
 "PO-Revision-Date: 2005-07-17 21:58-0000\n"
 "Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: British English <en@li.org>\n"
@@ -15,12 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../play/index.php:64 ../../download/index.php:62
+#: ../../play/index.php:64 ../../download/index.php:61
 msgid "Session Expired: please log in again at"
 msgstr "Session Expired: please log in again at"
 
-#: ../../lib/class/catalog.class.php:299 ../../lib/class/catalog.class.php:592
-#: ../../lib/class/album.class.php:325
+#: ../../lib/class/catalog.class.php:303 ../../lib/class/catalog.class.php:621
+#: ../../lib/class/album.class.php:328
 msgid "Error: Unable to open"
 msgstr "Error: Unable to open"
 
@@ -28,187 +28,192 @@ msgstr "Error: Unable to open"
 msgid "Error: Unable to change to directory"
 msgstr "Error: Unable to change to directory"
 
-#: ../../lib/class/catalog.class.php:375
+#: ../../lib/class/catalog.class.php:374
 msgid "Error: Unable to get filesize for"
 msgstr "Error: Unable to get filesize for"
 
-#: ../../lib/class/catalog.class.php:412
+#: ../../lib/class/catalog.class.php:411
 msgid "is not readable by ampache"
 msgstr "is not readable by ampache"
 
-#: ../../lib/class/catalog.class.php:501
+#: ../../lib/class/catalog.class.php:530
 msgid "album's with art"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:772
+#: ../../lib/class/catalog.class.php:812
 msgid "Starting Catalog Build"
 msgstr "Starting Catalogue Build"
 
-#: ../../lib/class/catalog.class.php:776
+#: ../../lib/class/catalog.class.php:816
 msgid "Running Remote Sync"
 msgstr "Running Remote Sync"
 
-#: ../../lib/class/catalog.class.php:781 ../../lib/class/catalog.class.php:947
+#: ../../lib/class/catalog.class.php:821 ../../lib/class/catalog.class.php:992
 msgid "Found"
 msgstr "Found"
 
-#: ../../lib/class/catalog.class.php:781 ../../lib/class/catalog.class.php:804
-#: ../../lib/class/catalog.class.php:947 ../../lib/class/catalog.class.php:977
-#: ../../lib/preferences.php:269 ../../lib/preferences.php:319
-#: ../../lib/ui.lib.php:1186 ../../admin/catalog.php:259
+#: ../../lib/class/catalog.class.php:821 ../../lib/class/catalog.class.php:848
+#: ../../lib/class/catalog.class.php:992
+#: ../../lib/class/catalog.class.php:1025 ../../lib/preferences.php:269
+#: ../../lib/preferences.php:319 ../../lib/ui.lib.php:1194
+#: ../../admin/catalog.php:259
 #, fuzzy
 msgid "None"
 msgstr "No"
 
-#: ../../lib/class/catalog.class.php:796 ../../lib/class/catalog.class.php:965
+#: ../../lib/class/catalog.class.php:840
+#: ../../lib/class/catalog.class.php:1014
 msgid "Added Playlist From"
 msgstr "Added Playlist From"
 
-#: ../../lib/class/catalog.class.php:803 ../../lib/class/catalog.class.php:976
-#: ../../admin/catalog.php:258
+#: ../../lib/class/catalog.class.php:847
+#: ../../lib/class/catalog.class.php:1024 ../../admin/catalog.php:258
 msgid "Starting Album Art Search"
 msgstr "Starting Album Art Search"
 
-#: ../../lib/class/catalog.class.php:804 ../../lib/class/catalog.class.php:977
-#: ../../admin/catalog.php:259
+#: ../../lib/class/catalog.class.php:848
+#: ../../lib/class/catalog.class.php:1025 ../../admin/catalog.php:259
 msgid "Searched"
 msgstr "Searched"
 
-#: ../../lib/class/catalog.class.php:814
+#: ../../lib/class/catalog.class.php:858
 msgid "Catalog Finished"
 msgstr "Catalogue Finished"
 
-#: ../../lib/class/catalog.class.php:814 ../../lib/class/catalog.class.php:997
+#: ../../lib/class/catalog.class.php:858
+#: ../../lib/class/catalog.class.php:1044
 msgid "Total Time"
 msgstr "Total Time"
 
-#: ../../lib/class/catalog.class.php:814 ../../lib/class/catalog.class.php:998
+#: ../../lib/class/catalog.class.php:858
+#: ../../lib/class/catalog.class.php:1045
 msgid "Total Songs"
 msgstr "Total Songs"
 
-#: ../../lib/class/catalog.class.php:815 ../../lib/class/catalog.class.php:998
+#: ../../lib/class/catalog.class.php:859
+#: ../../lib/class/catalog.class.php:1045
 msgid "Songs Per Seconds"
 msgstr "Songs Per Seconds"
 
-#: ../../lib/class/catalog.class.php:849
-#: ../../lib/class/catalog.class.php:1634
+#: ../../lib/class/catalog.class.php:894
+#: ../../lib/class/catalog.class.php:1565
 msgid "Updated"
 msgstr "Updated"
 
-#: ../../lib/class/catalog.class.php:856
+#: ../../lib/class/catalog.class.php:901
 msgid "No Update Needed"
 msgstr "No Update Needed"
 
-#: ../../lib/class/catalog.class.php:938
+#: ../../lib/class/catalog.class.php:983
 msgid "Starting New Song Search on"
 msgstr "Starting New Song Search on"
 
-#: ../../lib/class/catalog.class.php:938
+#: ../../lib/class/catalog.class.php:983
 msgid "catalog"
 msgstr "catalogue"
 
-#: ../../lib/class/catalog.class.php:942
+#: ../../lib/class/catalog.class.php:987
 msgid "Running Remote Update"
 msgstr "Running Remote Update"
 
-#: ../../lib/class/catalog.class.php:997
+#: ../../lib/class/catalog.class.php:1044
 msgid "Catalog Update Finished"
 msgstr "Catalogue Update Finished"
 
-#: ../../lib/class/catalog.class.php:1017
+#: ../../lib/class/catalog.class.php:1064
 msgid "Error"
 msgstr "Error"
 
-#: ../../lib/class/catalog.class.php:1017
+#: ../../lib/class/catalog.class.php:1064
 msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
 msgstr "Unable to load XMLRPC library, make sure XML-RPC is enabled"
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Error connecting to"
 msgstr "Error connecting to"
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Code"
 msgstr "Code"
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Reason"
 msgstr "Reason"
 
-#: ../../lib/class/catalog.class.php:1076
+#: ../../lib/class/catalog.class.php:1123
 msgid "Completed updating remote catalog(s)"
 msgstr "Completed updating remote catalogue(s)"
 
-#: ../../lib/class/catalog.class.php:1111
+#: ../../lib/class/catalog.class.php:1158
 msgid "Added"
 msgstr "Added"
 
-#: ../../lib/class/catalog.class.php:1193
+#: ../../lib/class/catalog.class.php:1240
 #, fuzzy
 msgid "Cleaning the"
 msgstr "Updating the"
 
-#: ../../lib/class/catalog.class.php:1193
-#: ../../lib/class/catalog.class.php:1589 ../../templates/sidebar.inc.php:30
+#: ../../lib/class/catalog.class.php:1240
+#: ../../lib/class/catalog.class.php:1520 ../../templates/sidebar.inc.php:30
 #: ../../ampache/templates/sidebar.inc.php:30
 msgid "Catalog"
 msgstr "Catalogue"
 
-#: ../../lib/class/catalog.class.php:1194
+#: ../../lib/class/catalog.class.php:1241
 msgid "Checking"
 msgstr "Checking"
 
-#: ../../lib/class/catalog.class.php:1265
+#: ../../lib/class/catalog.class.php:1313
 msgid "Catalog Clean Done"
 msgstr "Catalogue Clean Done"
 
-#: ../../lib/class/catalog.class.php:1265
+#: ../../lib/class/catalog.class.php:1313
 msgid "files removed"
 msgstr "files removed"
 
-#: ../../lib/class/catalog.class.php:1589
+#: ../../lib/class/catalog.class.php:1520
 msgid "Updating the"
 msgstr "Updating the"
 
-#: ../../lib/class/catalog.class.php:1590
+#: ../../lib/class/catalog.class.php:1521
 msgid "songs found checking tag information."
 msgstr "songs found checking tag information."
 
-#: ../../lib/class/catalog.class.php:1591
+#: ../../lib/class/catalog.class.php:1522
 msgid "Verifed"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1643
+#: ../../lib/class/catalog.class.php:1574
 msgid " FOUND"
 msgstr " FOUND"
 
-#: ../../lib/class/catalog.class.php:1645
+#: ../../lib/class/catalog.class.php:1576
 msgid "Searching for new Album Art"
 msgstr "Searching for new Album Art"
 
-#: ../../lib/class/catalog.class.php:1649
+#: ../../lib/class/catalog.class.php:1580
 msgid "Album Art Already Found"
 msgstr "Album Art Already Found"
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 #, fuzzy
 msgid "Update Finished."
 msgstr "Catalogue Update Finished"
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 #, fuzzy
 msgid "Checked"
 msgstr "Checking"
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 #, fuzzy
 msgid "songs updated."
 msgstr "Playlist updated."
 
-#: ../../lib/class/song.class.php:360
+#: ../../lib/class/song.class.php:361
 #: ../../templates/show_duplicates.inc.php:35
 #: ../../templates/show_edit_song.inc.php:31
 #: ../../templates/show_disabled_songs.inc:26
@@ -216,53 +221,53 @@ msgstr "Playlist updated."
 msgid "Title"
 msgstr "Title"
 
-#: ../../lib/class/song.class.php:360 ../../lib/class/song.class.php:364
-#: ../../lib/class/song.class.php:368 ../../lib/class/song.class.php:372
-#: ../../lib/class/song.class.php:376 ../../lib/class/song.class.php:380
-#: ../../lib/class/song.class.php:384 ../../lib/class/song.class.php:389
-#: ../../lib/class/song.class.php:394 ../../lib/class/song.class.php:398
-#: ../../lib/class/song.class.php:402 ../../lib/class/song.class.php:407
+#: ../../lib/class/song.class.php:361 ../../lib/class/song.class.php:365
+#: ../../lib/class/song.class.php:369 ../../lib/class/song.class.php:373
+#: ../../lib/class/song.class.php:377 ../../lib/class/song.class.php:381
+#: ../../lib/class/song.class.php:385 ../../lib/class/song.class.php:390
+#: ../../lib/class/song.class.php:395 ../../lib/class/song.class.php:399
+#: ../../lib/class/song.class.php:403 ../../lib/class/song.class.php:408
 msgid "updated to"
 msgstr "updated to"
 
-#: ../../lib/class/song.class.php:364
+#: ../../lib/class/song.class.php:365
 #: ../../templates/show_list_duplicates.inc.php:35
 #: ../../templates/show_songs.inc:53
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: ../../lib/class/song.class.php:368
+#: ../../lib/class/song.class.php:369
 msgid "Rate"
 msgstr "Rate"
 
-#: ../../lib/class/song.class.php:372
+#: ../../lib/class/song.class.php:373
 msgid "Mode"
 msgstr "Mode"
 
-#: ../../lib/class/song.class.php:376
+#: ../../lib/class/song.class.php:377
 #: ../../templates/show_tv_playlist.inc.php:46
 #: ../../templates/show_songs.inc:51
 msgid "Time"
 msgstr "Time"
 
-#: ../../lib/class/song.class.php:380
+#: ../../lib/class/song.class.php:381
 #: ../../templates/show_edit_song.inc.php:61
 #: ../../templates/show_localplay_playlist.inc.php:27
 #: ../../templates/show_songs.inc:45 ../../templates/show_songs.inc:50
 msgid "Track"
 msgstr "Track"
 
-#: ../../lib/class/song.class.php:384
+#: ../../lib/class/song.class.php:385
 msgid "Filesize"
 msgstr "Filesize"
 
-#: ../../lib/class/song.class.php:389
+#: ../../lib/class/song.class.php:390
 #: ../../templates/show_edit_song.inc.php:45
 #: ../../templates/show_get_albumart.inc.php:30
 #: ../../templates/show_play_selected.inc.php:60
 #: ../../templates/show_list_duplicates.inc.php:32
 #: ../../templates/show_recently_played.inc.php:32
-#: ../../templates/show_artists.inc:40 ../../templates/show_artists.inc:65
+#: ../../templates/show_artists.inc:40 ../../templates/show_artists.inc:71
 #: ../../templates/show_disabled_songs.inc:28
 #: ../../templates/show_songs.inc:48 ../../templates/show_albums.inc:41
 #: ../../templates/show_albums.inc:84
@@ -271,7 +276,7 @@ msgstr "Filesize"
 msgid "Artist"
 msgstr "Artist"
 
-#: ../../lib/class/song.class.php:394
+#: ../../lib/class/song.class.php:395
 #: ../../templates/show_edit_song.inc.php:37
 #: ../../templates/show_get_albumart.inc.php:38
 #: ../../templates/show_play_selected.inc.php:59
@@ -283,7 +288,7 @@ msgstr "Artist"
 msgid "Album"
 msgstr "Album"
 
-#: ../../lib/class/song.class.php:398
+#: ../../lib/class/song.class.php:399
 #: ../../templates/show_edit_song.inc.php:67
 #: ../../templates/show_play_selected.inc.php:61
 #: ../../templates/show_edit_album.inc.php:33
@@ -292,13 +297,13 @@ msgstr "Album"
 msgid "Year"
 msgstr "Year"
 
-#: ../../lib/class/song.class.php:402 ../../templates/show_flag.inc.php:64
+#: ../../lib/class/song.class.php:403 ../../templates/show_flag.inc.php:64
 #: ../../templates/show_edit_song.inc.php:73
 #: ../../templates/show_search.inc:37
 msgid "Comment"
 msgstr "Comment"
 
-#: ../../lib/class/song.class.php:407 ../../lib/ui.lib.php:843
+#: ../../lib/class/song.class.php:408 ../../lib/ui.lib.php:851
 #: ../../templates/sidebar.inc.php:36
 #: ../../templates/show_edit_song.inc.php:53
 #: ../../templates/show_genre.inc.php:29
@@ -313,34 +318,34 @@ msgstr "Genre"
 msgid "Error: Name Identical"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:263
+#: ../../lib/class/flag.class.php:264
 msgid "Approved"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:264
+#: ../../lib/class/flag.class.php:265
 msgid "Pending"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:276 ../../templates/show_flag.inc.php:56
+#: ../../lib/class/flag.class.php:277 ../../templates/show_flag.inc.php:56
 #: ../../templates/show_playlists.inc.php:57
 #: ../../templates/show_admin_tools.inc.php:50
 msgid "Delete"
 msgstr "Delete"
 
-#: ../../lib/class/flag.class.php:279
+#: ../../lib/class/flag.class.php:280
 msgid "Re-Tag"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:282 ../../templates/show_flag.inc.php:58
+#: ../../lib/class/flag.class.php:283 ../../templates/show_flag.inc.php:58
 msgid "Re-encode"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:285 ../../templates/show_flag.inc.php:59
+#: ../../lib/class/flag.class.php:286 ../../templates/show_flag.inc.php:59
 #, fuzzy
 msgid "Other"
 msgstr "other"
 
-#: ../../lib/class/flag.class.php:288 ../../lib/class/localplay.class.php:569
+#: ../../lib/class/flag.class.php:289 ../../lib/class/localplay.class.php:570
 #: ../../lib/general.lib.php:890
 #: ../../modules/localplay/icecast.controller.php:292
 #: ../../modules/localplay/mpd.controller.php:354
@@ -348,26 +353,26 @@ msgstr "other"
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../../lib/class/localplay.class.php:560 ../../templates/show_tv.inc.php:81
+#: ../../lib/class/localplay.class.php:561 ../../templates/show_tv.inc.php:64
 #: ../../templates/show_now_playing.inc:32
 msgid "Now Playing"
 msgstr "Now Playing"
 
-#: ../../lib/class/localplay.class.php:563
+#: ../../lib/class/localplay.class.php:564
 #, fuzzy
 msgid "Stopped"
 msgstr "Stop"
 
-#: ../../lib/class/localplay.class.php:566
+#: ../../lib/class/localplay.class.php:567
 #, fuzzy
 msgid "Paused"
 msgstr "Pause"
 
-#: ../../lib/class/album.class.php:162
+#: ../../lib/class/album.class.php:163
 msgid "Various"
 msgstr "Various"
 
-#: ../../lib/class/genre.class.php:284
+#: ../../lib/class/genre.class.php:285
 #, fuzzy
 msgid "Show Genres starting with"
 msgstr "<u>S</u>how artists starting with"
@@ -411,31 +416,31 @@ msgid "Disable"
 msgstr "Disable"
 
 #: ../../lib/preferences.php:271 ../../templates/show_tv_adminctl.inc.php:41
-#: ../../templates/show_playtype_switch.inc.php:9
+#: ../../templates/show_playtype_switch.inc.php:30
 msgid "Stream"
 msgstr "Stream"
 
 #: ../../lib/preferences.php:274 ../../templates/show_tv_adminctl.inc.php:42
-#: ../../templates/show_playtype_switch.inc.php:13
+#: ../../templates/show_playtype_switch.inc.php:34
 msgid "Downsample"
 msgstr "Downsample"
 
 #: ../../lib/preferences.php:277
-#: ../../templates/show_playtype_switch.inc.php:15
+#: ../../templates/show_playtype_switch.inc.php:36
 msgid "Democratic"
 msgstr ""
 
-#: ../../lib/preferences.php:280 ../../templates/sidebar.inc.php:170
+#: ../../lib/preferences.php:280 ../../templates/sidebar.inc.php:168
 #: ../../templates/show_tv_adminctl.inc.php:40
 #: ../../templates/show_localplay.inc.php:26
-#: ../../templates/show_playtype_switch.inc.php:11
+#: ../../templates/show_playtype_switch.inc.php:32
 #: ../../ampache/templates/sidebar.inc.php:170
 #, fuzzy
 msgid "Localplay"
 msgstr "Local Play"
 
 #: ../../lib/preferences.php:282
-#: ../../templates/show_playtype_switch.inc.php:17
+#: ../../templates/show_playtype_switch.inc.php:38
 msgid "XSPF Player"
 msgstr ""
 
@@ -480,11 +485,11 @@ msgstr "Local"
 msgid "No songs in this playlist."
 msgstr "No songs in this playlist."
 
-#: ../../lib/playlist.lib.php:191 ../../lib/ui.lib.php:892
-#: ../../templates/sidebar.inc.php:150
+#: ../../lib/playlist.lib.php:191 ../../lib/ui.lib.php:900
+#: ../../templates/sidebar.inc.php:148
 #: ../../templates/show_admin_tools.inc.php:48
 #: ../../ampache/templates/sidebar.inc.php:150
-#: ../../templates/show_artists.inc:55 ../../templates/show_random_play.inc:40
+#: ../../templates/show_random_play.inc:40
 #: ../../templates/show_add_access.inc:59
 #: ../../templates/show_edit_access.inc:69
 msgid "All"
@@ -499,7 +504,7 @@ msgstr "New Playlist"
 msgid "Error Access Denied"
 msgstr "User Access Level"
 
-#: ../../lib/ui.lib.php:194 ../../templates/sidebar.inc.php:89
+#: ../../lib/ui.lib.php:194 ../../templates/sidebar.inc.php:87
 #: ../../ampache/templates/sidebar.inc.php:89
 msgid "Browse"
 msgstr "Browse"
@@ -512,142 +517,136 @@ msgstr "Show w/o art"
 msgid "Show all"
 msgstr "Show all"
 
-#: ../../lib/ui.lib.php:538 ../../admin/mail.php:80
+#: ../../lib/ui.lib.php:539 ../../admin/mail.php:81
 #, fuzzy
 msgid "No Catalogs Found!"
 msgstr "Not Found"
 
-#: ../../lib/ui.lib.php:539 ../../admin/mail.php:81
-#: ../../templates/show_admin_tools.inc.php:67
+#: ../../lib/ui.lib.php:540 ../../admin/mail.php:82
+#: ../../templates/show_admin_tools.inc.php:75
 #: ../../templates/show_add_catalog.inc.php:28
 msgid "Add a Catalog"
 msgstr "Add a Catalogue"
 
-#: ../../lib/ui.lib.php:540 ../../admin/mail.php:82
-#: ../../templates/show_mail_users.inc.php:41
-#: ../../templates/show_local_catalog_info.inc.php:23
-msgid "Catalog Statistics"
-msgstr "Catalogue Statistics"
-
-#: ../../lib/ui.lib.php:576 ../../admin/mail.php:119
+#: ../../lib/ui.lib.php:578 ../../admin/mail.php:120
 msgid "day"
 msgstr "day"
 
-#: ../../lib/ui.lib.php:576 ../../admin/mail.php:119
+#: ../../lib/ui.lib.php:578 ../../admin/mail.php:120
 msgid "days"
 msgstr "days"
 
-#: ../../lib/ui.lib.php:578 ../../admin/mail.php:121
+#: ../../lib/ui.lib.php:580 ../../admin/mail.php:122
 msgid "hour"
 msgstr "hour"
 
-#: ../../lib/ui.lib.php:578 ../../admin/mail.php:121
+#: ../../lib/ui.lib.php:580 ../../admin/mail.php:122
 msgid "hours"
 msgstr "hours"
 
-#: ../../lib/ui.lib.php:782 ../../templates/show_tv.inc.php:58
-#: ../../templates/sidebar.inc.php:50
+#: ../../lib/ui.lib.php:790 ../../templates/sidebar.inc.php:48
 #: ../../ampache/templates/sidebar.inc.php:50
 msgid "Home"
 msgstr "Home"
 
-#: ../../lib/ui.lib.php:785
+#: ../../lib/ui.lib.php:793
 msgid "Upload"
 msgstr "Upload"
 
-#: ../../lib/ui.lib.php:788
+#: ../../lib/ui.lib.php:796
 msgid "Local Play"
 msgstr "Local Play"
 
-#: ../../lib/ui.lib.php:791
+#: ../../lib/ui.lib.php:799
 #, fuzzy
 msgid "Random Play"
 msgstr "Random"
 
-#: ../../lib/ui.lib.php:794 ../../templates/show_play_selected.inc.php:47
+#: ../../lib/ui.lib.php:802 ../../templates/show_play_selected.inc.php:47
 msgid "Playlist"
 msgstr "Playlist"
 
-#: ../../lib/ui.lib.php:797 ../../templates/show_duplicates.inc.php:51
-#: ../../templates/sidebar.inc.php:118 ../../templates/sidebar.inc.php:124
+#: ../../lib/ui.lib.php:805 ../../templates/show_duplicates.inc.php:51
+#: ../../templates/sidebar.inc.php:116 ../../templates/sidebar.inc.php:122
 #: ../../ampache/templates/sidebar.inc.php:118
 #: ../../ampache/templates/sidebar.inc.php:124
 #: ../../templates/show_search_bar.inc:31 ../../templates/show_search.inc:133
 msgid "Search"
 msgstr "Search"
 
-#: ../../lib/ui.lib.php:800 ../../templates/sidebar.inc.php:81
+#: ../../lib/ui.lib.php:808 ../../templates/sidebar.inc.php:79
 #: ../../ampache/templates/sidebar.inc.php:81
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../../lib/ui.lib.php:803 ../../lib/ui.lib.php:807
+#: ../../lib/ui.lib.php:811 ../../lib/ui.lib.php:815
 #, fuzzy
 msgid "Admin-Catalog"
 msgstr "Add Catalogue"
 
-#: ../../lib/ui.lib.php:811
+#: ../../lib/ui.lib.php:819
 msgid "Admin-User Management"
 msgstr ""
 
-#: ../../lib/ui.lib.php:815
+#: ../../lib/ui.lib.php:823
 #, fuzzy
 msgid "Admin-Mail Users"
 msgstr "Mail Users"
 
-#: ../../lib/ui.lib.php:819
+#: ../../lib/ui.lib.php:827
 #, fuzzy
 msgid "Admin-Manage Access Lists"
 msgstr "Access Lists"
 
-#: ../../lib/ui.lib.php:823
+#: ../../lib/ui.lib.php:831
 #, fuzzy
 msgid "Admin-Site Preferences"
 msgstr "Admin Preferences"
 
-#: ../../lib/ui.lib.php:827
+#: ../../lib/ui.lib.php:835
 msgid "Admin-Manage Modules"
 msgstr ""
 
-#: ../../lib/ui.lib.php:831
+#: ../../lib/ui.lib.php:839
 #, fuzzy
 msgid "Browse Music"
 msgstr "Browse"
 
-#: ../../lib/ui.lib.php:835 ../../admin/mail.php:133
-#: ../../templates/sidebar.inc.php:34 ../../templates/sidebar.inc.php:158
+#: ../../lib/ui.lib.php:843 ../../admin/mail.php:134
+#: ../../templates/sidebar.inc.php:34 ../../templates/sidebar.inc.php:156
 #: ../../templates/show_genre.inc.php:32
-#: ../../templates/show_local_catalog_info.inc.php:34
+#: ../../templates/show_local_catalog_info.inc.php:28
 #: ../../ampache/templates/sidebar.inc.php:34
 #: ../../ampache/templates/sidebar.inc.php:158
-#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:68
+#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:74
 msgid "Albums"
 msgstr "Albums"
 
-#: ../../lib/ui.lib.php:839 ../../admin/mail.php:134
-#: ../../templates/sidebar.inc.php:35 ../../templates/sidebar.inc.php:157
+#: ../../lib/ui.lib.php:847 ../../admin/mail.php:135
+#: ../../templates/sidebar.inc.php:35 ../../templates/sidebar.inc.php:155
 #: ../../templates/show_genre.inc.php:35
-#: ../../templates/show_local_catalog_info.inc.php:38
+#: ../../templates/show_local_catalog_info.inc.php:29
 #: ../../ampache/templates/sidebar.inc.php:35
 #: ../../ampache/templates/sidebar.inc.php:157
 msgid "Artists"
 msgstr "Artists"
 
-#: ../../lib/ui.lib.php:847 ../../templates/sidebar.inc.php:112
+#: ../../lib/ui.lib.php:855 ../../templates/sidebar.inc.php:110
 #: ../../ampache/templates/sidebar.inc.php:112
 #, fuzzy
 msgid "Statistics"
 msgstr "Catalogue Statistics"
 
-#: ../../lib/ui.lib.php:1421
+#: ../../lib/ui.lib.php:1429
 msgid "Manage Users"
 msgstr "Manage Users"
 
-#: ../../lib/ui.lib.php:1422
+#: ../../lib/ui.lib.php:1430
 msgid "Add a new user"
 msgstr "Add a new user"
 
-#: ../../lib/general.lib.php:670 ../../templates/show_user_stats.inc.php:32
+#: ../../lib/general.lib.php:670 ../../templates/show_box.inc.php:30
+#: ../../templates/show_user_stats.inc.php:32
 #: ../../templates/show_user_stats.inc.php:43
 #: ../../templates/show_user_stats.inc.php:54
 #: ../../templates/show_user_recommendations.inc.php:32
@@ -781,7 +780,7 @@ msgstr "All now playing data has been cleared"
 msgid "Do you really want to clear the statistics for this catalog?"
 msgstr "Do you really want to clear the statistics for this catalogue?"
 
-#: ../../admin/catalog.php:230 ../../templates/show_admin_tools.inc.php:68
+#: ../../admin/catalog.php:230 ../../templates/show_admin_tools.inc.php:76
 msgid "Clear Catalog Stats"
 msgstr "Clear Catalogue Stats"
 
@@ -837,28 +836,32 @@ msgstr "files removed"
 msgid "Flag Removed from"
 msgstr ""
 
-#: ../../admin/flag.php:274
+#: ../../admin/flag.php:270
+msgid "Flags Updated"
+msgstr ""
+
+#: ../../admin/flag.php:289
 msgid "Songs Disabled"
 msgstr "Songs Disabled"
 
-#: ../../admin/flag.php:274
+#: ../../admin/flag.php:289
 msgid "The requested song(s) have been disabled"
 msgstr "The requested song(s) have been disabled"
 
-#: ../../admin/flag.php:285
+#: ../../admin/flag.php:300
 msgid "Songs Enabled"
 msgstr "Songs Enabled"
 
-#: ../../admin/flag.php:285
+#: ../../admin/flag.php:300
 msgid "The requested song(s) have been enabled"
 msgstr "The requested song(s) have been enabled"
 
-#: ../../admin/flag.php:290
+#: ../../admin/flag.php:305
 #, fuzzy
 msgid "Flagged Records"
 msgstr "Flagged by"
 
-#: ../../admin/preferences.php:59 ../../admin/preferences.php:82
+#: ../../admin/preferences.php:60 ../../admin/preferences.php:83
 #, fuzzy
 msgid "Site"
 msgstr "Size"
@@ -906,68 +909,73 @@ msgstr "Error Username Required"
 msgid "Error Passwords don't match"
 msgstr "Error Passwords don't match"
 
-#: ../../admin/users.php:117 ../../register.php:138
+#: ../../admin/users.php:120 ../../register.php:138
 #, fuzzy
 msgid "Error Username already exists"
 msgstr "Error Username Required"
 
-#: ../../admin/users.php:139
+#: ../../admin/users.php:142
 msgid "Deletion Request"
 msgstr ""
 
-#: ../../admin/users.php:140
+#: ../../admin/users.php:143
 msgid "Are you sure you want to permanently delete"
 msgstr "Are you sure you want to permanently delete"
 
-#: ../../admin/users.php:145 ../../templates/show_confirm_action.inc.php:29
+#: ../../admin/users.php:148 ../../templates/show_confirm_action.inc.php:29
 #: ../../templates/show_search.inc:78
 msgid "No"
 msgstr "No"
 
-#: ../../admin/users.php:147
+#: ../../admin/users.php:150
 msgid "User Deleted"
 msgstr "User Deleted"
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:153
 msgid "Delete Error"
 msgstr "Delete Error"
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:153
 msgid "Unable to delete last Admin User"
 msgstr "Unable to delete last Admin User"
 
-#: ../../admin/mail.php:131 ../../templates/show_local_catalog_info.inc.php:26
+#: ../../admin/mail.php:83 ../../templates/show_mail_users.inc.php:41
+#: ../../templates/show_local_catalog_info.inc.php:23
+msgid "Catalog Statistics"
+msgstr "Catalogue Statistics"
+
+#: ../../admin/mail.php:132 ../../templates/show_local_catalog_info.inc.php:27
 msgid "Total Users"
 msgstr "Total Users"
 
-#: ../../admin/mail.php:132 ../../templates/show_local_catalog_info.inc.php:30
+#: ../../admin/mail.php:133 ../../templates/show_local_catalog_info.inc.php:26
 msgid "Connected Users"
 msgstr "Connected Users"
 
-#: ../../admin/mail.php:135 ../../templates/sidebar.inc.php:155
+#: ../../admin/mail.php:136 ../../templates/sidebar.inc.php:153
 #: ../../templates/show_genre.inc.php:38
-#: ../../templates/show_local_catalog_info.inc.php:42
+#: ../../templates/show_local_catalog_info.inc.php:30
 #: ../../templates/show_genres.inc.php:37
 #: ../../ampache/templates/sidebar.inc.php:155
-#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:67
+#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:73
 #: ../../templates/show_albums.inc:43 ../../templates/show_albums.inc:86
 msgid "Songs"
 msgstr "Songs"
 
-#: ../../admin/mail.php:136 ../../templates/show_local_catalog_info.inc.php:46
+#: ../../admin/mail.php:137 ../../templates/show_local_catalog_info.inc.php:31
 msgid "Catalog Size"
 msgstr "Catalogue Size"
 
-#: ../../admin/mail.php:137 ../../templates/show_local_catalog_info.inc.php:50
+#: ../../admin/mail.php:138 ../../templates/show_local_catalog_info.inc.php:32
 msgid "Catalog Time"
 msgstr "Catalogue Time"
 
-#: ../../admin/mail.php:219
+#: ../../admin/mail.php:252
 #, fuzzy
 msgid "E-mail Sent"
 msgstr "E-mail"
 
-#: ../../admin/mail.php:220
+#: ../../admin/mail.php:253
 msgid "Your E-mail was successfully sent."
 msgstr ""
 
@@ -1025,21 +1033,21 @@ msgid "Incorrect Tags"
 msgstr ""
 
 #: ../../templates/show_flag.inc.php:70
-#: ../../templates/show_flagged.inc.php:27
+#: ../../templates/show_flagged.inc.php:30
 msgid "Flag"
 msgstr "Flag"
 
 #: ../../templates/show_install_account.inc.php:36
-#: ../../templates/show_install_lang.inc.php:10
+#: ../../templates/show_install_lang.inc.php:32
 #: ../../templates/show_install_config.inc:36
-#: ../../templates/show_install.inc:10
+#: ../../templates/show_install.inc:32
 msgid "Ampache Installation"
 msgstr "Ampache Installation"
 
 #: ../../templates/show_install_account.inc.php:43
-#: ../../templates/show_install_lang.inc.php:17
+#: ../../templates/show_install_lang.inc.php:39
 #: ../../templates/show_install_config.inc:42
-#: ../../templates/show_install.inc:18
+#: ../../templates/show_install.inc:40
 #, fuzzy
 msgid ""
 "This Page handles the installation of the Ampache database and the creation "
@@ -1051,9 +1059,9 @@ msgstr ""
 "have the following pre-requisites"
 
 #: ../../templates/show_install_account.inc.php:46
-#: ../../templates/show_install_lang.inc.php:20
+#: ../../templates/show_install_lang.inc.php:42
 #: ../../templates/show_install_config.inc:45
-#: ../../templates/show_install.inc:21
+#: ../../templates/show_install.inc:43
 msgid ""
 "A MySQL Server with a username and password that can create/modify databases"
 msgstr ""
@@ -1068,9 +1076,9 @@ msgstr ""
 "ampache.cfg.dist.php file"
 
 #: ../../templates/show_install_account.inc.php:49
-#: ../../templates/show_install_lang.inc.php:24
+#: ../../templates/show_install_lang.inc.php:46
 #: ../../templates/show_install_config.inc:48
-#: ../../templates/show_install.inc:25
+#: ../../templates/show_install.inc:47
 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 "
@@ -1084,7 +1092,7 @@ msgstr ""
 
 #: ../../templates/show_install_account.inc.php:53
 #: ../../templates/show_install_config.inc:52
-#: ../../templates/show_install.inc:30
+#: ../../templates/show_install.inc:52
 msgid "Step 1 - Creating and Inserting the Ampache Database"
 msgstr "Step 1 - Creating and Inserting the Ampache Database"
 
@@ -1094,7 +1102,7 @@ msgstr "Step 2 - Creating the ampache.cfg.php file"
 
 #: ../../templates/show_install_account.inc.php:55
 #: ../../templates/show_install_config.inc:57
-#: ../../templates/show_install.inc:35
+#: ../../templates/show_install.inc:57
 msgid "Step 3 - Setup Initial Account"
 msgstr "Step 3 - Setup Initial Account"
 
@@ -1112,7 +1120,7 @@ msgid "Create Admin Account"
 msgstr "Create Account"
 
 #: ../../templates/show_install_account.inc.php:65
-#: ../../templates/show_user_registration.inc.php:99
+#: ../../templates/show_user_registration.inc.php:98
 #: ../../templates/show_edit_user.inc.php:40
 #: ../../templates/show_recently_played.inc.php:29
 #: ../../templates/show_users.inc:43
@@ -1120,7 +1128,7 @@ msgid "Username"
 msgstr "Username"
 
 #: ../../templates/show_install_account.inc.php:69
-#: ../../templates/show_user_registration.inc.php:127
+#: ../../templates/show_user_registration.inc.php:126
 #: ../../templates/show_edit_user.inc.php:63
 #: ../../templates/show_login_form.inc:37
 msgid "Password"
@@ -1131,7 +1139,7 @@ msgid "Create Account"
 msgstr "Create Account"
 
 #: ../../templates/show_playlists.inc.php:28
-#: ../../templates/sidebar.inc.php:106
+#: ../../templates/sidebar.inc.php:104
 #: ../../ampache/templates/sidebar.inc.php:106
 msgid "Playlists"
 msgstr "Playlists"
@@ -1166,22 +1174,20 @@ msgstr "View"
 
 #: ../../templates/show_playlists.inc.php:55
 #: ../../templates/show_play_selected.inc.php:50
-#: ../../templates/show_artists.inc:58 ../../templates/show_access_list.inc:67
+#: ../../templates/show_access_list.inc:67
 msgid "Edit"
 msgstr "Edit"
 
 #: ../../templates/show_playlists.inc.php:61
 #: ../../templates/show_tv_adminctl.inc.php:44
-#: ../../templates/show_genres.inc.php:47 ../../templates/show_artists.inc:54
 #: ../../templates/show_random_play.inc:82
 msgid "Play"
 msgstr "Play"
 
 #: ../../templates/show_playlists.inc.php:63
-#: ../../templates/sidebar.inc.php:135
+#: ../../templates/sidebar.inc.php:133
 #: ../../templates/show_localplay_status.inc.php:62
 #: ../../ampache/templates/sidebar.inc.php:135
-#: ../../templates/show_artists.inc:56
 msgid "Random"
 msgstr "Random"
 
@@ -1220,11 +1226,11 @@ msgstr ""
 msgid "Yes"
 msgstr "Yes"
 
-#: ../../templates/show_tv.inc.php:56
+#: ../../templates/show_tv.inc.php:42
 msgid "Controls"
 msgstr ""
 
-#: ../../templates/show_tv.inc.php:74
+#: ../../templates/show_tv.inc.php:57
 #: ../../templates/show_localplay.inc.php:42
 #, fuzzy
 msgid "Current Playlist"
@@ -1252,7 +1258,7 @@ msgstr "Name"
 
 #: ../../templates/show_playlist_edit.inc.php:36
 #: ../../templates/show_add_playlist.inc.php:32
-#: ../../templates/show_random_play.inc:50
+#: ../../templates/show_random_play.inc:49
 #: ../../templates/show_access_list.inc:51
 msgid "Type"
 msgstr "Type"
@@ -1268,6 +1274,7 @@ msgstr "Your Private"
 
 #: ../../templates/show_playlist_edit.inc.php:48
 #: ../../templates/show_tv_adminctl.inc.php:51
+#: ../../templates/show_flagged.inc.php:66
 #: ../../templates/show_play_selected.inc.php:64
 #: ../../templates/show_preference_admin.inc.php:47
 #: ../../templates/show_edit_access.inc:78
@@ -1303,42 +1310,36 @@ msgstr "Access Lists"
 msgid "Song Title"
 msgstr "Song title"
 
-#: ../../templates/sidebar.inc.php:38
-#: ../../ampache/templates/sidebar.inc.php:38
-#, fuzzy
-msgid "Lists"
-msgstr "Artists"
-
-#: ../../templates/sidebar.inc.php:62
+#: ../../templates/sidebar.inc.php:60
 #: ../../templates/show_tv_playlist.inc.php:48
 #: ../../templates/show_preference_admin.inc.php:39
 #: ../../ampache/templates/sidebar.inc.php:62
 msgid "Admin"
 msgstr "Admin"
 
-#: ../../templates/sidebar.inc.php:156
+#: ../../templates/sidebar.inc.php:154
 #: ../../ampache/templates/sidebar.inc.php:156
 #: ../../templates/show_random_play.inc:56
 msgid "Minutes"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:159
+#: ../../templates/sidebar.inc.php:157
 #: ../../ampache/templates/sidebar.inc.php:159
 #: ../../templates/show_random_play.inc:53
 msgid "Less Played"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:164
+#: ../../templates/sidebar.inc.php:162
 #: ../../ampache/templates/sidebar.inc.php:164
 msgid "Enqueue"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:187
+#: ../../templates/sidebar.inc.php:185
 #: ../../ampache/templates/sidebar.inc.php:187
 msgid "Democratic View"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:191
+#: ../../templates/sidebar.inc.php:189
 #: ../../ampache/templates/sidebar.inc.php:191
 msgid "Logout"
 msgstr "Logout"
@@ -1353,9 +1354,9 @@ msgstr "Catalogue"
 #: ../../templates/show_modules.inc.php:42
 #: ../../templates/show_modules.inc.php:75
 #: ../../templates/show_genres.inc.php:38
-#: ../../templates/show_flagged.inc.php:29
+#: ../../templates/show_flagged.inc.php:32
 #: ../../templates/show_localplay_playlist.inc.php:29
-#: ../../templates/show_artists.inc:44 ../../templates/show_artists.inc:69
+#: ../../templates/show_artists.inc:44 ../../templates/show_artists.inc:75
 #: ../../templates/show_songs.inc:55 ../../templates/show_albums.inc:47
 #: ../../templates/show_albums.inc:90 ../../templates/show_access_list.inc:52
 #: ../../templates/show_artist.inc:39
@@ -1375,63 +1376,71 @@ msgstr ""
 msgid "Clean"
 msgstr "clear"
 
+#: ../../templates/show_admin_tools.inc.php:56
+msgid "Fast"
+msgstr ""
+
 #: ../../templates/show_admin_tools.inc.php:57
+msgid "Gather Art"
+msgstr ""
+
+#: ../../templates/show_admin_tools.inc.php:65
 #, fuzzy
 msgid "No Catalogs Found"
 msgstr "Not Found"
 
-#: ../../templates/show_admin_tools.inc.php:63
+#: ../../templates/show_admin_tools.inc.php:71
 #, fuzzy
 msgid "Clean All"
 msgstr "Clean All Catalogues"
 
-#: ../../templates/show_admin_tools.inc.php:64
+#: ../../templates/show_admin_tools.inc.php:72
 #, fuzzy
 msgid "Verify All"
 msgstr "View All"
 
-#: ../../templates/show_admin_tools.inc.php:65
+#: ../../templates/show_admin_tools.inc.php:73
 #, fuzzy
 msgid "Add to All"
 msgstr "Add to"
 
-#: ../../templates/show_admin_tools.inc.php:66
+#: ../../templates/show_admin_tools.inc.php:74
 #, fuzzy
 msgid "Update All"
 msgstr "Updated"
 
-#: ../../templates/show_admin_tools.inc.php:69
+#: ../../templates/show_admin_tools.inc.php:77
 #: ../../templates/show_add_catalog.inc.php:78
 msgid "Gather Album Art"
 msgstr "Gather Album Art"
 
-#: ../../templates/show_admin_tools.inc.php:73
+#: ../../templates/show_admin_tools.inc.php:81
 msgid "Other Tools"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:75
+#: ../../templates/show_admin_tools.inc.php:83
 msgid "Show Duplicate Songs"
 msgstr "Show Duplicate Songs"
 
-#: ../../templates/show_admin_tools.inc.php:76
+#: ../../templates/show_admin_tools.inc.php:84
 msgid "Clear Now Playing"
 msgstr "Clear Now Playing"
 
-#: ../../templates/show_admin_tools.inc.php:78
+#: ../../templates/show_admin_tools.inc.php:85 ../../templates/header.inc:75
 #, fuzzy
 msgid "Generate New Config"
 msgstr "Write Configuration"
 
-#: ../../templates/show_admin_tools.inc.php:79
+#: ../../templates/show_admin_tools.inc.php:86
 #, fuzzy
 msgid "Preferences Permissions"
 msgstr "Preferences"
 
-#: ../../templates/show_admin_tools.inc.php:81
+#: ../../templates/show_admin_tools.inc.php:87
 msgid "Export To Itunes DB"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:82
+#: ../../templates/show_admin_tools.inc.php:88
 #, fuzzy
 msgid "Check for New Version"
 msgstr "Check for Configuration"
@@ -1468,7 +1477,7 @@ msgid "Find duplicate artists"
 msgstr "Find Duplicates"
 
 #: ../../templates/show_user.inc.php:30
-#: ../../templates/show_user_registration.inc.php:118
+#: ../../templates/show_user_registration.inc.php:117
 #: ../../templates/show_edit_user.inc.php:55
 msgid "E-mail"
 msgstr "E-mail"
@@ -1483,7 +1492,7 @@ msgid "New Password"
 msgstr "Password"
 
 #: ../../templates/show_user.inc.php:49
-#: ../../templates/show_user_registration.inc.php:136
+#: ../../templates/show_user_registration.inc.php:135
 #: ../../templates/show_edit_user.inc.php:72
 msgid "Confirm Password"
 msgstr "Confirm Password"
@@ -1549,46 +1558,46 @@ msgstr "Apply to All"
 msgid "description"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:55
+#: ../../templates/show_user_registration.inc.php:54
 #, fuzzy
 msgid "Ampache New User Registration"
 msgstr "Ampache Installation"
 
-#: ../../templates/show_user_registration.inc.php:70
+#: ../../templates/show_user_registration.inc.php:69
 #, fuzzy
 msgid "User Agreement"
 msgstr "User Deleted"
 
-#: ../../templates/show_user_registration.inc.php:80
+#: ../../templates/show_user_registration.inc.php:79
 #, fuzzy
 msgid "I Accept"
 msgstr "Accept"
 
-#: ../../templates/show_user_registration.inc.php:94
+#: ../../templates/show_user_registration.inc.php:93
 msgid "User Information"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:109
+#: ../../templates/show_user_registration.inc.php:108
 #: ../../templates/show_edit_user.inc.php:48
 msgid "Full Name"
 msgstr "Full Name"
 
-#: ../../templates/show_user_registration.inc.php:156
+#: ../../templates/show_user_registration.inc.php:155
 msgid "Clear Info"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:157
+#: ../../templates/show_user_registration.inc.php:156
 msgid "Register User"
 msgstr "Register User"
 
-#: ../../templates/show_install_lang.inc.php:15
-#: ../../templates/show_install.inc:16
+#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install.inc:38
 msgid "Requirements"
 msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:21
+#: ../../templates/show_install_lang.inc.php:43
 #: ../../templates/show_install_config.inc:46
-#: ../../templates/show_install.inc:22
+#: ../../templates/show_install.inc:44
 msgid ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
 "ampache.cfg.php.dist file"
@@ -1596,7 +1605,7 @@ msgstr ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
 "ampache.cfg.php.dist file"
 
-#: ../../templates/show_install_lang.inc.php:50
+#: ../../templates/show_install_lang.inc.php:72
 msgid "Start configuration"
 msgstr ""
 
@@ -1623,7 +1632,7 @@ msgstr ""
 
 #: ../../templates/show_modules.inc.php:61
 #: ../../templates/show_modules.inc.php:96
-#: ../../templates/show_flagged.inc.php:50
+#: ../../templates/show_flagged.inc.php:57
 #: ../../templates/show_list_duplicates.inc.php:81
 #: ../../templates/show_localplay_playlist.inc.php:51
 #: ../../templates/show_disabled_songs.inc:44
@@ -1702,7 +1711,7 @@ msgid "Mail to"
 msgstr "Mail to"
 
 #: ../../templates/show_mail_users.inc.php:45
-#: ../../templates/show_all_popular.inc.php:30 ../../index.php:66
+#: ../../templates/show_all_popular.inc.php:29
 msgid "Most Popular Albums"
 msgstr "Most Popular Albums"
 
@@ -1712,7 +1721,7 @@ msgid "Latest Artist Additions"
 msgstr "Newest Artist Additions"
 
 #: ../../templates/show_mail_users.inc.php:56
-#: ../../templates/show_all_popular.inc.php:27 ../../index.php:75
+#: ../../templates/show_all_popular.inc.php:26
 msgid "Most Popular Artists"
 msgstr "Most Popular Artists"
 
@@ -1722,38 +1731,43 @@ msgid "Latest Album Additions"
 msgstr "Newest Album Additions"
 
 #: ../../templates/show_mail_users.inc.php:67
-#: ../../templates/show_all_popular.inc.php:40
+#: ../../templates/show_all_popular.inc.php:38
 msgid "Most Popular Songs"
 msgstr "Most Popular Songs"
 
 #: ../../templates/show_mail_users.inc.php:73
+msgid "Flagged Songs"
+msgstr ""
+
+#: ../../templates/show_mail_users.inc.php:77
+#: ../../templates/show_admin_info.inc.php:36
+#, fuzzy
+msgid "Disabled Songs"
+msgstr "Show Disabled Songs"
+
+#: ../../templates/show_mail_users.inc.php:85
 #, fuzzy
 msgid "Most Popular Threshold in days"
 msgstr "Most Popular Songs"
 
-#: ../../templates/show_mail_users.inc.php:84
+#: ../../templates/show_mail_users.inc.php:96
 msgid "Subject"
 msgstr "Subject"
 
-#: ../../templates/show_mail_users.inc.php:91
+#: ../../templates/show_mail_users.inc.php:103
 msgid "Message"
 msgstr "Message"
 
-#: ../../templates/show_mail_users.inc.php:101
+#: ../../templates/show_mail_users.inc.php:113
 msgid "Send Mail"
 msgstr "Send Mail"
 
-#: ../../templates/show_admin_info.inc.php:33
+#: ../../templates/show_admin_info.inc.php:32
 msgid "Last Ten Flagged Records"
 msgstr ""
 
-#: ../../templates/show_admin_info.inc.php:37
-#, fuzzy
-msgid "Disabled Songs"
-msgstr "Show Disabled Songs"
-
-#: ../../templates/show_admin_info.inc.php:41
-#: ../../templates/show_flagged.inc.php:57
+#: ../../templates/show_admin_info.inc.php:40
+#: ../../templates/show_flagged.inc.php:73
 #: ../../templates/show_ip_history.inc.php:28
 #, fuzzy
 msgid "Show All"
@@ -1788,26 +1802,40 @@ msgid "Continue"
 msgstr "Continue"
 
 #: ../../templates/show_confirmation.inc.php:28
-#: ../../templates/show_preferences.inc:95
+#: ../../templates/show_preferences.inc:96
 #: ../../templates/show_similar_artists.inc:74
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../../templates/show_flagged.inc.php:26
+#: ../../templates/show_flagged.inc.php:27
+#: ../../templates/show_disabled_songs.inc:25
+#: ../../templates/show_artist.inc:33
+msgid "Select"
+msgstr "Select"
+
+#: ../../templates/show_flagged.inc.php:28
 #, fuzzy
 msgid "Object"
 msgstr "Subject"
 
-#: ../../templates/show_flagged.inc.php:28
+#: ../../templates/show_flagged.inc.php:29
+#: ../../templates/show_preference_admin.inc.php:38
+#: ../../templates/show_add_access.inc:47
+#: ../../templates/show_access_list.inc:49
+#: ../../templates/show_edit_access.inc:47
+msgid "User"
+msgstr "User"
+
+#: ../../templates/show_flagged.inc.php:31
 #, fuzzy
 msgid "Status"
 msgstr "Stats"
 
-#: ../../templates/show_flagged.inc.php:39
+#: ../../templates/show_flagged.inc.php:63
 msgid "Reject"
 msgstr "Reject"
 
-#: ../../templates/show_flagged.inc.php:43
+#: ../../templates/show_flagged.inc.php:64
 msgid "Approve"
 msgstr ""
 
@@ -1826,14 +1854,18 @@ msgstr ""
 msgid "Update id3 tags"
 msgstr "Update from tags"
 
-#: ../../templates/show_all_recent.inc.php:27
+#: ../../templates/show_all_recent.inc.php:25
 msgid "Newest Artist Additions"
 msgstr "Newest Artist Additions"
 
-#: ../../templates/show_all_recent.inc.php:30 ../../index.php:82
+#: ../../templates/show_all_recent.inc.php:28
 msgid "Newest Album Additions"
 msgstr "Newest Album Additions"
 
+#: ../../templates/show_all_recent.inc.php:31
+msgid "Newest Live Stream Additions"
+msgstr ""
+
 #: ../../templates/show_get_albumart.inc.php:23
 msgid "Customize Search"
 msgstr ""
@@ -1893,11 +1925,19 @@ msgstr "Create a new playlist"
 msgid "Delete Empty Playlists"
 msgstr "Import Playlist"
 
-#: ../../templates/show_all_popular.inc.php:37
+#: ../../templates/show_all_popular.inc.php:32
 #, fuzzy
 msgid "Most Popular Genres"
 msgstr "Most Popular Songs"
 
+#: ../../templates/show_all_popular.inc.php:41
+msgid "Most Popular Live Streams"
+msgstr ""
+
+#: ../../templates/show_all_popular.inc.php:44
+msgid "Most Popular Tags"
+msgstr ""
+
 #: ../../templates/show_play_selected.inc.php:28
 msgid "Play Selected"
 msgstr "Play Selected"
@@ -2044,22 +2084,10 @@ msgid "Filename Pattern"
 msgstr "Filename Pattern"
 
 #: ../../templates/show_add_catalog.inc.php:82
-msgid "ID3V2 Tags"
-msgstr "ID3V2 Tags"
-
-#: ../../templates/show_add_catalog.inc.php:86
-msgid "Amazon"
-msgstr "Amazon"
-
-#: ../../templates/show_add_catalog.inc.php:90
-msgid "File Folder"
-msgstr "File Folder"
-
-#: ../../templates/show_add_catalog.inc.php:98
 msgid "Build Playlists from m3u Files"
 msgstr "Build Playlists from m3u Files"
 
-#: ../../templates/show_add_catalog.inc.php:106
+#: ../../templates/show_add_catalog.inc.php:90
 msgid "Add Catalog"
 msgstr "Add Catalogue"
 
@@ -2124,7 +2152,7 @@ msgid "Recommendations"
 msgstr ""
 
 #: ../../templates/show_user_recommendations.inc.php:29
-msgid "Recommended Aritsts"
+msgid "Recommended Artists"
 msgstr ""
 
 #: ../../templates/show_user_recommendations.inc.php:40
@@ -2151,13 +2179,6 @@ msgstr "Level"
 msgid "Guest"
 msgstr ""
 
-#: ../../templates/show_preference_admin.inc.php:38
-#: ../../templates/show_add_access.inc:47
-#: ../../templates/show_access_list.inc:49
-#: ../../templates/show_edit_access.inc:47
-msgid "User"
-msgstr "User"
-
 #: ../../templates/show_edit_album.inc.php:23
 #, fuzzy
 msgid "Edit Album"
@@ -2204,11 +2225,19 @@ msgstr "year"
 msgid "Recently Played"
 msgstr ""
 
+#: ../../templates/show_recently_played.inc.php:33
+msgid "Last Played"
+msgstr ""
+
 #: ../../templates/show_edit_artist.inc.php:23
 #, fuzzy
 msgid "Edit Artist"
 msgstr "Artist"
 
+#: ../../templates/show_random_albums.inc.php:23
+msgid "Albums of the Moment"
+msgstr ""
+
 #: ../../localplay.php:50 ../../localplay.php:58
 #, fuzzy
 msgid "Song(s) Removed from Playlist"
@@ -2219,7 +2248,7 @@ msgstr "Server Playlist"
 msgid "Localplay Init Failed"
 msgstr "Local Play Control"
 
-#: ../../browse.php:48 ../../albums.php:191
+#: ../../browse.php:48 ../../albums.php:213
 #, fuzzy
 msgid "Show Albums starting with"
 msgstr "<u>S</u>how only albums starting with"
@@ -2229,7 +2258,7 @@ msgstr "<u>S</u>how only albums starting with"
 msgid "Show Artists starting with"
 msgstr "<u>S</u>how artists starting with"
 
-#: ../../browse.php:123
+#: ../../browse.php:124
 #, fuzzy
 msgid "Show Titles Starting With"
 msgstr "<u>S</u>how artists starting with"
@@ -2238,6 +2267,11 @@ msgstr "<u>S</u>how artists starting with"
 msgid "Error: No Keyword Entered"
 msgstr ""
 
+#: ../../ampache/templates/sidebar.inc.php:38
+#, fuzzy
+msgid "Lists"
+msgstr "Artists"
+
 #: ../../ratings.php:33
 #, fuzzy
 msgid "Rating Updated"
@@ -2259,7 +2293,7 @@ msgstr ""
 msgid "No local account found"
 msgstr ""
 
-#: ../../login.php:177
+#: ../../login.php:176
 msgid "Message of the Day"
 msgstr ""
 
@@ -2277,37 +2311,37 @@ msgstr "Password"
 msgid "Ampache Update"
 msgstr "Ampache Debug"
 
-#: ../../tv.php:61
+#: ../../tv.php:62
 #, fuzzy
 msgid "Playlist Cleared"
 msgstr "Now Playing Cleared"
 
-#: ../../artists.php:91 ../../albums.php:169
+#: ../../artists.php:91 ../../albums.php:191
 msgid "Starting Update from Tags"
 msgstr "Starting Update from Tags"
 
-#: ../../artists.php:96 ../../albums.php:174
+#: ../../artists.php:96 ../../albums.php:196
 msgid "Update From Tags Complete"
 msgstr "Update From Tags Complete"
 
-#: ../../artists.php:97 ../../albums.php:175
+#: ../../artists.php:97 ../../albums.php:197
 msgid "Return"
 msgstr "Return"
 
-#: ../../activate.php:44
+#: ../../activate.php:43
 msgid "No user with this name registered"
 msgstr ""
 
-#: ../../activate.php:48
+#: ../../activate.php:47
 msgid "The validation key used isn't correct."
 msgstr ""
 
-#: ../../activate.php:53
+#: ../../activate.php:52
 #, fuzzy
 msgid "User activated"
 msgstr "User Deleted"
 
-#: ../../activate.php:53
+#: ../../activate.php:52
 msgid "This User ID is activated and can be used"
 msgstr ""
 
@@ -2382,11 +2416,11 @@ msgstr "Album Art Cleared"
 msgid "Album Art information has been removed from the database"
 msgstr "Album Art information has been removed from the database"
 
-#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:133
+#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:159
 msgid "Album Art Not Located"
 msgstr "Album Art Not Located"
 
-#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:133
+#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:159
 #, fuzzy
 msgid ""
 "Album Art could not be located at this time. This may be due to write access "
@@ -2395,7 +2429,7 @@ msgstr ""
 "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."
 
-#: ../../albums.php:79 ../../albums.php:162
+#: ../../albums.php:79 ../../albums.php:106 ../../albums.php:185
 #, fuzzy
 msgid "Album Art Inserted"
 msgstr "Album Art Cleared"
@@ -2436,11 +2470,11 @@ msgstr "Error Passwords don't match"
 msgid "Error: Insert Failed"
 msgstr "Error: Insufficient Rights"
 
-#: ../../register.php:170
+#: ../../register.php:169
 msgid "Registration Complete"
 msgstr ""
 
-#: ../../bin/print_tags.php.inc:63
+#: ../../bin/print_tags.php.inc:64
 msgid ""
 "[print_tags.php.inc]\n"
 "This commandline script will display the tag information for the specified "
@@ -2449,7 +2483,7 @@ msgid ""
 "        \n"
 msgstr ""
 
-#: ../../bin/print_tags.php.inc:69
+#: ../../bin/print_tags.php.inc:70
 #, fuzzy
 msgid "Filename:"
 msgstr "Filename"
@@ -2517,16 +2551,11 @@ msgstr "Find Album Art"
 msgid "Click to close window"
 msgstr ""
 
-#: ../../templates/show_disabled_songs.inc:25
-#: ../../templates/show_artist.inc:33
-msgid "Select"
-msgstr "Select"
-
 #: ../../templates/show_disabled_songs.inc:30
 msgid "Addition Time"
 msgstr ""
 
-#: ../../templates/show_disabled_songs.inc:48
+#: ../../templates/show_disabled_songs.inc:49
 #, fuzzy
 msgid "Remove"
 msgstr "Remote"
@@ -2539,11 +2568,15 @@ msgstr "Prev"
 msgid "Next"
 msgstr "Next"
 
-#: ../../templates/header.inc:64 ../../ampache/templates/header.inc:64
+#: ../../templates/header.inc:63 ../../ampache/templates/header.inc:64
 #, fuzzy
 msgid "You are currently logged in as"
 msgstr "you are currently logged in as"
 
+#: ../../templates/header.inc:74
+msgid "Error Config File Out of Date"
+msgstr ""
+
 #: ../../templates/show_songs.inc:47
 msgid "Song title"
 msgstr "Song title"
@@ -2553,17 +2586,12 @@ msgstr "Song title"
 msgid "Rating"
 msgstr "Editing"
 
-#: ../../templates/show_songs.inc:176
+#: ../../templates/show_songs.inc:183
 msgid "Total"
 msgstr "Total"
 
-#: ../../templates/show_songs.inc:194
-#, fuzzy
-msgid "** Indicates flagged songs"
-msgstr "View flagged songs"
-
 #: ../../templates/show_install_config.inc:53
-#: ../../templates/show_install.inc:34
+#: ../../templates/show_install.inc:56
 msgid "Step 2 - Creating the Ampache.cfg.php file"
 msgstr "Step 2 - Creating the Ampache.cfg.php file"
 
@@ -2583,12 +2611,12 @@ msgid "Web Path"
 msgstr "Web Path"
 
 #: ../../templates/show_install_config.inc:68
-#: ../../templates/show_install.inc:42
+#: ../../templates/show_install.inc:64
 msgid "Desired Database Name"
 msgstr "Desired Database Name"
 
 #: ../../templates/show_install_config.inc:72
-#: ../../templates/show_install.inc:46
+#: ../../templates/show_install.inc:68
 msgid "MySQL Hostname"
 msgstr "MySQL Hostname"
 
@@ -2634,47 +2662,47 @@ msgstr "Reset Album Art"
 msgid "Find Album Art"
 msgstr "Find Album Art"
 
-#: ../../templates/show_preferences.inc:52
+#: ../../templates/show_preferences.inc:53
 msgid "Editing"
 msgstr "Editing"
 
-#: ../../templates/show_preferences.inc:52
+#: ../../templates/show_preferences.inc:53
 msgid "preferences"
 msgstr "preferences"
 
-#: ../../templates/show_preferences.inc:54
+#: ../../templates/show_preferences.inc:55
 msgid "Rebuild Preferences"
 msgstr "Rebuild Preferences"
 
-#: ../../templates/show_preferences.inc:61
+#: ../../templates/show_preferences.inc:62
 msgid "Interface"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:64
+#: ../../templates/show_preferences.inc:65
 #, fuzzy
 msgid "Streaming"
 msgstr "Stream"
 
-#: ../../templates/show_preferences.inc:67
+#: ../../templates/show_preferences.inc:68
 #, fuzzy
 msgid "Options"
 msgstr "Action"
 
-#: ../../templates/show_preferences.inc:71
+#: ../../templates/show_preferences.inc:72
 msgid "Account"
 msgstr "Account"
 
-#: ../../templates/show_preferences.inc:75
+#: ../../templates/show_preferences.inc:76
 #, fuzzy
 msgid "System"
 msgstr "Stream"
 
-#: ../../templates/show_preferences.inc:78
+#: ../../templates/show_preferences.inc:79
 #, fuzzy
 msgid "Modules"
 msgstr "Mode"
 
-#: ../../templates/show_preferences.inc:91
+#: ../../templates/show_preferences.inc:92
 msgid "Update Preferences"
 msgstr "Update Preferences"
 
@@ -2716,7 +2744,7 @@ msgstr "View Limit"
 msgid "Unlimited"
 msgstr ""
 
-#: ../../templates/show_install.inc:32
+#: ../../templates/show_install.inc:54
 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 "
@@ -2726,28 +2754,28 @@ msgstr ""
 "mysql account with database creation rights. This step may take a while "
 "depending upon the speed of your computer"
 
-#: ../../templates/show_install.inc:50
+#: ../../templates/show_install.inc:72
 msgid "MySQL Administrative Username"
 msgstr "MySQL Administrative Username"
 
-#: ../../templates/show_install.inc:54
+#: ../../templates/show_install.inc:76
 msgid "MySQL Administrative Password"
 msgstr "MySQL Administrative Password"
 
-#: ../../templates/show_install.inc:58
+#: ../../templates/show_install.inc:80
 msgid "Create Database User for New Database"
 msgstr ""
 
-#: ../../templates/show_install.inc:62
+#: ../../templates/show_install.inc:84
 #, fuzzy
 msgid "Ampache Database Username"
 msgstr "Desired Database Name"
 
-#: ../../templates/show_install.inc:66
+#: ../../templates/show_install.inc:88
 msgid "Ampache Database User Password"
 msgstr ""
 
-#: ../../templates/show_install.inc:71
+#: ../../templates/show_install.inc:93
 msgid "Insert Database"
 msgstr "Insert Database"
 
@@ -2863,12 +2891,12 @@ msgstr "Register User"
 msgid "Activity"
 msgstr ""
 
-#: ../../templates/show_users.inc:60
+#: ../../templates/show_users.inc:61
 #, fuzzy
 msgid "Last Ip"
 msgstr "Last Seen"
 
-#: ../../templates/show_users.inc:65
+#: ../../templates/show_users.inc:66
 msgid "On-line"
 msgstr "On-line"
 
@@ -3151,6 +3179,19 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
+#~ msgid "ID3V2 Tags"
+#~ msgstr "ID3V2 Tags"
+
+#~ msgid "Amazon"
+#~ msgstr "Amazon"
+
+#~ msgid "File Folder"
+#~ msgstr "File Folder"
+
+#, fuzzy
+#~ msgid "** Indicates flagged songs"
+#~ msgstr "View flagged songs"
+
 #~ msgid "IceCast"
 #~ msgstr "IceCast"
 
diff --git a/locale/es_ES/LC_MESSAGES/messages.po b/locale/es_ES/LC_MESSAGES/messages.po
index 05973ae7..e56ff1b7 100644
--- a/locale/es_ES/LC_MESSAGES/messages.po
+++ b/locale/es_ES/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-01 20:33-0800\n"
+"POT-Creation-Date: 2007-01-22 19:07-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../play/index.php:64 ../../download/index.php:62
+#: ../../play/index.php:64 ../../download/index.php:61
 msgid "Session Expired: please log in again at"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:299 ../../lib/class/catalog.class.php:592
-#: ../../lib/class/album.class.php:325
+#: ../../lib/class/catalog.class.php:303 ../../lib/class/catalog.class.php:621
+#: ../../lib/class/album.class.php:328
 msgid "Error: Unable to open"
 msgstr "Error: No puede abrir"
 
@@ -29,184 +29,189 @@ msgstr "Error: No puede abrir"
 msgid "Error: Unable to change to directory"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:375
+#: ../../lib/class/catalog.class.php:374
 msgid "Error: Unable to get filesize for"
 msgstr "Error: No puede conseguir el tamaño de"
 
-#: ../../lib/class/catalog.class.php:412
+#: ../../lib/class/catalog.class.php:411
 msgid "is not readable by ampache"
 msgstr "no puede estar leido por Ampache"
 
-#: ../../lib/class/catalog.class.php:501
+#: ../../lib/class/catalog.class.php:530
 msgid "album's with art"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:772
+#: ../../lib/class/catalog.class.php:812
 msgid "Starting Catalog Build"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:776
+#: ../../lib/class/catalog.class.php:816
 msgid "Running Remote Sync"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:781 ../../lib/class/catalog.class.php:947
+#: ../../lib/class/catalog.class.php:821 ../../lib/class/catalog.class.php:992
 msgid "Found"
 msgstr "Encontrado"
 
-#: ../../lib/class/catalog.class.php:781 ../../lib/class/catalog.class.php:804
-#: ../../lib/class/catalog.class.php:947 ../../lib/class/catalog.class.php:977
-#: ../../lib/preferences.php:269 ../../lib/preferences.php:319
-#: ../../lib/ui.lib.php:1186 ../../admin/catalog.php:259
+#: ../../lib/class/catalog.class.php:821 ../../lib/class/catalog.class.php:848
+#: ../../lib/class/catalog.class.php:992
+#: ../../lib/class/catalog.class.php:1025 ../../lib/preferences.php:269
+#: ../../lib/preferences.php:319 ../../lib/ui.lib.php:1194
+#: ../../admin/catalog.php:259
 #, fuzzy
 msgid "None"
 msgstr "No"
 
-#: ../../lib/class/catalog.class.php:796 ../../lib/class/catalog.class.php:965
+#: ../../lib/class/catalog.class.php:840
+#: ../../lib/class/catalog.class.php:1014
 msgid "Added Playlist From"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:803 ../../lib/class/catalog.class.php:976
-#: ../../admin/catalog.php:258
+#: ../../lib/class/catalog.class.php:847
+#: ../../lib/class/catalog.class.php:1024 ../../admin/catalog.php:258
 msgid "Starting Album Art Search"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:804 ../../lib/class/catalog.class.php:977
-#: ../../admin/catalog.php:259
+#: ../../lib/class/catalog.class.php:848
+#: ../../lib/class/catalog.class.php:1025 ../../admin/catalog.php:259
 msgid "Searched"
 msgstr "Buscado"
 
-#: ../../lib/class/catalog.class.php:814
+#: ../../lib/class/catalog.class.php:858
 msgid "Catalog Finished"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:814 ../../lib/class/catalog.class.php:997
+#: ../../lib/class/catalog.class.php:858
+#: ../../lib/class/catalog.class.php:1044
 msgid "Total Time"
 msgstr "Tiempo en total"
 
-#: ../../lib/class/catalog.class.php:814 ../../lib/class/catalog.class.php:998
+#: ../../lib/class/catalog.class.php:858
+#: ../../lib/class/catalog.class.php:1045
 msgid "Total Songs"
 msgstr "Canciónes en total"
 
-#: ../../lib/class/catalog.class.php:815 ../../lib/class/catalog.class.php:998
+#: ../../lib/class/catalog.class.php:859
+#: ../../lib/class/catalog.class.php:1045
 msgid "Songs Per Seconds"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:849
-#: ../../lib/class/catalog.class.php:1634
+#: ../../lib/class/catalog.class.php:894
+#: ../../lib/class/catalog.class.php:1565
 msgid "Updated"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:856
+#: ../../lib/class/catalog.class.php:901
 msgid "No Update Needed"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:938
+#: ../../lib/class/catalog.class.php:983
 msgid "Starting New Song Search on"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:938
+#: ../../lib/class/catalog.class.php:983
 msgid "catalog"
 msgstr "catálogo"
 
-#: ../../lib/class/catalog.class.php:942
+#: ../../lib/class/catalog.class.php:987
 msgid "Running Remote Update"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:997
+#: ../../lib/class/catalog.class.php:1044
 msgid "Catalog Update Finished"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1017
+#: ../../lib/class/catalog.class.php:1064
 msgid "Error"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1017
+#: ../../lib/class/catalog.class.php:1064
 msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Error connecting to"
 msgstr "Error conectando a"
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Code"
 msgstr "Codigo"
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Reason"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1076
+#: ../../lib/class/catalog.class.php:1123
 msgid "Completed updating remote catalog(s)"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1111
+#: ../../lib/class/catalog.class.php:1158
 msgid "Added"
 msgstr "Agregado"
 
-#: ../../lib/class/catalog.class.php:1193
+#: ../../lib/class/catalog.class.php:1240
 msgid "Cleaning the"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1193
-#: ../../lib/class/catalog.class.php:1589 ../../templates/sidebar.inc.php:30
+#: ../../lib/class/catalog.class.php:1240
+#: ../../lib/class/catalog.class.php:1520 ../../templates/sidebar.inc.php:30
 #: ../../ampache/templates/sidebar.inc.php:30
 msgid "Catalog"
 msgstr "Catálogo"
 
-#: ../../lib/class/catalog.class.php:1194
+#: ../../lib/class/catalog.class.php:1241
 msgid "Checking"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1265
+#: ../../lib/class/catalog.class.php:1313
 msgid "Catalog Clean Done"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1265
+#: ../../lib/class/catalog.class.php:1313
 msgid "files removed"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1589
+#: ../../lib/class/catalog.class.php:1520
 msgid "Updating the"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1590
+#: ../../lib/class/catalog.class.php:1521
 msgid "songs found checking tag information."
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1591
+#: ../../lib/class/catalog.class.php:1522
 msgid "Verifed"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1643
+#: ../../lib/class/catalog.class.php:1574
 msgid " FOUND"
 msgstr " ENCONTRADO"
 
-#: ../../lib/class/catalog.class.php:1645
+#: ../../lib/class/catalog.class.php:1576
 msgid "Searching for new Album Art"
 msgstr "Buscando nuevo arte de álbum"
 
-#: ../../lib/class/catalog.class.php:1649
+#: ../../lib/class/catalog.class.php:1580
 msgid "Album Art Already Found"
 msgstr "Ya encontró el arte de álbum"
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 #, fuzzy
 msgid "Update Finished."
 msgstr "Actualizar el usuario"
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 msgid "Checked"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 msgid "songs updated."
 msgstr ""
 
-#: ../../lib/class/song.class.php:360
+#: ../../lib/class/song.class.php:361
 #: ../../templates/show_duplicates.inc.php:35
 #: ../../templates/show_edit_song.inc.php:31
 #: ../../templates/show_disabled_songs.inc:26
@@ -214,53 +219,53 @@ msgstr ""
 msgid "Title"
 msgstr "Título"
 
-#: ../../lib/class/song.class.php:360 ../../lib/class/song.class.php:364
-#: ../../lib/class/song.class.php:368 ../../lib/class/song.class.php:372
-#: ../../lib/class/song.class.php:376 ../../lib/class/song.class.php:380
-#: ../../lib/class/song.class.php:384 ../../lib/class/song.class.php:389
-#: ../../lib/class/song.class.php:394 ../../lib/class/song.class.php:398
-#: ../../lib/class/song.class.php:402 ../../lib/class/song.class.php:407
+#: ../../lib/class/song.class.php:361 ../../lib/class/song.class.php:365
+#: ../../lib/class/song.class.php:369 ../../lib/class/song.class.php:373
+#: ../../lib/class/song.class.php:377 ../../lib/class/song.class.php:381
+#: ../../lib/class/song.class.php:385 ../../lib/class/song.class.php:390
+#: ../../lib/class/song.class.php:395 ../../lib/class/song.class.php:399
+#: ../../lib/class/song.class.php:403 ../../lib/class/song.class.php:408
 msgid "updated to"
 msgstr ""
 
-#: ../../lib/class/song.class.php:364
+#: ../../lib/class/song.class.php:365
 #: ../../templates/show_list_duplicates.inc.php:35
 #: ../../templates/show_songs.inc:53
 msgid "Bitrate"
 msgstr ""
 
-#: ../../lib/class/song.class.php:368
+#: ../../lib/class/song.class.php:369
 msgid "Rate"
 msgstr ""
 
-#: ../../lib/class/song.class.php:372
+#: ../../lib/class/song.class.php:373
 msgid "Mode"
 msgstr ""
 
-#: ../../lib/class/song.class.php:376
+#: ../../lib/class/song.class.php:377
 #: ../../templates/show_tv_playlist.inc.php:46
 #: ../../templates/show_songs.inc:51
 msgid "Time"
 msgstr "Tiempo"
 
-#: ../../lib/class/song.class.php:380
+#: ../../lib/class/song.class.php:381
 #: ../../templates/show_edit_song.inc.php:61
 #: ../../templates/show_localplay_playlist.inc.php:27
 #: ../../templates/show_songs.inc:45 ../../templates/show_songs.inc:50
 msgid "Track"
 msgstr ""
 
-#: ../../lib/class/song.class.php:384
+#: ../../lib/class/song.class.php:385
 msgid "Filesize"
 msgstr "Tamaño del archivo"
 
-#: ../../lib/class/song.class.php:389
+#: ../../lib/class/song.class.php:390
 #: ../../templates/show_edit_song.inc.php:45
 #: ../../templates/show_get_albumart.inc.php:30
 #: ../../templates/show_play_selected.inc.php:60
 #: ../../templates/show_list_duplicates.inc.php:32
 #: ../../templates/show_recently_played.inc.php:32
-#: ../../templates/show_artists.inc:40 ../../templates/show_artists.inc:65
+#: ../../templates/show_artists.inc:40 ../../templates/show_artists.inc:71
 #: ../../templates/show_disabled_songs.inc:28
 #: ../../templates/show_songs.inc:48 ../../templates/show_albums.inc:41
 #: ../../templates/show_albums.inc:84
@@ -269,7 +274,7 @@ msgstr "Tamaño del archivo"
 msgid "Artist"
 msgstr "Artista"
 
-#: ../../lib/class/song.class.php:394
+#: ../../lib/class/song.class.php:395
 #: ../../templates/show_edit_song.inc.php:37
 #: ../../templates/show_get_albumart.inc.php:38
 #: ../../templates/show_play_selected.inc.php:59
@@ -281,7 +286,7 @@ msgstr "Artista"
 msgid "Album"
 msgstr "Álbum"
 
-#: ../../lib/class/song.class.php:398
+#: ../../lib/class/song.class.php:399
 #: ../../templates/show_edit_song.inc.php:67
 #: ../../templates/show_play_selected.inc.php:61
 #: ../../templates/show_edit_album.inc.php:33
@@ -290,13 +295,13 @@ msgstr "Álbum"
 msgid "Year"
 msgstr "Año"
 
-#: ../../lib/class/song.class.php:402 ../../templates/show_flag.inc.php:64
+#: ../../lib/class/song.class.php:403 ../../templates/show_flag.inc.php:64
 #: ../../templates/show_edit_song.inc.php:73
 #: ../../templates/show_search.inc:37
 msgid "Comment"
 msgstr ""
 
-#: ../../lib/class/song.class.php:407 ../../lib/ui.lib.php:843
+#: ../../lib/class/song.class.php:408 ../../lib/ui.lib.php:851
 #: ../../templates/sidebar.inc.php:36
 #: ../../templates/show_edit_song.inc.php:53
 #: ../../templates/show_genre.inc.php:29
@@ -311,36 +316,36 @@ msgstr "Género"
 msgid "Error: Name Identical"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:263
+#: ../../lib/class/flag.class.php:264
 #, fuzzy
 msgid "Approved"
 msgstr "Modo"
 
-#: ../../lib/class/flag.class.php:264
+#: ../../lib/class/flag.class.php:265
 #, fuzzy
 msgid "Pending"
 msgstr "Añadiendo"
 
-#: ../../lib/class/flag.class.php:276 ../../templates/show_flag.inc.php:56
+#: ../../lib/class/flag.class.php:277 ../../templates/show_flag.inc.php:56
 #: ../../templates/show_playlists.inc.php:57
 #: ../../templates/show_admin_tools.inc.php:50
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../../lib/class/flag.class.php:279
+#: ../../lib/class/flag.class.php:280
 msgid "Re-Tag"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:282 ../../templates/show_flag.inc.php:58
+#: ../../lib/class/flag.class.php:283 ../../templates/show_flag.inc.php:58
 msgid "Re-encode"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:285 ../../templates/show_flag.inc.php:59
+#: ../../lib/class/flag.class.php:286 ../../templates/show_flag.inc.php:59
 #, fuzzy
 msgid "Other"
 msgstr "otro"
 
-#: ../../lib/class/flag.class.php:288 ../../lib/class/localplay.class.php:569
+#: ../../lib/class/flag.class.php:289 ../../lib/class/localplay.class.php:570
 #: ../../lib/general.lib.php:890
 #: ../../modules/localplay/icecast.controller.php:292
 #: ../../modules/localplay/mpd.controller.php:354
@@ -348,25 +353,25 @@ msgstr "otro"
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../../lib/class/localplay.class.php:560 ../../templates/show_tv.inc.php:81
+#: ../../lib/class/localplay.class.php:561 ../../templates/show_tv.inc.php:64
 #: ../../templates/show_now_playing.inc:32
 msgid "Now Playing"
 msgstr ""
 
-#: ../../lib/class/localplay.class.php:563
+#: ../../lib/class/localplay.class.php:564
 msgid "Stopped"
 msgstr ""
 
-#: ../../lib/class/localplay.class.php:566
+#: ../../lib/class/localplay.class.php:567
 #, fuzzy
 msgid "Paused"
 msgstr "Ya tocado"
 
-#: ../../lib/class/album.class.php:162
+#: ../../lib/class/album.class.php:163
 msgid "Various"
 msgstr "Varios"
 
-#: ../../lib/class/genre.class.php:284
+#: ../../lib/class/genre.class.php:285
 msgid "Show Genres starting with"
 msgstr "Mostrar géneros que empiezan con"
 
@@ -408,31 +413,31 @@ msgid "Disable"
 msgstr ""
 
 #: ../../lib/preferences.php:271 ../../templates/show_tv_adminctl.inc.php:41
-#: ../../templates/show_playtype_switch.inc.php:9
+#: ../../templates/show_playtype_switch.inc.php:30
 msgid "Stream"
 msgstr ""
 
 #: ../../lib/preferences.php:274 ../../templates/show_tv_adminctl.inc.php:42
-#: ../../templates/show_playtype_switch.inc.php:13
+#: ../../templates/show_playtype_switch.inc.php:34
 msgid "Downsample"
 msgstr ""
 
 #: ../../lib/preferences.php:277
-#: ../../templates/show_playtype_switch.inc.php:15
+#: ../../templates/show_playtype_switch.inc.php:36
 msgid "Democratic"
 msgstr ""
 
-#: ../../lib/preferences.php:280 ../../templates/sidebar.inc.php:170
+#: ../../lib/preferences.php:280 ../../templates/sidebar.inc.php:168
 #: ../../templates/show_tv_adminctl.inc.php:40
 #: ../../templates/show_localplay.inc.php:26
-#: ../../templates/show_playtype_switch.inc.php:11
+#: ../../templates/show_playtype_switch.inc.php:32
 #: ../../ampache/templates/sidebar.inc.php:170
 #, fuzzy
 msgid "Localplay"
 msgstr "Local"
 
 #: ../../lib/preferences.php:282
-#: ../../templates/show_playtype_switch.inc.php:17
+#: ../../templates/show_playtype_switch.inc.php:38
 msgid "XSPF Player"
 msgstr ""
 
@@ -476,11 +481,11 @@ msgstr "Local"
 msgid "No songs in this playlist."
 msgstr "No hay canciónes en esta lista."
 
-#: ../../lib/playlist.lib.php:191 ../../lib/ui.lib.php:892
-#: ../../templates/sidebar.inc.php:150
+#: ../../lib/playlist.lib.php:191 ../../lib/ui.lib.php:900
+#: ../../templates/sidebar.inc.php:148
 #: ../../templates/show_admin_tools.inc.php:48
 #: ../../ampache/templates/sidebar.inc.php:150
-#: ../../templates/show_artists.inc:55 ../../templates/show_random_play.inc:40
+#: ../../templates/show_random_play.inc:40
 #: ../../templates/show_add_access.inc:59
 #: ../../templates/show_edit_access.inc:69
 msgid "All"
@@ -494,7 +499,7 @@ msgstr "Nueva lista"
 msgid "Error Access Denied"
 msgstr ""
 
-#: ../../lib/ui.lib.php:194 ../../templates/sidebar.inc.php:89
+#: ../../lib/ui.lib.php:194 ../../templates/sidebar.inc.php:87
 #: ../../ampache/templates/sidebar.inc.php:89
 msgid "Browse"
 msgstr ""
@@ -507,141 +512,135 @@ msgstr "Mostrar todo sin arte"
 msgid "Show all"
 msgstr "Mostrar todo"
 
-#: ../../lib/ui.lib.php:538 ../../admin/mail.php:80
+#: ../../lib/ui.lib.php:539 ../../admin/mail.php:81
 msgid "No Catalogs Found!"
 msgstr ""
 
-#: ../../lib/ui.lib.php:539 ../../admin/mail.php:81
-#: ../../templates/show_admin_tools.inc.php:67
+#: ../../lib/ui.lib.php:540 ../../admin/mail.php:82
+#: ../../templates/show_admin_tools.inc.php:75
 #: ../../templates/show_add_catalog.inc.php:28
 msgid "Add a Catalog"
 msgstr "Añadir un catálogo"
 
-#: ../../lib/ui.lib.php:540 ../../admin/mail.php:82
-#: ../../templates/show_mail_users.inc.php:41
-#: ../../templates/show_local_catalog_info.inc.php:23
-msgid "Catalog Statistics"
-msgstr "Estadísticas del catálogo"
-
-#: ../../lib/ui.lib.php:576 ../../admin/mail.php:119
+#: ../../lib/ui.lib.php:578 ../../admin/mail.php:120
 msgid "day"
 msgstr "día"
 
-#: ../../lib/ui.lib.php:576 ../../admin/mail.php:119
+#: ../../lib/ui.lib.php:578 ../../admin/mail.php:120
 msgid "days"
 msgstr "días"
 
-#: ../../lib/ui.lib.php:578 ../../admin/mail.php:121
+#: ../../lib/ui.lib.php:580 ../../admin/mail.php:122
 msgid "hour"
 msgstr "hora"
 
-#: ../../lib/ui.lib.php:578 ../../admin/mail.php:121
+#: ../../lib/ui.lib.php:580 ../../admin/mail.php:122
 msgid "hours"
 msgstr "horas"
 
-#: ../../lib/ui.lib.php:782 ../../templates/show_tv.inc.php:58
-#: ../../templates/sidebar.inc.php:50
+#: ../../lib/ui.lib.php:790 ../../templates/sidebar.inc.php:48
 #: ../../ampache/templates/sidebar.inc.php:50
 msgid "Home"
 msgstr ""
 
-#: ../../lib/ui.lib.php:785
+#: ../../lib/ui.lib.php:793
 msgid "Upload"
 msgstr "Subir"
 
-#: ../../lib/ui.lib.php:788
+#: ../../lib/ui.lib.php:796
 msgid "Local Play"
 msgstr ""
 
-#: ../../lib/ui.lib.php:791
+#: ../../lib/ui.lib.php:799
 #, fuzzy
 msgid "Random Play"
 msgstr "Al azar"
 
-#: ../../lib/ui.lib.php:794 ../../templates/show_play_selected.inc.php:47
+#: ../../lib/ui.lib.php:802 ../../templates/show_play_selected.inc.php:47
 msgid "Playlist"
 msgstr "Lista"
 
-#: ../../lib/ui.lib.php:797 ../../templates/show_duplicates.inc.php:51
-#: ../../templates/sidebar.inc.php:118 ../../templates/sidebar.inc.php:124
+#: ../../lib/ui.lib.php:805 ../../templates/show_duplicates.inc.php:51
+#: ../../templates/sidebar.inc.php:116 ../../templates/sidebar.inc.php:122
 #: ../../ampache/templates/sidebar.inc.php:118
 #: ../../ampache/templates/sidebar.inc.php:124
 #: ../../templates/show_search_bar.inc:31 ../../templates/show_search.inc:133
 msgid "Search"
 msgstr "Buscar"
 
-#: ../../lib/ui.lib.php:800 ../../templates/sidebar.inc.php:81
+#: ../../lib/ui.lib.php:808 ../../templates/sidebar.inc.php:79
 #: ../../ampache/templates/sidebar.inc.php:81
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../../lib/ui.lib.php:803 ../../lib/ui.lib.php:807
+#: ../../lib/ui.lib.php:811 ../../lib/ui.lib.php:815
 #, fuzzy
 msgid "Admin-Catalog"
 msgstr "Añadir catálogo"
 
-#: ../../lib/ui.lib.php:811
+#: ../../lib/ui.lib.php:819
 #, fuzzy
 msgid "Admin-User Management"
 msgstr "Nombre de usuario"
 
-#: ../../lib/ui.lib.php:815
+#: ../../lib/ui.lib.php:823
 #, fuzzy
 msgid "Admin-Mail Users"
 msgstr "Mandar un correo a los usuarios"
 
-#: ../../lib/ui.lib.php:819
+#: ../../lib/ui.lib.php:827
 #, fuzzy
 msgid "Admin-Manage Access Lists"
 msgstr "Listas de aceso"
 
-#: ../../lib/ui.lib.php:823
+#: ../../lib/ui.lib.php:831
 #, fuzzy
 msgid "Admin-Site Preferences"
 msgstr "Preferencias del Admin"
 
-#: ../../lib/ui.lib.php:827
+#: ../../lib/ui.lib.php:835
 msgid "Admin-Manage Modules"
 msgstr ""
 
-#: ../../lib/ui.lib.php:831
+#: ../../lib/ui.lib.php:839
 msgid "Browse Music"
 msgstr ""
 
-#: ../../lib/ui.lib.php:835 ../../admin/mail.php:133
-#: ../../templates/sidebar.inc.php:34 ../../templates/sidebar.inc.php:158
+#: ../../lib/ui.lib.php:843 ../../admin/mail.php:134
+#: ../../templates/sidebar.inc.php:34 ../../templates/sidebar.inc.php:156
 #: ../../templates/show_genre.inc.php:32
-#: ../../templates/show_local_catalog_info.inc.php:34
+#: ../../templates/show_local_catalog_info.inc.php:28
 #: ../../ampache/templates/sidebar.inc.php:34
 #: ../../ampache/templates/sidebar.inc.php:158
-#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:68
+#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:74
 msgid "Albums"
 msgstr "Álbumes"
 
-#: ../../lib/ui.lib.php:839 ../../admin/mail.php:134
-#: ../../templates/sidebar.inc.php:35 ../../templates/sidebar.inc.php:157
+#: ../../lib/ui.lib.php:847 ../../admin/mail.php:135
+#: ../../templates/sidebar.inc.php:35 ../../templates/sidebar.inc.php:155
 #: ../../templates/show_genre.inc.php:35
-#: ../../templates/show_local_catalog_info.inc.php:38
+#: ../../templates/show_local_catalog_info.inc.php:29
 #: ../../ampache/templates/sidebar.inc.php:35
 #: ../../ampache/templates/sidebar.inc.php:157
 msgid "Artists"
 msgstr "Artistas"
 
-#: ../../lib/ui.lib.php:847 ../../templates/sidebar.inc.php:112
+#: ../../lib/ui.lib.php:855 ../../templates/sidebar.inc.php:110
 #: ../../ampache/templates/sidebar.inc.php:112
 #, fuzzy
 msgid "Statistics"
 msgstr "Estadísticas del catálogo"
 
-#: ../../lib/ui.lib.php:1421
+#: ../../lib/ui.lib.php:1429
 msgid "Manage Users"
 msgstr ""
 
-#: ../../lib/ui.lib.php:1422
+#: ../../lib/ui.lib.php:1430
 msgid "Add a new user"
 msgstr "Añadir usuario nuevo"
 
-#: ../../lib/general.lib.php:670 ../../templates/show_user_stats.inc.php:32
+#: ../../lib/general.lib.php:670 ../../templates/show_box.inc.php:30
+#: ../../templates/show_user_stats.inc.php:32
 #: ../../templates/show_user_stats.inc.php:43
 #: ../../templates/show_user_stats.inc.php:54
 #: ../../templates/show_user_recommendations.inc.php:32
@@ -771,7 +770,7 @@ msgstr ""
 msgid "Do you really want to clear the statistics for this catalog?"
 msgstr "¿Confirmas borrar las estadísticas de este catálogo?"
 
-#: ../../admin/catalog.php:230 ../../templates/show_admin_tools.inc.php:68
+#: ../../admin/catalog.php:230 ../../templates/show_admin_tools.inc.php:76
 msgid "Clear Catalog Stats"
 msgstr "Borrar las estadísticas del catálogo"
 
@@ -825,28 +824,32 @@ msgstr "Marcar la selección"
 msgid "Flag Removed from"
 msgstr ""
 
-#: ../../admin/flag.php:274
+#: ../../admin/flag.php:270
+msgid "Flags Updated"
+msgstr ""
+
+#: ../../admin/flag.php:289
 msgid "Songs Disabled"
 msgstr ""
 
-#: ../../admin/flag.php:274
+#: ../../admin/flag.php:289
 msgid "The requested song(s) have been disabled"
 msgstr ""
 
-#: ../../admin/flag.php:285
+#: ../../admin/flag.php:300
 msgid "Songs Enabled"
 msgstr ""
 
-#: ../../admin/flag.php:285
+#: ../../admin/flag.php:300
 msgid "The requested song(s) have been enabled"
 msgstr ""
 
-#: ../../admin/flag.php:290
+#: ../../admin/flag.php:305
 #, fuzzy
 msgid "Flagged Records"
 msgstr "Comentado por"
 
-#: ../../admin/preferences.php:59 ../../admin/preferences.php:82
+#: ../../admin/preferences.php:60 ../../admin/preferences.php:83
 #, fuzzy
 msgid "Site"
 msgstr "Título"
@@ -894,67 +897,72 @@ msgstr ""
 msgid "Error Passwords don't match"
 msgstr ""
 
-#: ../../admin/users.php:117 ../../register.php:138
+#: ../../admin/users.php:120 ../../register.php:138
 msgid "Error Username already exists"
 msgstr "Error: Este usuario ya existe"
 
-#: ../../admin/users.php:139
+#: ../../admin/users.php:142
 msgid "Deletion Request"
 msgstr ""
 
-#: ../../admin/users.php:140
+#: ../../admin/users.php:143
 msgid "Are you sure you want to permanently delete"
 msgstr ""
 
-#: ../../admin/users.php:145 ../../templates/show_confirm_action.inc.php:29
+#: ../../admin/users.php:148 ../../templates/show_confirm_action.inc.php:29
 #: ../../templates/show_search.inc:78
 msgid "No"
 msgstr "No"
 
-#: ../../admin/users.php:147
+#: ../../admin/users.php:150
 msgid "User Deleted"
 msgstr "Usuario borrado"
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:153
 msgid "Delete Error"
 msgstr "Error de borrar"
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:153
 msgid "Unable to delete last Admin User"
 msgstr "No puede borrar el último usuario administrador"
 
-#: ../../admin/mail.php:131 ../../templates/show_local_catalog_info.inc.php:26
+#: ../../admin/mail.php:83 ../../templates/show_mail_users.inc.php:41
+#: ../../templates/show_local_catalog_info.inc.php:23
+msgid "Catalog Statistics"
+msgstr "Estadísticas del catálogo"
+
+#: ../../admin/mail.php:132 ../../templates/show_local_catalog_info.inc.php:27
 msgid "Total Users"
 msgstr "Usuarios en total"
 
-#: ../../admin/mail.php:132 ../../templates/show_local_catalog_info.inc.php:30
+#: ../../admin/mail.php:133 ../../templates/show_local_catalog_info.inc.php:26
 msgid "Connected Users"
 msgstr "Usuarios conectados"
 
-#: ../../admin/mail.php:135 ../../templates/sidebar.inc.php:155
+#: ../../admin/mail.php:136 ../../templates/sidebar.inc.php:153
 #: ../../templates/show_genre.inc.php:38
-#: ../../templates/show_local_catalog_info.inc.php:42
+#: ../../templates/show_local_catalog_info.inc.php:30
 #: ../../templates/show_genres.inc.php:37
 #: ../../ampache/templates/sidebar.inc.php:155
-#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:67
+#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:73
 #: ../../templates/show_albums.inc:43 ../../templates/show_albums.inc:86
 msgid "Songs"
 msgstr "Canciónes"
 
-#: ../../admin/mail.php:136 ../../templates/show_local_catalog_info.inc.php:46
+#: ../../admin/mail.php:137 ../../templates/show_local_catalog_info.inc.php:31
 msgid "Catalog Size"
 msgstr "Tamaño del catálogo"
 
-#: ../../admin/mail.php:137 ../../templates/show_local_catalog_info.inc.php:50
+#: ../../admin/mail.php:138 ../../templates/show_local_catalog_info.inc.php:32
 msgid "Catalog Time"
 msgstr "Tiempo del catálogo"
 
-#: ../../admin/mail.php:219
+#: ../../admin/mail.php:252
 #, fuzzy
 msgid "E-mail Sent"
 msgstr "Correo"
 
-#: ../../admin/mail.php:220
+#: ../../admin/mail.php:253
 msgid "Your E-mail was successfully sent."
 msgstr ""
 
@@ -1011,21 +1019,21 @@ msgid "Incorrect Tags"
 msgstr ""
 
 #: ../../templates/show_flag.inc.php:70
-#: ../../templates/show_flagged.inc.php:27
+#: ../../templates/show_flagged.inc.php:30
 msgid "Flag"
 msgstr "Bandera"
 
 #: ../../templates/show_install_account.inc.php:36
-#: ../../templates/show_install_lang.inc.php:10
+#: ../../templates/show_install_lang.inc.php:32
 #: ../../templates/show_install_config.inc:36
-#: ../../templates/show_install.inc:10
+#: ../../templates/show_install.inc:32
 msgid "Ampache Installation"
 msgstr "Instalación de Ampache"
 
 #: ../../templates/show_install_account.inc.php:43
-#: ../../templates/show_install_lang.inc.php:17
+#: ../../templates/show_install_lang.inc.php:39
 #: ../../templates/show_install_config.inc:42
-#: ../../templates/show_install.inc:18
+#: ../../templates/show_install.inc:40
 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 "
@@ -1036,9 +1044,9 @@ msgstr ""
 "que tiene los requisitos siguientes."
 
 #: ../../templates/show_install_account.inc.php:46
-#: ../../templates/show_install_lang.inc.php:20
+#: ../../templates/show_install_lang.inc.php:42
 #: ../../templates/show_install_config.inc:45
-#: ../../templates/show_install.inc:21
+#: ../../templates/show_install.inc:43
 msgid ""
 "A MySQL Server with a username and password that can create/modify databases"
 msgstr ""
@@ -1052,9 +1060,9 @@ msgstr ""
 "config/ampache.cfg.dist.php"
 
 #: ../../templates/show_install_account.inc.php:49
-#: ../../templates/show_install_lang.inc.php:24
+#: ../../templates/show_install_lang.inc.php:46
 #: ../../templates/show_install_config.inc:48
-#: ../../templates/show_install.inc:25
+#: ../../templates/show_install.inc:47
 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 "
@@ -1064,7 +1072,7 @@ msgstr ""
 
 #: ../../templates/show_install_account.inc.php:53
 #: ../../templates/show_install_config.inc:52
-#: ../../templates/show_install.inc:30
+#: ../../templates/show_install.inc:52
 msgid "Step 1 - Creating and Inserting the Ampache Database"
 msgstr ""
 
@@ -1074,7 +1082,7 @@ msgstr ""
 
 #: ../../templates/show_install_account.inc.php:55
 #: ../../templates/show_install_config.inc:57
-#: ../../templates/show_install.inc:35
+#: ../../templates/show_install.inc:57
 msgid "Step 3 - Setup Initial Account"
 msgstr ""
 
@@ -1089,7 +1097,7 @@ msgid "Create Admin Account"
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:65
-#: ../../templates/show_user_registration.inc.php:99
+#: ../../templates/show_user_registration.inc.php:98
 #: ../../templates/show_edit_user.inc.php:40
 #: ../../templates/show_recently_played.inc.php:29
 #: ../../templates/show_users.inc:43
@@ -1097,7 +1105,7 @@ msgid "Username"
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:69
-#: ../../templates/show_user_registration.inc.php:127
+#: ../../templates/show_user_registration.inc.php:126
 #: ../../templates/show_edit_user.inc.php:63
 #: ../../templates/show_login_form.inc:37
 msgid "Password"
@@ -1108,7 +1116,7 @@ msgid "Create Account"
 msgstr "Crear una cuenta"
 
 #: ../../templates/show_playlists.inc.php:28
-#: ../../templates/sidebar.inc.php:106
+#: ../../templates/sidebar.inc.php:104
 #: ../../ampache/templates/sidebar.inc.php:106
 msgid "Playlists"
 msgstr "Listas de reproducción"
@@ -1140,22 +1148,20 @@ msgstr "Mirar"
 
 #: ../../templates/show_playlists.inc.php:55
 #: ../../templates/show_play_selected.inc.php:50
-#: ../../templates/show_artists.inc:58 ../../templates/show_access_list.inc:67
+#: ../../templates/show_access_list.inc:67
 msgid "Edit"
 msgstr ""
 
 #: ../../templates/show_playlists.inc.php:61
 #: ../../templates/show_tv_adminctl.inc.php:44
-#: ../../templates/show_genres.inc.php:47 ../../templates/show_artists.inc:54
 #: ../../templates/show_random_play.inc:82
 msgid "Play"
 msgstr "Toca"
 
 #: ../../templates/show_playlists.inc.php:63
-#: ../../templates/sidebar.inc.php:135
+#: ../../templates/sidebar.inc.php:133
 #: ../../templates/show_localplay_status.inc.php:62
 #: ../../ampache/templates/sidebar.inc.php:135
-#: ../../templates/show_artists.inc:56
 msgid "Random"
 msgstr "Al azar"
 
@@ -1194,11 +1200,11 @@ msgstr ""
 msgid "Yes"
 msgstr "Sí"
 
-#: ../../templates/show_tv.inc.php:56
+#: ../../templates/show_tv.inc.php:42
 msgid "Controls"
 msgstr ""
 
-#: ../../templates/show_tv.inc.php:74
+#: ../../templates/show_tv.inc.php:57
 #: ../../templates/show_localplay.inc.php:42
 #, fuzzy
 msgid "Current Playlist"
@@ -1226,7 +1232,7 @@ msgstr "Nombre"
 
 #: ../../templates/show_playlist_edit.inc.php:36
 #: ../../templates/show_add_playlist.inc.php:32
-#: ../../templates/show_random_play.inc:50
+#: ../../templates/show_random_play.inc:49
 #: ../../templates/show_access_list.inc:51
 msgid "Type"
 msgstr "Tipo"
@@ -1242,6 +1248,7 @@ msgstr "Tu privado"
 
 #: ../../templates/show_playlist_edit.inc.php:48
 #: ../../templates/show_tv_adminctl.inc.php:51
+#: ../../templates/show_flagged.inc.php:66
 #: ../../templates/show_play_selected.inc.php:64
 #: ../../templates/show_preference_admin.inc.php:47
 #: ../../templates/show_edit_access.inc:78
@@ -1275,41 +1282,36 @@ msgstr "Lista de aceso"
 msgid "Song Title"
 msgstr "Título de la canción"
 
-#: ../../templates/sidebar.inc.php:38
-#: ../../ampache/templates/sidebar.inc.php:38
-msgid "Lists"
-msgstr "Listas"
-
-#: ../../templates/sidebar.inc.php:62
+#: ../../templates/sidebar.inc.php:60
 #: ../../templates/show_tv_playlist.inc.php:48
 #: ../../templates/show_preference_admin.inc.php:39
 #: ../../ampache/templates/sidebar.inc.php:62
 msgid "Admin"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:156
+#: ../../templates/sidebar.inc.php:154
 #: ../../ampache/templates/sidebar.inc.php:156
 #: ../../templates/show_random_play.inc:56
 msgid "Minutes"
 msgstr "Minutos"
 
-#: ../../templates/sidebar.inc.php:159
+#: ../../templates/sidebar.inc.php:157
 #: ../../ampache/templates/sidebar.inc.php:159
 #: ../../templates/show_random_play.inc:53
 msgid "Less Played"
 msgstr "Menos tocado"
 
-#: ../../templates/sidebar.inc.php:164
+#: ../../templates/sidebar.inc.php:162
 #: ../../ampache/templates/sidebar.inc.php:164
 msgid "Enqueue"
 msgstr "Ponerlos en el queue"
 
-#: ../../templates/sidebar.inc.php:187
+#: ../../templates/sidebar.inc.php:185
 #: ../../ampache/templates/sidebar.inc.php:187
 msgid "Democratic View"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:191
+#: ../../templates/sidebar.inc.php:189
 #: ../../ampache/templates/sidebar.inc.php:191
 msgid "Logout"
 msgstr ""
@@ -1324,9 +1326,9 @@ msgstr "Catálogo"
 #: ../../templates/show_modules.inc.php:42
 #: ../../templates/show_modules.inc.php:75
 #: ../../templates/show_genres.inc.php:38
-#: ../../templates/show_flagged.inc.php:29
+#: ../../templates/show_flagged.inc.php:32
 #: ../../templates/show_localplay_playlist.inc.php:29
-#: ../../templates/show_artists.inc:44 ../../templates/show_artists.inc:69
+#: ../../templates/show_artists.inc:44 ../../templates/show_artists.inc:75
 #: ../../templates/show_songs.inc:55 ../../templates/show_albums.inc:47
 #: ../../templates/show_albums.inc:90 ../../templates/show_access_list.inc:52
 #: ../../templates/show_artist.inc:39
@@ -1346,62 +1348,70 @@ msgstr ""
 msgid "Clean"
 msgstr "Borrar la información"
 
+#: ../../templates/show_admin_tools.inc.php:56
+msgid "Fast"
+msgstr ""
+
 #: ../../templates/show_admin_tools.inc.php:57
+msgid "Gather Art"
+msgstr ""
+
+#: ../../templates/show_admin_tools.inc.php:65
 #, fuzzy
 msgid "No Catalogs Found"
 msgstr "No encontrado"
 
-#: ../../templates/show_admin_tools.inc.php:63
+#: ../../templates/show_admin_tools.inc.php:71
 #, fuzzy
 msgid "Clean All"
 msgstr "Limpiar todo(s) catálogo(s)"
 
-#: ../../templates/show_admin_tools.inc.php:64
+#: ../../templates/show_admin_tools.inc.php:72
 #, fuzzy
 msgid "Verify All"
 msgstr "Ver todos"
 
-#: ../../templates/show_admin_tools.inc.php:65
+#: ../../templates/show_admin_tools.inc.php:73
 #, fuzzy
 msgid "Add to All"
 msgstr "Añadir a"
 
-#: ../../templates/show_admin_tools.inc.php:66
+#: ../../templates/show_admin_tools.inc.php:74
 #, fuzzy
 msgid "Update All"
 msgstr "Actualizar perfil"
 
-#: ../../templates/show_admin_tools.inc.php:69
+#: ../../templates/show_admin_tools.inc.php:77
 #: ../../templates/show_add_catalog.inc.php:78
 msgid "Gather Album Art"
 msgstr "Recolectar arte del álbum"
 
-#: ../../templates/show_admin_tools.inc.php:73
+#: ../../templates/show_admin_tools.inc.php:81
 msgid "Other Tools"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:75
+#: ../../templates/show_admin_tools.inc.php:83
 msgid "Show Duplicate Songs"
 msgstr "Mostrar las canciónes duplicados"
 
-#: ../../templates/show_admin_tools.inc.php:76
+#: ../../templates/show_admin_tools.inc.php:84
 msgid "Clear Now Playing"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:78
+#: ../../templates/show_admin_tools.inc.php:85 ../../templates/header.inc:75
 msgid "Generate New Config"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:79
+#: ../../templates/show_admin_tools.inc.php:86
 #, fuzzy
 msgid "Preferences Permissions"
 msgstr "Preferencias"
 
-#: ../../templates/show_admin_tools.inc.php:81
+#: ../../templates/show_admin_tools.inc.php:87
 msgid "Export To Itunes DB"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:82
+#: ../../templates/show_admin_tools.inc.php:88
 msgid "Check for New Version"
 msgstr ""
 
@@ -1435,7 +1445,7 @@ msgid "Find duplicate artists"
 msgstr ""
 
 #: ../../templates/show_user.inc.php:30
-#: ../../templates/show_user_registration.inc.php:118
+#: ../../templates/show_user_registration.inc.php:117
 #: ../../templates/show_edit_user.inc.php:55
 msgid "E-mail"
 msgstr "Correo"
@@ -1450,7 +1460,7 @@ msgid "New Password"
 msgstr "Contraseña"
 
 #: ../../templates/show_user.inc.php:49
-#: ../../templates/show_user_registration.inc.php:136
+#: ../../templates/show_user_registration.inc.php:135
 #: ../../templates/show_edit_user.inc.php:72
 msgid "Confirm Password"
 msgstr ""
@@ -1516,49 +1526,49 @@ msgstr "Aplicar a todos"
 msgid "description"
 msgstr "descripción"
 
-#: ../../templates/show_user_registration.inc.php:55
+#: ../../templates/show_user_registration.inc.php:54
 msgid "Ampache New User Registration"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:70
+#: ../../templates/show_user_registration.inc.php:69
 msgid "User Agreement"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:80
+#: ../../templates/show_user_registration.inc.php:79
 msgid "I Accept"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:94
+#: ../../templates/show_user_registration.inc.php:93
 msgid "User Information"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:109
+#: ../../templates/show_user_registration.inc.php:108
 #: ../../templates/show_edit_user.inc.php:48
 msgid "Full Name"
 msgstr "Nombre entero"
 
-#: ../../templates/show_user_registration.inc.php:156
+#: ../../templates/show_user_registration.inc.php:155
 msgid "Clear Info"
 msgstr "Borrar la información"
 
-#: ../../templates/show_user_registration.inc.php:157
+#: ../../templates/show_user_registration.inc.php:156
 msgid "Register User"
 msgstr "Registrar usuario"
 
-#: ../../templates/show_install_lang.inc.php:15
-#: ../../templates/show_install.inc:16
+#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install.inc:38
 msgid "Requirements"
 msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:21
+#: ../../templates/show_install_lang.inc.php:43
 #: ../../templates/show_install_config.inc:46
-#: ../../templates/show_install.inc:22
+#: ../../templates/show_install.inc:44
 msgid ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
 "ampache.cfg.php.dist file"
 msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:50
+#: ../../templates/show_install_lang.inc.php:72
 msgid "Start configuration"
 msgstr ""
 
@@ -1585,7 +1595,7 @@ msgstr ""
 
 #: ../../templates/show_modules.inc.php:61
 #: ../../templates/show_modules.inc.php:96
-#: ../../templates/show_flagged.inc.php:50
+#: ../../templates/show_flagged.inc.php:57
 #: ../../templates/show_list_duplicates.inc.php:81
 #: ../../templates/show_localplay_playlist.inc.php:51
 #: ../../templates/show_disabled_songs.inc:44
@@ -1664,7 +1674,7 @@ msgid "Mail to"
 msgstr "Mandar a"
 
 #: ../../templates/show_mail_users.inc.php:45
-#: ../../templates/show_all_popular.inc.php:30 ../../index.php:66
+#: ../../templates/show_all_popular.inc.php:29
 msgid "Most Popular Albums"
 msgstr "Los álbumes más populares"
 
@@ -1674,7 +1684,7 @@ msgid "Latest Artist Additions"
 msgstr "Los artistas más nuevos"
 
 #: ../../templates/show_mail_users.inc.php:56
-#: ../../templates/show_all_popular.inc.php:27 ../../index.php:75
+#: ../../templates/show_all_popular.inc.php:26
 msgid "Most Popular Artists"
 msgstr "Los artistas más populares"
 
@@ -1684,38 +1694,43 @@ msgid "Latest Album Additions"
 msgstr "Los álbumes más nuevos"
 
 #: ../../templates/show_mail_users.inc.php:67
-#: ../../templates/show_all_popular.inc.php:40
+#: ../../templates/show_all_popular.inc.php:38
 msgid "Most Popular Songs"
 msgstr "Las canciónes más populares"
 
 #: ../../templates/show_mail_users.inc.php:73
+msgid "Flagged Songs"
+msgstr ""
+
+#: ../../templates/show_mail_users.inc.php:77
+#: ../../templates/show_admin_info.inc.php:36
+#, fuzzy
+msgid "Disabled Songs"
+msgstr "Canciónes duplicadas"
+
+#: ../../templates/show_mail_users.inc.php:85
 #, fuzzy
 msgid "Most Popular Threshold in days"
 msgstr "Las canciónes más populares"
 
-#: ../../templates/show_mail_users.inc.php:84
+#: ../../templates/show_mail_users.inc.php:96
 msgid "Subject"
 msgstr "Subjeto"
 
-#: ../../templates/show_mail_users.inc.php:91
+#: ../../templates/show_mail_users.inc.php:103
 msgid "Message"
 msgstr "Mensaje"
 
-#: ../../templates/show_mail_users.inc.php:101
+#: ../../templates/show_mail_users.inc.php:113
 msgid "Send Mail"
 msgstr "Mandar un correo"
 
-#: ../../templates/show_admin_info.inc.php:33
+#: ../../templates/show_admin_info.inc.php:32
 msgid "Last Ten Flagged Records"
 msgstr ""
 
-#: ../../templates/show_admin_info.inc.php:37
-#, fuzzy
-msgid "Disabled Songs"
-msgstr "Canciónes duplicadas"
-
-#: ../../templates/show_admin_info.inc.php:41
-#: ../../templates/show_flagged.inc.php:57
+#: ../../templates/show_admin_info.inc.php:40
+#: ../../templates/show_flagged.inc.php:73
 #: ../../templates/show_ip_history.inc.php:28
 #, fuzzy
 msgid "Show All"
@@ -1751,25 +1766,39 @@ msgid "Continue"
 msgstr "Seguir"
 
 #: ../../templates/show_confirmation.inc.php:28
-#: ../../templates/show_preferences.inc:95
+#: ../../templates/show_preferences.inc:96
 #: ../../templates/show_similar_artists.inc:74
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../../templates/show_flagged.inc.php:26
+#: ../../templates/show_flagged.inc.php:27
+#: ../../templates/show_disabled_songs.inc:25
+#: ../../templates/show_artist.inc:33
+msgid "Select"
+msgstr "Seleccionar"
+
+#: ../../templates/show_flagged.inc.php:28
 #, fuzzy
 msgid "Object"
 msgstr "Subjeto"
 
-#: ../../templates/show_flagged.inc.php:28
+#: ../../templates/show_flagged.inc.php:29
+#: ../../templates/show_preference_admin.inc.php:38
+#: ../../templates/show_add_access.inc:47
+#: ../../templates/show_access_list.inc:49
+#: ../../templates/show_edit_access.inc:47
+msgid "User"
+msgstr "Usuario"
+
+#: ../../templates/show_flagged.inc.php:31
 msgid "Status"
 msgstr ""
 
-#: ../../templates/show_flagged.inc.php:39
+#: ../../templates/show_flagged.inc.php:63
 msgid "Reject"
 msgstr ""
 
-#: ../../templates/show_flagged.inc.php:43
+#: ../../templates/show_flagged.inc.php:64
 msgid "Approve"
 msgstr ""
 
@@ -1786,14 +1815,18 @@ msgstr ""
 msgid "Update id3 tags"
 msgstr ""
 
-#: ../../templates/show_all_recent.inc.php:27
+#: ../../templates/show_all_recent.inc.php:25
 msgid "Newest Artist Additions"
 msgstr "Los artistas más nuevos"
 
-#: ../../templates/show_all_recent.inc.php:30 ../../index.php:82
+#: ../../templates/show_all_recent.inc.php:28
 msgid "Newest Album Additions"
 msgstr "Los álbumes más nuevos"
 
+#: ../../templates/show_all_recent.inc.php:31
+msgid "Newest Live Stream Additions"
+msgstr ""
+
 #: ../../templates/show_get_albumart.inc.php:23
 msgid "Customize Search"
 msgstr ""
@@ -1849,10 +1882,18 @@ msgstr "Crear nueva lista"
 msgid "Delete Empty Playlists"
 msgstr "Crear nueva lista"
 
-#: ../../templates/show_all_popular.inc.php:37
+#: ../../templates/show_all_popular.inc.php:32
 msgid "Most Popular Genres"
 msgstr "Los géneros más populares"
 
+#: ../../templates/show_all_popular.inc.php:41
+msgid "Most Popular Live Streams"
+msgstr ""
+
+#: ../../templates/show_all_popular.inc.php:44
+msgid "Most Popular Tags"
+msgstr ""
+
 #: ../../templates/show_play_selected.inc.php:28
 msgid "Play Selected"
 msgstr "Tocar la selección"
@@ -1994,22 +2035,10 @@ msgid "Filename Pattern"
 msgstr ""
 
 #: ../../templates/show_add_catalog.inc.php:82
-msgid "ID3V2 Tags"
-msgstr ""
-
-#: ../../templates/show_add_catalog.inc.php:86
-msgid "Amazon"
-msgstr "Amazon"
-
-#: ../../templates/show_add_catalog.inc.php:90
-msgid "File Folder"
-msgstr ""
-
-#: ../../templates/show_add_catalog.inc.php:98
 msgid "Build Playlists from m3u Files"
 msgstr ""
 
-#: ../../templates/show_add_catalog.inc.php:106
+#: ../../templates/show_add_catalog.inc.php:90
 msgid "Add Catalog"
 msgstr "Añadir catálogo"
 
@@ -2073,9 +2102,8 @@ msgid "Recommendations"
 msgstr ""
 
 #: ../../templates/show_user_recommendations.inc.php:29
-#, fuzzy
-msgid "Recommended Aritsts"
-msgstr "Cambiar el nombre del artista"
+msgid "Recommended Artists"
+msgstr ""
 
 #: ../../templates/show_user_recommendations.inc.php:40
 msgid "Recommended Albums"
@@ -2101,13 +2129,6 @@ msgstr "Nivel"
 msgid "Guest"
 msgstr ""
 
-#: ../../templates/show_preference_admin.inc.php:38
-#: ../../templates/show_add_access.inc:47
-#: ../../templates/show_access_list.inc:49
-#: ../../templates/show_edit_access.inc:47
-msgid "User"
-msgstr "Usuario"
-
 #: ../../templates/show_edit_album.inc.php:23
 #, fuzzy
 msgid "Edit Album"
@@ -2156,11 +2177,19 @@ msgstr "año"
 msgid "Recently Played"
 msgstr "Menos tocado"
 
+#: ../../templates/show_recently_played.inc.php:33
+msgid "Last Played"
+msgstr ""
+
 #: ../../templates/show_edit_artist.inc.php:23
 #, fuzzy
 msgid "Edit Artist"
 msgstr "Artista"
 
+#: ../../templates/show_random_albums.inc.php:23
+msgid "Albums of the Moment"
+msgstr ""
+
 #: ../../localplay.php:50 ../../localplay.php:58
 msgid "Song(s) Removed from Playlist"
 msgstr ""
@@ -2170,7 +2199,7 @@ msgstr ""
 msgid "Localplay Init Failed"
 msgstr "Control local de reproducción"
 
-#: ../../browse.php:48 ../../albums.php:191
+#: ../../browse.php:48 ../../albums.php:213
 msgid "Show Albums starting with"
 msgstr "Monstrar los álbumes que empiezan con"
 
@@ -2178,7 +2207,7 @@ msgstr "Monstrar los álbumes que empiezan con"
 msgid "Show Artists starting with"
 msgstr "Mostrar los artistas que empiezan con"
 
-#: ../../browse.php:123
+#: ../../browse.php:124
 #, fuzzy
 msgid "Show Titles Starting With"
 msgstr "Mostrar los artistas que empiezan con"
@@ -2187,6 +2216,10 @@ msgstr "Mostrar los artistas que empiezan con"
 msgid "Error: No Keyword Entered"
 msgstr ""
 
+#: ../../ampache/templates/sidebar.inc.php:38
+msgid "Lists"
+msgstr "Listas"
+
 #: ../../ratings.php:33
 msgid "Rating Updated"
 msgstr ""
@@ -2207,7 +2240,7 @@ msgstr ""
 msgid "No local account found"
 msgstr ""
 
-#: ../../login.php:177
+#: ../../login.php:176
 msgid "Message of the Day"
 msgstr ""
 
@@ -2225,36 +2258,36 @@ msgstr "Contraseña"
 msgid "Ampache Update"
 msgstr "Actualización rápida"
 
-#: ../../tv.php:61
+#: ../../tv.php:62
 #, fuzzy
 msgid "Playlist Cleared"
 msgstr "Lista creada"
 
-#: ../../artists.php:91 ../../albums.php:169
+#: ../../artists.php:91 ../../albums.php:191
 msgid "Starting Update from Tags"
 msgstr ""
 
-#: ../../artists.php:96 ../../albums.php:174
+#: ../../artists.php:96 ../../albums.php:196
 msgid "Update From Tags Complete"
 msgstr ""
 
-#: ../../artists.php:97 ../../albums.php:175
+#: ../../artists.php:97 ../../albums.php:197
 msgid "Return"
 msgstr ""
 
-#: ../../activate.php:44
+#: ../../activate.php:43
 msgid "No user with this name registered"
 msgstr "No hay usuario registrado con este nombre"
 
-#: ../../activate.php:48
+#: ../../activate.php:47
 msgid "The validation key used isn't correct."
 msgstr ""
 
-#: ../../activate.php:53
+#: ../../activate.php:52
 msgid "User activated"
 msgstr ""
 
-#: ../../activate.php:53
+#: ../../activate.php:52
 msgid "This User ID is activated and can be used"
 msgstr ""
 
@@ -2323,17 +2356,17 @@ msgstr ""
 msgid "Album Art information has been removed from the database"
 msgstr "Se eliminó el arte de álbumes de la base de datos"
 
-#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:133
+#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:159
 msgid "Album Art Not Located"
 msgstr ""
 
-#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:133
+#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:159
 msgid ""
 "Album Art could not be located at this time. This may be due to write access "
 "error, or the file is not received corectly."
 msgstr ""
 
-#: ../../albums.php:79 ../../albums.php:162
+#: ../../albums.php:79 ../../albums.php:106 ../../albums.php:185
 msgid "Album Art Inserted"
 msgstr ""
 
@@ -2369,11 +2402,11 @@ msgstr ""
 msgid "Error: Insert Failed"
 msgstr ""
 
-#: ../../register.php:170
+#: ../../register.php:169
 msgid "Registration Complete"
 msgstr ""
 
-#: ../../bin/print_tags.php.inc:63
+#: ../../bin/print_tags.php.inc:64
 msgid ""
 "[print_tags.php.inc]\n"
 "This commandline script will display the tag information for the specified "
@@ -2382,7 +2415,7 @@ msgid ""
 "        \n"
 msgstr ""
 
-#: ../../bin/print_tags.php.inc:69
+#: ../../bin/print_tags.php.inc:70
 msgid "Filename:"
 msgstr "Nombre del archivo:"
 
@@ -2442,16 +2475,11 @@ msgstr "Arte del álbum"
 msgid "Click to close window"
 msgstr "Haga click para cerrar la ventana"
 
-#: ../../templates/show_disabled_songs.inc:25
-#: ../../templates/show_artist.inc:33
-msgid "Select"
-msgstr "Seleccionar"
-
 #: ../../templates/show_disabled_songs.inc:30
 msgid "Addition Time"
 msgstr ""
 
-#: ../../templates/show_disabled_songs.inc:48
+#: ../../templates/show_disabled_songs.inc:49
 #, fuzzy
 msgid "Remove"
 msgstr "Cambiar el nombre"
@@ -2464,10 +2492,14 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: ../../templates/header.inc:64 ../../ampache/templates/header.inc:64
+#: ../../templates/header.inc:63 ../../ampache/templates/header.inc:64
 msgid "You are currently logged in as"
 msgstr ""
 
+#: ../../templates/header.inc:74
+msgid "Error Config File Out of Date"
+msgstr ""
+
 #: ../../templates/show_songs.inc:47
 msgid "Song title"
 msgstr "Título de la canción"
@@ -2476,17 +2508,12 @@ msgstr "Título de la canción"
 msgid "Rating"
 msgstr ""
 
-#: ../../templates/show_songs.inc:176
+#: ../../templates/show_songs.inc:183
 msgid "Total"
 msgstr "Total"
 
-#: ../../templates/show_songs.inc:194
-#, fuzzy
-msgid "** Indicates flagged songs"
-msgstr "Mirar las canciónes con banderas"
-
 #: ../../templates/show_install_config.inc:53
-#: ../../templates/show_install.inc:34
+#: ../../templates/show_install.inc:56
 msgid "Step 2 - Creating the Ampache.cfg.php file"
 msgstr ""
 
@@ -2502,12 +2529,12 @@ msgid "Web Path"
 msgstr ""
 
 #: ../../templates/show_install_config.inc:68
-#: ../../templates/show_install.inc:42
+#: ../../templates/show_install.inc:64
 msgid "Desired Database Name"
 msgstr ""
 
 #: ../../templates/show_install_config.inc:72
-#: ../../templates/show_install.inc:46
+#: ../../templates/show_install.inc:68
 msgid "MySQL Hostname"
 msgstr "Nombre del servidor MySQL"
 
@@ -2553,44 +2580,44 @@ msgstr ""
 msgid "Find Album Art"
 msgstr "Encontrar arte del álbum"
 
-#: ../../templates/show_preferences.inc:52
+#: ../../templates/show_preferences.inc:53
 msgid "Editing"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:52
+#: ../../templates/show_preferences.inc:53
 msgid "preferences"
 msgstr "preferencias"
 
-#: ../../templates/show_preferences.inc:54
+#: ../../templates/show_preferences.inc:55
 msgid "Rebuild Preferences"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:61
+#: ../../templates/show_preferences.inc:62
 msgid "Interface"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:64
+#: ../../templates/show_preferences.inc:65
 msgid "Streaming"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:67
+#: ../../templates/show_preferences.inc:68
 #, fuzzy
 msgid "Options"
 msgstr "Acciónes"
 
-#: ../../templates/show_preferences.inc:71
+#: ../../templates/show_preferences.inc:72
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../../templates/show_preferences.inc:75
+#: ../../templates/show_preferences.inc:76
 msgid "System"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:78
+#: ../../templates/show_preferences.inc:79
 msgid "Modules"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:91
+#: ../../templates/show_preferences.inc:92
 msgid "Update Preferences"
 msgstr ""
 
@@ -2632,7 +2659,7 @@ msgstr "Límite"
 msgid "Unlimited"
 msgstr "Sin límites"
 
-#: ../../templates/show_install.inc:32
+#: ../../templates/show_install.inc:54
 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 "
@@ -2642,27 +2669,27 @@ msgstr ""
 "una cuenta de MySQL con permisos de crear una base de datos.  Es posibleque "
 "tenga que esperar un ratito. Este dependa en cuán viejo es su computadora."
 
-#: ../../templates/show_install.inc:50
+#: ../../templates/show_install.inc:72
 msgid "MySQL Administrative Username"
 msgstr "Nombre administrativo de MySQL"
 
-#: ../../templates/show_install.inc:54
+#: ../../templates/show_install.inc:76
 msgid "MySQL Administrative Password"
 msgstr "Contraseña administrativa de MySQL"
 
-#: ../../templates/show_install.inc:58
+#: ../../templates/show_install.inc:80
 msgid "Create Database User for New Database"
 msgstr "Crear un usuario para nueva base de datos"
 
-#: ../../templates/show_install.inc:62
+#: ../../templates/show_install.inc:84
 msgid "Ampache Database Username"
 msgstr "Nombre del usuario de la base de datos Ampache"
 
-#: ../../templates/show_install.inc:66
+#: ../../templates/show_install.inc:88
 msgid "Ampache Database User Password"
 msgstr "Contraseña del usario de la base de datos Ampache"
 
-#: ../../templates/show_install.inc:71
+#: ../../templates/show_install.inc:93
 msgid "Insert Database"
 msgstr "Insertar una base de datos"
 
@@ -2777,12 +2804,12 @@ msgstr "Fecha de registro"
 msgid "Activity"
 msgstr ""
 
-#: ../../templates/show_users.inc:60
+#: ../../templates/show_users.inc:61
 #, fuzzy
 msgid "Last Ip"
 msgstr "Último visto"
 
-#: ../../templates/show_users.inc:65
+#: ../../templates/show_users.inc:66
 msgid "On-line"
 msgstr "En linea"
 
@@ -3039,6 +3066,17 @@ msgstr "Ahorrar la búsqueda como una canción en"
 msgid "Save"
 msgstr "Ahorrar"
 
+#~ msgid "Amazon"
+#~ msgstr "Amazon"
+
+#, fuzzy
+#~ msgid "Recommended Aritsts"
+#~ msgstr "Cambiar el nombre del artista"
+
+#, fuzzy
+#~ msgid "** Indicates flagged songs"
+#~ msgstr "Mirar las canciónes con banderas"
+
 #~ msgid "Found in ID3"
 #~ msgstr "Encontrado en ID3"
 
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index e6def3b2..a7c8d21a 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.mo
+++ b/locale/fr_FR/LC_MESSAGES/messages.mo
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 1365ee2c..0a45e144 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: v0.1a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-01 20:33-0800\n"
+"POT-Creation-Date: 2007-01-22 19:07-0800\n"
 "PO-Revision-Date: 2006-05-14 19:02+0100\n"
 "Last-Translator: Stephane Roy <sroy@j2n.net>\n"
 "Language-Team: FRENCH\n"
@@ -19,12 +19,12 @@ msgstr ""
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 
-#: ../../play/index.php:64 ../../download/index.php:62
+#: ../../play/index.php:64 ../../download/index.php:61
 msgid "Session Expired: please log in again at"
 msgstr "Session expir&eacute;e : reconnectez vous sur"
 
-#: ../../lib/class/catalog.class.php:299 ../../lib/class/catalog.class.php:592
-#: ../../lib/class/album.class.php:325
+#: ../../lib/class/catalog.class.php:303 ../../lib/class/catalog.class.php:621
+#: ../../lib/class/album.class.php:328
 msgid "Error: Unable to open"
 msgstr "Erreur : impossible d'ouvrir"
 
@@ -32,189 +32,194 @@ msgstr "Erreur : impossible d'ouvrir"
 msgid "Error: Unable to change to directory"
 msgstr "Erreur: Impossible de changer de r&eacute;pertoire"
 
-#: ../../lib/class/catalog.class.php:375
+#: ../../lib/class/catalog.class.php:374
 msgid "Error: Unable to get filesize for"
 msgstr "Erreur: Impossible d'obtenir la taille de fichier pour"
 
-#: ../../lib/class/catalog.class.php:412
+#: ../../lib/class/catalog.class.php:411
 msgid "is not readable by ampache"
 msgstr "n'est pas lisible par ampache"
 
-#: ../../lib/class/catalog.class.php:501
+#: ../../lib/class/catalog.class.php:530
 msgid "album's with art"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:772
+#: ../../lib/class/catalog.class.php:812
 msgid "Starting Catalog Build"
 msgstr "D&eacute;marrage de la construction du catalogue"
 
-#: ../../lib/class/catalog.class.php:776
+#: ../../lib/class/catalog.class.php:816
 msgid "Running Remote Sync"
 msgstr "Synchronisation distante en cours"
 
-#: ../../lib/class/catalog.class.php:781 ../../lib/class/catalog.class.php:947
+#: ../../lib/class/catalog.class.php:821 ../../lib/class/catalog.class.php:992
 msgid "Found"
 msgstr "Trouv&eacute;"
 
-#: ../../lib/class/catalog.class.php:781 ../../lib/class/catalog.class.php:804
-#: ../../lib/class/catalog.class.php:947 ../../lib/class/catalog.class.php:977
-#: ../../lib/preferences.php:269 ../../lib/preferences.php:319
-#: ../../lib/ui.lib.php:1186 ../../admin/catalog.php:259
+#: ../../lib/class/catalog.class.php:821 ../../lib/class/catalog.class.php:848
+#: ../../lib/class/catalog.class.php:992
+#: ../../lib/class/catalog.class.php:1025 ../../lib/preferences.php:269
+#: ../../lib/preferences.php:319 ../../lib/ui.lib.php:1194
+#: ../../admin/catalog.php:259
 #, fuzzy
 msgid "None"
 msgstr "Non"
 
-#: ../../lib/class/catalog.class.php:796 ../../lib/class/catalog.class.php:965
+#: ../../lib/class/catalog.class.php:840
+#: ../../lib/class/catalog.class.php:1014
 msgid "Added Playlist From"
 msgstr "Playlist ajout&eacute;e de"
 
-#: ../../lib/class/catalog.class.php:803 ../../lib/class/catalog.class.php:976
-#: ../../admin/catalog.php:258
+#: ../../lib/class/catalog.class.php:847
+#: ../../lib/class/catalog.class.php:1024 ../../admin/catalog.php:258
 msgid "Starting Album Art Search"
 msgstr "D&eacute;marrage de la recherche de jaquette d'album"
 
-#: ../../lib/class/catalog.class.php:804 ../../lib/class/catalog.class.php:977
-#: ../../admin/catalog.php:259
+#: ../../lib/class/catalog.class.php:848
+#: ../../lib/class/catalog.class.php:1025 ../../admin/catalog.php:259
 msgid "Searched"
 msgstr "Cherch&eacute;"
 
-#: ../../lib/class/catalog.class.php:814
+#: ../../lib/class/catalog.class.php:858
 msgid "Catalog Finished"
 msgstr "Catalogue termin&eacute;"
 
-#: ../../lib/class/catalog.class.php:814 ../../lib/class/catalog.class.php:997
+#: ../../lib/class/catalog.class.php:858
+#: ../../lib/class/catalog.class.php:1044
 msgid "Total Time"
 msgstr "Dur&eacute;e totale"
 
-#: ../../lib/class/catalog.class.php:814 ../../lib/class/catalog.class.php:998
+#: ../../lib/class/catalog.class.php:858
+#: ../../lib/class/catalog.class.php:1045
 msgid "Total Songs"
 msgstr "Total des morceaux"
 
-#: ../../lib/class/catalog.class.php:815 ../../lib/class/catalog.class.php:998
+#: ../../lib/class/catalog.class.php:859
+#: ../../lib/class/catalog.class.php:1045
 msgid "Songs Per Seconds"
 msgstr "Morceaux par secondes"
 
-#: ../../lib/class/catalog.class.php:849
-#: ../../lib/class/catalog.class.php:1634
+#: ../../lib/class/catalog.class.php:894
+#: ../../lib/class/catalog.class.php:1565
 msgid "Updated"
 msgstr "Mis &aacute; jour"
 
-#: ../../lib/class/catalog.class.php:856
+#: ../../lib/class/catalog.class.php:901
 msgid "No Update Needed"
 msgstr "Mise &aacute; jour non n&eacute;cessaire"
 
-#: ../../lib/class/catalog.class.php:938
+#: ../../lib/class/catalog.class.php:983
 msgid "Starting New Song Search on"
 msgstr "D&eacute;marrage de la recherche des nouveaux morceaux"
 
-#: ../../lib/class/catalog.class.php:938
+#: ../../lib/class/catalog.class.php:983
 msgid "catalog"
 msgstr "catalogue"
 
-#: ../../lib/class/catalog.class.php:942
+#: ../../lib/class/catalog.class.php:987
 msgid "Running Remote Update"
 msgstr "Mise &aacute; jour distante en cours"
 
-#: ../../lib/class/catalog.class.php:997
+#: ../../lib/class/catalog.class.php:1044
 msgid "Catalog Update Finished"
 msgstr "Mise &aacute; jour du catalogue termin&eacute;e"
 
-#: ../../lib/class/catalog.class.php:1017
+#: ../../lib/class/catalog.class.php:1064
 msgid "Error"
 msgstr "Erreur"
 
-#: ../../lib/class/catalog.class.php:1017
+#: ../../lib/class/catalog.class.php:1064
 msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
 msgstr ""
 "Impossible de charger la biblioth&egrave;que XMLRPC, assurez-vous que XML-"
 "RPC est actif"
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Error connecting to"
 msgstr "Erreur de connexion &aacute;"
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Code"
 msgstr "Code"
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Reason"
 msgstr "Raison"
 
-#: ../../lib/class/catalog.class.php:1076
+#: ../../lib/class/catalog.class.php:1123
 msgid "Completed updating remote catalog(s)"
 msgstr "Mise &aacute; jour de(s) catalogue(s) distant(s) termin&eacute;e"
 
-#: ../../lib/class/catalog.class.php:1111
+#: ../../lib/class/catalog.class.php:1158
 msgid "Added"
 msgstr "Ajout&eacute;"
 
-#: ../../lib/class/catalog.class.php:1193
+#: ../../lib/class/catalog.class.php:1240
 #, fuzzy
 msgid "Cleaning the"
 msgstr "mise &aacute; jour de"
 
-#: ../../lib/class/catalog.class.php:1193
-#: ../../lib/class/catalog.class.php:1589 ../../templates/sidebar.inc.php:30
+#: ../../lib/class/catalog.class.php:1240
+#: ../../lib/class/catalog.class.php:1520 ../../templates/sidebar.inc.php:30
 #: ../../ampache/templates/sidebar.inc.php:30
 msgid "Catalog"
 msgstr "Catalogues"
 
-#: ../../lib/class/catalog.class.php:1194
+#: ../../lib/class/catalog.class.php:1241
 msgid "Checking"
 msgstr "Test"
 
-#: ../../lib/class/catalog.class.php:1265
+#: ../../lib/class/catalog.class.php:1313
 msgid "Catalog Clean Done"
 msgstr "Nettoyage de catalogue termin&eacute;"
 
-#: ../../lib/class/catalog.class.php:1265
+#: ../../lib/class/catalog.class.php:1313
 msgid "files removed"
 msgstr "Fichiers enlev&eacute;s"
 
-#: ../../lib/class/catalog.class.php:1589
+#: ../../lib/class/catalog.class.php:1520
 msgid "Updating the"
 msgstr "mise &aacute; jour de"
 
-#: ../../lib/class/catalog.class.php:1590
+#: ../../lib/class/catalog.class.php:1521
 msgid "songs found checking tag information."
 msgstr "test des tags des morceaux trouv&eacute;s"
 
-#: ../../lib/class/catalog.class.php:1591
+#: ../../lib/class/catalog.class.php:1522
 msgid "Verifed"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1643
+#: ../../lib/class/catalog.class.php:1574
 msgid " FOUND"
 msgstr "TROUVE"
 
-#: ../../lib/class/catalog.class.php:1645
+#: ../../lib/class/catalog.class.php:1576
 msgid "Searching for new Album Art"
 msgstr "Recherche de nouvelle(s) jaquette(s) d'album(s)"
 
-#: ../../lib/class/catalog.class.php:1649
+#: ../../lib/class/catalog.class.php:1580
 msgid "Album Art Already Found"
 msgstr "Jaquette(s) d'album(s) d&eacute;ja trouv&eacute;e(s)"
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 #, fuzzy
 msgid "Update Finished."
 msgstr "Mise &aacute; jour du catalogue termin&eacute;e"
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 #, fuzzy
 msgid "Checked"
 msgstr "Test"
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 #, fuzzy
 msgid "songs updated."
 msgstr " a &eacute;t&eacute; mis &aacute; jour"
 
-#: ../../lib/class/song.class.php:360
+#: ../../lib/class/song.class.php:361
 #: ../../templates/show_duplicates.inc.php:35
 #: ../../templates/show_edit_song.inc.php:31
 #: ../../templates/show_disabled_songs.inc:26
@@ -222,53 +227,53 @@ msgstr " a &eacute;t&eacute; mis &aacute; jour"
 msgid "Title"
 msgstr "Titre"
 
-#: ../../lib/class/song.class.php:360 ../../lib/class/song.class.php:364
-#: ../../lib/class/song.class.php:368 ../../lib/class/song.class.php:372
-#: ../../lib/class/song.class.php:376 ../../lib/class/song.class.php:380
-#: ../../lib/class/song.class.php:384 ../../lib/class/song.class.php:389
-#: ../../lib/class/song.class.php:394 ../../lib/class/song.class.php:398
-#: ../../lib/class/song.class.php:402 ../../lib/class/song.class.php:407
+#: ../../lib/class/song.class.php:361 ../../lib/class/song.class.php:365
+#: ../../lib/class/song.class.php:369 ../../lib/class/song.class.php:373
+#: ../../lib/class/song.class.php:377 ../../lib/class/song.class.php:381
+#: ../../lib/class/song.class.php:385 ../../lib/class/song.class.php:390
+#: ../../lib/class/song.class.php:395 ../../lib/class/song.class.php:399
+#: ../../lib/class/song.class.php:403 ../../lib/class/song.class.php:408
 msgid "updated to"
 msgstr "Mise &aacute; jour pour"
 
-#: ../../lib/class/song.class.php:364
+#: ../../lib/class/song.class.php:365
 #: ../../templates/show_list_duplicates.inc.php:35
 #: ../../templates/show_songs.inc:53
 msgid "Bitrate"
 msgstr "D&eacute;bit"
 
-#: ../../lib/class/song.class.php:368
+#: ../../lib/class/song.class.php:369
 msgid "Rate"
 msgstr "Taux"
 
-#: ../../lib/class/song.class.php:372
+#: ../../lib/class/song.class.php:373
 msgid "Mode"
 msgstr "Mode"
 
-#: ../../lib/class/song.class.php:376
+#: ../../lib/class/song.class.php:377
 #: ../../templates/show_tv_playlist.inc.php:46
 #: ../../templates/show_songs.inc:51
 msgid "Time"
 msgstr "Dur&eacute;e"
 
-#: ../../lib/class/song.class.php:380
+#: ../../lib/class/song.class.php:381
 #: ../../templates/show_edit_song.inc.php:61
 #: ../../templates/show_localplay_playlist.inc.php:27
 #: ../../templates/show_songs.inc:45 ../../templates/show_songs.inc:50
 msgid "Track"
 msgstr "Piste"
 
-#: ../../lib/class/song.class.php:384
+#: ../../lib/class/song.class.php:385
 msgid "Filesize"
 msgstr "Taille du fichier"
 
-#: ../../lib/class/song.class.php:389
+#: ../../lib/class/song.class.php:390
 #: ../../templates/show_edit_song.inc.php:45
 #: ../../templates/show_get_albumart.inc.php:30
 #: ../../templates/show_play_selected.inc.php:60
 #: ../../templates/show_list_duplicates.inc.php:32
 #: ../../templates/show_recently_played.inc.php:32
-#: ../../templates/show_artists.inc:40 ../../templates/show_artists.inc:65
+#: ../../templates/show_artists.inc:40 ../../templates/show_artists.inc:71
 #: ../../templates/show_disabled_songs.inc:28
 #: ../../templates/show_songs.inc:48 ../../templates/show_albums.inc:41
 #: ../../templates/show_albums.inc:84
@@ -277,7 +282,7 @@ msgstr "Taille du fichier"
 msgid "Artist"
 msgstr "Artiste"
 
-#: ../../lib/class/song.class.php:394
+#: ../../lib/class/song.class.php:395
 #: ../../templates/show_edit_song.inc.php:37
 #: ../../templates/show_get_albumart.inc.php:38
 #: ../../templates/show_play_selected.inc.php:59
@@ -289,7 +294,7 @@ msgstr "Artiste"
 msgid "Album"
 msgstr "Album"
 
-#: ../../lib/class/song.class.php:398
+#: ../../lib/class/song.class.php:399
 #: ../../templates/show_edit_song.inc.php:67
 #: ../../templates/show_play_selected.inc.php:61
 #: ../../templates/show_edit_album.inc.php:33
@@ -298,13 +303,13 @@ msgstr "Album"
 msgid "Year"
 msgstr "Ann&eacute;e"
 
-#: ../../lib/class/song.class.php:402 ../../templates/show_flag.inc.php:64
+#: ../../lib/class/song.class.php:403 ../../templates/show_flag.inc.php:64
 #: ../../templates/show_edit_song.inc.php:73
 #: ../../templates/show_search.inc:37
 msgid "Comment"
 msgstr "Commentaire"
 
-#: ../../lib/class/song.class.php:407 ../../lib/ui.lib.php:843
+#: ../../lib/class/song.class.php:408 ../../lib/ui.lib.php:851
 #: ../../templates/sidebar.inc.php:36
 #: ../../templates/show_edit_song.inc.php:53
 #: ../../templates/show_genre.inc.php:29
@@ -319,36 +324,36 @@ msgstr "Genre"
 msgid "Error: Name Identical"
 msgstr "Erreur : noms identiques"
 
-#: ../../lib/class/flag.class.php:263
+#: ../../lib/class/flag.class.php:264
 #, fuzzy
 msgid "Approved"
 msgstr "D&eacute;plac&eacute;"
 
-#: ../../lib/class/flag.class.php:264
+#: ../../lib/class/flag.class.php:265
 #, fuzzy
 msgid "Pending"
 msgstr "Ajout"
 
-#: ../../lib/class/flag.class.php:276 ../../templates/show_flag.inc.php:56
+#: ../../lib/class/flag.class.php:277 ../../templates/show_flag.inc.php:56
 #: ../../templates/show_playlists.inc.php:57
 #: ../../templates/show_admin_tools.inc.php:50
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../../lib/class/flag.class.php:279
+#: ../../lib/class/flag.class.php:280
 msgid "Re-Tag"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:282 ../../templates/show_flag.inc.php:58
+#: ../../lib/class/flag.class.php:283 ../../templates/show_flag.inc.php:58
 msgid "Re-encode"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:285 ../../templates/show_flag.inc.php:59
+#: ../../lib/class/flag.class.php:286 ../../templates/show_flag.inc.php:59
 #, fuzzy
 msgid "Other"
 msgstr "autre"
 
-#: ../../lib/class/flag.class.php:288 ../../lib/class/localplay.class.php:569
+#: ../../lib/class/flag.class.php:289 ../../lib/class/localplay.class.php:570
 #: ../../lib/general.lib.php:890
 #: ../../modules/localplay/icecast.controller.php:292
 #: ../../modules/localplay/mpd.controller.php:354
@@ -356,26 +361,26 @@ msgstr "autre"
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../../lib/class/localplay.class.php:560 ../../templates/show_tv.inc.php:81
+#: ../../lib/class/localplay.class.php:561 ../../templates/show_tv.inc.php:64
 #: ../../templates/show_now_playing.inc:32
 msgid "Now Playing"
 msgstr "En cours de lecture"
 
-#: ../../lib/class/localplay.class.php:563
+#: ../../lib/class/localplay.class.php:564
 #, fuzzy
 msgid "Stopped"
 msgstr "Stop"
 
-#: ../../lib/class/localplay.class.php:566
+#: ../../lib/class/localplay.class.php:567
 #, fuzzy
 msgid "Paused"
 msgstr "Pause"
 
-#: ../../lib/class/album.class.php:162
+#: ../../lib/class/album.class.php:163
 msgid "Various"
 msgstr "Divers"
 
-#: ../../lib/class/genre.class.php:284
+#: ../../lib/class/genre.class.php:285
 msgid "Show Genres starting with"
 msgstr "Voir les Genres commen&ccedil;ant par"
 
@@ -417,31 +422,31 @@ msgid "Disable"
 msgstr "D&eacute;sactiver"
 
 #: ../../lib/preferences.php:271 ../../templates/show_tv_adminctl.inc.php:41
-#: ../../templates/show_playtype_switch.inc.php:9
+#: ../../templates/show_playtype_switch.inc.php:30
 msgid "Stream"
 msgstr "Flux"
 
 #: ../../lib/preferences.php:274 ../../templates/show_tv_adminctl.inc.php:42
-#: ../../templates/show_playtype_switch.inc.php:13
+#: ../../templates/show_playtype_switch.inc.php:34
 msgid "Downsample"
 msgstr "Downsample"
 
 #: ../../lib/preferences.php:277
-#: ../../templates/show_playtype_switch.inc.php:15
+#: ../../templates/show_playtype_switch.inc.php:36
 msgid "Democratic"
 msgstr ""
 
-#: ../../lib/preferences.php:280 ../../templates/sidebar.inc.php:170
+#: ../../lib/preferences.php:280 ../../templates/sidebar.inc.php:168
 #: ../../templates/show_tv_adminctl.inc.php:40
 #: ../../templates/show_localplay.inc.php:26
-#: ../../templates/show_playtype_switch.inc.php:11
+#: ../../templates/show_playtype_switch.inc.php:32
 #: ../../ampache/templates/sidebar.inc.php:170
 #, fuzzy
 msgid "Localplay"
 msgstr "Lecture en local"
 
 #: ../../lib/preferences.php:282
-#: ../../templates/show_playtype_switch.inc.php:17
+#: ../../templates/show_playtype_switch.inc.php:38
 msgid "XSPF Player"
 msgstr ""
 
@@ -476,7 +481,7 @@ msgstr "D&eacute;sactiver"
 
 #: ../../lib/preferences.php:327
 msgid "Global"
-msgstr ""
+msgstr "Monde"
 
 #: ../../lib/preferences.php:328 ../../templates/show_add_catalog.inc.php:58
 msgid "Local"
@@ -486,11 +491,11 @@ msgstr "Local"
 msgid "No songs in this playlist."
 msgstr "Aucun morceau dans cette liste de lecture"
 
-#: ../../lib/playlist.lib.php:191 ../../lib/ui.lib.php:892
-#: ../../templates/sidebar.inc.php:150
+#: ../../lib/playlist.lib.php:191 ../../lib/ui.lib.php:900
+#: ../../templates/sidebar.inc.php:148
 #: ../../templates/show_admin_tools.inc.php:48
 #: ../../ampache/templates/sidebar.inc.php:150
-#: ../../templates/show_artists.inc:55 ../../templates/show_random_play.inc:40
+#: ../../templates/show_random_play.inc:40
 #: ../../templates/show_add_access.inc:59
 #: ../../templates/show_edit_access.inc:69
 msgid "All"
@@ -504,7 +509,7 @@ msgstr "Nouvelle liste de lecture"
 msgid "Error Access Denied"
 msgstr "Erreur, acc&egrave;s interdit"
 
-#: ../../lib/ui.lib.php:194 ../../templates/sidebar.inc.php:89
+#: ../../lib/ui.lib.php:194 ../../templates/sidebar.inc.php:87
 #: ../../ampache/templates/sidebar.inc.php:89
 msgid "Browse"
 msgstr "Parcourir"
@@ -517,142 +522,136 @@ msgstr "Afficher sans jaquette"
 msgid "Show all"
 msgstr "Montrer tout"
 
-#: ../../lib/ui.lib.php:538 ../../admin/mail.php:80
+#: ../../lib/ui.lib.php:539 ../../admin/mail.php:81
 msgid "No Catalogs Found!"
 msgstr "Aucun catalogue trouv&eacute; !"
 
-#: ../../lib/ui.lib.php:539 ../../admin/mail.php:81
-#: ../../templates/show_admin_tools.inc.php:67
+#: ../../lib/ui.lib.php:540 ../../admin/mail.php:82
+#: ../../templates/show_admin_tools.inc.php:75
 #: ../../templates/show_add_catalog.inc.php:28
 msgid "Add a Catalog"
 msgstr "Ajouter un catalogue"
 
-#: ../../lib/ui.lib.php:540 ../../admin/mail.php:82
-#: ../../templates/show_mail_users.inc.php:41
-#: ../../templates/show_local_catalog_info.inc.php:23
-msgid "Catalog Statistics"
-msgstr "Statistiques des catalogues"
-
-#: ../../lib/ui.lib.php:576 ../../admin/mail.php:119
+#: ../../lib/ui.lib.php:578 ../../admin/mail.php:120
 msgid "day"
 msgstr "jour"
 
-#: ../../lib/ui.lib.php:576 ../../admin/mail.php:119
+#: ../../lib/ui.lib.php:578 ../../admin/mail.php:120
 msgid "days"
 msgstr "jours"
 
-#: ../../lib/ui.lib.php:578 ../../admin/mail.php:121
+#: ../../lib/ui.lib.php:580 ../../admin/mail.php:122
 msgid "hour"
 msgstr "heure"
 
-#: ../../lib/ui.lib.php:578 ../../admin/mail.php:121
+#: ../../lib/ui.lib.php:580 ../../admin/mail.php:122
 msgid "hours"
 msgstr "heures"
 
-#: ../../lib/ui.lib.php:782 ../../templates/show_tv.inc.php:58
-#: ../../templates/sidebar.inc.php:50
+#: ../../lib/ui.lib.php:790 ../../templates/sidebar.inc.php:48
 #: ../../ampache/templates/sidebar.inc.php:50
 msgid "Home"
 msgstr "Accueil"
 
-#: ../../lib/ui.lib.php:785
+#: ../../lib/ui.lib.php:793
 msgid "Upload"
 msgstr "Envoyer"
 
-#: ../../lib/ui.lib.php:788
+#: ../../lib/ui.lib.php:796
 msgid "Local Play"
 msgstr "Lecture en local"
 
-#: ../../lib/ui.lib.php:791
+#: ../../lib/ui.lib.php:799
 #, fuzzy
 msgid "Random Play"
 msgstr "Al&eacute;atoire"
 
-#: ../../lib/ui.lib.php:794 ../../templates/show_play_selected.inc.php:47
+#: ../../lib/ui.lib.php:802 ../../templates/show_play_selected.inc.php:47
 msgid "Playlist"
 msgstr "Liste de lecture"
 
-#: ../../lib/ui.lib.php:797 ../../templates/show_duplicates.inc.php:51
-#: ../../templates/sidebar.inc.php:118 ../../templates/sidebar.inc.php:124
+#: ../../lib/ui.lib.php:805 ../../templates/show_duplicates.inc.php:51
+#: ../../templates/sidebar.inc.php:116 ../../templates/sidebar.inc.php:122
 #: ../../ampache/templates/sidebar.inc.php:118
 #: ../../ampache/templates/sidebar.inc.php:124
 #: ../../templates/show_search_bar.inc:31 ../../templates/show_search.inc:133
 msgid "Search"
 msgstr "Chercher"
 
-#: ../../lib/ui.lib.php:800 ../../templates/sidebar.inc.php:81
+#: ../../lib/ui.lib.php:808 ../../templates/sidebar.inc.php:79
 #: ../../ampache/templates/sidebar.inc.php:81
 msgid "Preferences"
 msgstr "Pr&eacute;f&eacute;rences"
 
-#: ../../lib/ui.lib.php:803 ../../lib/ui.lib.php:807
+#: ../../lib/ui.lib.php:811 ../../lib/ui.lib.php:815
 #, fuzzy
 msgid "Admin-Catalog"
 msgstr "Ajouter un catalogue"
 
-#: ../../lib/ui.lib.php:811
+#: ../../lib/ui.lib.php:819
 #, fuzzy
 msgid "Admin-User Management"
 msgstr "Gestion des utilisateurs"
 
-#: ../../lib/ui.lib.php:815
+#: ../../lib/ui.lib.php:823
 #, fuzzy
 msgid "Admin-Mail Users"
 msgstr "E-mail aux utilisateurs"
 
-#: ../../lib/ui.lib.php:819
+#: ../../lib/ui.lib.php:827
 #, fuzzy
 msgid "Admin-Manage Access Lists"
 msgstr "Liste d'acc&egrave;s"
 
-#: ../../lib/ui.lib.php:823
+#: ../../lib/ui.lib.php:831
 #, fuzzy
 msgid "Admin-Site Preferences"
 msgstr "Pr&eacute;f&eacute;rences administrateur"
 
-#: ../../lib/ui.lib.php:827
+#: ../../lib/ui.lib.php:835
 msgid "Admin-Manage Modules"
 msgstr ""
 
-#: ../../lib/ui.lib.php:831
+#: ../../lib/ui.lib.php:839
 #, fuzzy
 msgid "Browse Music"
 msgstr "Parcourir"
 
-#: ../../lib/ui.lib.php:835 ../../admin/mail.php:133
-#: ../../templates/sidebar.inc.php:34 ../../templates/sidebar.inc.php:158
+#: ../../lib/ui.lib.php:843 ../../admin/mail.php:134
+#: ../../templates/sidebar.inc.php:34 ../../templates/sidebar.inc.php:156
 #: ../../templates/show_genre.inc.php:32
-#: ../../templates/show_local_catalog_info.inc.php:34
+#: ../../templates/show_local_catalog_info.inc.php:28
 #: ../../ampache/templates/sidebar.inc.php:34
 #: ../../ampache/templates/sidebar.inc.php:158
-#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:68
+#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:74
 msgid "Albums"
 msgstr "Albums"
 
-#: ../../lib/ui.lib.php:839 ../../admin/mail.php:134
-#: ../../templates/sidebar.inc.php:35 ../../templates/sidebar.inc.php:157
+#: ../../lib/ui.lib.php:847 ../../admin/mail.php:135
+#: ../../templates/sidebar.inc.php:35 ../../templates/sidebar.inc.php:155
 #: ../../templates/show_genre.inc.php:35
-#: ../../templates/show_local_catalog_info.inc.php:38
+#: ../../templates/show_local_catalog_info.inc.php:29
 #: ../../ampache/templates/sidebar.inc.php:35
 #: ../../ampache/templates/sidebar.inc.php:157
 msgid "Artists"
 msgstr "Artistes"
 
-#: ../../lib/ui.lib.php:847 ../../templates/sidebar.inc.php:112
+#: ../../lib/ui.lib.php:855 ../../templates/sidebar.inc.php:110
 #: ../../ampache/templates/sidebar.inc.php:112
 #, fuzzy
 msgid "Statistics"
 msgstr "Statistiques des catalogues"
 
-#: ../../lib/ui.lib.php:1421
+#: ../../lib/ui.lib.php:1429
 msgid "Manage Users"
 msgstr "G&eacute;rer les utilisateurs"
 
-#: ../../lib/ui.lib.php:1422
+#: ../../lib/ui.lib.php:1430
 msgid "Add a new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: ../../lib/general.lib.php:670 ../../templates/show_user_stats.inc.php:32
+#: ../../lib/general.lib.php:670 ../../templates/show_box.inc.php:30
+#: ../../templates/show_user_stats.inc.php:32
 #: ../../templates/show_user_stats.inc.php:43
 #: ../../templates/show_user_stats.inc.php:54
 #: ../../templates/show_user_recommendations.inc.php:32
@@ -790,7 +789,7 @@ msgstr ""
 msgid "Do you really want to clear the statistics for this catalog?"
 msgstr "Voulez-vous vraiment effacer les statistiques de ce catalogue ?"
 
-#: ../../admin/catalog.php:230 ../../templates/show_admin_tools.inc.php:68
+#: ../../admin/catalog.php:230 ../../templates/show_admin_tools.inc.php:76
 msgid "Clear Catalog Stats"
 msgstr "Vider les statistiques des catalogues"
 
@@ -848,30 +847,34 @@ msgstr "Fichiers enlev&eacute;s"
 msgid "Flag Removed from"
 msgstr ""
 
-#: ../../admin/flag.php:274
+#: ../../admin/flag.php:270
+msgid "Flags Updated"
+msgstr "marqu&eacutee ajout&eacute;e"
+
+#: ../../admin/flag.php:289
 msgid "Songs Disabled"
 msgstr "Morceaux d&eacute;sactiv&eacute;s"
 
-#: ../../admin/flag.php:274
+#: ../../admin/flag.php:289
 msgid "The requested song(s) have been disabled"
 msgstr ""
 "Le(s) morceau(x) demand&eacute;(s) ont(a) &eacute;t&eacute; d&eacute;"
 "sactiv&eacute;(s)"
 
-#: ../../admin/flag.php:285
+#: ../../admin/flag.php:300
 msgid "Songs Enabled"
 msgstr "Morceaux activ&eacute;s"
 
-#: ../../admin/flag.php:285
+#: ../../admin/flag.php:300
 msgid "The requested song(s) have been enabled"
 msgstr ""
 
-#: ../../admin/flag.php:290
+#: ../../admin/flag.php:305
 #, fuzzy
 msgid "Flagged Records"
 msgstr "Marqu&eacute; par"
 
-#: ../../admin/preferences.php:59 ../../admin/preferences.php:82
+#: ../../admin/preferences.php:60 ../../admin/preferences.php:83
 #, fuzzy
 msgid "Site"
 msgstr "Taille"
@@ -920,67 +923,72 @@ msgstr "Erreur: Le nom d'utilisateur est obligatoire"
 msgid "Error Passwords don't match"
 msgstr "Erreur: Les mots de passe ne correspondent pas"
 
-#: ../../admin/users.php:117 ../../register.php:138
+#: ../../admin/users.php:120 ../../register.php:138
 msgid "Error Username already exists"
 msgstr "Erreur: Nom d'utilisateur d&eacute;j&aacute; existant"
 
-#: ../../admin/users.php:139
+#: ../../admin/users.php:142
 msgid "Deletion Request"
 msgstr ""
 
-#: ../../admin/users.php:140
+#: ../../admin/users.php:143
 msgid "Are you sure you want to permanently delete"
 msgstr "Êtes-vous sûr de vouloir supprimer d&eacute;finitivement"
 
-#: ../../admin/users.php:145 ../../templates/show_confirm_action.inc.php:29
+#: ../../admin/users.php:148 ../../templates/show_confirm_action.inc.php:29
 #: ../../templates/show_search.inc:78
 msgid "No"
 msgstr "Non"
 
-#: ../../admin/users.php:147
+#: ../../admin/users.php:150
 msgid "User Deleted"
 msgstr "Utilisateur supprim&eacute;"
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:153
 msgid "Delete Error"
 msgstr "Erreur de suppression"
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:153
 msgid "Unable to delete last Admin User"
 msgstr "Il est impossible de supprimer le dernier administrateur"
 
-#: ../../admin/mail.php:131 ../../templates/show_local_catalog_info.inc.php:26
+#: ../../admin/mail.php:83 ../../templates/show_mail_users.inc.php:41
+#: ../../templates/show_local_catalog_info.inc.php:23
+msgid "Catalog Statistics"
+msgstr "Statistiques des catalogues"
+
+#: ../../admin/mail.php:132 ../../templates/show_local_catalog_info.inc.php:27
 msgid "Total Users"
 msgstr "Total des utilisateurs"
 
-#: ../../admin/mail.php:132 ../../templates/show_local_catalog_info.inc.php:30
+#: ../../admin/mail.php:133 ../../templates/show_local_catalog_info.inc.php:26
 msgid "Connected Users"
 msgstr "Utilisateurs connect&eacute;s"
 
-#: ../../admin/mail.php:135 ../../templates/sidebar.inc.php:155
+#: ../../admin/mail.php:136 ../../templates/sidebar.inc.php:153
 #: ../../templates/show_genre.inc.php:38
-#: ../../templates/show_local_catalog_info.inc.php:42
+#: ../../templates/show_local_catalog_info.inc.php:30
 #: ../../templates/show_genres.inc.php:37
 #: ../../ampache/templates/sidebar.inc.php:155
-#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:67
+#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:73
 #: ../../templates/show_albums.inc:43 ../../templates/show_albums.inc:86
 msgid "Songs"
 msgstr "Morceaux"
 
-#: ../../admin/mail.php:136 ../../templates/show_local_catalog_info.inc.php:46
+#: ../../admin/mail.php:137 ../../templates/show_local_catalog_info.inc.php:31
 msgid "Catalog Size"
 msgstr "Taille du catalogue"
 
-#: ../../admin/mail.php:137 ../../templates/show_local_catalog_info.inc.php:50
+#: ../../admin/mail.php:138 ../../templates/show_local_catalog_info.inc.php:32
 msgid "Catalog Time"
 msgstr "Dur&eacute;e du catalogue"
 
-#: ../../admin/mail.php:219
+#: ../../admin/mail.php:252
 #, fuzzy
 msgid "E-mail Sent"
 msgstr "Gestion d'e-mail"
 
-#: ../../admin/mail.php:220
+#: ../../admin/mail.php:253
 msgid "Your E-mail was successfully sent."
 msgstr ""
 
@@ -1043,21 +1051,21 @@ msgid "Incorrect Tags"
 msgstr ""
 
 #: ../../templates/show_flag.inc.php:70
-#: ../../templates/show_flagged.inc.php:27
+#: ../../templates/show_flagged.inc.php:30
 msgid "Flag"
 msgstr "Marque"
 
 #: ../../templates/show_install_account.inc.php:36
-#: ../../templates/show_install_lang.inc.php:10
+#: ../../templates/show_install_lang.inc.php:32
 #: ../../templates/show_install_config.inc:36
-#: ../../templates/show_install.inc:10
+#: ../../templates/show_install.inc:32
 msgid "Ampache Installation"
 msgstr "Installation d'Ampache"
 
 #: ../../templates/show_install_account.inc.php:43
-#: ../../templates/show_install_lang.inc.php:17
+#: ../../templates/show_install_lang.inc.php:39
 #: ../../templates/show_install_config.inc:42
-#: ../../templates/show_install.inc:18
+#: ../../templates/show_install.inc:40
 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 "
@@ -1068,9 +1076,9 @@ msgstr ""
 "assurez-vous d'avoir tous les pr&eacute;-requis"
 
 #: ../../templates/show_install_account.inc.php:46
-#: ../../templates/show_install_lang.inc.php:20
+#: ../../templates/show_install_lang.inc.php:42
 #: ../../templates/show_install_config.inc:45
-#: ../../templates/show_install.inc:21
+#: ../../templates/show_install.inc:43
 msgid ""
 "A MySQL Server with a username and password that can create/modify databases"
 msgstr ""
@@ -1086,9 +1094,9 @@ msgstr ""
 "sql et /config/ampache.cfg.dist.php"
 
 #: ../../templates/show_install_account.inc.php:49
-#: ../../templates/show_install_lang.inc.php:24
+#: ../../templates/show_install_lang.inc.php:46
 #: ../../templates/show_install_config.inc:48
-#: ../../templates/show_install.inc:25
+#: ../../templates/show_install.inc:47
 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 "
@@ -1103,7 +1111,7 @@ msgstr ""
 
 #: ../../templates/show_install_account.inc.php:53
 #: ../../templates/show_install_config.inc:52
-#: ../../templates/show_install.inc:30
+#: ../../templates/show_install.inc:52
 msgid "Step 1 - Creating and Inserting the Ampache Database"
 msgstr ""
 "Etape 1 - Cr&eacute;ation et alimentation de la base de donn&eacute;es "
@@ -1115,7 +1123,7 @@ msgstr "Etape 2 - Cr&eacute;ation du fichier ampache.cfg.php"
 
 #: ../../templates/show_install_account.inc.php:55
 #: ../../templates/show_install_config.inc:57
-#: ../../templates/show_install.inc:35
+#: ../../templates/show_install.inc:57
 msgid "Step 3 - Setup Initial Account"
 msgstr "Etape 3 - Param&egrave;tres du compte initial"
 
@@ -1133,7 +1141,7 @@ msgid "Create Admin Account"
 msgstr "Cr&eacute;er un compte administrateur"
 
 #: ../../templates/show_install_account.inc.php:65
-#: ../../templates/show_user_registration.inc.php:99
+#: ../../templates/show_user_registration.inc.php:98
 #: ../../templates/show_edit_user.inc.php:40
 #: ../../templates/show_recently_played.inc.php:29
 #: ../../templates/show_users.inc:43
@@ -1141,7 +1149,7 @@ msgid "Username"
 msgstr "Nom d'utilisateur"
 
 #: ../../templates/show_install_account.inc.php:69
-#: ../../templates/show_user_registration.inc.php:127
+#: ../../templates/show_user_registration.inc.php:126
 #: ../../templates/show_edit_user.inc.php:63
 #: ../../templates/show_login_form.inc:37
 msgid "Password"
@@ -1152,7 +1160,7 @@ msgid "Create Account"
 msgstr "Cr&eacute;er un compte"
 
 #: ../../templates/show_playlists.inc.php:28
-#: ../../templates/sidebar.inc.php:106
+#: ../../templates/sidebar.inc.php:104
 #: ../../ampache/templates/sidebar.inc.php:106
 msgid "Playlists"
 msgstr "Listes de lecture"
@@ -1184,22 +1192,20 @@ msgstr "voir"
 
 #: ../../templates/show_playlists.inc.php:55
 #: ../../templates/show_play_selected.inc.php:50
-#: ../../templates/show_artists.inc:58 ../../templates/show_access_list.inc:67
+#: ../../templates/show_access_list.inc:67
 msgid "Edit"
 msgstr "&eacute;diter"
 
 #: ../../templates/show_playlists.inc.php:61
 #: ../../templates/show_tv_adminctl.inc.php:44
-#: ../../templates/show_genres.inc.php:47 ../../templates/show_artists.inc:54
 #: ../../templates/show_random_play.inc:82
 msgid "Play"
 msgstr "Jouer"
 
 #: ../../templates/show_playlists.inc.php:63
-#: ../../templates/sidebar.inc.php:135
+#: ../../templates/sidebar.inc.php:133
 #: ../../templates/show_localplay_status.inc.php:62
 #: ../../ampache/templates/sidebar.inc.php:135
-#: ../../templates/show_artists.inc:56
 msgid "Random"
 msgstr "Al&eacute;atoire"
 
@@ -1231,19 +1237,19 @@ msgstr "Artiste, Album et Titre"
 
 #: ../../templates/show_duplicates.inc.php:44
 msgid "Select Best Guess"
-msgstr ""
+msgstr "Choisi le meilleur conjecture"
 
 #: ../../templates/show_confirm_action.inc.php:28
 #: ../../templates/show_search.inc:77
 msgid "Yes"
 msgstr "Oui"
 
-#: ../../templates/show_tv.inc.php:56
+#: ../../templates/show_tv.inc.php:42
 #, fuzzy
 msgid "Controls"
 msgstr "Sections administrateur"
 
-#: ../../templates/show_tv.inc.php:74
+#: ../../templates/show_tv.inc.php:57
 #: ../../templates/show_localplay.inc.php:42
 #, fuzzy
 msgid "Current Playlist"
@@ -1271,7 +1277,7 @@ msgstr "Nom"
 
 #: ../../templates/show_playlist_edit.inc.php:36
 #: ../../templates/show_add_playlist.inc.php:32
-#: ../../templates/show_random_play.inc:50
+#: ../../templates/show_random_play.inc:49
 #: ../../templates/show_access_list.inc:51
 msgid "Type"
 msgstr "Type"
@@ -1282,10 +1288,11 @@ msgstr "Public"
 
 #: ../../templates/show_playlist_edit.inc.php:40
 msgid "Private"
-msgstr ""
+msgstr "Priv&eacute;"
 
 #: ../../templates/show_playlist_edit.inc.php:48
 #: ../../templates/show_tv_adminctl.inc.php:51
+#: ../../templates/show_flagged.inc.php:66
 #: ../../templates/show_play_selected.inc.php:64
 #: ../../templates/show_preference_admin.inc.php:47
 #: ../../templates/show_edit_access.inc:78
@@ -1320,41 +1327,36 @@ msgstr "Liste d'acc&egrave;s"
 msgid "Song Title"
 msgstr "Titre du morceau"
 
-#: ../../templates/sidebar.inc.php:38
-#: ../../ampache/templates/sidebar.inc.php:38
-msgid "Lists"
-msgstr "Listes"
-
-#: ../../templates/sidebar.inc.php:62
+#: ../../templates/sidebar.inc.php:60
 #: ../../templates/show_tv_playlist.inc.php:48
 #: ../../templates/show_preference_admin.inc.php:39
 #: ../../ampache/templates/sidebar.inc.php:62
 msgid "Admin"
 msgstr "Administration"
 
-#: ../../templates/sidebar.inc.php:156
+#: ../../templates/sidebar.inc.php:154
 #: ../../ampache/templates/sidebar.inc.php:156
 #: ../../templates/show_random_play.inc:56
 msgid "Minutes"
 msgstr "Minutes"
 
-#: ../../templates/sidebar.inc.php:159
+#: ../../templates/sidebar.inc.php:157
 #: ../../ampache/templates/sidebar.inc.php:159
 #: ../../templates/show_random_play.inc:53
 msgid "Less Played"
 msgstr "Moins jou&eacute;"
 
-#: ../../templates/sidebar.inc.php:164
+#: ../../templates/sidebar.inc.php:162
 #: ../../ampache/templates/sidebar.inc.php:164
 msgid "Enqueue"
 msgstr "En Liste"
 
-#: ../../templates/sidebar.inc.php:187
+#: ../../templates/sidebar.inc.php:185
 #: ../../ampache/templates/sidebar.inc.php:187
 msgid "Democratic View"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:191
+#: ../../templates/sidebar.inc.php:189
 #: ../../ampache/templates/sidebar.inc.php:191
 msgid "Logout"
 msgstr "D&eacute;connexion"
@@ -1369,9 +1371,9 @@ msgstr "Catalogues"
 #: ../../templates/show_modules.inc.php:42
 #: ../../templates/show_modules.inc.php:75
 #: ../../templates/show_genres.inc.php:38
-#: ../../templates/show_flagged.inc.php:29
+#: ../../templates/show_flagged.inc.php:32
 #: ../../templates/show_localplay_playlist.inc.php:29
-#: ../../templates/show_artists.inc:44 ../../templates/show_artists.inc:69
+#: ../../templates/show_artists.inc:44 ../../templates/show_artists.inc:75
 #: ../../templates/show_songs.inc:55 ../../templates/show_albums.inc:47
 #: ../../templates/show_albums.inc:90 ../../templates/show_access_list.inc:52
 #: ../../templates/show_artist.inc:39
@@ -1384,70 +1386,78 @@ msgstr "ajouter"
 
 #: ../../templates/show_admin_tools.inc.php:44
 msgid "Verify"
-msgstr ""
+msgstr "V&eacute;rifier"
 
 #: ../../templates/show_admin_tools.inc.php:46
 #, fuzzy
 msgid "Clean"
 msgstr "Supprimer les informations"
 
+#: ../../templates/show_admin_tools.inc.php:56
+msgid "Fast"
+msgstr "Rapide"
+
 #: ../../templates/show_admin_tools.inc.php:57
+msgid "Gather Art"
+msgstr ""
+
+#: ../../templates/show_admin_tools.inc.php:65
 #, fuzzy
 msgid "No Catalogs Found"
 msgstr "Aucun catalogue trouv&eacute; !"
 
-#: ../../templates/show_admin_tools.inc.php:63
+#: ../../templates/show_admin_tools.inc.php:71
 #, fuzzy
 msgid "Clean All"
 msgstr "Nettoyer tous les Catalogues"
 
-#: ../../templates/show_admin_tools.inc.php:64
+#: ../../templates/show_admin_tools.inc.php:72
 #, fuzzy
 msgid "Verify All"
 msgstr "Tout voir"
 
-#: ../../templates/show_admin_tools.inc.php:65
+#: ../../templates/show_admin_tools.inc.php:73
 #, fuzzy
 msgid "Add to All"
 msgstr "Ajouter &aacute;"
 
-#: ../../templates/show_admin_tools.inc.php:66
+#: ../../templates/show_admin_tools.inc.php:74
 #, fuzzy
 msgid "Update All"
 msgstr "Mis &aacute; jour"
 
-#: ../../templates/show_admin_tools.inc.php:69
+#: ../../templates/show_admin_tools.inc.php:77
 #: ../../templates/show_add_catalog.inc.php:78
 msgid "Gather Album Art"
 msgstr "Recup&eacute;rer la jaquette d'album"
 
-#: ../../templates/show_admin_tools.inc.php:73
+#: ../../templates/show_admin_tools.inc.php:81
 msgid "Other Tools"
-msgstr ""
+msgstr "l'Autre ouils"
 
-#: ../../templates/show_admin_tools.inc.php:75
+#: ../../templates/show_admin_tools.inc.php:83
 msgid "Show Duplicate Songs"
 msgstr "Voir les doublons"
 
-#: ../../templates/show_admin_tools.inc.php:76
+#: ../../templates/show_admin_tools.inc.php:84
 msgid "Clear Now Playing"
 msgstr "Effacer lecture en cours"
 
-#: ../../templates/show_admin_tools.inc.php:78
+#: ../../templates/show_admin_tools.inc.php:85 ../../templates/header.inc:75
 #, fuzzy
 msgid "Generate New Config"
 msgstr "&eacute;crire la configuration"
 
-#: ../../templates/show_admin_tools.inc.php:79
+#: ../../templates/show_admin_tools.inc.php:86
 #, fuzzy
 msgid "Preferences Permissions"
 msgstr "Pr&eacute;f&eacute;rences"
 
-#: ../../templates/show_admin_tools.inc.php:81
+#: ../../templates/show_admin_tools.inc.php:87
 msgid "Export To Itunes DB"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:82
+#: ../../templates/show_admin_tools.inc.php:88
 #, fuzzy
 msgid "Check for New Version"
 msgstr "Test de la configuration"
@@ -1483,7 +1493,7 @@ msgid "Find duplicate artists"
 msgstr "Trouver des doublons"
 
 #: ../../templates/show_user.inc.php:30
-#: ../../templates/show_user_registration.inc.php:118
+#: ../../templates/show_user_registration.inc.php:117
 #: ../../templates/show_edit_user.inc.php:55
 msgid "E-mail"
 msgstr "E-mail"
@@ -1498,7 +1508,7 @@ msgid "New Password"
 msgstr "Mot de passe"
 
 #: ../../templates/show_user.inc.php:49
-#: ../../templates/show_user_registration.inc.php:136
+#: ../../templates/show_user_registration.inc.php:135
 #: ../../templates/show_edit_user.inc.php:72
 msgid "Confirm Password"
 msgstr "Confirmation du mot de passe"
@@ -1564,43 +1574,43 @@ msgstr "Pour tous"
 msgid "description"
 msgstr "Description"
 
-#: ../../templates/show_user_registration.inc.php:55
+#: ../../templates/show_user_registration.inc.php:54
 msgid "Ampache New User Registration"
 msgstr "Enregistrement d'un nouvel utilisateur Ampache"
 
-#: ../../templates/show_user_registration.inc.php:70
+#: ../../templates/show_user_registration.inc.php:69
 msgid "User Agreement"
 msgstr "Accord de l'utilisateur"
 
-#: ../../templates/show_user_registration.inc.php:80
+#: ../../templates/show_user_registration.inc.php:79
 msgid "I Accept"
 msgstr "J'accepte"
 
-#: ../../templates/show_user_registration.inc.php:94
+#: ../../templates/show_user_registration.inc.php:93
 msgid "User Information"
 msgstr "Informations de l'utilisateur"
 
-#: ../../templates/show_user_registration.inc.php:109
+#: ../../templates/show_user_registration.inc.php:108
 #: ../../templates/show_edit_user.inc.php:48
 msgid "Full Name"
 msgstr "Nom complet"
 
-#: ../../templates/show_user_registration.inc.php:156
+#: ../../templates/show_user_registration.inc.php:155
 msgid "Clear Info"
 msgstr "Supprimer les informations"
 
-#: ../../templates/show_user_registration.inc.php:157
+#: ../../templates/show_user_registration.inc.php:156
 msgid "Register User"
 msgstr "Enregistrer un utilisateur"
 
-#: ../../templates/show_install_lang.inc.php:15
-#: ../../templates/show_install.inc:16
+#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install.inc:38
 msgid "Requirements"
-msgstr ""
+msgstr "Conditions"
 
-#: ../../templates/show_install_lang.inc.php:21
+#: ../../templates/show_install_lang.inc.php:43
 #: ../../templates/show_install_config.inc:46
-#: ../../templates/show_install.inc:22
+#: ../../templates/show_install.inc:44
 msgid ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
 "ampache.cfg.php.dist file"
@@ -1608,9 +1618,9 @@ msgstr ""
 "Votre serveur web a des droits en lecture sur les fichiers /sql/ampache.sql "
 "et /config/ampache.cfg.php.dist"
 
-#: ../../templates/show_install_lang.inc.php:50
+#: ../../templates/show_install_lang.inc.php:72
 msgid "Start configuration"
-msgstr ""
+msgstr "Commenc&eacute; configuration"
 
 #: ../../templates/show_modules.inc.php:38
 #, fuzzy
@@ -1637,7 +1647,7 @@ msgstr "Utilisateur activ&eacute;"
 
 #: ../../templates/show_modules.inc.php:61
 #: ../../templates/show_modules.inc.php:96
-#: ../../templates/show_flagged.inc.php:50
+#: ../../templates/show_flagged.inc.php:57
 #: ../../templates/show_list_duplicates.inc.php:81
 #: ../../templates/show_localplay_playlist.inc.php:51
 #: ../../templates/show_disabled_songs.inc:44
@@ -1647,7 +1657,7 @@ msgstr "Aucun catalogue trouv&eacute; !"
 
 #: ../../templates/show_modules.inc.php:70
 msgid "Available Plugins"
-msgstr ""
+msgstr "Plugins disponible"
 
 #: ../../templates/show_modules.inc.php:73
 #, fuzzy
@@ -1676,7 +1686,7 @@ msgstr "OU"
 #: ../../templates/show_edit_album.inc.php:41
 #: ../../templates/show_edit_artist.inc.php:35
 msgid "Flag for Retagging"
-msgstr ""
+msgstr "marqu&aecute;es pour indexation"
 
 #: ../../templates/show_edit_song.inc.php:89
 #, fuzzy
@@ -1716,7 +1726,7 @@ msgid "Mail to"
 msgstr "Mail pour"
 
 #: ../../templates/show_mail_users.inc.php:45
-#: ../../templates/show_all_popular.inc.php:30 ../../index.php:66
+#: ../../templates/show_all_popular.inc.php:29
 msgid "Most Popular Albums"
 msgstr "Albums les plus populaires"
 
@@ -1726,7 +1736,7 @@ msgid "Latest Artist Additions"
 msgstr "Artistes r&eacute;cemment ajout&eacute;s"
 
 #: ../../templates/show_mail_users.inc.php:56
-#: ../../templates/show_all_popular.inc.php:27 ../../index.php:75
+#: ../../templates/show_all_popular.inc.php:26
 msgid "Most Popular Artists"
 msgstr "Artistes les plus populaires"
 
@@ -1736,38 +1746,43 @@ msgid "Latest Album Additions"
 msgstr "Albums r&eacute;cemment ajout&eacute;s"
 
 #: ../../templates/show_mail_users.inc.php:67
-#: ../../templates/show_all_popular.inc.php:40
+#: ../../templates/show_all_popular.inc.php:38
 msgid "Most Popular Songs"
 msgstr "Morceaux les plus populaires"
 
 #: ../../templates/show_mail_users.inc.php:73
+msgid "Flagged Songs"
+msgstr "Morceaux marqu&eacute;es"
+
+#: ../../templates/show_mail_users.inc.php:77
+#: ../../templates/show_admin_info.inc.php:36
+#, fuzzy
+msgid "Disabled Songs"
+msgstr "Voir les morceaux d&eacute;sactiv&eacute;s"
+
+#: ../../templates/show_mail_users.inc.php:85
 #, fuzzy
 msgid "Most Popular Threshold in days"
 msgstr "Morceaux les plus populaires"
 
-#: ../../templates/show_mail_users.inc.php:84
+#: ../../templates/show_mail_users.inc.php:96
 msgid "Subject"
 msgstr "Sujet"
 
-#: ../../templates/show_mail_users.inc.php:91
+#: ../../templates/show_mail_users.inc.php:103
 msgid "Message"
 msgstr "Message"
 
-#: ../../templates/show_mail_users.inc.php:101
+#: ../../templates/show_mail_users.inc.php:113
 msgid "Send Mail"
 msgstr "Envoyer l'e-mail"
 
-#: ../../templates/show_admin_info.inc.php:33
+#: ../../templates/show_admin_info.inc.php:32
 msgid "Last Ten Flagged Records"
-msgstr ""
+msgstr "Derri&eacute;re dix marqu&eacute;es"
 
-#: ../../templates/show_admin_info.inc.php:37
-#, fuzzy
-msgid "Disabled Songs"
-msgstr "Voir les morceaux d&eacute;sactiv&eacute;s"
-
-#: ../../templates/show_admin_info.inc.php:41
-#: ../../templates/show_flagged.inc.php:57
+#: ../../templates/show_admin_info.inc.php:40
+#: ../../templates/show_flagged.inc.php:73
 #: ../../templates/show_ip_history.inc.php:28
 #, fuzzy
 msgid "Show All"
@@ -1788,40 +1803,52 @@ msgstr "Sections administrateur"
 
 #: ../../templates/show_tv_adminctl.inc.php:25
 #: ../../templates/show_tv_adminctl.inc.php:47
-#, fuzzy
 msgid "Base Playlist"
-msgstr "Nouvelle liste de lecture"
+msgstr "liste de lecture accueil"
 
 #: ../../templates/show_tv_adminctl.inc.php:36
 #: ../../templates/show_localplay.inc.php:32
-#, fuzzy
 msgid "Clear Playlist"
-msgstr "Nouvelle liste de lecture"
+msgstr "cr&eacute;&eacute;e liste de lecture"
 
 #: ../../templates/show_confirmation.inc.php:26
 msgid "Continue"
 msgstr "Continuer"
 
 #: ../../templates/show_confirmation.inc.php:28
-#: ../../templates/show_preferences.inc:95
+#: ../../templates/show_preferences.inc:96
 #: ../../templates/show_similar_artists.inc:74
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../../templates/show_flagged.inc.php:26
+#: ../../templates/show_flagged.inc.php:27
+#: ../../templates/show_disabled_songs.inc:25
+#: ../../templates/show_artist.inc:33
+msgid "Select"
+msgstr "Selectionner"
+
+#: ../../templates/show_flagged.inc.php:28
 #, fuzzy
 msgid "Object"
 msgstr "Sujet"
 
-#: ../../templates/show_flagged.inc.php:28
+#: ../../templates/show_flagged.inc.php:29
+#: ../../templates/show_preference_admin.inc.php:38
+#: ../../templates/show_add_access.inc:47
+#: ../../templates/show_access_list.inc:49
+#: ../../templates/show_edit_access.inc:47
+msgid "User"
+msgstr "Utilisateur"
+
+#: ../../templates/show_flagged.inc.php:31
 msgid "Status"
 msgstr "Statut"
 
-#: ../../templates/show_flagged.inc.php:39
+#: ../../templates/show_flagged.inc.php:63
 msgid "Reject"
 msgstr "Refuser"
 
-#: ../../templates/show_flagged.inc.php:43
+#: ../../templates/show_flagged.inc.php:64
 msgid "Approve"
 msgstr "Approuver"
 
@@ -1838,14 +1865,18 @@ msgstr "Ins&eacute;rer la valeur en cours"
 msgid "Update id3 tags"
 msgstr "Mettre &aacute; jour les balises ID3"
 
-#: ../../templates/show_all_recent.inc.php:27
+#: ../../templates/show_all_recent.inc.php:25
 msgid "Newest Artist Additions"
 msgstr "Artistes r&eacute;cemment ajout&eacute;s"
 
-#: ../../templates/show_all_recent.inc.php:30 ../../index.php:82
+#: ../../templates/show_all_recent.inc.php:28
 msgid "Newest Album Additions"
 msgstr "Albums r&eacute;cemment ajout&eacute;s"
 
+#: ../../templates/show_all_recent.inc.php:31
+msgid "Newest Live Stream Additions"
+msgstr "Flux Live r&eacute;cemment ajout&eacute;s"
+
 #: ../../templates/show_get_albumart.inc.php:23
 msgid "Customize Search"
 msgstr "Recherche personnalis&eacute;e"
@@ -1901,10 +1932,18 @@ msgstr "Cr&eacute;er un nouvelle liste de lecture"
 msgid "Delete Empty Playlists"
 msgstr "Importer une liste de lecture"
 
-#: ../../templates/show_all_popular.inc.php:37
+#: ../../templates/show_all_popular.inc.php:32
 msgid "Most Popular Genres"
 msgstr "Genres les plus populaires"
 
+#: ../../templates/show_all_popular.inc.php:41
+msgid "Most Popular Live Streams"
+msgstr "Flux live plus populaire"
+
+#: ../../templates/show_all_popular.inc.php:44
+msgid "Most Popular Tags"
+msgstr "Tags plus populaire"
+
 #: ../../templates/show_play_selected.inc.php:28
 msgid "Play Selected"
 msgstr "Jouer la s&eacute;lection"
@@ -2050,22 +2089,10 @@ msgid "Filename Pattern"
 msgstr "Motif de nom de fichier"
 
 #: ../../templates/show_add_catalog.inc.php:82
-msgid "ID3V2 Tags"
-msgstr "Balises ID3v2"
-
-#: ../../templates/show_add_catalog.inc.php:86
-msgid "Amazon"
-msgstr "Amazon"
-
-#: ../../templates/show_add_catalog.inc.php:90
-msgid "File Folder"
-msgstr "Dossier des fichiers"
-
-#: ../../templates/show_add_catalog.inc.php:98
 msgid "Build Playlists from m3u Files"
 msgstr "Construire les listes de lecture &aacute; partir des fichiers m3u"
 
-#: ../../templates/show_add_catalog.inc.php:106
+#: ../../templates/show_add_catalog.inc.php:90
 msgid "Add Catalog"
 msgstr "Ajouter un catalogue"
 
@@ -2109,7 +2136,7 @@ msgstr "Voir les morceaux d&eacute;sactiv&eacute;s"
 
 #: ../../templates/show_ip_history.inc.php:23
 msgid "IP History"
-msgstr ""
+msgstr "Histoire d'IP"
 
 #: ../../templates/show_ip_history.inc.php:26
 msgid "Show Unique"
@@ -2129,9 +2156,8 @@ msgid "Recommendations"
 msgstr ""
 
 #: ../../templates/show_user_recommendations.inc.php:29
-#, fuzzy
-msgid "Recommended Aritsts"
-msgstr "Recommende les artistes"
+msgid "Recommended Artists"
+msgstr "Recommende les Artists"
 
 #: ../../templates/show_user_recommendations.inc.php:40
 msgid "Recommended Albums"
@@ -2157,13 +2183,6 @@ msgstr "Niveau"
 msgid "Guest"
 msgstr "Invite"
 
-#: ../../templates/show_preference_admin.inc.php:38
-#: ../../templates/show_add_access.inc:47
-#: ../../templates/show_access_list.inc:49
-#: ../../templates/show_edit_access.inc:47
-msgid "User"
-msgstr "Utilisateur"
-
 #: ../../templates/show_edit_album.inc.php:23
 #, fuzzy
 msgid "Edit Album"
@@ -2212,21 +2231,29 @@ msgstr "ann&eacute;e"
 msgid "Recently Played"
 msgstr "Moins jou&eacute;"
 
+#: ../../templates/show_recently_played.inc.php:33
+msgid "Last Played"
+msgstr "Derniers jouers"
+
 #: ../../templates/show_edit_artist.inc.php:23
 #, fuzzy
 msgid "Edit Artist"
 msgstr "Artiste"
 
+#: ../../templates/show_random_albums.inc.php:23
+msgid "Albums of the Moment"
+msgstr "l'Album de cette moment"
+
 #: ../../localplay.php:50 ../../localplay.php:58
 msgid "Song(s) Removed from Playlist"
-msgstr ""
+msgstr "Morceaux Supprim&eacute;"
 
 #: ../../localplay.php:77
 #, fuzzy
 msgid "Localplay Init Failed"
 msgstr "Controle de lecture locale"
 
-#: ../../browse.php:48 ../../albums.php:191
+#: ../../browse.php:48 ../../albums.php:213
 msgid "Show Albums starting with"
 msgstr "Voir les albums commen&ccedil;ant par"
 
@@ -2234,7 +2261,7 @@ msgstr "Voir les albums commen&ccedil;ant par"
 msgid "Show Artists starting with"
 msgstr "Voir les artistes commen&ccedil;ant par"
 
-#: ../../browse.php:123
+#: ../../browse.php:124
 #, fuzzy
 msgid "Show Titles Starting With"
 msgstr "Voir les artistes commen&ccedil;ant par"
@@ -2243,6 +2270,10 @@ msgstr "Voir les artistes commen&ccedil;ant par"
 msgid "Error: No Keyword Entered"
 msgstr "Erreur: Aucun mot cl&eacute; entr&eacute;"
 
+#: ../../ampache/templates/sidebar.inc.php:38
+msgid "Lists"
+msgstr "Listes"
+
 #: ../../ratings.php:33
 msgid "Rating Updated"
 msgstr "Score mis &aacute; jour"
@@ -2263,7 +2294,7 @@ msgstr ""
 msgid "No local account found"
 msgstr ""
 
-#: ../../login.php:177
+#: ../../login.php:176
 msgid "Message of the Day"
 msgstr "Message de Jour"
 
@@ -2274,43 +2305,41 @@ msgstr "Erreur : Mot de passe ne correspondant pas ou vide"
 #: ../../preferences.php:61
 #, fuzzy
 msgid "Password Updated"
-msgstr "Liste de lecture mise &aacute; jour"
+msgstr "Mot de passe mise &aacute; jour"
 
 #: ../../update.php:73
-#, fuzzy
 msgid "Ampache Update"
 msgstr "Mode debogage d'Ampache"
 
-#: ../../tv.php:61
-#, fuzzy
+#: ../../tv.php:62
 msgid "Playlist Cleared"
 msgstr "Liste de lecture cr&eacute;&eacute;e"
 
-#: ../../artists.php:91 ../../albums.php:169
+#: ../../artists.php:91 ../../albums.php:191
 msgid "Starting Update from Tags"
 msgstr "D&eacute;marrage de la mise &aacute; jour &aacute; partir des balises"
 
-#: ../../artists.php:96 ../../albums.php:174
+#: ../../artists.php:96 ../../albums.php:196
 msgid "Update From Tags Complete"
 msgstr "Mise &aacute; jour &aacute; partir des balises termin&eacute;e"
 
-#: ../../artists.php:97 ../../albums.php:175
+#: ../../artists.php:97 ../../albums.php:197
 msgid "Return"
 msgstr "Retour"
 
-#: ../../activate.php:44
+#: ../../activate.php:43
 msgid "No user with this name registered"
 msgstr "Pas d'utilisateur enregistr&eacute; avec ce nom"
 
-#: ../../activate.php:48
+#: ../../activate.php:47
 msgid "The validation key used isn't correct."
 msgstr "La cl&eacute; de validation utilis&eacute;e n'est pas correcte."
 
-#: ../../activate.php:53
+#: ../../activate.php:52
 msgid "User activated"
 msgstr "Utilisateur activ&eacute;"
 
-#: ../../activate.php:53
+#: ../../activate.php:52
 msgid "This User ID is activated and can be used"
 msgstr "Cet identifiant utilisateur est actif et peut etre utilis&eacute;"
 
@@ -2320,7 +2349,7 @@ msgstr "Liste de lecture supprim&eacute;e"
 
 #: ../../playlist.php:46
 msgid "The Requested Playlist has been deleted"
-msgstr ""
+msgstr "Liste de lecture supprim&eacute;e"
 
 #: ../../playlist.php:56
 msgid "Are you sure you want to delete this playlist"
@@ -2353,12 +2382,10 @@ msgid "has been updated and is now"
 msgstr " a &eacute;t&eacute; mis &aacute; jour"
 
 #: ../../playlist.php:166
-#, fuzzy
 msgid "Playlist Imported"
 msgstr "Liste de lecture cr&eacute;&eacute;e"
 
 #: ../../playlist.php:195
-#, fuzzy
 msgid "Empty Playlists Deleted"
 msgstr "Liste de lecture supprim&eacute;e"
 
@@ -2369,24 +2396,23 @@ msgstr "Marqu&eacute; par"
 
 #: ../../flag.php:46
 msgid "The specified item has been flagged"
-msgstr ""
+msgstr "Marqu&eacute; par"
 
 #: ../../albums.php:48
 msgid "Album Art Cleared"
 msgstr "Jaquettes d'album vid&eacute;es"
 
 #: ../../albums.php:48
-#, fuzzy
 msgid "Album Art information has been removed from the database"
 msgstr ""
 "Les informations de jaquettes d'albums ont &eacute;t&eacute; supprim&eacute;"
 "es de la base de donn&eacute;es"
 
-#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:133
+#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:159
 msgid "Album Art Not Located"
 msgstr "Jaquette d'album non trouv&eacute;e"
 
-#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:133
+#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:159
 #, fuzzy
 msgid ""
 "Album Art could not be located at this time. This may be due to write access "
@@ -2395,7 +2421,7 @@ msgstr ""
 "Pas de jaquette d'album trouv&eacute;e. Cel&aacute; peut etre du &aacute; "
 "une surcharge temporaire d'Amazon ou un album inconnu de leur catalogue"
 
-#: ../../albums.php:79 ../../albums.php:162
+#: ../../albums.php:79 ../../albums.php:106 ../../albums.php:185
 msgid "Album Art Inserted"
 msgstr "Jaquette d'album incluse"
 
@@ -2405,7 +2431,7 @@ msgstr ""
 
 #: ../../register.php:88
 msgid "Error Captcha Failed"
-msgstr ""
+msgstr "Erreur Captcha s'est cassé"
 
 #: ../../register.php:95
 msgid "You <U>must</U> accept the user agreement"
@@ -2431,11 +2457,11 @@ msgstr "Vos mots de passe ne correspondent pas"
 msgid "Error: Insert Failed"
 msgstr "Erreur : Enregistrement non effectu&eacute;"
 
-#: ../../register.php:170
+#: ../../register.php:169
 msgid "Registration Complete"
 msgstr "Enregistrement termin&eacute;"
 
-#: ../../bin/print_tags.php.inc:63
+#: ../../bin/print_tags.php.inc:64
 msgid ""
 "[print_tags.php.inc]\n"
 "This commandline script will display the tag information for the specified "
@@ -2449,7 +2475,7 @@ msgstr ""
 "comme elles apparaitrons dans Ampache. \n"
 "        \n"
 
-#: ../../bin/print_tags.php.inc:69
+#: ../../bin/print_tags.php.inc:70
 msgid "Filename:"
 msgstr "Nom de fichier :"
 
@@ -2524,19 +2550,13 @@ msgstr "Jaquette d'album"
 msgid "Click to close window"
 msgstr "Cliquer pour fermer la fenetre"
 
-#: ../../templates/show_disabled_songs.inc:25
-#: ../../templates/show_artist.inc:33
-msgid "Select"
-msgstr "Selectionner"
-
 #: ../../templates/show_disabled_songs.inc:30
 msgid "Addition Time"
-msgstr ""
+msgstr "Le temp d'ajout"
 
-#: ../../templates/show_disabled_songs.inc:48
-#, fuzzy
+#: ../../templates/show_disabled_songs.inc:49
 msgid "Remove"
-msgstr "Distant"
+msgstr "Effacement"
 
 #: ../../templates/list_header.inc:110
 msgid "Prev"
@@ -2546,10 +2566,14 @@ msgstr "Pr&eacute;c&eacute;dant"
 msgid "Next"
 msgstr "Suivant"
 
-#: ../../templates/header.inc:64 ../../ampache/templates/header.inc:64
+#: ../../templates/header.inc:63 ../../ampache/templates/header.inc:64
 msgid "You are currently logged in as"
 msgstr "Vous êtes actuellement connect&eacute; en tant que"
 
+#: ../../templates/header.inc:74
+msgid "Error Config File Out of Date"
+msgstr "Erreur la configuration est vieux"
+
 #: ../../templates/show_songs.inc:47
 msgid "Song title"
 msgstr "Titre du morceau"
@@ -2558,17 +2582,12 @@ msgstr "Titre du morceau"
 msgid "Rating"
 msgstr "Score"
 
-#: ../../templates/show_songs.inc:176
+#: ../../templates/show_songs.inc:183
 msgid "Total"
 msgstr "Total"
 
-#: ../../templates/show_songs.inc:194
-#, fuzzy
-msgid "** Indicates flagged songs"
-msgstr "Voir les morceaux marqu&eacute;s"
-
 #: ../../templates/show_install_config.inc:53
-#: ../../templates/show_install.inc:34
+#: ../../templates/show_install.inc:56
 msgid "Step 2 - Creating the Ampache.cfg.php file"
 msgstr "&eacute;tape 2 - Cr&eacute;ation du fichier Ampache.cfg.php"
 
@@ -2588,12 +2607,12 @@ msgid "Web Path"
 msgstr "Chemin d'acc&egrave;s web"
 
 #: ../../templates/show_install_config.inc:68
-#: ../../templates/show_install.inc:42
+#: ../../templates/show_install.inc:64
 msgid "Desired Database Name"
 msgstr "Nom de la base de donn&eacute;es"
 
 #: ../../templates/show_install_config.inc:72
-#: ../../templates/show_install.inc:46
+#: ../../templates/show_install.inc:68
 msgid "MySQL Hostname"
 msgstr "H&ocirc;te MySQL"
 
@@ -2639,47 +2658,45 @@ msgstr "R&eacute;initialiser la jaquette d'album"
 msgid "Find Album Art"
 msgstr "Trouver la jaquette d'album"
 
-#: ../../templates/show_preferences.inc:52
+#: ../../templates/show_preferences.inc:53
 msgid "Editing"
 msgstr "&eacute;dition"
 
-#: ../../templates/show_preferences.inc:52
+#: ../../templates/show_preferences.inc:53
 msgid "preferences"
 msgstr "pr&eacute;f&eacute;rences"
 
-#: ../../templates/show_preferences.inc:54
+#: ../../templates/show_preferences.inc:55
 msgid "Rebuild Preferences"
 msgstr "Reconstruire les pr&eacute;f&eacute;rences"
 
-#: ../../templates/show_preferences.inc:61
+#: ../../templates/show_preferences.inc:62
 msgid "Interface"
-msgstr ""
+msgstr "L'Interface"
 
-#: ../../templates/show_preferences.inc:64
+#: ../../templates/show_preferences.inc:65
 #, fuzzy
 msgid "Streaming"
 msgstr "Flux"
 
-#: ../../templates/show_preferences.inc:67
-#, fuzzy
+#: ../../templates/show_preferences.inc:68
 msgid "Options"
 msgstr "Actions"
 
-#: ../../templates/show_preferences.inc:71
+#: ../../templates/show_preferences.inc:72
 msgid "Account"
 msgstr "Compte"
 
-#: ../../templates/show_preferences.inc:75
-#, fuzzy
+#: ../../templates/show_preferences.inc:76
 msgid "System"
-msgstr "Flux"
+msgstr "Le Serveur"
 
-#: ../../templates/show_preferences.inc:78
+#: ../../templates/show_preferences.inc:79
 #, fuzzy
 msgid "Modules"
 msgstr "Mode"
 
-#: ../../templates/show_preferences.inc:91
+#: ../../templates/show_preferences.inc:92
 msgid "Update Preferences"
 msgstr "Mise &aacute; jour des pr&eacute;f&eacute;rences"
 
@@ -2714,13 +2731,13 @@ msgstr "d'un catalogue"
 
 #: ../../templates/show_random_play.inc:67
 msgid "Size Limit"
-msgstr ""
+msgstr "Limite de Taille"
 
 #: ../../templates/show_random_play.inc:70 ../../templates/show_search.inc:122
 msgid "Unlimited"
 msgstr "illimit&eacute;"
 
-#: ../../templates/show_install.inc:32
+#: ../../templates/show_install.inc:54
 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 "
@@ -2731,28 +2748,28 @@ msgstr ""
 "cr&eacute;ation. Cette &eacute;tape peut prendre un certain temps d&eacute;"
 "pendant de la vitesse de votre ordinateur"
 
-#: ../../templates/show_install.inc:50
+#: ../../templates/show_install.inc:72
 msgid "MySQL Administrative Username"
 msgstr "Nom d'utilisateur administrateur MySQL"
 
-#: ../../templates/show_install.inc:54
+#: ../../templates/show_install.inc:76
 msgid "MySQL Administrative Password"
 msgstr "Mot de passe administrateur MySQL"
 
-#: ../../templates/show_install.inc:58
+#: ../../templates/show_install.inc:80
 msgid "Create Database User for New Database"
 msgstr ""
 "Cr&eacute;e un utilisateur de base de donn&eacute;es pour la nouvelle base"
 
-#: ../../templates/show_install.inc:62
+#: ../../templates/show_install.inc:84
 msgid "Ampache Database Username"
 msgstr "Nom d'utilisateur de base de donn&eacute;es Ampache"
 
-#: ../../templates/show_install.inc:66
+#: ../../templates/show_install.inc:88
 msgid "Ampache Database User Password"
 msgstr "Mot de passe de l'utilisateur de base de donn&eacute;es Ampache"
 
-#: ../../templates/show_install.inc:71
+#: ../../templates/show_install.inc:93
 msgid "Insert Database"
 msgstr "Remplissage de la base de donn&eacute;es"
 
@@ -2845,7 +2862,7 @@ msgstr "Adresse de fin"
 
 #: ../../templates/show_access_list.inc:50
 msgid "Key"
-msgstr ""
+msgstr "Clef"
 
 #: ../../templates/show_access_list.inc:69
 msgid "Revoke"
@@ -2867,12 +2884,12 @@ msgstr "Date d'enregistrement"
 msgid "Activity"
 msgstr ""
 
-#: ../../templates/show_users.inc:60
+#: ../../templates/show_users.inc:61
 #, fuzzy
 msgid "Last Ip"
 msgstr "Dernier(s) vu(s)"
 
-#: ../../templates/show_users.inc:65
+#: ../../templates/show_users.inc:66
 msgid "On-line"
 msgstr "En ligne"
 
@@ -2973,12 +2990,10 @@ msgstr ""
 "recommand&eacute;"
 
 #: ../../templates/show_test.inc:121
-#, fuzzy
 msgid "PHP PCRE Support"
 msgstr "Support de PHP ICONV"
 
 #: ../../templates/show_test.inc:134
-#, fuzzy
 msgid ""
 "This test makes sure you have PCRE support compiled into your version of "
 "PHP, this is required for Ampache."
@@ -2987,7 +3002,6 @@ msgstr ""
 "Les sessions sont indispensable au bon fonctionnement d'Ampache"
 
 #: ../../templates/show_test.inc:138
-#, fuzzy
 msgid "PHP PutENV Support"
 msgstr "Support de PHP ICONV"
 
@@ -3052,9 +3066,8 @@ msgid "Please check the artists you want to merge with the current one"
 msgstr ""
 
 #: ../../templates/show_similar_artists.inc:62
-#, fuzzy
 msgid "Back"
-msgstr "Piste"
+msgstr "Avant"
 
 #: ../../templates/show_similar_artists.inc:73
 #, fuzzy
@@ -3062,7 +3075,6 @@ msgid "Rename selected"
 msgstr "Enlever les pistes s&eacute;lectionn&eacute;es"
 
 #: ../../templates/show_similar_artists.inc:83
-#, fuzzy
 msgid "Advanced Options"
 msgstr "Avanc&eacute;"
 
@@ -3102,9 +3114,8 @@ msgid "One Star"
 msgstr "Propri&eacute;taire"
 
 #: ../../templates/show_search.inc:97
-#, fuzzy
 msgid "Two Stars"
-msgstr "Total des utilisateurs"
+msgstr ""
 
 #: ../../templates/show_search.inc:98
 msgid "Three Stars"
@@ -3154,419 +3165,3 @@ msgstr "Sauver la recherche comme un morceau sur"
 #: ../../templates/show_search.inc:147
 msgid "Save"
 msgstr "Sauver"
-
-#~ msgid "Found in ID3"
-#~ msgstr "Trouv&eacute; dans ID3"
-
-#~ msgid "Found on Amazon"
-#~ msgstr "Trouv&eacute; sur Amazon"
-
-#~ msgid "Found in Folder"
-#~ msgstr "Trouv&eacute; dans le dossier"
-
-#~ msgid "Not Found"
-#~ msgstr "Non trouv&eacute;"
-
-#~ msgid "Starting Dump Album Art"
-#~ msgstr "D&eacute;marrage du dump de jaquettes d'albums"
-
-#~ msgid "Written"
-#~ msgstr "Ecrit"
-
-#~ msgid "Error unable to open file for writting"
-#~ msgstr "Erreur: Impossible d'ouvrir le fichier en &eacute;criture"
-
-#~ msgid "Album Art Dump Complete"
-#~ msgstr "Dump de jaquettes d'albums termin&eacute;"
-
-#, fuzzy
-#~ msgid "Full"
-#~ msgstr "Nom complet"
-
-#~ msgid "The file uploaded successfully"
-#~ msgstr "Le fichier a &eacute;t&eacute; envoy&eacute; avec succ&egrave;s"
-
-#~ msgid ""
-#~ "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-#~ msgstr ""
-#~ "Le fichier &aacute; charger d&eacute;passe la limite du parametre "
-#~ "upload_max_filesize de php.ini"
-
-#~ msgid ""
-#~ "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified "
-#~ "in the HTML form"
-#~ msgstr ""
-#~ "Le fichier &aacute; charger d&eacute;passe la limite du parametre "
-#~ "MAX_FILESIZE indiqu&eacute; dans la feuille HTML"
-
-#~ msgid "The uploaded file was only partially uploaded"
-#~ msgstr ""
-#~ "Le fichier n'a &eacute;t&eacute; que partiellement t&eacute;l&eacute;"
-#~ "charg&eacute;"
-
-#~ msgid "No file was uploaded"
-#~ msgstr "Le fichier n'a pas &eacute;t&eacute; envoy&eacute;"
-
-#~ msgid "Missing a temporary folder"
-#~ msgstr "R&eacute;pertoire temporaire manquant"
-
-#~ msgid "Flag song"
-#~ msgstr "Morceau marqu&eacute;"
-
-#~ 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 ""
-#~ "Marquer les morceaux suivant ayant un des probl&egrave;mes r&eacute;"
-#~ "pertori&eacute;s ci-dessous. Un administrateur du site prendra alors les "
-#~ "mesures appropri&eacute;es pour ces morceaux marqu&eacute;s"
-
-#~ msgid "Site Preferences"
-#~ msgstr "Pr&eacute;f&eacute;rences du site"
-
-#, fuzzy
-#~ msgid "User Activity"
-#~ msgstr "Utilisateur activ&eacute;"
-
-#~ msgid "catalog path"
-#~ msgstr "chemin du catalogue"
-
-#, fuzzy
-#~ msgid "You don't have any duplicate songs."
-#~ msgstr "Vous n'avez aucun catalogue"
-
-#~ msgid ""
-#~ "No Amazon Developer Key set, amazon album art searching will not work"
-#~ msgstr ""
-#~ "Pas de clef d&eacute;veloppeur Amazon d&eacute;finie, la recherche de "
-#~ "jaquette d'album par Amazon ne fonctionnera pas"
-
-#, fuzzy
-#~ msgid "Files Uploaded"
-#~ msgstr "Aucun fichier envoy&eacute;"
-
-#, fuzzy
-#~ msgid "Upload Added"
-#~ msgstr "Envoyer"
-
-#, fuzzy
-#~ msgid "Upload Deleted"
-#~ msgstr "T&eacute;l&eacute;charger la s&eacute;lection"
-
-#~ msgid "MPD Server Playlist"
-#~ msgstr "Liste de lecture de serveur MPD"
-
-#~ msgid "Refresh the Playlist Window"
-#~ msgstr "Rafraîchir la fenêtre de liste de lecture"
-
-#~ msgid "Click to shuffle (randomize) the playlist"
-#~ msgstr ""
-#~ "Cliquer pour r&eacute;ordonner al&eacute;atoirement la liste de lecture"
-
-#~ msgid "shuffle"
-#~ msgstr "m&eacute;langer"
-
-#~ msgid "Click to the clear the playlist"
-#~ msgstr "Cliquer pour nettoyer la liste de lecture"
-
-#~ msgid "Click to the remove all except the Now Playing"
-#~ msgstr "Cliquer pour tout supprimer except&eacute; la lecture en cours"
-
-#~ msgid "Direct Link"
-#~ msgstr "Lien direct"
-
-#~ msgid "Favor Unplayed"
-#~ msgstr "Favoriser les non-jou&eacute;s"
-
-#~ msgid "Add a catalog"
-#~ msgstr "Ajouter un catalogue"
-
-#~ msgid "Access Lists"
-#~ msgstr "Liste d'acc&egrave;s"
-
-#~ msgid "Show Disabled Songs"
-#~ msgstr "Voir les morceaux d&eacute;sactiv&eacute;s"
-
-#~ msgid "View flagged songs"
-#~ msgstr "Voir les morceaux marqu&eacute;s"
-
-#~ 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 ""
-#~ "Erreur: ICONV non trouv&eacute;, les balises ID3V2 ne seront pas "
-#~ "correctement import&eacute;es. Voir <a href=\"http://php.oregonstate.edu/"
-#~ "iconv\">Iconv</a> pour la mani&egrave;re d'obtenir ICONV"
-
-#~ msgid "Update Catalogs"
-#~ msgstr "Mise &aacute; jour des catalogues"
-
-#~ msgid "Add to Catalog(s)"
-#~ msgstr "Ajouter au(x) catalogue(s)"
-
-#~ msgid "Add to all Catalogs"
-#~ msgstr "Ajouter &aacute; tous les catalogues"
-
-#~ msgid "Fast Add"
-#~ msgstr "Ajout rapide"
-
-#~ msgid "Update Catalog(s)"
-#~ msgstr "Mettre &aacute; jour le(s) catalogue(s)"
-
-#~ msgid "Update All Catalogs"
-#~ msgstr "Mettre &aacute; jour tous les catalogues"
-
-#~ msgid "Fast Update"
-#~ msgstr "Mise &aacute; jour rapide"
-
-#~ msgid "Clean Catalog(s)"
-#~ msgstr "Nettoyer le(s) catalogue(s)"
-
-#~ msgid "Clean All Catalogs"
-#~ msgstr "Nettoyer tous les Catalogues"
-
-#~ msgid "You don't have any catalogs."
-#~ msgstr "Vous n'avez aucun catalogue"
-
-#~ msgid "Catalog Tools"
-#~ msgstr "Outils pour les catalogues"
-
-#~ msgid "MPD Play Control"
-#~ msgstr "Cont&ocirc;le de lecture MPD"
-
-#~ msgid "Stop"
-#~ msgstr "Stop"
-
-#~ msgid "Pause"
-#~ msgstr "Pause"
-
-#~ msgid "Loop"
-#~ msgstr "Boucle"
-
-#~ msgid "Now Playing :"
-#~ msgstr "En cours de lecture :"
-
-#~ msgid "(in "
-#~ msgstr "(dans "
-
-#~ msgid "Total Tracks"
-#~ msgstr "Total des pistes"
-
-#~ msgid "Uploading Music to Ampache"
-#~ msgstr "Envoyer de la musique vers Ampache"
-
-#~ msgid "The following Audio file formats are supported"
-#~ msgstr "Les formats audio suivant sont support&eacute;s"
-
-#~ msgid "max_upload_size"
-#~ msgstr "max_upload_size"
-
-#~ msgid "Opened for writing"
-#~ msgstr "Ouvert en &eacute;criture"
-
-#~ msgid "Error, cannot write"
-#~ msgstr "Erreur: Ne peut pas &eacute;crire"
-
-#~ msgid "Error, cannot write song in file"
-#~ msgstr "Erreur: Ne peut pas &eacute;crire le morceau dans le fichier"
-
-#~ msgid "Closed after write"
-#~ msgstr "Ferm&eacute; apr&egrave;s &eacute;criture"
-
-#~ msgid "IceCast"
-#~ msgstr "IceCast"
-
-#~ msgid "Music Player Daemon"
-#~ msgstr "Music Player Daemon"
-
-#~ msgid "SlimServer"
-#~ msgstr "SlimServer"
-
-#~ msgid "Could not add"
-#~ msgstr "Ajout impossible"
-
-#~ msgid "German"
-#~ msgstr "Allemand"
-
-#~ msgid "Spanish"
-#~ msgstr "Espagnol"
-
-#~ msgid "French"
-#~ msgstr "Fran&ccedil;ais"
-
-#~ msgid "Italian"
-#~ msgstr "Italien"
-
-#~ msgid "Dutch"
-#~ msgstr "Hollandais"
-
-#~ msgid "Error Connecting"
-#~ msgstr "Erreur de connexion"
-
-#~ msgid "Do you really want to clear your catalog?"
-#~ msgstr "Voulez-vous vraiment vider votre catalogue ?"
-
-#~ msgid "Changing User Information for"
-#~ msgstr "Modifier les informations de l'utilisateur pour"
-
-#~ msgid "Update Profile"
-#~ msgstr "Mise &aacute; jour de profil"
-
-#~ msgid "Enter password"
-#~ msgstr "Entrer un mot de passe"
-
-#~ msgid "Change Password"
-#~ msgstr "Changer de mot de passe"
-
-#~ msgid "Delete Your Personal Statistics"
-#~ msgstr "Supprimer vos statistiques personnelles"
-
-#~ msgid "from"
-#~ msgstr "de"
-
-#~ msgid "Flag Selected"
-#~ msgstr "Marquer la s&eacute;lection"
-
-#~ msgid "Edit Selected"
-#~ msgstr "&eacute;diter la s&eacute;lection"
-
-#~ msgid "to"
-#~ msgstr "vers"
-
-#~ msgid "View All Playlists"
-#~ msgstr "Voir toutes les listes de lecture"
-
-#~ msgid "Unknown action requested"
-#~ msgstr "Action requise inconnue"
-
-#~ msgid "Flagging song completed."
-#~ msgstr "Marquer les morceaux finis."
-
-#~ msgid "Error: Insufficient Rights"
-#~ msgstr "Erreur : Droits insuffisants"
-
-#~ msgid "Move Failed"
-#~ msgstr "D&eacute;placement &eacute;chou&eacute;"
-
-#~ msgid "Catalog Managment"
-#~ msgstr "Gestion des catalogues"
-
-#~ msgid "Common Functions"
-#~ msgstr "Fonctions communes"
-
-#~ msgid "ID3 set command"
-#~ msgstr "Commande de d&eacute;finition ID3"
-
-#~ msgid "Under CONF"
-#~ msgstr "En desous de CONF"
-
-#~ msgid "Under LIBGLUE"
-#~ msgstr "En dessous de LIBGLUE"
-
-#~ msgid "Playback"
-#~ msgstr "Playback"
-
-#~ msgid "Increase Volume"
-#~ msgstr "Augmenter le volume"
-
-#~ msgid "Decrease Volume"
-#~ msgstr "Diminuer le volume"
-
-#~ msgid "Clear queue"
-#~ msgstr "Vider la file d'attente"
-
-#~ msgid "ID3 Set Command"
-#~ msgstr "Commande d'affectation ID3"
-
-#~ msgid "New Flag"
-#~ msgstr "Nouvelle marque"
-
-#~ msgid "ID3 Update"
-#~ msgstr "Mise &aacute; jour ID3"
-
-#~ msgid "Accept"
-#~ msgstr "Accepter"
-
-#~ msgid "Go!"
-#~ msgstr "Allez!"
-
-#~ msgid "Play Random Songs"
-#~ msgstr "Jouer un morceau au hasard"
-
-#~ msgid "Add Host"
-#~ msgstr "Ajouter un h&ocirc;te"
-
-#~ msgid "Stats"
-#~ msgstr "Stats"
-
-#~ msgid "Prefs"
-#~ msgstr "Pr&eacute;f&eacute;rences"
-
-#~ msgid "Access"
-#~ msgstr "Acc&egrave;s"
-
-#~ msgid "delete"
-#~ msgstr "supprimer"
-
-#~ msgid "Object Type"
-#~ msgstr "Type d'objet"
-
-#~ msgid "Genres"
-#~ msgstr "Genres"
-
-#~ msgid "<u>S</u>how all albums"
-#~ msgstr "<u>M</u>ontrer tout les albums"
-
-#~ msgid "All songs by"
-#~ msgstr "Toutes les chanson de"
-
-#~ msgid "Welcome to"
-#~ msgstr "bienvenue sur"
-
-#~ msgid "New"
-#~ msgstr "Nouveau"
-
-#~ msgid "Import"
-#~ msgstr "Importer"
-
-#~ msgid "There are no playlists of this type"
-#~ msgstr "Il n'y a pas de liste de lecture de ce type"
-
-#~ msgid "owned by"
-#~ msgstr "Propri&eacute;t&eacute; de"
-
-#~ msgid "An Unknown Error has occured."
-#~ msgstr "Une erreur inconnue est apparue"
-
-#~ msgid "Create/Modify User Accounts for Ampache"
-#~ msgstr "Cr&eacute;ation/Modification des comptes utilisateur pour Ampache"
-
-#~ msgid "Mail"
-#~ msgstr "Mail"
-
-#~ msgid "Mail your users to notify them of changes"
-#~ msgstr ""
-#~ "Envoyer un mail &aacute; vos utilisateurs pour les informer des "
-#~ "changements"
-
-#~ msgid "Create/Update/Clean your catalog here"
-#~ msgstr "Cr&eacute;er/Modifier/nettoyer votre catalogue ici"
-
-#~ msgid "Modify Site-wide preferences"
-#~ msgstr "Modifier les pr&eacute;f&eacute;rence du site"
-
-#~ msgid "Modify Access List Permissions"
-#~ msgstr "Modifier la liste d'acces autoris&eacute;"
-
-#~ msgid "Must have access_control=true in ampache.cfg"
-#~ msgstr "Vous devez avoir access_control=true dans ampache.cfg.php"
-
-#~ msgid "refresh now"
-#~ msgstr "rafraichir maintenant"
-
-#~ msgid "clear"
-#~ msgstr "&eacute;ffacer"
-
-#~ msgid "Remove Dead Songs from DB"
-#~ msgstr "Nettoyer la Base de donnees"
diff --git a/locale/is_IS/LC_MESSAGES/messages.po b/locale/is_IS/LC_MESSAGES/messages.po
index 16ad575d..05b19ea8 100644
--- a/locale/is_IS/LC_MESSAGES/messages.po
+++ b/locale/is_IS/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-01 20:33-0800\n"
+"POT-Creation-Date: 2007-01-22 19:07-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../play/index.php:64 ../../download/index.php:62
+#: ../../play/index.php:64 ../../download/index.php:61
 msgid "Session Expired: please log in again at"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:299 ../../lib/class/catalog.class.php:592
-#: ../../lib/class/album.class.php:325
+#: ../../lib/class/catalog.class.php:303 ../../lib/class/catalog.class.php:621
+#: ../../lib/class/album.class.php:328
 msgid "Error: Unable to open"
 msgstr ""
 
@@ -29,182 +29,187 @@ msgstr ""
 msgid "Error: Unable to change to directory"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:375
+#: ../../lib/class/catalog.class.php:374
 msgid "Error: Unable to get filesize for"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:412
+#: ../../lib/class/catalog.class.php:411
 msgid "is not readable by ampache"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:501
+#: ../../lib/class/catalog.class.php:530
 msgid "album's with art"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:772
+#: ../../lib/class/catalog.class.php:812
 msgid "Starting Catalog Build"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:776
+#: ../../lib/class/catalog.class.php:816
 msgid "Running Remote Sync"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:781 ../../lib/class/catalog.class.php:947
+#: ../../lib/class/catalog.class.php:821 ../../lib/class/catalog.class.php:992
 msgid "Found"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:781 ../../lib/class/catalog.class.php:804
-#: ../../lib/class/catalog.class.php:947 ../../lib/class/catalog.class.php:977
-#: ../../lib/preferences.php:269 ../../lib/preferences.php:319
-#: ../../lib/ui.lib.php:1186 ../../admin/catalog.php:259
+#: ../../lib/class/catalog.class.php:821 ../../lib/class/catalog.class.php:848
+#: ../../lib/class/catalog.class.php:992
+#: ../../lib/class/catalog.class.php:1025 ../../lib/preferences.php:269
+#: ../../lib/preferences.php:319 ../../lib/ui.lib.php:1194
+#: ../../admin/catalog.php:259
 msgid "None"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:796 ../../lib/class/catalog.class.php:965
+#: ../../lib/class/catalog.class.php:840
+#: ../../lib/class/catalog.class.php:1014
 msgid "Added Playlist From"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:803 ../../lib/class/catalog.class.php:976
-#: ../../admin/catalog.php:258
+#: ../../lib/class/catalog.class.php:847
+#: ../../lib/class/catalog.class.php:1024 ../../admin/catalog.php:258
 msgid "Starting Album Art Search"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:804 ../../lib/class/catalog.class.php:977
-#: ../../admin/catalog.php:259
+#: ../../lib/class/catalog.class.php:848
+#: ../../lib/class/catalog.class.php:1025 ../../admin/catalog.php:259
 msgid "Searched"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:814
+#: ../../lib/class/catalog.class.php:858
 msgid "Catalog Finished"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:814 ../../lib/class/catalog.class.php:997
+#: ../../lib/class/catalog.class.php:858
+#: ../../lib/class/catalog.class.php:1044
 msgid "Total Time"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:814 ../../lib/class/catalog.class.php:998
+#: ../../lib/class/catalog.class.php:858
+#: ../../lib/class/catalog.class.php:1045
 msgid "Total Songs"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:815 ../../lib/class/catalog.class.php:998
+#: ../../lib/class/catalog.class.php:859
+#: ../../lib/class/catalog.class.php:1045
 msgid "Songs Per Seconds"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:849
-#: ../../lib/class/catalog.class.php:1634
+#: ../../lib/class/catalog.class.php:894
+#: ../../lib/class/catalog.class.php:1565
 msgid "Updated"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:856
+#: ../../lib/class/catalog.class.php:901
 msgid "No Update Needed"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:938
+#: ../../lib/class/catalog.class.php:983
 msgid "Starting New Song Search on"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:938
+#: ../../lib/class/catalog.class.php:983
 msgid "catalog"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:942
+#: ../../lib/class/catalog.class.php:987
 msgid "Running Remote Update"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:997
+#: ../../lib/class/catalog.class.php:1044
 msgid "Catalog Update Finished"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1017
+#: ../../lib/class/catalog.class.php:1064
 msgid "Error"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1017
+#: ../../lib/class/catalog.class.php:1064
 msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Error connecting to"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Code"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Reason"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1076
+#: ../../lib/class/catalog.class.php:1123
 msgid "Completed updating remote catalog(s)"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1111
+#: ../../lib/class/catalog.class.php:1158
 msgid "Added"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1193
+#: ../../lib/class/catalog.class.php:1240
 msgid "Cleaning the"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1193
-#: ../../lib/class/catalog.class.php:1589 ../../templates/sidebar.inc.php:30
+#: ../../lib/class/catalog.class.php:1240
+#: ../../lib/class/catalog.class.php:1520 ../../templates/sidebar.inc.php:30
 #: ../../ampache/templates/sidebar.inc.php:30
 msgid "Catalog"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1194
+#: ../../lib/class/catalog.class.php:1241
 msgid "Checking"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1265
+#: ../../lib/class/catalog.class.php:1313
 msgid "Catalog Clean Done"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1265
+#: ../../lib/class/catalog.class.php:1313
 msgid "files removed"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1589
+#: ../../lib/class/catalog.class.php:1520
 msgid "Updating the"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1590
+#: ../../lib/class/catalog.class.php:1521
 msgid "songs found checking tag information."
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1591
+#: ../../lib/class/catalog.class.php:1522
 msgid "Verifed"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1643
+#: ../../lib/class/catalog.class.php:1574
 msgid " FOUND"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1645
+#: ../../lib/class/catalog.class.php:1576
 msgid "Searching for new Album Art"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1649
+#: ../../lib/class/catalog.class.php:1580
 msgid "Album Art Already Found"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 msgid "Update Finished."
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 msgid "Checked"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 msgid "songs updated."
 msgstr ""
 
-#: ../../lib/class/song.class.php:360
+#: ../../lib/class/song.class.php:361
 #: ../../templates/show_duplicates.inc.php:35
 #: ../../templates/show_edit_song.inc.php:31
 #: ../../templates/show_disabled_songs.inc:26
@@ -212,53 +217,53 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
-#: ../../lib/class/song.class.php:360 ../../lib/class/song.class.php:364
-#: ../../lib/class/song.class.php:368 ../../lib/class/song.class.php:372
-#: ../../lib/class/song.class.php:376 ../../lib/class/song.class.php:380
-#: ../../lib/class/song.class.php:384 ../../lib/class/song.class.php:389
-#: ../../lib/class/song.class.php:394 ../../lib/class/song.class.php:398
-#: ../../lib/class/song.class.php:402 ../../lib/class/song.class.php:407
+#: ../../lib/class/song.class.php:361 ../../lib/class/song.class.php:365
+#: ../../lib/class/song.class.php:369 ../../lib/class/song.class.php:373
+#: ../../lib/class/song.class.php:377 ../../lib/class/song.class.php:381
+#: ../../lib/class/song.class.php:385 ../../lib/class/song.class.php:390
+#: ../../lib/class/song.class.php:395 ../../lib/class/song.class.php:399
+#: ../../lib/class/song.class.php:403 ../../lib/class/song.class.php:408
 msgid "updated to"
 msgstr ""
 
-#: ../../lib/class/song.class.php:364
+#: ../../lib/class/song.class.php:365
 #: ../../templates/show_list_duplicates.inc.php:35
 #: ../../templates/show_songs.inc:53
 msgid "Bitrate"
 msgstr ""
 
-#: ../../lib/class/song.class.php:368
+#: ../../lib/class/song.class.php:369
 msgid "Rate"
 msgstr ""
 
-#: ../../lib/class/song.class.php:372
+#: ../../lib/class/song.class.php:373
 msgid "Mode"
 msgstr ""
 
-#: ../../lib/class/song.class.php:376
+#: ../../lib/class/song.class.php:377
 #: ../../templates/show_tv_playlist.inc.php:46
 #: ../../templates/show_songs.inc:51
 msgid "Time"
 msgstr ""
 
-#: ../../lib/class/song.class.php:380
+#: ../../lib/class/song.class.php:381
 #: ../../templates/show_edit_song.inc.php:61
 #: ../../templates/show_localplay_playlist.inc.php:27
 #: ../../templates/show_songs.inc:45 ../../templates/show_songs.inc:50
 msgid "Track"
 msgstr ""
 
-#: ../../lib/class/song.class.php:384
+#: ../../lib/class/song.class.php:385
 msgid "Filesize"
 msgstr ""
 
-#: ../../lib/class/song.class.php:389
+#: ../../lib/class/song.class.php:390
 #: ../../templates/show_edit_song.inc.php:45
 #: ../../templates/show_get_albumart.inc.php:30
 #: ../../templates/show_play_selected.inc.php:60
 #: ../../templates/show_list_duplicates.inc.php:32
 #: ../../templates/show_recently_played.inc.php:32
-#: ../../templates/show_artists.inc:40 ../../templates/show_artists.inc:65
+#: ../../templates/show_artists.inc:40 ../../templates/show_artists.inc:71
 #: ../../templates/show_disabled_songs.inc:28
 #: ../../templates/show_songs.inc:48 ../../templates/show_albums.inc:41
 #: ../../templates/show_albums.inc:84
@@ -267,7 +272,7 @@ msgstr ""
 msgid "Artist"
 msgstr ""
 
-#: ../../lib/class/song.class.php:394
+#: ../../lib/class/song.class.php:395
 #: ../../templates/show_edit_song.inc.php:37
 #: ../../templates/show_get_albumart.inc.php:38
 #: ../../templates/show_play_selected.inc.php:59
@@ -279,7 +284,7 @@ msgstr ""
 msgid "Album"
 msgstr ""
 
-#: ../../lib/class/song.class.php:398
+#: ../../lib/class/song.class.php:399
 #: ../../templates/show_edit_song.inc.php:67
 #: ../../templates/show_play_selected.inc.php:61
 #: ../../templates/show_edit_album.inc.php:33
@@ -288,13 +293,13 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
-#: ../../lib/class/song.class.php:402 ../../templates/show_flag.inc.php:64
+#: ../../lib/class/song.class.php:403 ../../templates/show_flag.inc.php:64
 #: ../../templates/show_edit_song.inc.php:73
 #: ../../templates/show_search.inc:37
 msgid "Comment"
 msgstr ""
 
-#: ../../lib/class/song.class.php:407 ../../lib/ui.lib.php:843
+#: ../../lib/class/song.class.php:408 ../../lib/ui.lib.php:851
 #: ../../templates/sidebar.inc.php:36
 #: ../../templates/show_edit_song.inc.php:53
 #: ../../templates/show_genre.inc.php:29
@@ -309,33 +314,33 @@ msgstr ""
 msgid "Error: Name Identical"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:263
+#: ../../lib/class/flag.class.php:264
 msgid "Approved"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:264
+#: ../../lib/class/flag.class.php:265
 msgid "Pending"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:276 ../../templates/show_flag.inc.php:56
+#: ../../lib/class/flag.class.php:277 ../../templates/show_flag.inc.php:56
 #: ../../templates/show_playlists.inc.php:57
 #: ../../templates/show_admin_tools.inc.php:50
 msgid "Delete"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:279
+#: ../../lib/class/flag.class.php:280
 msgid "Re-Tag"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:282 ../../templates/show_flag.inc.php:58
+#: ../../lib/class/flag.class.php:283 ../../templates/show_flag.inc.php:58
 msgid "Re-encode"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:285 ../../templates/show_flag.inc.php:59
+#: ../../lib/class/flag.class.php:286 ../../templates/show_flag.inc.php:59
 msgid "Other"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:288 ../../lib/class/localplay.class.php:569
+#: ../../lib/class/flag.class.php:289 ../../lib/class/localplay.class.php:570
 #: ../../lib/general.lib.php:890
 #: ../../modules/localplay/icecast.controller.php:292
 #: ../../modules/localplay/mpd.controller.php:354
@@ -343,24 +348,24 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: ../../lib/class/localplay.class.php:560 ../../templates/show_tv.inc.php:81
+#: ../../lib/class/localplay.class.php:561 ../../templates/show_tv.inc.php:64
 #: ../../templates/show_now_playing.inc:32
 msgid "Now Playing"
 msgstr ""
 
-#: ../../lib/class/localplay.class.php:563
+#: ../../lib/class/localplay.class.php:564
 msgid "Stopped"
 msgstr ""
 
-#: ../../lib/class/localplay.class.php:566
+#: ../../lib/class/localplay.class.php:567
 msgid "Paused"
 msgstr ""
 
-#: ../../lib/class/album.class.php:162
+#: ../../lib/class/album.class.php:163
 msgid "Various"
 msgstr ""
 
-#: ../../lib/class/genre.class.php:284
+#: ../../lib/class/genre.class.php:285
 msgid "Show Genres starting with"
 msgstr ""
 
@@ -402,30 +407,30 @@ msgid "Disable"
 msgstr ""
 
 #: ../../lib/preferences.php:271 ../../templates/show_tv_adminctl.inc.php:41
-#: ../../templates/show_playtype_switch.inc.php:9
+#: ../../templates/show_playtype_switch.inc.php:30
 msgid "Stream"
 msgstr ""
 
 #: ../../lib/preferences.php:274 ../../templates/show_tv_adminctl.inc.php:42
-#: ../../templates/show_playtype_switch.inc.php:13
+#: ../../templates/show_playtype_switch.inc.php:34
 msgid "Downsample"
 msgstr ""
 
 #: ../../lib/preferences.php:277
-#: ../../templates/show_playtype_switch.inc.php:15
+#: ../../templates/show_playtype_switch.inc.php:36
 msgid "Democratic"
 msgstr ""
 
-#: ../../lib/preferences.php:280 ../../templates/sidebar.inc.php:170
+#: ../../lib/preferences.php:280 ../../templates/sidebar.inc.php:168
 #: ../../templates/show_tv_adminctl.inc.php:40
 #: ../../templates/show_localplay.inc.php:26
-#: ../../templates/show_playtype_switch.inc.php:11
+#: ../../templates/show_playtype_switch.inc.php:32
 #: ../../ampache/templates/sidebar.inc.php:170
 msgid "Localplay"
 msgstr ""
 
 #: ../../lib/preferences.php:282
-#: ../../templates/show_playtype_switch.inc.php:17
+#: ../../templates/show_playtype_switch.inc.php:38
 msgid "XSPF Player"
 msgstr ""
 
@@ -469,11 +474,11 @@ msgstr ""
 msgid "No songs in this playlist."
 msgstr ""
 
-#: ../../lib/playlist.lib.php:191 ../../lib/ui.lib.php:892
-#: ../../templates/sidebar.inc.php:150
+#: ../../lib/playlist.lib.php:191 ../../lib/ui.lib.php:900
+#: ../../templates/sidebar.inc.php:148
 #: ../../templates/show_admin_tools.inc.php:48
 #: ../../ampache/templates/sidebar.inc.php:150
-#: ../../templates/show_artists.inc:55 ../../templates/show_random_play.inc:40
+#: ../../templates/show_random_play.inc:40
 #: ../../templates/show_add_access.inc:59
 #: ../../templates/show_edit_access.inc:69
 msgid "All"
@@ -487,7 +492,7 @@ msgstr ""
 msgid "Error Access Denied"
 msgstr ""
 
-#: ../../lib/ui.lib.php:194 ../../templates/sidebar.inc.php:89
+#: ../../lib/ui.lib.php:194 ../../templates/sidebar.inc.php:87
 #: ../../ampache/templates/sidebar.inc.php:89
 msgid "Browse"
 msgstr ""
@@ -500,134 +505,128 @@ msgstr ""
 msgid "Show all"
 msgstr ""
 
-#: ../../lib/ui.lib.php:538 ../../admin/mail.php:80
+#: ../../lib/ui.lib.php:539 ../../admin/mail.php:81
 msgid "No Catalogs Found!"
 msgstr ""
 
-#: ../../lib/ui.lib.php:539 ../../admin/mail.php:81
-#: ../../templates/show_admin_tools.inc.php:67
+#: ../../lib/ui.lib.php:540 ../../admin/mail.php:82
+#: ../../templates/show_admin_tools.inc.php:75
 #: ../../templates/show_add_catalog.inc.php:28
 msgid "Add a Catalog"
 msgstr ""
 
-#: ../../lib/ui.lib.php:540 ../../admin/mail.php:82
-#: ../../templates/show_mail_users.inc.php:41
-#: ../../templates/show_local_catalog_info.inc.php:23
-msgid "Catalog Statistics"
-msgstr ""
-
-#: ../../lib/ui.lib.php:576 ../../admin/mail.php:119
+#: ../../lib/ui.lib.php:578 ../../admin/mail.php:120
 msgid "day"
 msgstr ""
 
-#: ../../lib/ui.lib.php:576 ../../admin/mail.php:119
+#: ../../lib/ui.lib.php:578 ../../admin/mail.php:120
 msgid "days"
 msgstr ""
 
-#: ../../lib/ui.lib.php:578 ../../admin/mail.php:121
+#: ../../lib/ui.lib.php:580 ../../admin/mail.php:122
 msgid "hour"
 msgstr ""
 
-#: ../../lib/ui.lib.php:578 ../../admin/mail.php:121
+#: ../../lib/ui.lib.php:580 ../../admin/mail.php:122
 msgid "hours"
 msgstr ""
 
-#: ../../lib/ui.lib.php:782 ../../templates/show_tv.inc.php:58
-#: ../../templates/sidebar.inc.php:50
+#: ../../lib/ui.lib.php:790 ../../templates/sidebar.inc.php:48
 #: ../../ampache/templates/sidebar.inc.php:50
 msgid "Home"
 msgstr ""
 
-#: ../../lib/ui.lib.php:785
+#: ../../lib/ui.lib.php:793
 msgid "Upload"
 msgstr ""
 
-#: ../../lib/ui.lib.php:788
+#: ../../lib/ui.lib.php:796
 msgid "Local Play"
 msgstr ""
 
-#: ../../lib/ui.lib.php:791
+#: ../../lib/ui.lib.php:799
 msgid "Random Play"
 msgstr ""
 
-#: ../../lib/ui.lib.php:794 ../../templates/show_play_selected.inc.php:47
+#: ../../lib/ui.lib.php:802 ../../templates/show_play_selected.inc.php:47
 msgid "Playlist"
 msgstr ""
 
-#: ../../lib/ui.lib.php:797 ../../templates/show_duplicates.inc.php:51
-#: ../../templates/sidebar.inc.php:118 ../../templates/sidebar.inc.php:124
+#: ../../lib/ui.lib.php:805 ../../templates/show_duplicates.inc.php:51
+#: ../../templates/sidebar.inc.php:116 ../../templates/sidebar.inc.php:122
 #: ../../ampache/templates/sidebar.inc.php:118
 #: ../../ampache/templates/sidebar.inc.php:124
 #: ../../templates/show_search_bar.inc:31 ../../templates/show_search.inc:133
 msgid "Search"
 msgstr ""
 
-#: ../../lib/ui.lib.php:800 ../../templates/sidebar.inc.php:81
+#: ../../lib/ui.lib.php:808 ../../templates/sidebar.inc.php:79
 #: ../../ampache/templates/sidebar.inc.php:81
 msgid "Preferences"
 msgstr ""
 
-#: ../../lib/ui.lib.php:803 ../../lib/ui.lib.php:807
+#: ../../lib/ui.lib.php:811 ../../lib/ui.lib.php:815
 msgid "Admin-Catalog"
 msgstr ""
 
-#: ../../lib/ui.lib.php:811
+#: ../../lib/ui.lib.php:819
 msgid "Admin-User Management"
 msgstr ""
 
-#: ../../lib/ui.lib.php:815
+#: ../../lib/ui.lib.php:823
 msgid "Admin-Mail Users"
 msgstr ""
 
-#: ../../lib/ui.lib.php:819
+#: ../../lib/ui.lib.php:827
 msgid "Admin-Manage Access Lists"
 msgstr ""
 
-#: ../../lib/ui.lib.php:823
+#: ../../lib/ui.lib.php:831
 msgid "Admin-Site Preferences"
 msgstr ""
 
-#: ../../lib/ui.lib.php:827
+#: ../../lib/ui.lib.php:835
 msgid "Admin-Manage Modules"
 msgstr ""
 
-#: ../../lib/ui.lib.php:831
+#: ../../lib/ui.lib.php:839
 msgid "Browse Music"
 msgstr ""
 
-#: ../../lib/ui.lib.php:835 ../../admin/mail.php:133
-#: ../../templates/sidebar.inc.php:34 ../../templates/sidebar.inc.php:158
+#: ../../lib/ui.lib.php:843 ../../admin/mail.php:134
+#: ../../templates/sidebar.inc.php:34 ../../templates/sidebar.inc.php:156
 #: ../../templates/show_genre.inc.php:32
-#: ../../templates/show_local_catalog_info.inc.php:34
+#: ../../templates/show_local_catalog_info.inc.php:28
 #: ../../ampache/templates/sidebar.inc.php:34
 #: ../../ampache/templates/sidebar.inc.php:158
-#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:68
+#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:74
 msgid "Albums"
 msgstr ""
 
-#: ../../lib/ui.lib.php:839 ../../admin/mail.php:134
-#: ../../templates/sidebar.inc.php:35 ../../templates/sidebar.inc.php:157
+#: ../../lib/ui.lib.php:847 ../../admin/mail.php:135
+#: ../../templates/sidebar.inc.php:35 ../../templates/sidebar.inc.php:155
 #: ../../templates/show_genre.inc.php:35
-#: ../../templates/show_local_catalog_info.inc.php:38
+#: ../../templates/show_local_catalog_info.inc.php:29
 #: ../../ampache/templates/sidebar.inc.php:35
 #: ../../ampache/templates/sidebar.inc.php:157
 msgid "Artists"
 msgstr ""
 
-#: ../../lib/ui.lib.php:847 ../../templates/sidebar.inc.php:112
+#: ../../lib/ui.lib.php:855 ../../templates/sidebar.inc.php:110
 #: ../../ampache/templates/sidebar.inc.php:112
 msgid "Statistics"
 msgstr ""
 
-#: ../../lib/ui.lib.php:1421
+#: ../../lib/ui.lib.php:1429
 msgid "Manage Users"
 msgstr ""
 
-#: ../../lib/ui.lib.php:1422
+#: ../../lib/ui.lib.php:1430
 msgid "Add a new user"
 msgstr ""
 
-#: ../../lib/general.lib.php:670 ../../templates/show_user_stats.inc.php:32
+#: ../../lib/general.lib.php:670 ../../templates/show_box.inc.php:30
+#: ../../templates/show_user_stats.inc.php:32
 #: ../../templates/show_user_stats.inc.php:43
 #: ../../templates/show_user_stats.inc.php:54
 #: ../../templates/show_user_recommendations.inc.php:32
@@ -749,7 +748,7 @@ msgstr ""
 msgid "Do you really want to clear the statistics for this catalog?"
 msgstr ""
 
-#: ../../admin/catalog.php:230 ../../templates/show_admin_tools.inc.php:68
+#: ../../admin/catalog.php:230 ../../templates/show_admin_tools.inc.php:76
 msgid "Clear Catalog Stats"
 msgstr ""
 
@@ -797,27 +796,31 @@ msgstr ""
 msgid "Flag Removed from"
 msgstr ""
 
-#: ../../admin/flag.php:274
+#: ../../admin/flag.php:270
+msgid "Flags Updated"
+msgstr ""
+
+#: ../../admin/flag.php:289
 msgid "Songs Disabled"
 msgstr ""
 
-#: ../../admin/flag.php:274
+#: ../../admin/flag.php:289
 msgid "The requested song(s) have been disabled"
 msgstr ""
 
-#: ../../admin/flag.php:285
+#: ../../admin/flag.php:300
 msgid "Songs Enabled"
 msgstr ""
 
-#: ../../admin/flag.php:285
+#: ../../admin/flag.php:300
 msgid "The requested song(s) have been enabled"
 msgstr ""
 
-#: ../../admin/flag.php:290
+#: ../../admin/flag.php:305
 msgid "Flagged Records"
 msgstr ""
 
-#: ../../admin/preferences.php:59 ../../admin/preferences.php:82
+#: ../../admin/preferences.php:60 ../../admin/preferences.php:83
 msgid "Site"
 msgstr ""
 
@@ -861,66 +864,71 @@ msgstr ""
 msgid "Error Passwords don't match"
 msgstr ""
 
-#: ../../admin/users.php:117 ../../register.php:138
+#: ../../admin/users.php:120 ../../register.php:138
 msgid "Error Username already exists"
 msgstr ""
 
-#: ../../admin/users.php:139
+#: ../../admin/users.php:142
 msgid "Deletion Request"
 msgstr ""
 
-#: ../../admin/users.php:140
+#: ../../admin/users.php:143
 msgid "Are you sure you want to permanently delete"
 msgstr ""
 
-#: ../../admin/users.php:145 ../../templates/show_confirm_action.inc.php:29
+#: ../../admin/users.php:148 ../../templates/show_confirm_action.inc.php:29
 #: ../../templates/show_search.inc:78
 msgid "No"
 msgstr ""
 
-#: ../../admin/users.php:147
+#: ../../admin/users.php:150
 msgid "User Deleted"
 msgstr ""
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:153
 msgid "Delete Error"
 msgstr ""
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:153
 msgid "Unable to delete last Admin User"
 msgstr ""
 
-#: ../../admin/mail.php:131 ../../templates/show_local_catalog_info.inc.php:26
+#: ../../admin/mail.php:83 ../../templates/show_mail_users.inc.php:41
+#: ../../templates/show_local_catalog_info.inc.php:23
+msgid "Catalog Statistics"
+msgstr ""
+
+#: ../../admin/mail.php:132 ../../templates/show_local_catalog_info.inc.php:27
 msgid "Total Users"
 msgstr ""
 
-#: ../../admin/mail.php:132 ../../templates/show_local_catalog_info.inc.php:30
+#: ../../admin/mail.php:133 ../../templates/show_local_catalog_info.inc.php:26
 msgid "Connected Users"
 msgstr ""
 
-#: ../../admin/mail.php:135 ../../templates/sidebar.inc.php:155
+#: ../../admin/mail.php:136 ../../templates/sidebar.inc.php:153
 #: ../../templates/show_genre.inc.php:38
-#: ../../templates/show_local_catalog_info.inc.php:42
+#: ../../templates/show_local_catalog_info.inc.php:30
 #: ../../templates/show_genres.inc.php:37
 #: ../../ampache/templates/sidebar.inc.php:155
-#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:67
+#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:73
 #: ../../templates/show_albums.inc:43 ../../templates/show_albums.inc:86
 msgid "Songs"
 msgstr ""
 
-#: ../../admin/mail.php:136 ../../templates/show_local_catalog_info.inc.php:46
+#: ../../admin/mail.php:137 ../../templates/show_local_catalog_info.inc.php:31
 msgid "Catalog Size"
 msgstr ""
 
-#: ../../admin/mail.php:137 ../../templates/show_local_catalog_info.inc.php:50
+#: ../../admin/mail.php:138 ../../templates/show_local_catalog_info.inc.php:32
 msgid "Catalog Time"
 msgstr ""
 
-#: ../../admin/mail.php:219
+#: ../../admin/mail.php:252
 msgid "E-mail Sent"
 msgstr ""
 
-#: ../../admin/mail.php:220
+#: ../../admin/mail.php:253
 msgid "Your E-mail was successfully sent."
 msgstr ""
 
@@ -974,21 +982,21 @@ msgid "Incorrect Tags"
 msgstr ""
 
 #: ../../templates/show_flag.inc.php:70
-#: ../../templates/show_flagged.inc.php:27
+#: ../../templates/show_flagged.inc.php:30
 msgid "Flag"
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:36
-#: ../../templates/show_install_lang.inc.php:10
+#: ../../templates/show_install_lang.inc.php:32
 #: ../../templates/show_install_config.inc:36
-#: ../../templates/show_install.inc:10
+#: ../../templates/show_install.inc:32
 msgid "Ampache Installation"
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:43
-#: ../../templates/show_install_lang.inc.php:17
+#: ../../templates/show_install_lang.inc.php:39
 #: ../../templates/show_install_config.inc:42
-#: ../../templates/show_install.inc:18
+#: ../../templates/show_install.inc:40
 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 "
@@ -996,9 +1004,9 @@ msgid ""
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:46
-#: ../../templates/show_install_lang.inc.php:20
+#: ../../templates/show_install_lang.inc.php:42
 #: ../../templates/show_install_config.inc:45
-#: ../../templates/show_install.inc:21
+#: ../../templates/show_install.inc:43
 msgid ""
 "A MySQL Server with a username and password that can create/modify databases"
 msgstr ""
@@ -1010,9 +1018,9 @@ msgid ""
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:49
-#: ../../templates/show_install_lang.inc.php:24
+#: ../../templates/show_install_lang.inc.php:46
 #: ../../templates/show_install_config.inc:48
-#: ../../templates/show_install.inc:25
+#: ../../templates/show_install.inc:47
 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 "
@@ -1022,7 +1030,7 @@ msgstr ""
 
 #: ../../templates/show_install_account.inc.php:53
 #: ../../templates/show_install_config.inc:52
-#: ../../templates/show_install.inc:30
+#: ../../templates/show_install.inc:52
 msgid "Step 1 - Creating and Inserting the Ampache Database"
 msgstr ""
 
@@ -1032,7 +1040,7 @@ msgstr ""
 
 #: ../../templates/show_install_account.inc.php:55
 #: ../../templates/show_install_config.inc:57
-#: ../../templates/show_install.inc:35
+#: ../../templates/show_install.inc:57
 msgid "Step 3 - Setup Initial Account"
 msgstr ""
 
@@ -1047,7 +1055,7 @@ msgid "Create Admin Account"
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:65
-#: ../../templates/show_user_registration.inc.php:99
+#: ../../templates/show_user_registration.inc.php:98
 #: ../../templates/show_edit_user.inc.php:40
 #: ../../templates/show_recently_played.inc.php:29
 #: ../../templates/show_users.inc:43
@@ -1055,7 +1063,7 @@ msgid "Username"
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:69
-#: ../../templates/show_user_registration.inc.php:127
+#: ../../templates/show_user_registration.inc.php:126
 #: ../../templates/show_edit_user.inc.php:63
 #: ../../templates/show_login_form.inc:37
 msgid "Password"
@@ -1066,7 +1074,7 @@ msgid "Create Account"
 msgstr ""
 
 #: ../../templates/show_playlists.inc.php:28
-#: ../../templates/sidebar.inc.php:106
+#: ../../templates/sidebar.inc.php:104
 #: ../../ampache/templates/sidebar.inc.php:106
 msgid "Playlists"
 msgstr ""
@@ -1098,22 +1106,20 @@ msgstr ""
 
 #: ../../templates/show_playlists.inc.php:55
 #: ../../templates/show_play_selected.inc.php:50
-#: ../../templates/show_artists.inc:58 ../../templates/show_access_list.inc:67
+#: ../../templates/show_access_list.inc:67
 msgid "Edit"
 msgstr ""
 
 #: ../../templates/show_playlists.inc.php:61
 #: ../../templates/show_tv_adminctl.inc.php:44
-#: ../../templates/show_genres.inc.php:47 ../../templates/show_artists.inc:54
 #: ../../templates/show_random_play.inc:82
 msgid "Play"
 msgstr ""
 
 #: ../../templates/show_playlists.inc.php:63
-#: ../../templates/sidebar.inc.php:135
+#: ../../templates/sidebar.inc.php:133
 #: ../../templates/show_localplay_status.inc.php:62
 #: ../../ampache/templates/sidebar.inc.php:135
-#: ../../templates/show_artists.inc:56
 msgid "Random"
 msgstr ""
 
@@ -1151,11 +1157,11 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: ../../templates/show_tv.inc.php:56
+#: ../../templates/show_tv.inc.php:42
 msgid "Controls"
 msgstr ""
 
-#: ../../templates/show_tv.inc.php:74
+#: ../../templates/show_tv.inc.php:57
 #: ../../templates/show_localplay.inc.php:42
 msgid "Current Playlist"
 msgstr ""
@@ -1181,7 +1187,7 @@ msgstr ""
 
 #: ../../templates/show_playlist_edit.inc.php:36
 #: ../../templates/show_add_playlist.inc.php:32
-#: ../../templates/show_random_play.inc:50
+#: ../../templates/show_random_play.inc:49
 #: ../../templates/show_access_list.inc:51
 msgid "Type"
 msgstr ""
@@ -1196,6 +1202,7 @@ msgstr ""
 
 #: ../../templates/show_playlist_edit.inc.php:48
 #: ../../templates/show_tv_adminctl.inc.php:51
+#: ../../templates/show_flagged.inc.php:66
 #: ../../templates/show_play_selected.inc.php:64
 #: ../../templates/show_preference_admin.inc.php:47
 #: ../../templates/show_edit_access.inc:78
@@ -1227,41 +1234,36 @@ msgstr ""
 msgid "Song Title"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:38
-#: ../../ampache/templates/sidebar.inc.php:38
-msgid "Lists"
-msgstr ""
-
-#: ../../templates/sidebar.inc.php:62
+#: ../../templates/sidebar.inc.php:60
 #: ../../templates/show_tv_playlist.inc.php:48
 #: ../../templates/show_preference_admin.inc.php:39
 #: ../../ampache/templates/sidebar.inc.php:62
 msgid "Admin"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:156
+#: ../../templates/sidebar.inc.php:154
 #: ../../ampache/templates/sidebar.inc.php:156
 #: ../../templates/show_random_play.inc:56
 msgid "Minutes"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:159
+#: ../../templates/sidebar.inc.php:157
 #: ../../ampache/templates/sidebar.inc.php:159
 #: ../../templates/show_random_play.inc:53
 msgid "Less Played"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:164
+#: ../../templates/sidebar.inc.php:162
 #: ../../ampache/templates/sidebar.inc.php:164
 msgid "Enqueue"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:187
+#: ../../templates/sidebar.inc.php:185
 #: ../../ampache/templates/sidebar.inc.php:187
 msgid "Democratic View"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:191
+#: ../../templates/sidebar.inc.php:189
 #: ../../ampache/templates/sidebar.inc.php:191
 msgid "Logout"
 msgstr ""
@@ -1275,9 +1277,9 @@ msgstr ""
 #: ../../templates/show_modules.inc.php:42
 #: ../../templates/show_modules.inc.php:75
 #: ../../templates/show_genres.inc.php:38
-#: ../../templates/show_flagged.inc.php:29
+#: ../../templates/show_flagged.inc.php:32
 #: ../../templates/show_localplay_playlist.inc.php:29
-#: ../../templates/show_artists.inc:44 ../../templates/show_artists.inc:69
+#: ../../templates/show_artists.inc:44 ../../templates/show_artists.inc:75
 #: ../../templates/show_songs.inc:55 ../../templates/show_albums.inc:47
 #: ../../templates/show_albums.inc:90 ../../templates/show_access_list.inc:52
 #: ../../templates/show_artist.inc:39
@@ -1296,56 +1298,64 @@ msgstr ""
 msgid "Clean"
 msgstr ""
 
+#: ../../templates/show_admin_tools.inc.php:56
+msgid "Fast"
+msgstr ""
+
 #: ../../templates/show_admin_tools.inc.php:57
+msgid "Gather Art"
+msgstr ""
+
+#: ../../templates/show_admin_tools.inc.php:65
 msgid "No Catalogs Found"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:63
+#: ../../templates/show_admin_tools.inc.php:71
 msgid "Clean All"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:64
+#: ../../templates/show_admin_tools.inc.php:72
 msgid "Verify All"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:65
+#: ../../templates/show_admin_tools.inc.php:73
 msgid "Add to All"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:66
+#: ../../templates/show_admin_tools.inc.php:74
 msgid "Update All"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:69
+#: ../../templates/show_admin_tools.inc.php:77
 #: ../../templates/show_add_catalog.inc.php:78
 msgid "Gather Album Art"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:73
+#: ../../templates/show_admin_tools.inc.php:81
 msgid "Other Tools"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:75
+#: ../../templates/show_admin_tools.inc.php:83
 msgid "Show Duplicate Songs"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:76
+#: ../../templates/show_admin_tools.inc.php:84
 msgid "Clear Now Playing"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:78
+#: ../../templates/show_admin_tools.inc.php:85 ../../templates/header.inc:75
 msgid "Generate New Config"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:79
+#: ../../templates/show_admin_tools.inc.php:86
 msgid "Preferences Permissions"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:81
+#: ../../templates/show_admin_tools.inc.php:87
 msgid "Export To Itunes DB"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:82
+#: ../../templates/show_admin_tools.inc.php:88
 msgid "Check for New Version"
 msgstr ""
 
@@ -1379,7 +1389,7 @@ msgid "Find duplicate artists"
 msgstr ""
 
 #: ../../templates/show_user.inc.php:30
-#: ../../templates/show_user_registration.inc.php:118
+#: ../../templates/show_user_registration.inc.php:117
 #: ../../templates/show_edit_user.inc.php:55
 msgid "E-mail"
 msgstr ""
@@ -1393,7 +1403,7 @@ msgid "New Password"
 msgstr ""
 
 #: ../../templates/show_user.inc.php:49
-#: ../../templates/show_user_registration.inc.php:136
+#: ../../templates/show_user_registration.inc.php:135
 #: ../../templates/show_edit_user.inc.php:72
 msgid "Confirm Password"
 msgstr ""
@@ -1453,49 +1463,49 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:55
+#: ../../templates/show_user_registration.inc.php:54
 msgid "Ampache New User Registration"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:70
+#: ../../templates/show_user_registration.inc.php:69
 msgid "User Agreement"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:80
+#: ../../templates/show_user_registration.inc.php:79
 msgid "I Accept"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:94
+#: ../../templates/show_user_registration.inc.php:93
 msgid "User Information"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:109
+#: ../../templates/show_user_registration.inc.php:108
 #: ../../templates/show_edit_user.inc.php:48
 msgid "Full Name"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:156
+#: ../../templates/show_user_registration.inc.php:155
 msgid "Clear Info"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:157
+#: ../../templates/show_user_registration.inc.php:156
 msgid "Register User"
 msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:15
-#: ../../templates/show_install.inc:16
+#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install.inc:38
 msgid "Requirements"
 msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:21
+#: ../../templates/show_install_lang.inc.php:43
 #: ../../templates/show_install_config.inc:46
-#: ../../templates/show_install.inc:22
+#: ../../templates/show_install.inc:44
 msgid ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
 "ampache.cfg.php.dist file"
 msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:50
+#: ../../templates/show_install_lang.inc.php:72
 msgid "Start configuration"
 msgstr ""
 
@@ -1520,7 +1530,7 @@ msgstr ""
 
 #: ../../templates/show_modules.inc.php:61
 #: ../../templates/show_modules.inc.php:96
-#: ../../templates/show_flagged.inc.php:50
+#: ../../templates/show_flagged.inc.php:57
 #: ../../templates/show_list_duplicates.inc.php:81
 #: ../../templates/show_localplay_playlist.inc.php:51
 #: ../../templates/show_disabled_songs.inc:44
@@ -1593,7 +1603,7 @@ msgid "Mail to"
 msgstr ""
 
 #: ../../templates/show_mail_users.inc.php:45
-#: ../../templates/show_all_popular.inc.php:30 ../../index.php:66
+#: ../../templates/show_all_popular.inc.php:29
 msgid "Most Popular Albums"
 msgstr ""
 
@@ -1602,7 +1612,7 @@ msgid "Latest Artist Additions"
 msgstr ""
 
 #: ../../templates/show_mail_users.inc.php:56
-#: ../../templates/show_all_popular.inc.php:27 ../../index.php:75
+#: ../../templates/show_all_popular.inc.php:26
 msgid "Most Popular Artists"
 msgstr ""
 
@@ -1611,36 +1621,41 @@ msgid "Latest Album Additions"
 msgstr ""
 
 #: ../../templates/show_mail_users.inc.php:67
-#: ../../templates/show_all_popular.inc.php:40
+#: ../../templates/show_all_popular.inc.php:38
 msgid "Most Popular Songs"
 msgstr ""
 
 #: ../../templates/show_mail_users.inc.php:73
+msgid "Flagged Songs"
+msgstr ""
+
+#: ../../templates/show_mail_users.inc.php:77
+#: ../../templates/show_admin_info.inc.php:36
+msgid "Disabled Songs"
+msgstr ""
+
+#: ../../templates/show_mail_users.inc.php:85
 msgid "Most Popular Threshold in days"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:84
+#: ../../templates/show_mail_users.inc.php:96
 msgid "Subject"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:91
+#: ../../templates/show_mail_users.inc.php:103
 msgid "Message"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:101
+#: ../../templates/show_mail_users.inc.php:113
 msgid "Send Mail"
 msgstr ""
 
-#: ../../templates/show_admin_info.inc.php:33
+#: ../../templates/show_admin_info.inc.php:32
 msgid "Last Ten Flagged Records"
 msgstr ""
 
-#: ../../templates/show_admin_info.inc.php:37
-msgid "Disabled Songs"
-msgstr ""
-
-#: ../../templates/show_admin_info.inc.php:41
-#: ../../templates/show_flagged.inc.php:57
+#: ../../templates/show_admin_info.inc.php:40
+#: ../../templates/show_flagged.inc.php:73
 #: ../../templates/show_ip_history.inc.php:28
 msgid "Show All"
 msgstr ""
@@ -1672,24 +1687,38 @@ msgid "Continue"
 msgstr ""
 
 #: ../../templates/show_confirmation.inc.php:28
-#: ../../templates/show_preferences.inc:95
+#: ../../templates/show_preferences.inc:96
 #: ../../templates/show_similar_artists.inc:74
 msgid "Cancel"
 msgstr ""
 
-#: ../../templates/show_flagged.inc.php:26
-msgid "Object"
+#: ../../templates/show_flagged.inc.php:27
+#: ../../templates/show_disabled_songs.inc:25
+#: ../../templates/show_artist.inc:33
+msgid "Select"
 msgstr ""
 
 #: ../../templates/show_flagged.inc.php:28
+msgid "Object"
+msgstr ""
+
+#: ../../templates/show_flagged.inc.php:29
+#: ../../templates/show_preference_admin.inc.php:38
+#: ../../templates/show_add_access.inc:47
+#: ../../templates/show_access_list.inc:49
+#: ../../templates/show_edit_access.inc:47
+msgid "User"
+msgstr ""
+
+#: ../../templates/show_flagged.inc.php:31
 msgid "Status"
 msgstr ""
 
-#: ../../templates/show_flagged.inc.php:39
+#: ../../templates/show_flagged.inc.php:63
 msgid "Reject"
 msgstr ""
 
-#: ../../templates/show_flagged.inc.php:43
+#: ../../templates/show_flagged.inc.php:64
 msgid "Approve"
 msgstr ""
 
@@ -1706,14 +1735,18 @@ msgstr ""
 msgid "Update id3 tags"
 msgstr ""
 
-#: ../../templates/show_all_recent.inc.php:27
+#: ../../templates/show_all_recent.inc.php:25
 msgid "Newest Artist Additions"
 msgstr ""
 
-#: ../../templates/show_all_recent.inc.php:30 ../../index.php:82
+#: ../../templates/show_all_recent.inc.php:28
 msgid "Newest Album Additions"
 msgstr ""
 
+#: ../../templates/show_all_recent.inc.php:31
+msgid "Newest Live Stream Additions"
+msgstr ""
+
 #: ../../templates/show_get_albumart.inc.php:23
 msgid "Customize Search"
 msgstr ""
@@ -1766,10 +1799,18 @@ msgstr ""
 msgid "Delete Empty Playlists"
 msgstr ""
 
-#: ../../templates/show_all_popular.inc.php:37
+#: ../../templates/show_all_popular.inc.php:32
 msgid "Most Popular Genres"
 msgstr ""
 
+#: ../../templates/show_all_popular.inc.php:41
+msgid "Most Popular Live Streams"
+msgstr ""
+
+#: ../../templates/show_all_popular.inc.php:44
+msgid "Most Popular Tags"
+msgstr ""
+
 #: ../../templates/show_play_selected.inc.php:28
 msgid "Play Selected"
 msgstr ""
@@ -1910,22 +1951,10 @@ msgid "Filename Pattern"
 msgstr ""
 
 #: ../../templates/show_add_catalog.inc.php:82
-msgid "ID3V2 Tags"
-msgstr ""
-
-#: ../../templates/show_add_catalog.inc.php:86
-msgid "Amazon"
-msgstr ""
-
-#: ../../templates/show_add_catalog.inc.php:90
-msgid "File Folder"
-msgstr ""
-
-#: ../../templates/show_add_catalog.inc.php:98
 msgid "Build Playlists from m3u Files"
 msgstr ""
 
-#: ../../templates/show_add_catalog.inc.php:106
+#: ../../templates/show_add_catalog.inc.php:90
 msgid "Add Catalog"
 msgstr ""
 
@@ -1987,7 +2016,7 @@ msgid "Recommendations"
 msgstr ""
 
 #: ../../templates/show_user_recommendations.inc.php:29
-msgid "Recommended Aritsts"
+msgid "Recommended Artists"
 msgstr ""
 
 #: ../../templates/show_user_recommendations.inc.php:40
@@ -2013,13 +2042,6 @@ msgstr ""
 msgid "Guest"
 msgstr ""
 
-#: ../../templates/show_preference_admin.inc.php:38
-#: ../../templates/show_add_access.inc:47
-#: ../../templates/show_access_list.inc:49
-#: ../../templates/show_edit_access.inc:47
-msgid "User"
-msgstr ""
-
 #: ../../templates/show_edit_album.inc.php:23
 msgid "Edit Album"
 msgstr ""
@@ -2061,10 +2083,18 @@ msgstr ""
 msgid "Recently Played"
 msgstr ""
 
+#: ../../templates/show_recently_played.inc.php:33
+msgid "Last Played"
+msgstr ""
+
 #: ../../templates/show_edit_artist.inc.php:23
 msgid "Edit Artist"
 msgstr ""
 
+#: ../../templates/show_random_albums.inc.php:23
+msgid "Albums of the Moment"
+msgstr ""
+
 #: ../../localplay.php:50 ../../localplay.php:58
 msgid "Song(s) Removed from Playlist"
 msgstr ""
@@ -2073,7 +2103,7 @@ msgstr ""
 msgid "Localplay Init Failed"
 msgstr ""
 
-#: ../../browse.php:48 ../../albums.php:191
+#: ../../browse.php:48 ../../albums.php:213
 msgid "Show Albums starting with"
 msgstr ""
 
@@ -2081,7 +2111,7 @@ msgstr ""
 msgid "Show Artists starting with"
 msgstr ""
 
-#: ../../browse.php:123
+#: ../../browse.php:124
 msgid "Show Titles Starting With"
 msgstr ""
 
@@ -2089,6 +2119,10 @@ msgstr ""
 msgid "Error: No Keyword Entered"
 msgstr ""
 
+#: ../../ampache/templates/sidebar.inc.php:38
+msgid "Lists"
+msgstr ""
+
 #: ../../ratings.php:33
 msgid "Rating Updated"
 msgstr ""
@@ -2109,7 +2143,7 @@ msgstr ""
 msgid "No local account found"
 msgstr ""
 
-#: ../../login.php:177
+#: ../../login.php:176
 msgid "Message of the Day"
 msgstr ""
 
@@ -2125,35 +2159,35 @@ msgstr ""
 msgid "Ampache Update"
 msgstr ""
 
-#: ../../tv.php:61
+#: ../../tv.php:62
 msgid "Playlist Cleared"
 msgstr ""
 
-#: ../../artists.php:91 ../../albums.php:169
+#: ../../artists.php:91 ../../albums.php:191
 msgid "Starting Update from Tags"
 msgstr ""
 
-#: ../../artists.php:96 ../../albums.php:174
+#: ../../artists.php:96 ../../albums.php:196
 msgid "Update From Tags Complete"
 msgstr ""
 
-#: ../../artists.php:97 ../../albums.php:175
+#: ../../artists.php:97 ../../albums.php:197
 msgid "Return"
 msgstr ""
 
-#: ../../activate.php:44
+#: ../../activate.php:43
 msgid "No user with this name registered"
 msgstr ""
 
-#: ../../activate.php:48
+#: ../../activate.php:47
 msgid "The validation key used isn't correct."
 msgstr ""
 
-#: ../../activate.php:53
+#: ../../activate.php:52
 msgid "User activated"
 msgstr ""
 
-#: ../../activate.php:53
+#: ../../activate.php:52
 msgid "This User ID is activated and can be used"
 msgstr ""
 
@@ -2217,17 +2251,17 @@ msgstr ""
 msgid "Album Art information has been removed from the database"
 msgstr ""
 
-#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:133
+#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:159
 msgid "Album Art Not Located"
 msgstr ""
 
-#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:133
+#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:159
 msgid ""
 "Album Art could not be located at this time. This may be due to write access "
 "error, or the file is not received corectly."
 msgstr ""
 
-#: ../../albums.php:79 ../../albums.php:162
+#: ../../albums.php:79 ../../albums.php:106 ../../albums.php:185
 msgid "Album Art Inserted"
 msgstr ""
 
@@ -2263,11 +2297,11 @@ msgstr ""
 msgid "Error: Insert Failed"
 msgstr ""
 
-#: ../../register.php:170
+#: ../../register.php:169
 msgid "Registration Complete"
 msgstr ""
 
-#: ../../bin/print_tags.php.inc:63
+#: ../../bin/print_tags.php.inc:64
 msgid ""
 "[print_tags.php.inc]\n"
 "This commandline script will display the tag information for the specified "
@@ -2276,7 +2310,7 @@ msgid ""
 "        \n"
 msgstr ""
 
-#: ../../bin/print_tags.php.inc:69
+#: ../../bin/print_tags.php.inc:70
 msgid "Filename:"
 msgstr ""
 
@@ -2336,16 +2370,11 @@ msgstr ""
 msgid "Click to close window"
 msgstr ""
 
-#: ../../templates/show_disabled_songs.inc:25
-#: ../../templates/show_artist.inc:33
-msgid "Select"
-msgstr ""
-
 #: ../../templates/show_disabled_songs.inc:30
 msgid "Addition Time"
 msgstr ""
 
-#: ../../templates/show_disabled_songs.inc:48
+#: ../../templates/show_disabled_songs.inc:49
 msgid "Remove"
 msgstr ""
 
@@ -2357,10 +2386,14 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: ../../templates/header.inc:64 ../../ampache/templates/header.inc:64
+#: ../../templates/header.inc:63 ../../ampache/templates/header.inc:64
 msgid "You are currently logged in as"
 msgstr ""
 
+#: ../../templates/header.inc:74
+msgid "Error Config File Out of Date"
+msgstr ""
+
 #: ../../templates/show_songs.inc:47
 msgid "Song title"
 msgstr ""
@@ -2369,16 +2402,12 @@ msgstr ""
 msgid "Rating"
 msgstr ""
 
-#: ../../templates/show_songs.inc:176
+#: ../../templates/show_songs.inc:183
 msgid "Total"
 msgstr ""
 
-#: ../../templates/show_songs.inc:194
-msgid "** Indicates flagged songs"
-msgstr ""
-
 #: ../../templates/show_install_config.inc:53
-#: ../../templates/show_install.inc:34
+#: ../../templates/show_install.inc:56
 msgid "Step 2 - Creating the Ampache.cfg.php file"
 msgstr ""
 
@@ -2394,12 +2423,12 @@ msgid "Web Path"
 msgstr ""
 
 #: ../../templates/show_install_config.inc:68
-#: ../../templates/show_install.inc:42
+#: ../../templates/show_install.inc:64
 msgid "Desired Database Name"
 msgstr ""
 
 #: ../../templates/show_install_config.inc:72
-#: ../../templates/show_install.inc:46
+#: ../../templates/show_install.inc:68
 msgid "MySQL Hostname"
 msgstr ""
 
@@ -2445,43 +2474,43 @@ msgstr ""
 msgid "Find Album Art"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:52
+#: ../../templates/show_preferences.inc:53
 msgid "Editing"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:52
+#: ../../templates/show_preferences.inc:53
 msgid "preferences"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:54
+#: ../../templates/show_preferences.inc:55
 msgid "Rebuild Preferences"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:61
+#: ../../templates/show_preferences.inc:62
 msgid "Interface"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:64
+#: ../../templates/show_preferences.inc:65
 msgid "Streaming"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:67
+#: ../../templates/show_preferences.inc:68
 msgid "Options"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:71
+#: ../../templates/show_preferences.inc:72
 msgid "Account"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:75
+#: ../../templates/show_preferences.inc:76
 msgid "System"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:78
+#: ../../templates/show_preferences.inc:79
 msgid "Modules"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:91
+#: ../../templates/show_preferences.inc:92
 msgid "Update Preferences"
 msgstr ""
 
@@ -2521,34 +2550,34 @@ msgstr ""
 msgid "Unlimited"
 msgstr ""
 
-#: ../../templates/show_install.inc:32
+#: ../../templates/show_install.inc:54
 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:50
+#: ../../templates/show_install.inc:72
 msgid "MySQL Administrative Username"
 msgstr ""
 
-#: ../../templates/show_install.inc:54
+#: ../../templates/show_install.inc:76
 msgid "MySQL Administrative Password"
 msgstr ""
 
-#: ../../templates/show_install.inc:58
+#: ../../templates/show_install.inc:80
 msgid "Create Database User for New Database"
 msgstr ""
 
-#: ../../templates/show_install.inc:62
+#: ../../templates/show_install.inc:84
 msgid "Ampache Database Username"
 msgstr ""
 
-#: ../../templates/show_install.inc:66
+#: ../../templates/show_install.inc:88
 msgid "Ampache Database User Password"
 msgstr ""
 
-#: ../../templates/show_install.inc:71
+#: ../../templates/show_install.inc:93
 msgid "Insert Database"
 msgstr ""
 
@@ -2656,11 +2685,11 @@ msgstr ""
 msgid "Activity"
 msgstr ""
 
-#: ../../templates/show_users.inc:60
+#: ../../templates/show_users.inc:61
 msgid "Last Ip"
 msgstr ""
 
-#: ../../templates/show_users.inc:65
+#: ../../templates/show_users.inc:66
 msgid "On-line"
 msgstr ""
 
diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po
index ce55c11b..67b5c202 100644
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-01 20:33-0800\n"
+"POT-Creation-Date: 2007-01-22 19:07-0800\n"
 "PO-Revision-Date: 2006-01-08 00:34+0100\n"
 "Last-Translator: Mr-miky <translate@mr-miky.com>\n"
 "Language-Team: Italian\n"
@@ -18,12 +18,12 @@ msgstr ""
 "X-Generator: KBabel 1.11\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../../play/index.php:64 ../../download/index.php:62
+#: ../../play/index.php:64 ../../download/index.php:61
 msgid "Session Expired: please log in again at"
 msgstr "Sessione scaduta: Per cortesia rifai il login"
 
-#: ../../lib/class/catalog.class.php:299 ../../lib/class/catalog.class.php:592
-#: ../../lib/class/album.class.php:325
+#: ../../lib/class/catalog.class.php:303 ../../lib/class/catalog.class.php:621
+#: ../../lib/class/album.class.php:328
 msgid "Error: Unable to open"
 msgstr "Errore: Impossibile aprire"
 
@@ -31,188 +31,193 @@ msgstr "Errore: Impossibile aprire"
 msgid "Error: Unable to change to directory"
 msgstr "Errore: Impossibile cambiare alla cartella"
 
-#: ../../lib/class/catalog.class.php:375
+#: ../../lib/class/catalog.class.php:374
 msgid "Error: Unable to get filesize for"
 msgstr "Errore, impossibile leggere la dimensione del file"
 
-#: ../../lib/class/catalog.class.php:412
+#: ../../lib/class/catalog.class.php:411
 msgid "is not readable by ampache"
 msgstr "non è leggibile da ampache"
 
-#: ../../lib/class/catalog.class.php:501
+#: ../../lib/class/catalog.class.php:530
 msgid "album's with art"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:772
+#: ../../lib/class/catalog.class.php:812
 msgid "Starting Catalog Build"
 msgstr "Avvio costruzione catalogo"
 
-#: ../../lib/class/catalog.class.php:776
+#: ../../lib/class/catalog.class.php:816
 msgid "Running Remote Sync"
 msgstr "Sincronizzazione remota in corso"
 
-#: ../../lib/class/catalog.class.php:781 ../../lib/class/catalog.class.php:947
+#: ../../lib/class/catalog.class.php:821 ../../lib/class/catalog.class.php:992
 msgid "Found"
 msgstr "Trovato"
 
-#: ../../lib/class/catalog.class.php:781 ../../lib/class/catalog.class.php:804
-#: ../../lib/class/catalog.class.php:947 ../../lib/class/catalog.class.php:977
-#: ../../lib/preferences.php:269 ../../lib/preferences.php:319
-#: ../../lib/ui.lib.php:1186 ../../admin/catalog.php:259
+#: ../../lib/class/catalog.class.php:821 ../../lib/class/catalog.class.php:848
+#: ../../lib/class/catalog.class.php:992
+#: ../../lib/class/catalog.class.php:1025 ../../lib/preferences.php:269
+#: ../../lib/preferences.php:319 ../../lib/ui.lib.php:1194
+#: ../../admin/catalog.php:259
 #, fuzzy
 msgid "None"
 msgstr "No"
 
-#: ../../lib/class/catalog.class.php:796 ../../lib/class/catalog.class.php:965
+#: ../../lib/class/catalog.class.php:840
+#: ../../lib/class/catalog.class.php:1014
 msgid "Added Playlist From"
 msgstr "Aggiunta playlist da"
 
-#: ../../lib/class/catalog.class.php:803 ../../lib/class/catalog.class.php:976
-#: ../../admin/catalog.php:258
+#: ../../lib/class/catalog.class.php:847
+#: ../../lib/class/catalog.class.php:1024 ../../admin/catalog.php:258
 msgid "Starting Album Art Search"
 msgstr "Inizio ricerca copertine."
 
-#: ../../lib/class/catalog.class.php:804 ../../lib/class/catalog.class.php:977
-#: ../../admin/catalog.php:259
+#: ../../lib/class/catalog.class.php:848
+#: ../../lib/class/catalog.class.php:1025 ../../admin/catalog.php:259
 msgid "Searched"
 msgstr "Cercato"
 
-#: ../../lib/class/catalog.class.php:814
+#: ../../lib/class/catalog.class.php:858
 msgid "Catalog Finished"
 msgstr "Catalogo terminato"
 
-#: ../../lib/class/catalog.class.php:814 ../../lib/class/catalog.class.php:997
+#: ../../lib/class/catalog.class.php:858
+#: ../../lib/class/catalog.class.php:1044
 msgid "Total Time"
 msgstr "Tempo impiegato"
 
-#: ../../lib/class/catalog.class.php:814 ../../lib/class/catalog.class.php:998
+#: ../../lib/class/catalog.class.php:858
+#: ../../lib/class/catalog.class.php:1045
 msgid "Total Songs"
 msgstr "Totale brani"
 
-#: ../../lib/class/catalog.class.php:815 ../../lib/class/catalog.class.php:998
+#: ../../lib/class/catalog.class.php:859
+#: ../../lib/class/catalog.class.php:1045
 msgid "Songs Per Seconds"
 msgstr "Brani per secondo"
 
-#: ../../lib/class/catalog.class.php:849
-#: ../../lib/class/catalog.class.php:1634
+#: ../../lib/class/catalog.class.php:894
+#: ../../lib/class/catalog.class.php:1565
 msgid "Updated"
 msgstr "Aggiornato"
 
-#: ../../lib/class/catalog.class.php:856
+#: ../../lib/class/catalog.class.php:901
 msgid "No Update Needed"
 msgstr "Non è necessario aggiornare"
 
-#: ../../lib/class/catalog.class.php:938
+#: ../../lib/class/catalog.class.php:983
 msgid "Starting New Song Search on"
 msgstr "Avvio nuova ricerca brano in"
 
-#: ../../lib/class/catalog.class.php:938
+#: ../../lib/class/catalog.class.php:983
 msgid "catalog"
 msgstr "catalogo"
 
-#: ../../lib/class/catalog.class.php:942
+#: ../../lib/class/catalog.class.php:987
 msgid "Running Remote Update"
 msgstr "Aggiornamento remoto in corso"
 
-#: ../../lib/class/catalog.class.php:997
+#: ../../lib/class/catalog.class.php:1044
 msgid "Catalog Update Finished"
 msgstr "Aggiornamento catalogo terminato"
 
-#: ../../lib/class/catalog.class.php:1017
+#: ../../lib/class/catalog.class.php:1064
 msgid "Error"
 msgstr "Errore"
 
-#: ../../lib/class/catalog.class.php:1017
+#: ../../lib/class/catalog.class.php:1064
 msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
 msgstr ""
 "Impossibile caricare la libreria XMLRPC, verifica che XML-RPC sia abilitato"
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Error connecting to"
 msgstr "Errore connettendosi a"
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Code"
 msgstr "Codice"
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Reason"
 msgstr "Motivazione"
 
-#: ../../lib/class/catalog.class.php:1076
+#: ../../lib/class/catalog.class.php:1123
 msgid "Completed updating remote catalog(s)"
 msgstr "Terminato aggiornamento remoto catalogo(ghi)."
 
-#: ../../lib/class/catalog.class.php:1111
+#: ../../lib/class/catalog.class.php:1158
 msgid "Added"
 msgstr "Aggiunti"
 
-#: ../../lib/class/catalog.class.php:1193
+#: ../../lib/class/catalog.class.php:1240
 #, fuzzy
 msgid "Cleaning the"
 msgstr "Aggiornamento di"
 
-#: ../../lib/class/catalog.class.php:1193
-#: ../../lib/class/catalog.class.php:1589 ../../templates/sidebar.inc.php:30
+#: ../../lib/class/catalog.class.php:1240
+#: ../../lib/class/catalog.class.php:1520 ../../templates/sidebar.inc.php:30
 #: ../../ampache/templates/sidebar.inc.php:30
 msgid "Catalog"
 msgstr "Catalogo"
 
-#: ../../lib/class/catalog.class.php:1194
+#: ../../lib/class/catalog.class.php:1241
 msgid "Checking"
 msgstr "Controllo in corso"
 
-#: ../../lib/class/catalog.class.php:1265
+#: ../../lib/class/catalog.class.php:1313
 msgid "Catalog Clean Done"
 msgstr "Pulizia catalogo terminata"
 
-#: ../../lib/class/catalog.class.php:1265
+#: ../../lib/class/catalog.class.php:1313
 msgid "files removed"
 msgstr "files rimossi"
 
-#: ../../lib/class/catalog.class.php:1589
+#: ../../lib/class/catalog.class.php:1520
 msgid "Updating the"
 msgstr "Aggiornamento di"
 
-#: ../../lib/class/catalog.class.php:1590
+#: ../../lib/class/catalog.class.php:1521
 msgid "songs found checking tag information."
 msgstr "controllo informazioni tag dei brani trovati."
 
-#: ../../lib/class/catalog.class.php:1591
+#: ../../lib/class/catalog.class.php:1522
 msgid "Verifed"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1643
+#: ../../lib/class/catalog.class.php:1574
 msgid " FOUND"
 msgstr "TROVATO"
 
-#: ../../lib/class/catalog.class.php:1645
+#: ../../lib/class/catalog.class.php:1576
 msgid "Searching for new Album Art"
 msgstr "Ricerca nuova copertina"
 
-#: ../../lib/class/catalog.class.php:1649
+#: ../../lib/class/catalog.class.php:1580
 msgid "Album Art Already Found"
 msgstr "Copertina album già trovata"
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 #, fuzzy
 msgid "Update Finished."
 msgstr "Aggiornamento catalogo terminato"
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 #, fuzzy
 msgid "Checked"
 msgstr "Controllo in corso"
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 #, fuzzy
 msgid "songs updated."
 msgstr "è stata aggiornata"
 
-#: ../../lib/class/song.class.php:360
+#: ../../lib/class/song.class.php:361
 #: ../../templates/show_duplicates.inc.php:35
 #: ../../templates/show_edit_song.inc.php:31
 #: ../../templates/show_disabled_songs.inc:26
@@ -220,53 +225,53 @@ msgstr "è stata aggiornata"
 msgid "Title"
 msgstr "Titolo"
 
-#: ../../lib/class/song.class.php:360 ../../lib/class/song.class.php:364
-#: ../../lib/class/song.class.php:368 ../../lib/class/song.class.php:372
-#: ../../lib/class/song.class.php:376 ../../lib/class/song.class.php:380
-#: ../../lib/class/song.class.php:384 ../../lib/class/song.class.php:389
-#: ../../lib/class/song.class.php:394 ../../lib/class/song.class.php:398
-#: ../../lib/class/song.class.php:402 ../../lib/class/song.class.php:407
+#: ../../lib/class/song.class.php:361 ../../lib/class/song.class.php:365
+#: ../../lib/class/song.class.php:369 ../../lib/class/song.class.php:373
+#: ../../lib/class/song.class.php:377 ../../lib/class/song.class.php:381
+#: ../../lib/class/song.class.php:385 ../../lib/class/song.class.php:390
+#: ../../lib/class/song.class.php:395 ../../lib/class/song.class.php:399
+#: ../../lib/class/song.class.php:403 ../../lib/class/song.class.php:408
 msgid "updated to"
 msgstr "aggiornato a"
 
-#: ../../lib/class/song.class.php:364
+#: ../../lib/class/song.class.php:365
 #: ../../templates/show_list_duplicates.inc.php:35
 #: ../../templates/show_songs.inc:53
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: ../../lib/class/song.class.php:368
+#: ../../lib/class/song.class.php:369
 msgid "Rate"
 msgstr "Voto"
 
-#: ../../lib/class/song.class.php:372
+#: ../../lib/class/song.class.php:373
 msgid "Mode"
 msgstr "Modo"
 
-#: ../../lib/class/song.class.php:376
+#: ../../lib/class/song.class.php:377
 #: ../../templates/show_tv_playlist.inc.php:46
 #: ../../templates/show_songs.inc:51
 msgid "Time"
 msgstr "Durata"
 
-#: ../../lib/class/song.class.php:380
+#: ../../lib/class/song.class.php:381
 #: ../../templates/show_edit_song.inc.php:61
 #: ../../templates/show_localplay_playlist.inc.php:27
 #: ../../templates/show_songs.inc:45 ../../templates/show_songs.inc:50
 msgid "Track"
 msgstr "Traccia"
 
-#: ../../lib/class/song.class.php:384
+#: ../../lib/class/song.class.php:385
 msgid "Filesize"
 msgstr "Dimensione file"
 
-#: ../../lib/class/song.class.php:389
+#: ../../lib/class/song.class.php:390
 #: ../../templates/show_edit_song.inc.php:45
 #: ../../templates/show_get_albumart.inc.php:30
 #: ../../templates/show_play_selected.inc.php:60
 #: ../../templates/show_list_duplicates.inc.php:32
 #: ../../templates/show_recently_played.inc.php:32
-#: ../../templates/show_artists.inc:40 ../../templates/show_artists.inc:65
+#: ../../templates/show_artists.inc:40 ../../templates/show_artists.inc:71
 #: ../../templates/show_disabled_songs.inc:28
 #: ../../templates/show_songs.inc:48 ../../templates/show_albums.inc:41
 #: ../../templates/show_albums.inc:84
@@ -275,7 +280,7 @@ msgstr "Dimensione file"
 msgid "Artist"
 msgstr "Artista"
 
-#: ../../lib/class/song.class.php:394
+#: ../../lib/class/song.class.php:395
 #: ../../templates/show_edit_song.inc.php:37
 #: ../../templates/show_get_albumart.inc.php:38
 #: ../../templates/show_play_selected.inc.php:59
@@ -287,7 +292,7 @@ msgstr "Artista"
 msgid "Album"
 msgstr "Album"
 
-#: ../../lib/class/song.class.php:398
+#: ../../lib/class/song.class.php:399
 #: ../../templates/show_edit_song.inc.php:67
 #: ../../templates/show_play_selected.inc.php:61
 #: ../../templates/show_edit_album.inc.php:33
@@ -296,13 +301,13 @@ msgstr "Album"
 msgid "Year"
 msgstr "Anno"
 
-#: ../../lib/class/song.class.php:402 ../../templates/show_flag.inc.php:64
+#: ../../lib/class/song.class.php:403 ../../templates/show_flag.inc.php:64
 #: ../../templates/show_edit_song.inc.php:73
 #: ../../templates/show_search.inc:37
 msgid "Comment"
 msgstr "Commento"
 
-#: ../../lib/class/song.class.php:407 ../../lib/ui.lib.php:843
+#: ../../lib/class/song.class.php:408 ../../lib/ui.lib.php:851
 #: ../../templates/sidebar.inc.php:36
 #: ../../templates/show_edit_song.inc.php:53
 #: ../../templates/show_genre.inc.php:29
@@ -317,36 +322,36 @@ msgstr "Genere"
 msgid "Error: Name Identical"
 msgstr "Errore: Nome identico"
 
-#: ../../lib/class/flag.class.php:263
+#: ../../lib/class/flag.class.php:264
 #, fuzzy
 msgid "Approved"
 msgstr "Spostato"
 
-#: ../../lib/class/flag.class.php:264
+#: ../../lib/class/flag.class.php:265
 #, fuzzy
 msgid "Pending"
 msgstr "Aggiunta"
 
-#: ../../lib/class/flag.class.php:276 ../../templates/show_flag.inc.php:56
+#: ../../lib/class/flag.class.php:277 ../../templates/show_flag.inc.php:56
 #: ../../templates/show_playlists.inc.php:57
 #: ../../templates/show_admin_tools.inc.php:50
 msgid "Delete"
 msgstr "Cancella"
 
-#: ../../lib/class/flag.class.php:279
+#: ../../lib/class/flag.class.php:280
 msgid "Re-Tag"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:282 ../../templates/show_flag.inc.php:58
+#: ../../lib/class/flag.class.php:283 ../../templates/show_flag.inc.php:58
 msgid "Re-encode"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:285 ../../templates/show_flag.inc.php:59
+#: ../../lib/class/flag.class.php:286 ../../templates/show_flag.inc.php:59
 #, fuzzy
 msgid "Other"
 msgstr "altro"
 
-#: ../../lib/class/flag.class.php:288 ../../lib/class/localplay.class.php:569
+#: ../../lib/class/flag.class.php:289 ../../lib/class/localplay.class.php:570
 #: ../../lib/general.lib.php:890
 #: ../../modules/localplay/icecast.controller.php:292
 #: ../../modules/localplay/mpd.controller.php:354
@@ -354,26 +359,26 @@ msgstr "altro"
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../../lib/class/localplay.class.php:560 ../../templates/show_tv.inc.php:81
+#: ../../lib/class/localplay.class.php:561 ../../templates/show_tv.inc.php:64
 #: ../../templates/show_now_playing.inc:32
 msgid "Now Playing"
 msgstr "In esecuzione"
 
-#: ../../lib/class/localplay.class.php:563
+#: ../../lib/class/localplay.class.php:564
 #, fuzzy
 msgid "Stopped"
 msgstr "Arresta"
 
-#: ../../lib/class/localplay.class.php:566
+#: ../../lib/class/localplay.class.php:567
 #, fuzzy
 msgid "Paused"
 msgstr "Pausa"
 
-#: ../../lib/class/album.class.php:162
+#: ../../lib/class/album.class.php:163
 msgid "Various"
 msgstr "Vari"
 
-#: ../../lib/class/genre.class.php:284
+#: ../../lib/class/genre.class.php:285
 msgid "Show Genres starting with"
 msgstr "Mostra generi che iniziano per"
 
@@ -415,31 +420,31 @@ msgid "Disable"
 msgstr "Disabilitato"
 
 #: ../../lib/preferences.php:271 ../../templates/show_tv_adminctl.inc.php:41
-#: ../../templates/show_playtype_switch.inc.php:9
+#: ../../templates/show_playtype_switch.inc.php:30
 msgid "Stream"
 msgstr "Stream"
 
 #: ../../lib/preferences.php:274 ../../templates/show_tv_adminctl.inc.php:42
-#: ../../templates/show_playtype_switch.inc.php:13
+#: ../../templates/show_playtype_switch.inc.php:34
 msgid "Downsample"
 msgstr ""
 
 #: ../../lib/preferences.php:277
-#: ../../templates/show_playtype_switch.inc.php:15
+#: ../../templates/show_playtype_switch.inc.php:36
 msgid "Democratic"
 msgstr ""
 
-#: ../../lib/preferences.php:280 ../../templates/sidebar.inc.php:170
+#: ../../lib/preferences.php:280 ../../templates/sidebar.inc.php:168
 #: ../../templates/show_tv_adminctl.inc.php:40
 #: ../../templates/show_localplay.inc.php:26
-#: ../../templates/show_playtype_switch.inc.php:11
+#: ../../templates/show_playtype_switch.inc.php:32
 #: ../../ampache/templates/sidebar.inc.php:170
 #, fuzzy
 msgid "Localplay"
 msgstr "Riproduzione locale"
 
 #: ../../lib/preferences.php:282
-#: ../../templates/show_playtype_switch.inc.php:17
+#: ../../templates/show_playtype_switch.inc.php:38
 msgid "XSPF Player"
 msgstr ""
 
@@ -484,11 +489,11 @@ msgstr "Locale"
 msgid "No songs in this playlist."
 msgstr "Non ci sono brani in questa playlist"
 
-#: ../../lib/playlist.lib.php:191 ../../lib/ui.lib.php:892
-#: ../../templates/sidebar.inc.php:150
+#: ../../lib/playlist.lib.php:191 ../../lib/ui.lib.php:900
+#: ../../templates/sidebar.inc.php:148
 #: ../../templates/show_admin_tools.inc.php:48
 #: ../../ampache/templates/sidebar.inc.php:150
-#: ../../templates/show_artists.inc:55 ../../templates/show_random_play.inc:40
+#: ../../templates/show_random_play.inc:40
 #: ../../templates/show_add_access.inc:59
 #: ../../templates/show_edit_access.inc:69
 msgid "All"
@@ -502,7 +507,7 @@ msgstr "Nuova playlist"
 msgid "Error Access Denied"
 msgstr "Errore Accesso negato"
 
-#: ../../lib/ui.lib.php:194 ../../templates/sidebar.inc.php:89
+#: ../../lib/ui.lib.php:194 ../../templates/sidebar.inc.php:87
 #: ../../ampache/templates/sidebar.inc.php:89
 msgid "Browse"
 msgstr "Sfoglia"
@@ -515,142 +520,136 @@ msgstr "Mostra senza immagini"
 msgid "Show all"
 msgstr "Mostra tutto"
 
-#: ../../lib/ui.lib.php:538 ../../admin/mail.php:80
+#: ../../lib/ui.lib.php:539 ../../admin/mail.php:81
 msgid "No Catalogs Found!"
 msgstr "Non è stato trovato alcun catalogo"
 
-#: ../../lib/ui.lib.php:539 ../../admin/mail.php:81
-#: ../../templates/show_admin_tools.inc.php:67
+#: ../../lib/ui.lib.php:540 ../../admin/mail.php:82
+#: ../../templates/show_admin_tools.inc.php:75
 #: ../../templates/show_add_catalog.inc.php:28
 msgid "Add a Catalog"
 msgstr "Aggiungi un catalogo"
 
-#: ../../lib/ui.lib.php:540 ../../admin/mail.php:82
-#: ../../templates/show_mail_users.inc.php:41
-#: ../../templates/show_local_catalog_info.inc.php:23
-msgid "Catalog Statistics"
-msgstr "Statistiche catalogo"
-
-#: ../../lib/ui.lib.php:576 ../../admin/mail.php:119
+#: ../../lib/ui.lib.php:578 ../../admin/mail.php:120
 msgid "day"
 msgstr "giorno"
 
-#: ../../lib/ui.lib.php:576 ../../admin/mail.php:119
+#: ../../lib/ui.lib.php:578 ../../admin/mail.php:120
 msgid "days"
 msgstr "giorni"
 
-#: ../../lib/ui.lib.php:578 ../../admin/mail.php:121
+#: ../../lib/ui.lib.php:580 ../../admin/mail.php:122
 msgid "hour"
 msgstr "ora"
 
-#: ../../lib/ui.lib.php:578 ../../admin/mail.php:121
+#: ../../lib/ui.lib.php:580 ../../admin/mail.php:122
 msgid "hours"
 msgstr "ore"
 
-#: ../../lib/ui.lib.php:782 ../../templates/show_tv.inc.php:58
-#: ../../templates/sidebar.inc.php:50
+#: ../../lib/ui.lib.php:790 ../../templates/sidebar.inc.php:48
 #: ../../ampache/templates/sidebar.inc.php:50
 msgid "Home"
 msgstr "Inizio"
 
-#: ../../lib/ui.lib.php:785
+#: ../../lib/ui.lib.php:793
 msgid "Upload"
 msgstr ""
 
-#: ../../lib/ui.lib.php:788
+#: ../../lib/ui.lib.php:796
 msgid "Local Play"
 msgstr "Riproduzione locale"
 
-#: ../../lib/ui.lib.php:791
+#: ../../lib/ui.lib.php:799
 #, fuzzy
 msgid "Random Play"
 msgstr "Casuale"
 
-#: ../../lib/ui.lib.php:794 ../../templates/show_play_selected.inc.php:47
+#: ../../lib/ui.lib.php:802 ../../templates/show_play_selected.inc.php:47
 msgid "Playlist"
 msgstr "Playlist"
 
-#: ../../lib/ui.lib.php:797 ../../templates/show_duplicates.inc.php:51
-#: ../../templates/sidebar.inc.php:118 ../../templates/sidebar.inc.php:124
+#: ../../lib/ui.lib.php:805 ../../templates/show_duplicates.inc.php:51
+#: ../../templates/sidebar.inc.php:116 ../../templates/sidebar.inc.php:122
 #: ../../ampache/templates/sidebar.inc.php:118
 #: ../../ampache/templates/sidebar.inc.php:124
 #: ../../templates/show_search_bar.inc:31 ../../templates/show_search.inc:133
 msgid "Search"
 msgstr "Cerca"
 
-#: ../../lib/ui.lib.php:800 ../../templates/sidebar.inc.php:81
+#: ../../lib/ui.lib.php:808 ../../templates/sidebar.inc.php:79
 #: ../../ampache/templates/sidebar.inc.php:81
 msgid "Preferences"
 msgstr "Impostazioni"
 
-#: ../../lib/ui.lib.php:803 ../../lib/ui.lib.php:807
+#: ../../lib/ui.lib.php:811 ../../lib/ui.lib.php:815
 #, fuzzy
 msgid "Admin-Catalog"
 msgstr "Aggiungi catalogo"
 
-#: ../../lib/ui.lib.php:811
+#: ../../lib/ui.lib.php:819
 #, fuzzy
 msgid "Admin-User Management"
 msgstr "Gestione utenti"
 
-#: ../../lib/ui.lib.php:815
+#: ../../lib/ui.lib.php:823
 #, fuzzy
 msgid "Admin-Mail Users"
 msgstr "Posta utenti"
 
-#: ../../lib/ui.lib.php:819
+#: ../../lib/ui.lib.php:827
 #, fuzzy
 msgid "Admin-Manage Access Lists"
 msgstr "Liste accesso"
 
-#: ../../lib/ui.lib.php:823
+#: ../../lib/ui.lib.php:831
 #, fuzzy
 msgid "Admin-Site Preferences"
 msgstr "Impostazioni amministrazione"
 
-#: ../../lib/ui.lib.php:827
+#: ../../lib/ui.lib.php:835
 msgid "Admin-Manage Modules"
 msgstr ""
 
-#: ../../lib/ui.lib.php:831
+#: ../../lib/ui.lib.php:839
 #, fuzzy
 msgid "Browse Music"
 msgstr "Sfoglia"
 
-#: ../../lib/ui.lib.php:835 ../../admin/mail.php:133
-#: ../../templates/sidebar.inc.php:34 ../../templates/sidebar.inc.php:158
+#: ../../lib/ui.lib.php:843 ../../admin/mail.php:134
+#: ../../templates/sidebar.inc.php:34 ../../templates/sidebar.inc.php:156
 #: ../../templates/show_genre.inc.php:32
-#: ../../templates/show_local_catalog_info.inc.php:34
+#: ../../templates/show_local_catalog_info.inc.php:28
 #: ../../ampache/templates/sidebar.inc.php:34
 #: ../../ampache/templates/sidebar.inc.php:158
-#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:68
+#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:74
 msgid "Albums"
 msgstr "Albums"
 
-#: ../../lib/ui.lib.php:839 ../../admin/mail.php:134
-#: ../../templates/sidebar.inc.php:35 ../../templates/sidebar.inc.php:157
+#: ../../lib/ui.lib.php:847 ../../admin/mail.php:135
+#: ../../templates/sidebar.inc.php:35 ../../templates/sidebar.inc.php:155
 #: ../../templates/show_genre.inc.php:35
-#: ../../templates/show_local_catalog_info.inc.php:38
+#: ../../templates/show_local_catalog_info.inc.php:29
 #: ../../ampache/templates/sidebar.inc.php:35
 #: ../../ampache/templates/sidebar.inc.php:157
 msgid "Artists"
 msgstr "Artisti"
 
-#: ../../lib/ui.lib.php:847 ../../templates/sidebar.inc.php:112
+#: ../../lib/ui.lib.php:855 ../../templates/sidebar.inc.php:110
 #: ../../ampache/templates/sidebar.inc.php:112
 #, fuzzy
 msgid "Statistics"
 msgstr "Statistiche catalogo"
 
-#: ../../lib/ui.lib.php:1421
+#: ../../lib/ui.lib.php:1429
 msgid "Manage Users"
 msgstr "Gestione utenti"
 
-#: ../../lib/ui.lib.php:1422
+#: ../../lib/ui.lib.php:1430
 msgid "Add a new user"
 msgstr "Aggiungi nuovo utente"
 
-#: ../../lib/general.lib.php:670 ../../templates/show_user_stats.inc.php:32
+#: ../../lib/general.lib.php:670 ../../templates/show_box.inc.php:30
+#: ../../templates/show_user_stats.inc.php:32
 #: ../../templates/show_user_stats.inc.php:43
 #: ../../templates/show_user_stats.inc.php:54
 #: ../../templates/show_user_recommendations.inc.php:32
@@ -780,7 +779,7 @@ msgstr "Tutti gli 'In esecuzione ora' sono stati cancellati"
 msgid "Do you really want to clear the statistics for this catalog?"
 msgstr "Vuoi veramente eliminare le statistiche di questo catalogo?"
 
-#: ../../admin/catalog.php:230 ../../templates/show_admin_tools.inc.php:68
+#: ../../admin/catalog.php:230 ../../templates/show_admin_tools.inc.php:76
 msgid "Clear Catalog Stats"
 msgstr "Azzera stato del catalogo"
 
@@ -836,28 +835,32 @@ msgstr "Modifica marcati"
 msgid "Flag Removed from"
 msgstr ""
 
-#: ../../admin/flag.php:274
+#: ../../admin/flag.php:270
+msgid "Flags Updated"
+msgstr ""
+
+#: ../../admin/flag.php:289
 msgid "Songs Disabled"
 msgstr "Brani disabilitati"
 
-#: ../../admin/flag.php:274
+#: ../../admin/flag.php:289
 msgid "The requested song(s) have been disabled"
 msgstr "I brani richiesti sono stati disabilitati"
 
-#: ../../admin/flag.php:285
+#: ../../admin/flag.php:300
 msgid "Songs Enabled"
 msgstr "Brani abilitati"
 
-#: ../../admin/flag.php:285
+#: ../../admin/flag.php:300
 msgid "The requested song(s) have been enabled"
 msgstr "I brani richiesti sono stati abilitati"
 
-#: ../../admin/flag.php:290
+#: ../../admin/flag.php:305
 #, fuzzy
 msgid "Flagged Records"
 msgstr "Marcata da"
 
-#: ../../admin/preferences.php:59 ../../admin/preferences.php:82
+#: ../../admin/preferences.php:60 ../../admin/preferences.php:83
 #, fuzzy
 msgid "Site"
 msgstr "Dimensione"
@@ -905,67 +908,72 @@ msgstr "Errore, E' necessario un nome utente"
 msgid "Error Passwords don't match"
 msgstr "Errore password non corrispondente"
 
-#: ../../admin/users.php:117 ../../register.php:138
+#: ../../admin/users.php:120 ../../register.php:138
 msgid "Error Username already exists"
 msgstr "Errore, Nome utente già in uso"
 
-#: ../../admin/users.php:139
+#: ../../admin/users.php:142
 msgid "Deletion Request"
 msgstr ""
 
-#: ../../admin/users.php:140
+#: ../../admin/users.php:143
 msgid "Are you sure you want to permanently delete"
 msgstr "Sei sicuro di volere cancellare permanentemente"
 
-#: ../../admin/users.php:145 ../../templates/show_confirm_action.inc.php:29
+#: ../../admin/users.php:148 ../../templates/show_confirm_action.inc.php:29
 #: ../../templates/show_search.inc:78
 msgid "No"
 msgstr "No"
 
-#: ../../admin/users.php:147
+#: ../../admin/users.php:150
 msgid "User Deleted"
 msgstr "Utente cancellato"
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:153
 msgid "Delete Error"
 msgstr "Errore di cancellazione"
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:153
 msgid "Unable to delete last Admin User"
 msgstr "Impossibile cancellare l' ultimo utente amministratore"
 
-#: ../../admin/mail.php:131 ../../templates/show_local_catalog_info.inc.php:26
+#: ../../admin/mail.php:83 ../../templates/show_mail_users.inc.php:41
+#: ../../templates/show_local_catalog_info.inc.php:23
+msgid "Catalog Statistics"
+msgstr "Statistiche catalogo"
+
+#: ../../admin/mail.php:132 ../../templates/show_local_catalog_info.inc.php:27
 msgid "Total Users"
 msgstr "Totale utenti"
 
-#: ../../admin/mail.php:132 ../../templates/show_local_catalog_info.inc.php:30
+#: ../../admin/mail.php:133 ../../templates/show_local_catalog_info.inc.php:26
 msgid "Connected Users"
 msgstr "Utenti connessi"
 
-#: ../../admin/mail.php:135 ../../templates/sidebar.inc.php:155
+#: ../../admin/mail.php:136 ../../templates/sidebar.inc.php:153
 #: ../../templates/show_genre.inc.php:38
-#: ../../templates/show_local_catalog_info.inc.php:42
+#: ../../templates/show_local_catalog_info.inc.php:30
 #: ../../templates/show_genres.inc.php:37
 #: ../../ampache/templates/sidebar.inc.php:155
-#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:67
+#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:73
 #: ../../templates/show_albums.inc:43 ../../templates/show_albums.inc:86
 msgid "Songs"
 msgstr "Brani"
 
-#: ../../admin/mail.php:136 ../../templates/show_local_catalog_info.inc.php:46
+#: ../../admin/mail.php:137 ../../templates/show_local_catalog_info.inc.php:31
 msgid "Catalog Size"
 msgstr "Dimensione catalogo"
 
-#: ../../admin/mail.php:137 ../../templates/show_local_catalog_info.inc.php:50
+#: ../../admin/mail.php:138 ../../templates/show_local_catalog_info.inc.php:32
 msgid "Catalog Time"
 msgstr "Durata catalogo"
 
-#: ../../admin/mail.php:219
+#: ../../admin/mail.php:252
 #, fuzzy
 msgid "E-mail Sent"
 msgstr "Gestione E-mail"
 
-#: ../../admin/mail.php:220
+#: ../../admin/mail.php:253
 msgid "Your E-mail was successfully sent."
 msgstr ""
 
@@ -1028,21 +1036,21 @@ msgid "Incorrect Tags"
 msgstr ""
 
 #: ../../templates/show_flag.inc.php:70
-#: ../../templates/show_flagged.inc.php:27
+#: ../../templates/show_flagged.inc.php:30
 msgid "Flag"
 msgstr "Marcatura"
 
 #: ../../templates/show_install_account.inc.php:36
-#: ../../templates/show_install_lang.inc.php:10
+#: ../../templates/show_install_lang.inc.php:32
 #: ../../templates/show_install_config.inc:36
-#: ../../templates/show_install.inc:10
+#: ../../templates/show_install.inc:32
 msgid "Ampache Installation"
 msgstr "Installazione Ampache"
 
 #: ../../templates/show_install_account.inc.php:43
-#: ../../templates/show_install_lang.inc.php:17
+#: ../../templates/show_install_lang.inc.php:39
 #: ../../templates/show_install_config.inc:42
-#: ../../templates/show_install.inc:18
+#: ../../templates/show_install.inc:40
 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 "
@@ -1053,9 +1061,9 @@ msgstr ""
 "i seguenti pre-requisiti"
 
 #: ../../templates/show_install_account.inc.php:46
-#: ../../templates/show_install_lang.inc.php:20
+#: ../../templates/show_install_lang.inc.php:42
 #: ../../templates/show_install_config.inc:45
-#: ../../templates/show_install.inc:21
+#: ../../templates/show_install.inc:43
 msgid ""
 "A MySQL Server with a username and password that can create/modify databases"
 msgstr ""
@@ -1071,9 +1079,9 @@ msgstr ""
 "config/ampache.cfg.dist.php"
 
 #: ../../templates/show_install_account.inc.php:49
-#: ../../templates/show_install_lang.inc.php:24
+#: ../../templates/show_install_lang.inc.php:46
 #: ../../templates/show_install_config.inc:48
-#: ../../templates/show_install.inc:25
+#: ../../templates/show_install.inc:47
 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 "
@@ -1083,7 +1091,7 @@ msgstr ""
 
 #: ../../templates/show_install_account.inc.php:53
 #: ../../templates/show_install_config.inc:52
-#: ../../templates/show_install.inc:30
+#: ../../templates/show_install.inc:52
 msgid "Step 1 - Creating and Inserting the Ampache Database"
 msgstr "Passo 1 - Creazione ed inserimento del database Ampache"
 
@@ -1093,7 +1101,7 @@ msgstr "Passo 2 - Creazione del file ampache.cfg.php"
 
 #: ../../templates/show_install_account.inc.php:55
 #: ../../templates/show_install_config.inc:57
-#: ../../templates/show_install.inc:35
+#: ../../templates/show_install.inc:57
 msgid "Step 3 - Setup Initial Account"
 msgstr "Passo 3 -Impostazione account iniziale"
 
@@ -1110,7 +1118,7 @@ msgid "Create Admin Account"
 msgstr "Crea account Amministratore"
 
 #: ../../templates/show_install_account.inc.php:65
-#: ../../templates/show_user_registration.inc.php:99
+#: ../../templates/show_user_registration.inc.php:98
 #: ../../templates/show_edit_user.inc.php:40
 #: ../../templates/show_recently_played.inc.php:29
 #: ../../templates/show_users.inc:43
@@ -1118,7 +1126,7 @@ msgid "Username"
 msgstr "Nome utente"
 
 #: ../../templates/show_install_account.inc.php:69
-#: ../../templates/show_user_registration.inc.php:127
+#: ../../templates/show_user_registration.inc.php:126
 #: ../../templates/show_edit_user.inc.php:63
 #: ../../templates/show_login_form.inc:37
 msgid "Password"
@@ -1129,7 +1137,7 @@ msgid "Create Account"
 msgstr "Crea account"
 
 #: ../../templates/show_playlists.inc.php:28
-#: ../../templates/sidebar.inc.php:106
+#: ../../templates/sidebar.inc.php:104
 #: ../../ampache/templates/sidebar.inc.php:106
 msgid "Playlists"
 msgstr "Playlists"
@@ -1161,22 +1169,20 @@ msgstr "Visualizza"
 
 #: ../../templates/show_playlists.inc.php:55
 #: ../../templates/show_play_selected.inc.php:50
-#: ../../templates/show_artists.inc:58 ../../templates/show_access_list.inc:67
+#: ../../templates/show_access_list.inc:67
 msgid "Edit"
 msgstr "Modifica"
 
 #: ../../templates/show_playlists.inc.php:61
 #: ../../templates/show_tv_adminctl.inc.php:44
-#: ../../templates/show_genres.inc.php:47 ../../templates/show_artists.inc:54
 #: ../../templates/show_random_play.inc:82
 msgid "Play"
 msgstr "Riproduci"
 
 #: ../../templates/show_playlists.inc.php:63
-#: ../../templates/sidebar.inc.php:135
+#: ../../templates/sidebar.inc.php:133
 #: ../../templates/show_localplay_status.inc.php:62
 #: ../../ampache/templates/sidebar.inc.php:135
-#: ../../templates/show_artists.inc:56
 msgid "Random"
 msgstr "Casuale"
 
@@ -1215,11 +1221,11 @@ msgstr ""
 msgid "Yes"
 msgstr "Si"
 
-#: ../../templates/show_tv.inc.php:56
+#: ../../templates/show_tv.inc.php:42
 msgid "Controls"
 msgstr ""
 
-#: ../../templates/show_tv.inc.php:74
+#: ../../templates/show_tv.inc.php:57
 #: ../../templates/show_localplay.inc.php:42
 #, fuzzy
 msgid "Current Playlist"
@@ -1247,7 +1253,7 @@ msgstr "Nome"
 
 #: ../../templates/show_playlist_edit.inc.php:36
 #: ../../templates/show_add_playlist.inc.php:32
-#: ../../templates/show_random_play.inc:50
+#: ../../templates/show_random_play.inc:49
 #: ../../templates/show_access_list.inc:51
 msgid "Type"
 msgstr ""
@@ -1262,6 +1268,7 @@ msgstr ""
 
 #: ../../templates/show_playlist_edit.inc.php:48
 #: ../../templates/show_tv_adminctl.inc.php:51
+#: ../../templates/show_flagged.inc.php:66
 #: ../../templates/show_play_selected.inc.php:64
 #: ../../templates/show_preference_admin.inc.php:47
 #: ../../templates/show_edit_access.inc:78
@@ -1296,41 +1303,36 @@ msgstr "Liste di accesso"
 msgid "Song Title"
 msgstr "Titolo brano"
 
-#: ../../templates/sidebar.inc.php:38
-#: ../../ampache/templates/sidebar.inc.php:38
-msgid "Lists"
-msgstr "Liste"
-
-#: ../../templates/sidebar.inc.php:62
+#: ../../templates/sidebar.inc.php:60
 #: ../../templates/show_tv_playlist.inc.php:48
 #: ../../templates/show_preference_admin.inc.php:39
 #: ../../ampache/templates/sidebar.inc.php:62
 msgid "Admin"
 msgstr "Amministrazione"
 
-#: ../../templates/sidebar.inc.php:156
+#: ../../templates/sidebar.inc.php:154
 #: ../../ampache/templates/sidebar.inc.php:156
 #: ../../templates/show_random_play.inc:56
 msgid "Minutes"
 msgstr "Minuti"
 
-#: ../../templates/sidebar.inc.php:159
+#: ../../templates/sidebar.inc.php:157
 #: ../../ampache/templates/sidebar.inc.php:159
 #: ../../templates/show_random_play.inc:53
 msgid "Less Played"
 msgstr "Meno ascoltati"
 
-#: ../../templates/sidebar.inc.php:164
+#: ../../templates/sidebar.inc.php:162
 #: ../../ampache/templates/sidebar.inc.php:164
 msgid "Enqueue"
 msgstr "Accoda"
 
-#: ../../templates/sidebar.inc.php:187
+#: ../../templates/sidebar.inc.php:185
 #: ../../ampache/templates/sidebar.inc.php:187
 msgid "Democratic View"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:191
+#: ../../templates/sidebar.inc.php:189
 #: ../../ampache/templates/sidebar.inc.php:191
 msgid "Logout"
 msgstr "Uscita"
@@ -1345,9 +1347,9 @@ msgstr "Catalogo"
 #: ../../templates/show_modules.inc.php:42
 #: ../../templates/show_modules.inc.php:75
 #: ../../templates/show_genres.inc.php:38
-#: ../../templates/show_flagged.inc.php:29
+#: ../../templates/show_flagged.inc.php:32
 #: ../../templates/show_localplay_playlist.inc.php:29
-#: ../../templates/show_artists.inc:44 ../../templates/show_artists.inc:69
+#: ../../templates/show_artists.inc:44 ../../templates/show_artists.inc:75
 #: ../../templates/show_songs.inc:55 ../../templates/show_albums.inc:47
 #: ../../templates/show_albums.inc:90 ../../templates/show_access_list.inc:52
 #: ../../templates/show_artist.inc:39
@@ -1367,62 +1369,70 @@ msgstr ""
 msgid "Clean"
 msgstr "Cancella informazioni"
 
+#: ../../templates/show_admin_tools.inc.php:56
+msgid "Fast"
+msgstr ""
+
 #: ../../templates/show_admin_tools.inc.php:57
+msgid "Gather Art"
+msgstr ""
+
+#: ../../templates/show_admin_tools.inc.php:65
 #, fuzzy
 msgid "No Catalogs Found"
 msgstr "Non è stato trovato alcun catalogo"
 
-#: ../../templates/show_admin_tools.inc.php:63
+#: ../../templates/show_admin_tools.inc.php:71
 #, fuzzy
 msgid "Clean All"
 msgstr "Vuota tutti i cataloghi"
 
-#: ../../templates/show_admin_tools.inc.php:64
+#: ../../templates/show_admin_tools.inc.php:72
 msgid "Verify All"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:65
+#: ../../templates/show_admin_tools.inc.php:73
 #, fuzzy
 msgid "Add to All"
 msgstr "Aggiungi a"
 
-#: ../../templates/show_admin_tools.inc.php:66
+#: ../../templates/show_admin_tools.inc.php:74
 #, fuzzy
 msgid "Update All"
 msgstr "Aggiornato"
 
-#: ../../templates/show_admin_tools.inc.php:69
+#: ../../templates/show_admin_tools.inc.php:77
 #: ../../templates/show_add_catalog.inc.php:78
 msgid "Gather Album Art"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:73
+#: ../../templates/show_admin_tools.inc.php:81
 msgid "Other Tools"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:75
+#: ../../templates/show_admin_tools.inc.php:83
 msgid "Show Duplicate Songs"
 msgstr "Mostra brani duplicati"
 
-#: ../../templates/show_admin_tools.inc.php:76
+#: ../../templates/show_admin_tools.inc.php:84
 msgid "Clear Now Playing"
 msgstr "Cancella 'Ora in ascolto'"
 
-#: ../../templates/show_admin_tools.inc.php:78
+#: ../../templates/show_admin_tools.inc.php:85 ../../templates/header.inc:75
 #, fuzzy
 msgid "Generate New Config"
 msgstr "Scrivi configurazione"
 
-#: ../../templates/show_admin_tools.inc.php:79
+#: ../../templates/show_admin_tools.inc.php:86
 #, fuzzy
 msgid "Preferences Permissions"
 msgstr "Impostazioni"
 
-#: ../../templates/show_admin_tools.inc.php:81
+#: ../../templates/show_admin_tools.inc.php:87
 msgid "Export To Itunes DB"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:82
+#: ../../templates/show_admin_tools.inc.php:88
 #, fuzzy
 msgid "Check for New Version"
 msgstr "Controllo configurazione"
@@ -1458,7 +1468,7 @@ msgid "Find duplicate artists"
 msgstr "Trova duplicati"
 
 #: ../../templates/show_user.inc.php:30
-#: ../../templates/show_user_registration.inc.php:118
+#: ../../templates/show_user_registration.inc.php:117
 #: ../../templates/show_edit_user.inc.php:55
 msgid "E-mail"
 msgstr "E-mail"
@@ -1473,7 +1483,7 @@ msgid "New Password"
 msgstr "Password"
 
 #: ../../templates/show_user.inc.php:49
-#: ../../templates/show_user_registration.inc.php:136
+#: ../../templates/show_user_registration.inc.php:135
 #: ../../templates/show_edit_user.inc.php:72
 msgid "Confirm Password"
 msgstr "Conferma password"
@@ -1538,49 +1548,49 @@ msgstr "Applica a tutti"
 msgid "description"
 msgstr "descrizione"
 
-#: ../../templates/show_user_registration.inc.php:55
+#: ../../templates/show_user_registration.inc.php:54
 msgid "Ampache New User Registration"
 msgstr "Registrazione nuovo utente Ampache"
 
-#: ../../templates/show_user_registration.inc.php:70
+#: ../../templates/show_user_registration.inc.php:69
 msgid "User Agreement"
 msgstr "Consenso utente"
 
-#: ../../templates/show_user_registration.inc.php:80
+#: ../../templates/show_user_registration.inc.php:79
 msgid "I Accept"
 msgstr "Accetto"
 
-#: ../../templates/show_user_registration.inc.php:94
+#: ../../templates/show_user_registration.inc.php:93
 msgid "User Information"
 msgstr "Informazioni utente"
 
-#: ../../templates/show_user_registration.inc.php:109
+#: ../../templates/show_user_registration.inc.php:108
 #: ../../templates/show_edit_user.inc.php:48
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: ../../templates/show_user_registration.inc.php:156
+#: ../../templates/show_user_registration.inc.php:155
 msgid "Clear Info"
 msgstr "Cancella informazioni"
 
-#: ../../templates/show_user_registration.inc.php:157
+#: ../../templates/show_user_registration.inc.php:156
 msgid "Register User"
 msgstr "Registra utente"
 
-#: ../../templates/show_install_lang.inc.php:15
-#: ../../templates/show_install.inc:16
+#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install.inc:38
 msgid "Requirements"
 msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:21
+#: ../../templates/show_install_lang.inc.php:43
 #: ../../templates/show_install_config.inc:46
-#: ../../templates/show_install.inc:22
+#: ../../templates/show_install.inc:44
 msgid ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
 "ampache.cfg.php.dist file"
 msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:50
+#: ../../templates/show_install_lang.inc.php:72
 msgid "Start configuration"
 msgstr ""
 
@@ -1609,7 +1619,7 @@ msgstr "Utente attivato"
 
 #: ../../templates/show_modules.inc.php:61
 #: ../../templates/show_modules.inc.php:96
-#: ../../templates/show_flagged.inc.php:50
+#: ../../templates/show_flagged.inc.php:57
 #: ../../templates/show_list_duplicates.inc.php:81
 #: ../../templates/show_localplay_playlist.inc.php:51
 #: ../../templates/show_disabled_songs.inc:44
@@ -1688,7 +1698,7 @@ msgid "Mail to"
 msgstr ""
 
 #: ../../templates/show_mail_users.inc.php:45
-#: ../../templates/show_all_popular.inc.php:30 ../../index.php:66
+#: ../../templates/show_all_popular.inc.php:29
 msgid "Most Popular Albums"
 msgstr "Album più popolare"
 
@@ -1698,7 +1708,7 @@ msgid "Latest Artist Additions"
 msgstr "Nuovi artisti aggiunti recentemente"
 
 #: ../../templates/show_mail_users.inc.php:56
-#: ../../templates/show_all_popular.inc.php:27 ../../index.php:75
+#: ../../templates/show_all_popular.inc.php:26
 msgid "Most Popular Artists"
 msgstr "Artista più popolare"
 
@@ -1708,38 +1718,43 @@ msgid "Latest Album Additions"
 msgstr "Nuovi album aggiunti recentemente"
 
 #: ../../templates/show_mail_users.inc.php:67
-#: ../../templates/show_all_popular.inc.php:40
+#: ../../templates/show_all_popular.inc.php:38
 msgid "Most Popular Songs"
 msgstr "Brani più popolari"
 
 #: ../../templates/show_mail_users.inc.php:73
+msgid "Flagged Songs"
+msgstr ""
+
+#: ../../templates/show_mail_users.inc.php:77
+#: ../../templates/show_admin_info.inc.php:36
+#, fuzzy
+msgid "Disabled Songs"
+msgstr "Mostra brani disabilitati"
+
+#: ../../templates/show_mail_users.inc.php:85
 #, fuzzy
 msgid "Most Popular Threshold in days"
 msgstr "Brani più popolari"
 
-#: ../../templates/show_mail_users.inc.php:84
+#: ../../templates/show_mail_users.inc.php:96
 msgid "Subject"
 msgstr "Oggetto"
 
-#: ../../templates/show_mail_users.inc.php:91
+#: ../../templates/show_mail_users.inc.php:103
 msgid "Message"
 msgstr "Messaggio"
 
-#: ../../templates/show_mail_users.inc.php:101
+#: ../../templates/show_mail_users.inc.php:113
 msgid "Send Mail"
 msgstr "Invia Mail"
 
-#: ../../templates/show_admin_info.inc.php:33
+#: ../../templates/show_admin_info.inc.php:32
 msgid "Last Ten Flagged Records"
 msgstr ""
 
-#: ../../templates/show_admin_info.inc.php:37
-#, fuzzy
-msgid "Disabled Songs"
-msgstr "Mostra brani disabilitati"
-
-#: ../../templates/show_admin_info.inc.php:41
-#: ../../templates/show_flagged.inc.php:57
+#: ../../templates/show_admin_info.inc.php:40
+#: ../../templates/show_flagged.inc.php:73
 #: ../../templates/show_ip_history.inc.php:28
 #, fuzzy
 msgid "Show All"
@@ -1775,25 +1790,39 @@ msgid "Continue"
 msgstr "Continua"
 
 #: ../../templates/show_confirmation.inc.php:28
-#: ../../templates/show_preferences.inc:95
+#: ../../templates/show_preferences.inc:96
 #: ../../templates/show_similar_artists.inc:74
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../../templates/show_flagged.inc.php:26
+#: ../../templates/show_flagged.inc.php:27
+#: ../../templates/show_disabled_songs.inc:25
+#: ../../templates/show_artist.inc:33
+msgid "Select"
+msgstr "Seleziona"
+
+#: ../../templates/show_flagged.inc.php:28
 #, fuzzy
 msgid "Object"
 msgstr "Oggetto"
 
-#: ../../templates/show_flagged.inc.php:28
+#: ../../templates/show_flagged.inc.php:29
+#: ../../templates/show_preference_admin.inc.php:38
+#: ../../templates/show_add_access.inc:47
+#: ../../templates/show_access_list.inc:49
+#: ../../templates/show_edit_access.inc:47
+msgid "User"
+msgstr "Utente"
+
+#: ../../templates/show_flagged.inc.php:31
 msgid "Status"
 msgstr "Stato"
 
-#: ../../templates/show_flagged.inc.php:39
+#: ../../templates/show_flagged.inc.php:63
 msgid "Reject"
 msgstr "Rifiuta"
 
-#: ../../templates/show_flagged.inc.php:43
+#: ../../templates/show_flagged.inc.php:64
 msgid "Approve"
 msgstr ""
 
@@ -1810,14 +1839,18 @@ msgstr ""
 msgid "Update id3 tags"
 msgstr "Aggiorna tags Id3"
 
-#: ../../templates/show_all_recent.inc.php:27
+#: ../../templates/show_all_recent.inc.php:25
 msgid "Newest Artist Additions"
 msgstr "Nuovi artisti aggiunti recentemente"
 
-#: ../../templates/show_all_recent.inc.php:30 ../../index.php:82
+#: ../../templates/show_all_recent.inc.php:28
 msgid "Newest Album Additions"
 msgstr "Nuovi album aggiunti recentemente"
 
+#: ../../templates/show_all_recent.inc.php:31
+msgid "Newest Live Stream Additions"
+msgstr ""
+
 #: ../../templates/show_get_albumart.inc.php:23
 msgid "Customize Search"
 msgstr "Personalizza ricerca"
@@ -1877,10 +1910,18 @@ msgstr "Crea nuova playlist"
 msgid "Delete Empty Playlists"
 msgstr "Importa playlist"
 
-#: ../../templates/show_all_popular.inc.php:37
+#: ../../templates/show_all_popular.inc.php:32
 msgid "Most Popular Genres"
 msgstr "Genere più popolare"
 
+#: ../../templates/show_all_popular.inc.php:41
+msgid "Most Popular Live Streams"
+msgstr ""
+
+#: ../../templates/show_all_popular.inc.php:44
+msgid "Most Popular Tags"
+msgstr ""
+
 #: ../../templates/show_play_selected.inc.php:28
 msgid "Play Selected"
 msgstr "Riproduci selezionati"
@@ -2027,22 +2068,10 @@ msgid "Filename Pattern"
 msgstr "Filtro nome file"
 
 #: ../../templates/show_add_catalog.inc.php:82
-msgid "ID3V2 Tags"
-msgstr "Tags ID3V2"
-
-#: ../../templates/show_add_catalog.inc.php:86
-msgid "Amazon"
-msgstr "Amazon"
-
-#: ../../templates/show_add_catalog.inc.php:90
-msgid "File Folder"
-msgstr "Cartella file"
-
-#: ../../templates/show_add_catalog.inc.php:98
 msgid "Build Playlists from m3u Files"
 msgstr "Genera  playliste dai file m3u"
 
-#: ../../templates/show_add_catalog.inc.php:106
+#: ../../templates/show_add_catalog.inc.php:90
 msgid "Add Catalog"
 msgstr "Aggiungi catalogo"
 
@@ -2106,9 +2135,8 @@ msgid "Recommendations"
 msgstr ""
 
 #: ../../templates/show_user_recommendations.inc.php:29
-#, fuzzy
-msgid "Recommended Aritsts"
-msgstr "Rinomina artista"
+msgid "Recommended Artists"
+msgstr ""
 
 #: ../../templates/show_user_recommendations.inc.php:40
 msgid "Recommended Albums"
@@ -2134,13 +2162,6 @@ msgstr "Livello"
 msgid "Guest"
 msgstr ""
 
-#: ../../templates/show_preference_admin.inc.php:38
-#: ../../templates/show_add_access.inc:47
-#: ../../templates/show_access_list.inc:49
-#: ../../templates/show_edit_access.inc:47
-msgid "User"
-msgstr "Utente"
-
 #: ../../templates/show_edit_album.inc.php:23
 #, fuzzy
 msgid "Edit Album"
@@ -2189,11 +2210,19 @@ msgstr "anno"
 msgid "Recently Played"
 msgstr "Meno ascoltati"
 
+#: ../../templates/show_recently_played.inc.php:33
+msgid "Last Played"
+msgstr ""
+
 #: ../../templates/show_edit_artist.inc.php:23
 #, fuzzy
 msgid "Edit Artist"
 msgstr "Artista"
 
+#: ../../templates/show_random_albums.inc.php:23
+msgid "Albums of the Moment"
+msgstr ""
+
 #: ../../localplay.php:50 ../../localplay.php:58
 msgid "Song(s) Removed from Playlist"
 msgstr ""
@@ -2203,7 +2232,7 @@ msgstr ""
 msgid "Localplay Init Failed"
 msgstr "Controllo riproduzione locale"
 
-#: ../../browse.php:48 ../../albums.php:191
+#: ../../browse.php:48 ../../albums.php:213
 msgid "Show Albums starting with"
 msgstr "Mostra album che iniziano per"
 
@@ -2211,7 +2240,7 @@ msgstr "Mostra album che iniziano per"
 msgid "Show Artists starting with"
 msgstr "Mostra artisti che iniziano per"
 
-#: ../../browse.php:123
+#: ../../browse.php:124
 #, fuzzy
 msgid "Show Titles Starting With"
 msgstr "Mostra artisti che iniziano per"
@@ -2220,6 +2249,10 @@ msgstr "Mostra artisti che iniziano per"
 msgid "Error: No Keyword Entered"
 msgstr "Errore: Nessuna parola chiave inserita"
 
+#: ../../ampache/templates/sidebar.inc.php:38
+msgid "Lists"
+msgstr "Liste"
+
 #: ../../ratings.php:33
 msgid "Rating Updated"
 msgstr "Voto aggiornato"
@@ -2240,7 +2273,7 @@ msgstr ""
 msgid "No local account found"
 msgstr ""
 
-#: ../../login.php:177
+#: ../../login.php:176
 msgid "Message of the Day"
 msgstr ""
 
@@ -2258,36 +2291,36 @@ msgstr "Playlist aggiornata"
 msgid "Ampache Update"
 msgstr "Ampache Debug"
 
-#: ../../tv.php:61
+#: ../../tv.php:62
 #, fuzzy
 msgid "Playlist Cleared"
 msgstr "Playlist creata."
 
-#: ../../artists.php:91 ../../albums.php:169
+#: ../../artists.php:91 ../../albums.php:191
 msgid "Starting Update from Tags"
 msgstr "Inizio aggiornamento da Tags"
 
-#: ../../artists.php:96 ../../albums.php:174
+#: ../../artists.php:96 ../../albums.php:196
 msgid "Update From Tags Complete"
 msgstr "Aggiornamento da Tags ultimato"
 
-#: ../../artists.php:97 ../../albums.php:175
+#: ../../artists.php:97 ../../albums.php:197
 msgid "Return"
 msgstr "Ritorna"
 
-#: ../../activate.php:44
+#: ../../activate.php:43
 msgid "No user with this name registered"
 msgstr "Non c'è nessun utente registrato con questo nome"
 
-#: ../../activate.php:48
+#: ../../activate.php:47
 msgid "The validation key used isn't correct."
 msgstr "La chiave di validazione usata non è corretta"
 
-#: ../../activate.php:53
+#: ../../activate.php:52
 msgid "User activated"
 msgstr "Utente attivato"
 
-#: ../../activate.php:53
+#: ../../activate.php:52
 msgid "This User ID is activated and can be used"
 msgstr "ID utente attivato ed utilizzabile"
 
@@ -2359,11 +2392,11 @@ msgid "Album Art information has been removed from the database"
 msgstr ""
 "Le informazioni sulla copertina dell' album sono state rimosse dal database"
 
-#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:133
+#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:159
 msgid "Album Art Not Located"
 msgstr "Copertina non rintracciata"
 
-#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:133
+#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:159
 #, fuzzy
 msgid ""
 "Album Art could not be located at this time. This may be due to write access "
@@ -2372,7 +2405,7 @@ msgstr ""
 "La copertina non può essere rintracciata ora.Può essere dovuto al fatto che "
 "Amazon è occupato o l' album non è presente nella loro collezione."
 
-#: ../../albums.php:79 ../../albums.php:162
+#: ../../albums.php:79 ../../albums.php:106 ../../albums.php:185
 msgid "Album Art Inserted"
 msgstr "Copertina inserita"
 
@@ -2408,11 +2441,11 @@ msgstr "Le passord non corrispondono"
 msgid "Error: Insert Failed"
 msgstr "Errore: inserimento fallito"
 
-#: ../../register.php:170
+#: ../../register.php:169
 msgid "Registration Complete"
 msgstr "Registrazione completata"
 
-#: ../../bin/print_tags.php.inc:63
+#: ../../bin/print_tags.php.inc:64
 msgid ""
 "[print_tags.php.inc]\n"
 "This commandline script will display the tag information for the specified "
@@ -2421,7 +2454,7 @@ msgid ""
 "        \n"
 msgstr ""
 
-#: ../../bin/print_tags.php.inc:69
+#: ../../bin/print_tags.php.inc:70
 msgid "Filename:"
 msgstr "Nome file:"
 
@@ -2481,16 +2514,11 @@ msgstr "Copertine"
 msgid "Click to close window"
 msgstr ""
 
-#: ../../templates/show_disabled_songs.inc:25
-#: ../../templates/show_artist.inc:33
-msgid "Select"
-msgstr "Seleziona"
-
 #: ../../templates/show_disabled_songs.inc:30
 msgid "Addition Time"
 msgstr ""
 
-#: ../../templates/show_disabled_songs.inc:48
+#: ../../templates/show_disabled_songs.inc:49
 #, fuzzy
 msgid "Remove"
 msgstr "Remoto"
@@ -2503,10 +2531,14 @@ msgstr "Precedente"
 msgid "Next"
 msgstr "Successivo"
 
-#: ../../templates/header.inc:64 ../../ampache/templates/header.inc:64
+#: ../../templates/header.inc:63 ../../ampache/templates/header.inc:64
 msgid "You are currently logged in as"
 msgstr "Sei attualmente connesso come"
 
+#: ../../templates/header.inc:74
+msgid "Error Config File Out of Date"
+msgstr ""
+
 #: ../../templates/show_songs.inc:47
 msgid "Song title"
 msgstr "Titolo brano"
@@ -2515,17 +2547,12 @@ msgstr "Titolo brano"
 msgid "Rating"
 msgstr "Voto"
 
-#: ../../templates/show_songs.inc:176
+#: ../../templates/show_songs.inc:183
 msgid "Total"
 msgstr "Totale"
 
-#: ../../templates/show_songs.inc:194
-#, fuzzy
-msgid "** Indicates flagged songs"
-msgstr "Mostra brani marcati"
-
 #: ../../templates/show_install_config.inc:53
-#: ../../templates/show_install.inc:34
+#: ../../templates/show_install.inc:56
 msgid "Step 2 - Creating the Ampache.cfg.php file"
 msgstr "Passso 2 - Creazione del file Ampache.cfg.php"
 
@@ -2541,12 +2568,12 @@ msgid "Web Path"
 msgstr "Percorso Web"
 
 #: ../../templates/show_install_config.inc:68
-#: ../../templates/show_install.inc:42
+#: ../../templates/show_install.inc:64
 msgid "Desired Database Name"
 msgstr "Nome del database desiderato"
 
 #: ../../templates/show_install_config.inc:72
-#: ../../templates/show_install.inc:46
+#: ../../templates/show_install.inc:68
 msgid "MySQL Hostname"
 msgstr "Server MySQL"
 
@@ -2592,47 +2619,47 @@ msgstr ""
 msgid "Find Album Art"
 msgstr "Trova copertina album"
 
-#: ../../templates/show_preferences.inc:52
+#: ../../templates/show_preferences.inc:53
 msgid "Editing"
 msgstr "Modifica"
 
-#: ../../templates/show_preferences.inc:52
+#: ../../templates/show_preferences.inc:53
 msgid "preferences"
 msgstr "impostazioni"
 
-#: ../../templates/show_preferences.inc:54
+#: ../../templates/show_preferences.inc:55
 msgid "Rebuild Preferences"
 msgstr "Ricostruisci impostazioni"
 
-#: ../../templates/show_preferences.inc:61
+#: ../../templates/show_preferences.inc:62
 msgid "Interface"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:64
+#: ../../templates/show_preferences.inc:65
 #, fuzzy
 msgid "Streaming"
 msgstr "Stream"
 
-#: ../../templates/show_preferences.inc:67
+#: ../../templates/show_preferences.inc:68
 #, fuzzy
 msgid "Options"
 msgstr "Azioni"
 
-#: ../../templates/show_preferences.inc:71
+#: ../../templates/show_preferences.inc:72
 msgid "Account"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:75
+#: ../../templates/show_preferences.inc:76
 #, fuzzy
 msgid "System"
 msgstr "Stream"
 
-#: ../../templates/show_preferences.inc:78
+#: ../../templates/show_preferences.inc:79
 #, fuzzy
 msgid "Modules"
 msgstr "Modo"
 
-#: ../../templates/show_preferences.inc:91
+#: ../../templates/show_preferences.inc:92
 msgid "Update Preferences"
 msgstr "Aggiorna impostazioni"
 
@@ -2673,34 +2700,34 @@ msgstr ""
 msgid "Unlimited"
 msgstr "Illimitato"
 
-#: ../../templates/show_install.inc:32
+#: ../../templates/show_install.inc:54
 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:50
+#: ../../templates/show_install.inc:72
 msgid "MySQL Administrative Username"
 msgstr "Utente amministratore MySQL"
 
-#: ../../templates/show_install.inc:54
+#: ../../templates/show_install.inc:76
 msgid "MySQL Administrative Password"
 msgstr "Password amministratore MySQL"
 
-#: ../../templates/show_install.inc:58
+#: ../../templates/show_install.inc:80
 msgid "Create Database User for New Database"
 msgstr ""
 
-#: ../../templates/show_install.inc:62
+#: ../../templates/show_install.inc:84
 msgid "Ampache Database Username"
 msgstr "Nome utente del database Ampache"
 
-#: ../../templates/show_install.inc:66
+#: ../../templates/show_install.inc:88
 msgid "Ampache Database User Password"
 msgstr "Password utente del database Ampache"
 
-#: ../../templates/show_install.inc:71
+#: ../../templates/show_install.inc:93
 msgid "Insert Database"
 msgstr "Inserisci database"
 
@@ -2815,12 +2842,12 @@ msgstr "Data registrazione"
 msgid "Activity"
 msgstr ""
 
-#: ../../templates/show_users.inc:60
+#: ../../templates/show_users.inc:61
 #, fuzzy
 msgid "Last Ip"
 msgstr "Ultimo accesso"
 
-#: ../../templates/show_users.inc:65
+#: ../../templates/show_users.inc:66
 msgid "On-line"
 msgstr "In linea"
 
@@ -3093,6 +3120,23 @@ msgstr ""
 msgid "Save"
 msgstr "Salva"
 
+#~ msgid "ID3V2 Tags"
+#~ msgstr "Tags ID3V2"
+
+#~ msgid "Amazon"
+#~ msgstr "Amazon"
+
+#~ msgid "File Folder"
+#~ msgstr "Cartella file"
+
+#, fuzzy
+#~ msgid "Recommended Aritsts"
+#~ msgstr "Rinomina artista"
+
+#, fuzzy
+#~ msgid "** Indicates flagged songs"
+#~ msgstr "Mostra brani marcati"
+
 #~ msgid ""
 #~ "No Amazon Developer Key set, amazon album art searching will not work"
 #~ msgstr ""
diff --git a/locale/nl_NL/LC_MESSAGES/messages.po b/locale/nl_NL/LC_MESSAGES/messages.po
index 798d3931..bd04c31f 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: Ampache SVN 693\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-01 20:33-0800\n"
+"POT-Creation-Date: 2007-01-22 19:07-0800\n"
 "PO-Revision-Date: 2006-11-14 08:00+0100\n"
 "Last-Translator: Terence Theijn <terence.theijn@gmail.com>\n"
 "Language-Team: Dutch <terence.theijn@gmail.com>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../play/index.php:64 ../../download/index.php:62
+#: ../../play/index.php:64 ../../download/index.php:61
 msgid "Session Expired: please log in again at"
 msgstr "Sessie Verlopen: log opnieuw in op"
 
-#: ../../lib/class/catalog.class.php:299 ../../lib/class/catalog.class.php:592
-#: ../../lib/class/album.class.php:325
+#: ../../lib/class/catalog.class.php:303 ../../lib/class/catalog.class.php:621
+#: ../../lib/class/album.class.php:328
 msgid "Error: Unable to open"
 msgstr "Fout: Kan niet openen"
 
@@ -29,187 +29,192 @@ msgstr "Fout: Kan niet openen"
 msgid "Error: Unable to change to directory"
 msgstr "Fout: Kan niet naar directory veranderen"
 
-#: ../../lib/class/catalog.class.php:375
+#: ../../lib/class/catalog.class.php:374
 msgid "Error: Unable to get filesize for"
 msgstr "Fout: Kan bestands grootte niet opvragen voor"
 
-#: ../../lib/class/catalog.class.php:412
+#: ../../lib/class/catalog.class.php:411
 msgid "is not readable by ampache"
 msgstr "is niet leesbaar voor Ampache"
 
-#: ../../lib/class/catalog.class.php:501
+#: ../../lib/class/catalog.class.php:530
 msgid "album's with art"
 msgstr "album's met hoesje"
 
-#: ../../lib/class/catalog.class.php:772
+#: ../../lib/class/catalog.class.php:812
 msgid "Starting Catalog Build"
 msgstr "Start bouwen van Catalogus"
 
-#: ../../lib/class/catalog.class.php:776
+#: ../../lib/class/catalog.class.php:816
 msgid "Running Remote Sync"
 msgstr "Start Remote Synchronisatie"
 
-#: ../../lib/class/catalog.class.php:781 ../../lib/class/catalog.class.php:947
+#: ../../lib/class/catalog.class.php:821 ../../lib/class/catalog.class.php:992
 msgid "Found"
 msgstr "Gevonden"
 
-#: ../../lib/class/catalog.class.php:781 ../../lib/class/catalog.class.php:804
-#: ../../lib/class/catalog.class.php:947 ../../lib/class/catalog.class.php:977
-#: ../../lib/preferences.php:269 ../../lib/preferences.php:319
-#: ../../lib/ui.lib.php:1186 ../../admin/catalog.php:259
+#: ../../lib/class/catalog.class.php:821 ../../lib/class/catalog.class.php:848
+#: ../../lib/class/catalog.class.php:992
+#: ../../lib/class/catalog.class.php:1025 ../../lib/preferences.php:269
+#: ../../lib/preferences.php:319 ../../lib/ui.lib.php:1194
+#: ../../admin/catalog.php:259
 #, fuzzy
 msgid "None"
 msgstr "Nee"
 
-#: ../../lib/class/catalog.class.php:796 ../../lib/class/catalog.class.php:965
+#: ../../lib/class/catalog.class.php:840
+#: ../../lib/class/catalog.class.php:1014
 msgid "Added Playlist From"
 msgstr "Speellijst toegevoegd van"
 
-#: ../../lib/class/catalog.class.php:803 ../../lib/class/catalog.class.php:976
-#: ../../admin/catalog.php:258
+#: ../../lib/class/catalog.class.php:847
+#: ../../lib/class/catalog.class.php:1024 ../../admin/catalog.php:258
 msgid "Starting Album Art Search"
 msgstr "Start Zoeken naar Album Hoes"
 
-#: ../../lib/class/catalog.class.php:804 ../../lib/class/catalog.class.php:977
-#: ../../admin/catalog.php:259
+#: ../../lib/class/catalog.class.php:848
+#: ../../lib/class/catalog.class.php:1025 ../../admin/catalog.php:259
 msgid "Searched"
 msgstr "Doorzocht"
 
-#: ../../lib/class/catalog.class.php:814
+#: ../../lib/class/catalog.class.php:858
 msgid "Catalog Finished"
 msgstr "Catalogus Klaar"
 
-#: ../../lib/class/catalog.class.php:814 ../../lib/class/catalog.class.php:997
+#: ../../lib/class/catalog.class.php:858
+#: ../../lib/class/catalog.class.php:1044
 msgid "Total Time"
 msgstr "Totale Tijd"
 
-#: ../../lib/class/catalog.class.php:814 ../../lib/class/catalog.class.php:998
+#: ../../lib/class/catalog.class.php:858
+#: ../../lib/class/catalog.class.php:1045
 msgid "Total Songs"
 msgstr "Totaal Aantal Liedjes"
 
-#: ../../lib/class/catalog.class.php:815 ../../lib/class/catalog.class.php:998
+#: ../../lib/class/catalog.class.php:859
+#: ../../lib/class/catalog.class.php:1045
 msgid "Songs Per Seconds"
 msgstr "Liedjes per Seconde"
 
-#: ../../lib/class/catalog.class.php:849
-#: ../../lib/class/catalog.class.php:1634
+#: ../../lib/class/catalog.class.php:894
+#: ../../lib/class/catalog.class.php:1565
 msgid "Updated"
 msgstr "Bijgewerkt"
 
-#: ../../lib/class/catalog.class.php:856
+#: ../../lib/class/catalog.class.php:901
 msgid "No Update Needed"
 msgstr "Geen Update Nodig"
 
-#: ../../lib/class/catalog.class.php:938
+#: ../../lib/class/catalog.class.php:983
 msgid "Starting New Song Search on"
 msgstr "Start Nieuwe Zoekopdracht voor liedje"
 
-#: ../../lib/class/catalog.class.php:938
+#: ../../lib/class/catalog.class.php:983
 msgid "catalog"
 msgstr "catalogus"
 
-#: ../../lib/class/catalog.class.php:942
+#: ../../lib/class/catalog.class.php:987
 msgid "Running Remote Update"
 msgstr "Bezig met bijwerken van Remote Catalogus"
 
-#: ../../lib/class/catalog.class.php:997
+#: ../../lib/class/catalog.class.php:1044
 msgid "Catalog Update Finished"
 msgstr "Bijwerken Catalogus Gereed"
 
-#: ../../lib/class/catalog.class.php:1017
+#: ../../lib/class/catalog.class.php:1064
 msgid "Error"
 msgstr "Fout"
 
-#: ../../lib/class/catalog.class.php:1017
+#: ../../lib/class/catalog.class.php:1064
 msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
 msgstr "Kan XMLRPC library niet laden, check of XML-RPC aanstaat"
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Error connecting to"
 msgstr "Fout met connectie naar"
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Code"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Reason"
 msgstr "Reden"
 
-#: ../../lib/class/catalog.class.php:1076
+#: ../../lib/class/catalog.class.php:1123
 msgid "Completed updating remote catalog(s)"
 msgstr "Klaar met Bijwerken van Remote Catalogus(sen)"
 
-#: ../../lib/class/catalog.class.php:1111
+#: ../../lib/class/catalog.class.php:1158
 msgid "Added"
 msgstr "Toegevoegd"
 
-#: ../../lib/class/catalog.class.php:1193
+#: ../../lib/class/catalog.class.php:1240
 #, fuzzy
 msgid "Cleaning the"
 msgstr "Bijwerken van"
 
-#: ../../lib/class/catalog.class.php:1193
-#: ../../lib/class/catalog.class.php:1589 ../../templates/sidebar.inc.php:30
+#: ../../lib/class/catalog.class.php:1240
+#: ../../lib/class/catalog.class.php:1520 ../../templates/sidebar.inc.php:30
 #: ../../ampache/templates/sidebar.inc.php:30
 msgid "Catalog"
 msgstr "Catalogus"
 
-#: ../../lib/class/catalog.class.php:1194
+#: ../../lib/class/catalog.class.php:1241
 msgid "Checking"
 msgstr "Bezig met Controleren"
 
-#: ../../lib/class/catalog.class.php:1265
+#: ../../lib/class/catalog.class.php:1313
 msgid "Catalog Clean Done"
 msgstr "Opschoning Catalogus Gereed"
 
-#: ../../lib/class/catalog.class.php:1265
+#: ../../lib/class/catalog.class.php:1313
 msgid "files removed"
 msgstr "files verwijderd"
 
-#: ../../lib/class/catalog.class.php:1589
+#: ../../lib/class/catalog.class.php:1520
 msgid "Updating the"
 msgstr "Werk bij de"
 
-#: ../../lib/class/catalog.class.php:1590
+#: ../../lib/class/catalog.class.php:1521
 msgid "songs found checking tag information."
 msgstr "Liedje gevonden bezig met controleren van tag informatie"
 
-#: ../../lib/class/catalog.class.php:1591
+#: ../../lib/class/catalog.class.php:1522
 msgid "Verifed"
 msgstr "Geverifieerd"
 
-#: ../../lib/class/catalog.class.php:1643
+#: ../../lib/class/catalog.class.php:1574
 msgid " FOUND"
 msgstr " GEVONDEN"
 
-#: ../../lib/class/catalog.class.php:1645
+#: ../../lib/class/catalog.class.php:1576
 msgid "Searching for new Album Art"
 msgstr "Bezig met zoeken naar nieuwe album hoes"
 
-#: ../../lib/class/catalog.class.php:1649
+#: ../../lib/class/catalog.class.php:1580
 msgid "Album Art Already Found"
 msgstr "Album hoes reeds gevonden"
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 #, fuzzy
 msgid "Update Finished."
 msgstr "Bijwerken Catalogus Gereed"
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 #, fuzzy
 msgid "Checked"
 msgstr "Bezig met Controleren"
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 #, fuzzy
 msgid "songs updated."
 msgstr "liedjes bijgewerkt."
 
-#: ../../lib/class/song.class.php:360
+#: ../../lib/class/song.class.php:361
 #: ../../templates/show_duplicates.inc.php:35
 #: ../../templates/show_edit_song.inc.php:31
 #: ../../templates/show_disabled_songs.inc:26
@@ -217,53 +222,53 @@ msgstr "liedjes bijgewerkt."
 msgid "Title"
 msgstr "Titel"
 
-#: ../../lib/class/song.class.php:360 ../../lib/class/song.class.php:364
-#: ../../lib/class/song.class.php:368 ../../lib/class/song.class.php:372
-#: ../../lib/class/song.class.php:376 ../../lib/class/song.class.php:380
-#: ../../lib/class/song.class.php:384 ../../lib/class/song.class.php:389
-#: ../../lib/class/song.class.php:394 ../../lib/class/song.class.php:398
-#: ../../lib/class/song.class.php:402 ../../lib/class/song.class.php:407
+#: ../../lib/class/song.class.php:361 ../../lib/class/song.class.php:365
+#: ../../lib/class/song.class.php:369 ../../lib/class/song.class.php:373
+#: ../../lib/class/song.class.php:377 ../../lib/class/song.class.php:381
+#: ../../lib/class/song.class.php:385 ../../lib/class/song.class.php:390
+#: ../../lib/class/song.class.php:395 ../../lib/class/song.class.php:399
+#: ../../lib/class/song.class.php:403 ../../lib/class/song.class.php:408
 msgid "updated to"
 msgstr "bijgewerkt naar"
 
-#: ../../lib/class/song.class.php:364
+#: ../../lib/class/song.class.php:365
 #: ../../templates/show_list_duplicates.inc.php:35
 #: ../../templates/show_songs.inc:53
 msgid "Bitrate"
 msgstr ""
 
-#: ../../lib/class/song.class.php:368
+#: ../../lib/class/song.class.php:369
 msgid "Rate"
 msgstr ""
 
-#: ../../lib/class/song.class.php:372
+#: ../../lib/class/song.class.php:373
 msgid "Mode"
 msgstr "Modus"
 
-#: ../../lib/class/song.class.php:376
+#: ../../lib/class/song.class.php:377
 #: ../../templates/show_tv_playlist.inc.php:46
 #: ../../templates/show_songs.inc:51
 msgid "Time"
 msgstr "Tijd"
 
-#: ../../lib/class/song.class.php:380
+#: ../../lib/class/song.class.php:381
 #: ../../templates/show_edit_song.inc.php:61
 #: ../../templates/show_localplay_playlist.inc.php:27
 #: ../../templates/show_songs.inc:45 ../../templates/show_songs.inc:50
 msgid "Track"
 msgstr "Nummer"
 
-#: ../../lib/class/song.class.php:384
+#: ../../lib/class/song.class.php:385
 msgid "Filesize"
 msgstr "Bestands grootte"
 
-#: ../../lib/class/song.class.php:389
+#: ../../lib/class/song.class.php:390
 #: ../../templates/show_edit_song.inc.php:45
 #: ../../templates/show_get_albumart.inc.php:30
 #: ../../templates/show_play_selected.inc.php:60
 #: ../../templates/show_list_duplicates.inc.php:32
 #: ../../templates/show_recently_played.inc.php:32
-#: ../../templates/show_artists.inc:40 ../../templates/show_artists.inc:65
+#: ../../templates/show_artists.inc:40 ../../templates/show_artists.inc:71
 #: ../../templates/show_disabled_songs.inc:28
 #: ../../templates/show_songs.inc:48 ../../templates/show_albums.inc:41
 #: ../../templates/show_albums.inc:84
@@ -272,7 +277,7 @@ msgstr "Bestands grootte"
 msgid "Artist"
 msgstr "Artiest"
 
-#: ../../lib/class/song.class.php:394
+#: ../../lib/class/song.class.php:395
 #: ../../templates/show_edit_song.inc.php:37
 #: ../../templates/show_get_albumart.inc.php:38
 #: ../../templates/show_play_selected.inc.php:59
@@ -284,7 +289,7 @@ msgstr "Artiest"
 msgid "Album"
 msgstr "Album"
 
-#: ../../lib/class/song.class.php:398
+#: ../../lib/class/song.class.php:399
 #: ../../templates/show_edit_song.inc.php:67
 #: ../../templates/show_play_selected.inc.php:61
 #: ../../templates/show_edit_album.inc.php:33
@@ -293,13 +298,13 @@ msgstr "Album"
 msgid "Year"
 msgstr "Jaar"
 
-#: ../../lib/class/song.class.php:402 ../../templates/show_flag.inc.php:64
+#: ../../lib/class/song.class.php:403 ../../templates/show_flag.inc.php:64
 #: ../../templates/show_edit_song.inc.php:73
 #: ../../templates/show_search.inc:37
 msgid "Comment"
 msgstr "Commentaar"
 
-#: ../../lib/class/song.class.php:407 ../../lib/ui.lib.php:843
+#: ../../lib/class/song.class.php:408 ../../lib/ui.lib.php:851
 #: ../../templates/sidebar.inc.php:36
 #: ../../templates/show_edit_song.inc.php:53
 #: ../../templates/show_genre.inc.php:29
@@ -314,36 +319,36 @@ msgstr "Genre"
 msgid "Error: Name Identical"
 msgstr "Fout: Identieke Naam"
 
-#: ../../lib/class/flag.class.php:263
+#: ../../lib/class/flag.class.php:264
 #, fuzzy
 msgid "Approved"
 msgstr "Verplaatst"
 
-#: ../../lib/class/flag.class.php:264
+#: ../../lib/class/flag.class.php:265
 #, fuzzy
 msgid "Pending"
 msgstr "Bezig met Toevoegen"
 
-#: ../../lib/class/flag.class.php:276 ../../templates/show_flag.inc.php:56
+#: ../../lib/class/flag.class.php:277 ../../templates/show_flag.inc.php:56
 #: ../../templates/show_playlists.inc.php:57
 #: ../../templates/show_admin_tools.inc.php:50
 msgid "Delete"
 msgstr "Verwijder"
 
-#: ../../lib/class/flag.class.php:279
+#: ../../lib/class/flag.class.php:280
 msgid "Re-Tag"
 msgstr "Opnieuw Taggen"
 
-#: ../../lib/class/flag.class.php:282 ../../templates/show_flag.inc.php:58
+#: ../../lib/class/flag.class.php:283 ../../templates/show_flag.inc.php:58
 msgid "Re-encode"
 msgstr "Opnieuw encoderen"
 
-#: ../../lib/class/flag.class.php:285 ../../templates/show_flag.inc.php:59
+#: ../../lib/class/flag.class.php:286 ../../templates/show_flag.inc.php:59
 #, fuzzy
 msgid "Other"
 msgstr "anders"
 
-#: ../../lib/class/flag.class.php:288 ../../lib/class/localplay.class.php:569
+#: ../../lib/class/flag.class.php:289 ../../lib/class/localplay.class.php:570
 #: ../../lib/general.lib.php:890
 #: ../../modules/localplay/icecast.controller.php:292
 #: ../../modules/localplay/mpd.controller.php:354
@@ -351,25 +356,25 @@ msgstr "anders"
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../../lib/class/localplay.class.php:560 ../../templates/show_tv.inc.php:81
+#: ../../lib/class/localplay.class.php:561 ../../templates/show_tv.inc.php:64
 #: ../../templates/show_now_playing.inc:32
 msgid "Now Playing"
 msgstr "Nu Speelt"
 
-#: ../../lib/class/localplay.class.php:563
+#: ../../lib/class/localplay.class.php:564
 msgid "Stopped"
 msgstr "Gestopt"
 
-#: ../../lib/class/localplay.class.php:566
+#: ../../lib/class/localplay.class.php:567
 #, fuzzy
 msgid "Paused"
 msgstr "Gespeeld"
 
-#: ../../lib/class/album.class.php:162
+#: ../../lib/class/album.class.php:163
 msgid "Various"
 msgstr "Diverse"
 
-#: ../../lib/class/genre.class.php:284
+#: ../../lib/class/genre.class.php:285
 msgid "Show Genres starting with"
 msgstr "Laat Genres zien beginnend met"
 
@@ -411,31 +416,31 @@ msgid "Disable"
 msgstr "Deactiveer"
 
 #: ../../lib/preferences.php:271 ../../templates/show_tv_adminctl.inc.php:41
-#: ../../templates/show_playtype_switch.inc.php:9
+#: ../../templates/show_playtype_switch.inc.php:30
 msgid "Stream"
 msgstr ""
 
 #: ../../lib/preferences.php:274 ../../templates/show_tv_adminctl.inc.php:42
-#: ../../templates/show_playtype_switch.inc.php:13
+#: ../../templates/show_playtype_switch.inc.php:34
 msgid "Downsample"
 msgstr ""
 
 #: ../../lib/preferences.php:277
-#: ../../templates/show_playtype_switch.inc.php:15
+#: ../../templates/show_playtype_switch.inc.php:36
 msgid "Democratic"
 msgstr "Democratisch"
 
-#: ../../lib/preferences.php:280 ../../templates/sidebar.inc.php:170
+#: ../../lib/preferences.php:280 ../../templates/sidebar.inc.php:168
 #: ../../templates/show_tv_adminctl.inc.php:40
 #: ../../templates/show_localplay.inc.php:26
-#: ../../templates/show_playtype_switch.inc.php:11
+#: ../../templates/show_playtype_switch.inc.php:32
 #: ../../ampache/templates/sidebar.inc.php:170
 #, fuzzy
 msgid "Localplay"
 msgstr "Lokaal Afspelen"
 
 #: ../../lib/preferences.php:282
-#: ../../templates/show_playtype_switch.inc.php:17
+#: ../../templates/show_playtype_switch.inc.php:38
 msgid "XSPF Player"
 msgstr "XSPF Speler"
 
@@ -480,11 +485,11 @@ msgstr "Lokaal"
 msgid "No songs in this playlist."
 msgstr "Geen liedjes in deze speellijst"
 
-#: ../../lib/playlist.lib.php:191 ../../lib/ui.lib.php:892
-#: ../../templates/sidebar.inc.php:150
+#: ../../lib/playlist.lib.php:191 ../../lib/ui.lib.php:900
+#: ../../templates/sidebar.inc.php:148
 #: ../../templates/show_admin_tools.inc.php:48
 #: ../../ampache/templates/sidebar.inc.php:150
-#: ../../templates/show_artists.inc:55 ../../templates/show_random_play.inc:40
+#: ../../templates/show_random_play.inc:40
 #: ../../templates/show_add_access.inc:59
 #: ../../templates/show_edit_access.inc:69
 msgid "All"
@@ -498,7 +503,7 @@ msgstr "Nieuwe Speellijst"
 msgid "Error Access Denied"
 msgstr "Fout Toegang Gewijgerd"
 
-#: ../../lib/ui.lib.php:194 ../../templates/sidebar.inc.php:89
+#: ../../lib/ui.lib.php:194 ../../templates/sidebar.inc.php:87
 #: ../../ampache/templates/sidebar.inc.php:89
 msgid "Browse"
 msgstr "Bladeren"
@@ -511,142 +516,136 @@ msgstr "Zonder Hoes"
 msgid "Show all"
 msgstr "Alles"
 
-#: ../../lib/ui.lib.php:538 ../../admin/mail.php:80
+#: ../../lib/ui.lib.php:539 ../../admin/mail.php:81
 msgid "No Catalogs Found!"
 msgstr "Geen Catalogus Gevonden"
 
-#: ../../lib/ui.lib.php:539 ../../admin/mail.php:81
-#: ../../templates/show_admin_tools.inc.php:67
+#: ../../lib/ui.lib.php:540 ../../admin/mail.php:82
+#: ../../templates/show_admin_tools.inc.php:75
 #: ../../templates/show_add_catalog.inc.php:28
 msgid "Add a Catalog"
 msgstr "Voeg Catalogus Toe"
 
-#: ../../lib/ui.lib.php:540 ../../admin/mail.php:82
-#: ../../templates/show_mail_users.inc.php:41
-#: ../../templates/show_local_catalog_info.inc.php:23
-msgid "Catalog Statistics"
-msgstr "Catalogus Statistieken"
-
-#: ../../lib/ui.lib.php:576 ../../admin/mail.php:119
+#: ../../lib/ui.lib.php:578 ../../admin/mail.php:120
 msgid "day"
 msgstr "dag"
 
-#: ../../lib/ui.lib.php:576 ../../admin/mail.php:119
+#: ../../lib/ui.lib.php:578 ../../admin/mail.php:120
 msgid "days"
 msgstr "dagen"
 
-#: ../../lib/ui.lib.php:578 ../../admin/mail.php:121
+#: ../../lib/ui.lib.php:580 ../../admin/mail.php:122
 msgid "hour"
 msgstr "uur"
 
-#: ../../lib/ui.lib.php:578 ../../admin/mail.php:121
+#: ../../lib/ui.lib.php:580 ../../admin/mail.php:122
 msgid "hours"
 msgstr "uren"
 
-#: ../../lib/ui.lib.php:782 ../../templates/show_tv.inc.php:58
-#: ../../templates/sidebar.inc.php:50
+#: ../../lib/ui.lib.php:790 ../../templates/sidebar.inc.php:48
 #: ../../ampache/templates/sidebar.inc.php:50
 msgid "Home"
 msgstr "Begin"
 
-#: ../../lib/ui.lib.php:785
+#: ../../lib/ui.lib.php:793
 msgid "Upload"
 msgstr ""
 
-#: ../../lib/ui.lib.php:788
+#: ../../lib/ui.lib.php:796
 msgid "Local Play"
 msgstr "Lokaal Afspelen"
 
-#: ../../lib/ui.lib.php:791
+#: ../../lib/ui.lib.php:799
 #, fuzzy
 msgid "Random Play"
 msgstr "Willekeurig Aspelen"
 
-#: ../../lib/ui.lib.php:794 ../../templates/show_play_selected.inc.php:47
+#: ../../lib/ui.lib.php:802 ../../templates/show_play_selected.inc.php:47
 msgid "Playlist"
 msgstr "Speellijst"
 
-#: ../../lib/ui.lib.php:797 ../../templates/show_duplicates.inc.php:51
-#: ../../templates/sidebar.inc.php:118 ../../templates/sidebar.inc.php:124
+#: ../../lib/ui.lib.php:805 ../../templates/show_duplicates.inc.php:51
+#: ../../templates/sidebar.inc.php:116 ../../templates/sidebar.inc.php:122
 #: ../../ampache/templates/sidebar.inc.php:118
 #: ../../ampache/templates/sidebar.inc.php:124
 #: ../../templates/show_search_bar.inc:31 ../../templates/show_search.inc:133
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../../lib/ui.lib.php:800 ../../templates/sidebar.inc.php:81
+#: ../../lib/ui.lib.php:808 ../../templates/sidebar.inc.php:79
 #: ../../ampache/templates/sidebar.inc.php:81
 msgid "Preferences"
 msgstr "Instellingen"
 
-#: ../../lib/ui.lib.php:803 ../../lib/ui.lib.php:807
+#: ../../lib/ui.lib.php:811 ../../lib/ui.lib.php:815
 #, fuzzy
 msgid "Admin-Catalog"
 msgstr "Voeg Catalogus Toe"
 
-#: ../../lib/ui.lib.php:811
+#: ../../lib/ui.lib.php:819
 #, fuzzy
 msgid "Admin-User Management"
 msgstr "Gebruikers Overeenkomst"
 
-#: ../../lib/ui.lib.php:815
+#: ../../lib/ui.lib.php:823
 #, fuzzy
 msgid "Admin-Mail Users"
 msgstr "Mail Gebruikers"
 
-#: ../../lib/ui.lib.php:819
+#: ../../lib/ui.lib.php:827
 #, fuzzy
 msgid "Admin-Manage Access Lists"
 msgstr "Toegangs Regels"
 
-#: ../../lib/ui.lib.php:823
+#: ../../lib/ui.lib.php:831
 #, fuzzy
 msgid "Admin-Site Preferences"
 msgstr "Beheer Site Instellingen"
 
-#: ../../lib/ui.lib.php:827
+#: ../../lib/ui.lib.php:835
 msgid "Admin-Manage Modules"
 msgstr "Beheer Modules"
 
-#: ../../lib/ui.lib.php:831
+#: ../../lib/ui.lib.php:839
 #, fuzzy
 msgid "Browse Music"
 msgstr "Bladeren"
 
-#: ../../lib/ui.lib.php:835 ../../admin/mail.php:133
-#: ../../templates/sidebar.inc.php:34 ../../templates/sidebar.inc.php:158
+#: ../../lib/ui.lib.php:843 ../../admin/mail.php:134
+#: ../../templates/sidebar.inc.php:34 ../../templates/sidebar.inc.php:156
 #: ../../templates/show_genre.inc.php:32
-#: ../../templates/show_local_catalog_info.inc.php:34
+#: ../../templates/show_local_catalog_info.inc.php:28
 #: ../../ampache/templates/sidebar.inc.php:34
 #: ../../ampache/templates/sidebar.inc.php:158
-#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:68
+#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:74
 msgid "Albums"
 msgstr ""
 
-#: ../../lib/ui.lib.php:839 ../../admin/mail.php:134
-#: ../../templates/sidebar.inc.php:35 ../../templates/sidebar.inc.php:157
+#: ../../lib/ui.lib.php:847 ../../admin/mail.php:135
+#: ../../templates/sidebar.inc.php:35 ../../templates/sidebar.inc.php:155
 #: ../../templates/show_genre.inc.php:35
-#: ../../templates/show_local_catalog_info.inc.php:38
+#: ../../templates/show_local_catalog_info.inc.php:29
 #: ../../ampache/templates/sidebar.inc.php:35
 #: ../../ampache/templates/sidebar.inc.php:157
 msgid "Artists"
 msgstr "Artiesten"
 
-#: ../../lib/ui.lib.php:847 ../../templates/sidebar.inc.php:112
+#: ../../lib/ui.lib.php:855 ../../templates/sidebar.inc.php:110
 #: ../../ampache/templates/sidebar.inc.php:112
 #, fuzzy
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: ../../lib/ui.lib.php:1421
+#: ../../lib/ui.lib.php:1429
 msgid "Manage Users"
 msgstr "Beheer Gebruikers"
 
-#: ../../lib/ui.lib.php:1422
+#: ../../lib/ui.lib.php:1430
 msgid "Add a new user"
 msgstr "Voeg gebruiker toe"
 
-#: ../../lib/general.lib.php:670 ../../templates/show_user_stats.inc.php:32
+#: ../../lib/general.lib.php:670 ../../templates/show_box.inc.php:30
+#: ../../templates/show_user_stats.inc.php:32
 #: ../../templates/show_user_stats.inc.php:43
 #: ../../templates/show_user_stats.inc.php:54
 #: ../../templates/show_user_recommendations.inc.php:32
@@ -780,9 +779,10 @@ msgstr "Alle Nu Speelt data opgeschoond"
 
 #: ../../admin/catalog.php:229
 msgid "Do you really want to clear the statistics for this catalog?"
-msgstr "Weet je zeker dat je alle Statistieken van deze catalogus wilt verwijderen?"
+msgstr ""
+"Weet je zeker dat je alle Statistieken van deze catalogus wilt verwijderen?"
 
-#: ../../admin/catalog.php:230 ../../templates/show_admin_tools.inc.php:68
+#: ../../admin/catalog.php:230 ../../templates/show_admin_tools.inc.php:76
 msgid "Clear Catalog Stats"
 msgstr "Schoon Catalogus Statistieken op"
 
@@ -838,28 +838,32 @@ msgstr "Markering verwijderd"
 msgid "Flag Removed from"
 msgstr "Markering verwijderd van"
 
-#: ../../admin/flag.php:274
+#: ../../admin/flag.php:270
+msgid "Flags Updated"
+msgstr ""
+
+#: ../../admin/flag.php:289
 msgid "Songs Disabled"
 msgstr "Liedjes Gedeactiveerd"
 
-#: ../../admin/flag.php:274
+#: ../../admin/flag.php:289
 msgid "The requested song(s) have been disabled"
 msgstr "De gevraagde liedjes zijn gedeactiveerd"
 
-#: ../../admin/flag.php:285
+#: ../../admin/flag.php:300
 msgid "Songs Enabled"
 msgstr "Liedjes Geactiveerd"
 
-#: ../../admin/flag.php:285
+#: ../../admin/flag.php:300
 msgid "The requested song(s) have been enabled"
 msgstr "De Gevraagde liedjes zijn geactiveerd"
 
-#: ../../admin/flag.php:290
+#: ../../admin/flag.php:305
 #, fuzzy
 msgid "Flagged Records"
 msgstr "Gemarkeerd door"
 
-#: ../../admin/preferences.php:59 ../../admin/preferences.php:82
+#: ../../admin/preferences.php:60 ../../admin/preferences.php:83
 #, fuzzy
 msgid "Site"
 msgstr "Grootte"
@@ -907,66 +911,71 @@ msgstr "Fout Gebruikersnaam Verplicht"
 msgid "Error Passwords don't match"
 msgstr "Fout Paswoorden zijn niet gelijk"
 
-#: ../../admin/users.php:117 ../../register.php:138
+#: ../../admin/users.php:120 ../../register.php:138
 msgid "Error Username already exists"
 msgstr "Fout Gebruikersnaam bestaat al"
 
-#: ../../admin/users.php:139
+#: ../../admin/users.php:142
 msgid "Deletion Request"
 msgstr "Verwijder Verzoek"
 
-#: ../../admin/users.php:140
+#: ../../admin/users.php:143
 msgid "Are you sure you want to permanently delete"
 msgstr "Weet je zeker dat je dit permanent wilt verwijderem"
 
-#: ../../admin/users.php:145 ../../templates/show_confirm_action.inc.php:29
+#: ../../admin/users.php:148 ../../templates/show_confirm_action.inc.php:29
 #: ../../templates/show_search.inc:78
 msgid "No"
 msgstr "Nee"
 
-#: ../../admin/users.php:147
+#: ../../admin/users.php:150
 msgid "User Deleted"
 msgstr "Gebruiker Verwijderd"
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:153
 msgid "Delete Error"
 msgstr "Verwijder Fout"
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:153
 msgid "Unable to delete last Admin User"
 msgstr "Kan de laatste admin gebruiker niet verwijderen"
 
-#: ../../admin/mail.php:131 ../../templates/show_local_catalog_info.inc.php:26
+#: ../../admin/mail.php:83 ../../templates/show_mail_users.inc.php:41
+#: ../../templates/show_local_catalog_info.inc.php:23
+msgid "Catalog Statistics"
+msgstr "Catalogus Statistieken"
+
+#: ../../admin/mail.php:132 ../../templates/show_local_catalog_info.inc.php:27
 msgid "Total Users"
 msgstr "Gebruikers Totaal"
 
-#: ../../admin/mail.php:132 ../../templates/show_local_catalog_info.inc.php:30
+#: ../../admin/mail.php:133 ../../templates/show_local_catalog_info.inc.php:26
 msgid "Connected Users"
 msgstr "Actieve Gebruikers"
 
-#: ../../admin/mail.php:135 ../../templates/sidebar.inc.php:155
+#: ../../admin/mail.php:136 ../../templates/sidebar.inc.php:153
 #: ../../templates/show_genre.inc.php:38
-#: ../../templates/show_local_catalog_info.inc.php:42
+#: ../../templates/show_local_catalog_info.inc.php:30
 #: ../../templates/show_genres.inc.php:37
 #: ../../ampache/templates/sidebar.inc.php:155
-#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:67
+#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:73
 #: ../../templates/show_albums.inc:43 ../../templates/show_albums.inc:86
 msgid "Songs"
 msgstr "Liedjes"
 
-#: ../../admin/mail.php:136 ../../templates/show_local_catalog_info.inc.php:46
+#: ../../admin/mail.php:137 ../../templates/show_local_catalog_info.inc.php:31
 msgid "Catalog Size"
 msgstr "Catalogus Grootte"
 
-#: ../../admin/mail.php:137 ../../templates/show_local_catalog_info.inc.php:50
+#: ../../admin/mail.php:138 ../../templates/show_local_catalog_info.inc.php:32
 msgid "Catalog Time"
 msgstr "Catalogus Tijd"
 
-#: ../../admin/mail.php:219
+#: ../../admin/mail.php:252
 msgid "E-mail Sent"
 msgstr "E-mail Verzonden"
 
-#: ../../admin/mail.php:220
+#: ../../admin/mail.php:253
 msgid "Your E-mail was successfully sent."
 msgstr "Uw E-mail is succesvol verzonden."
 
@@ -1029,21 +1038,21 @@ msgid "Incorrect Tags"
 msgstr "Incorrecte Tags"
 
 #: ../../templates/show_flag.inc.php:70
-#: ../../templates/show_flagged.inc.php:27
+#: ../../templates/show_flagged.inc.php:30
 msgid "Flag"
 msgstr "Markeer"
 
 #: ../../templates/show_install_account.inc.php:36
-#: ../../templates/show_install_lang.inc.php:10
+#: ../../templates/show_install_lang.inc.php:32
 #: ../../templates/show_install_config.inc:36
-#: ../../templates/show_install.inc:10
+#: ../../templates/show_install.inc:32
 msgid "Ampache Installation"
 msgstr "Ampache Installatie"
 
 #: ../../templates/show_install_account.inc.php:43
-#: ../../templates/show_install_lang.inc.php:17
+#: ../../templates/show_install_lang.inc.php:39
 #: ../../templates/show_install_config.inc:42
-#: ../../templates/show_install.inc:18
+#: ../../templates/show_install.inc:40
 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 "
@@ -1054,9 +1063,9 @@ msgstr ""
 "controleer of u voldoet aanonderstaande eisen"
 
 #: ../../templates/show_install_account.inc.php:46
-#: ../../templates/show_install_lang.inc.php:20
+#: ../../templates/show_install_lang.inc.php:42
 #: ../../templates/show_install_config.inc:45
-#: ../../templates/show_install.inc:21
+#: ../../templates/show_install.inc:43
 msgid ""
 "A MySQL Server with a username and password that can create/modify databases"
 msgstr ""
@@ -1072,9 +1081,9 @@ msgstr ""
 "hetampache.cfg.dist.php bestand"
 
 #: ../../templates/show_install_account.inc.php:49
-#: ../../templates/show_install_lang.inc.php:24
+#: ../../templates/show_install_lang.inc.php:46
 #: ../../templates/show_install_config.inc:48
-#: ../../templates/show_install.inc:25
+#: ../../templates/show_install.inc:47
 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 "
@@ -1089,7 +1098,7 @@ msgstr ""
 
 #: ../../templates/show_install_account.inc.php:53
 #: ../../templates/show_install_config.inc:52
-#: ../../templates/show_install.inc:30
+#: ../../templates/show_install.inc:52
 msgid "Step 1 - Creating and Inserting the Ampache Database"
 msgstr "Stap 1 - Aanmaken en vullen van de Ampache Database"
 
@@ -1099,7 +1108,7 @@ msgstr "Stap 2 - Aanmaken vna het ampache.cfg.php bestand"
 
 #: ../../templates/show_install_account.inc.php:55
 #: ../../templates/show_install_config.inc:57
-#: ../../templates/show_install.inc:35
+#: ../../templates/show_install.inc:57
 msgid "Step 3 - Setup Initial Account"
 msgstr "Stap 3 - Opzet Initeel Account"
 
@@ -1116,7 +1125,7 @@ msgid "Create Admin Account"
 msgstr "Maak een Beheer Account aan"
 
 #: ../../templates/show_install_account.inc.php:65
-#: ../../templates/show_user_registration.inc.php:99
+#: ../../templates/show_user_registration.inc.php:98
 #: ../../templates/show_edit_user.inc.php:40
 #: ../../templates/show_recently_played.inc.php:29
 #: ../../templates/show_users.inc:43
@@ -1124,7 +1133,7 @@ msgid "Username"
 msgstr "Gebruikersnaam"
 
 #: ../../templates/show_install_account.inc.php:69
-#: ../../templates/show_user_registration.inc.php:127
+#: ../../templates/show_user_registration.inc.php:126
 #: ../../templates/show_edit_user.inc.php:63
 #: ../../templates/show_login_form.inc:37
 msgid "Password"
@@ -1135,7 +1144,7 @@ msgid "Create Account"
 msgstr "Maak Account aan"
 
 #: ../../templates/show_playlists.inc.php:28
-#: ../../templates/sidebar.inc.php:106
+#: ../../templates/sidebar.inc.php:104
 #: ../../ampache/templates/sidebar.inc.php:106
 msgid "Playlists"
 msgstr "Speellijsten"
@@ -1167,22 +1176,20 @@ msgstr "Bekijk"
 
 #: ../../templates/show_playlists.inc.php:55
 #: ../../templates/show_play_selected.inc.php:50
-#: ../../templates/show_artists.inc:58 ../../templates/show_access_list.inc:67
+#: ../../templates/show_access_list.inc:67
 msgid "Edit"
 msgstr "Bewerk"
 
 #: ../../templates/show_playlists.inc.php:61
 #: ../../templates/show_tv_adminctl.inc.php:44
-#: ../../templates/show_genres.inc.php:47 ../../templates/show_artists.inc:54
 #: ../../templates/show_random_play.inc:82
 msgid "Play"
 msgstr "Speel"
 
 #: ../../templates/show_playlists.inc.php:63
-#: ../../templates/sidebar.inc.php:135
+#: ../../templates/sidebar.inc.php:133
 #: ../../templates/show_localplay_status.inc.php:62
 #: ../../ampache/templates/sidebar.inc.php:135
-#: ../../templates/show_artists.inc:56
 msgid "Random"
 msgstr "Willekeurig"
 
@@ -1221,11 +1228,11 @@ msgstr ""
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../templates/show_tv.inc.php:56
+#: ../../templates/show_tv.inc.php:42
 msgid "Controls"
 msgstr "Bedieningen"
 
-#: ../../templates/show_tv.inc.php:74
+#: ../../templates/show_tv.inc.php:57
 #: ../../templates/show_localplay.inc.php:42
 #, fuzzy
 msgid "Current Playlist"
@@ -1253,7 +1260,7 @@ msgstr "Naam"
 
 #: ../../templates/show_playlist_edit.inc.php:36
 #: ../../templates/show_add_playlist.inc.php:32
-#: ../../templates/show_random_play.inc:50
+#: ../../templates/show_random_play.inc:49
 #: ../../templates/show_access_list.inc:51
 msgid "Type"
 msgstr ""
@@ -1268,6 +1275,7 @@ msgstr "Prive"
 
 #: ../../templates/show_playlist_edit.inc.php:48
 #: ../../templates/show_tv_adminctl.inc.php:51
+#: ../../templates/show_flagged.inc.php:66
 #: ../../templates/show_play_selected.inc.php:64
 #: ../../templates/show_preference_admin.inc.php:47
 #: ../../templates/show_edit_access.inc:78
@@ -1302,41 +1310,36 @@ msgstr "Toegangs Lijst"
 msgid "Song Title"
 msgstr "Naam Liedje"
 
-#: ../../templates/sidebar.inc.php:38
-#: ../../ampache/templates/sidebar.inc.php:38
-msgid "Lists"
-msgstr "Lijsten"
-
-#: ../../templates/sidebar.inc.php:62
+#: ../../templates/sidebar.inc.php:60
 #: ../../templates/show_tv_playlist.inc.php:48
 #: ../../templates/show_preference_admin.inc.php:39
 #: ../../ampache/templates/sidebar.inc.php:62
 msgid "Admin"
 msgstr "Beheer"
 
-#: ../../templates/sidebar.inc.php:156
+#: ../../templates/sidebar.inc.php:154
 #: ../../ampache/templates/sidebar.inc.php:156
 #: ../../templates/show_random_play.inc:56
 msgid "Minutes"
 msgstr "Minuten"
 
-#: ../../templates/sidebar.inc.php:159
+#: ../../templates/sidebar.inc.php:157
 #: ../../ampache/templates/sidebar.inc.php:159
 #: ../../templates/show_random_play.inc:53
 msgid "Less Played"
 msgstr "Minst Gespeeld"
 
-#: ../../templates/sidebar.inc.php:164
+#: ../../templates/sidebar.inc.php:162
 #: ../../ampache/templates/sidebar.inc.php:164
 msgid "Enqueue"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:187
+#: ../../templates/sidebar.inc.php:185
 #: ../../ampache/templates/sidebar.inc.php:187
 msgid "Democratic View"
 msgstr "Bekijk Democratisch"
 
-#: ../../templates/sidebar.inc.php:191
+#: ../../templates/sidebar.inc.php:189
 #: ../../ampache/templates/sidebar.inc.php:191
 msgid "Logout"
 msgstr "Uitloggen"
@@ -1351,9 +1354,9 @@ msgstr "Catalogus"
 #: ../../templates/show_modules.inc.php:42
 #: ../../templates/show_modules.inc.php:75
 #: ../../templates/show_genres.inc.php:38
-#: ../../templates/show_flagged.inc.php:29
+#: ../../templates/show_flagged.inc.php:32
 #: ../../templates/show_localplay_playlist.inc.php:29
-#: ../../templates/show_artists.inc:44 ../../templates/show_artists.inc:69
+#: ../../templates/show_artists.inc:44 ../../templates/show_artists.inc:75
 #: ../../templates/show_songs.inc:55 ../../templates/show_albums.inc:47
 #: ../../templates/show_albums.inc:90 ../../templates/show_access_list.inc:52
 #: ../../templates/show_artist.inc:39
@@ -1373,62 +1376,70 @@ msgstr "Verifieer"
 msgid "Clean"
 msgstr "Wis"
 
+#: ../../templates/show_admin_tools.inc.php:56
+msgid "Fast"
+msgstr ""
+
 #: ../../templates/show_admin_tools.inc.php:57
+msgid "Gather Art"
+msgstr ""
+
+#: ../../templates/show_admin_tools.inc.php:65
 #, fuzzy
 msgid "No Catalogs Found"
 msgstr "Geen Catalogus Gevonden"
 
-#: ../../templates/show_admin_tools.inc.php:63
+#: ../../templates/show_admin_tools.inc.php:71
 #, fuzzy
 msgid "Clean All"
 msgstr "Schoon Alle"
 
-#: ../../templates/show_admin_tools.inc.php:64
+#: ../../templates/show_admin_tools.inc.php:72
 msgid "Verify All"
 msgstr "Verifieer Alle"
 
-#: ../../templates/show_admin_tools.inc.php:65
+#: ../../templates/show_admin_tools.inc.php:73
 #, fuzzy
 msgid "Add to All"
 msgstr "Voeg Toe aan Alle"
 
-#: ../../templates/show_admin_tools.inc.php:66
+#: ../../templates/show_admin_tools.inc.php:74
 #, fuzzy
 msgid "Update All"
 msgstr "Werk Alle bij"
 
-#: ../../templates/show_admin_tools.inc.php:69
+#: ../../templates/show_admin_tools.inc.php:77
 #: ../../templates/show_add_catalog.inc.php:78
 msgid "Gather Album Art"
 msgstr "Vergaar Albums Hoesjes"
 
-#: ../../templates/show_admin_tools.inc.php:73
+#: ../../templates/show_admin_tools.inc.php:81
 msgid "Other Tools"
 msgstr "Andere Gereedschappen"
 
-#: ../../templates/show_admin_tools.inc.php:75
+#: ../../templates/show_admin_tools.inc.php:83
 msgid "Show Duplicate Songs"
 msgstr "Laat dubbele liedjes zien"
 
-#: ../../templates/show_admin_tools.inc.php:76
+#: ../../templates/show_admin_tools.inc.php:84
 msgid "Clear Now Playing"
 msgstr "Leeg Nu Speelt"
 
-#: ../../templates/show_admin_tools.inc.php:78
+#: ../../templates/show_admin_tools.inc.php:85 ../../templates/header.inc:75
 #, fuzzy
 msgid "Generate New Config"
 msgstr "Schrijf Config"
 
-#: ../../templates/show_admin_tools.inc.php:79
+#: ../../templates/show_admin_tools.inc.php:86
 #, fuzzy
 msgid "Preferences Permissions"
 msgstr "Instellingen Permissies"
 
-#: ../../templates/show_admin_tools.inc.php:81
+#: ../../templates/show_admin_tools.inc.php:87
 msgid "Export To Itunes DB"
 msgstr "Exporteer naar Itunes DB"
 
-#: ../../templates/show_admin_tools.inc.php:82
+#: ../../templates/show_admin_tools.inc.php:88
 #, fuzzy
 msgid "Check for New Version"
 msgstr "Check voor Nieuwe Versie"
@@ -1464,7 +1475,7 @@ msgid "Find duplicate artists"
 msgstr "Zoek Dubbele Artiesten"
 
 #: ../../templates/show_user.inc.php:30
-#: ../../templates/show_user_registration.inc.php:118
+#: ../../templates/show_user_registration.inc.php:117
 #: ../../templates/show_edit_user.inc.php:55
 msgid "E-mail"
 msgstr ""
@@ -1479,7 +1490,7 @@ msgid "New Password"
 msgstr "Nieuwe Paswoord"
 
 #: ../../templates/show_user.inc.php:49
-#: ../../templates/show_user_registration.inc.php:136
+#: ../../templates/show_user_registration.inc.php:135
 #: ../../templates/show_edit_user.inc.php:72
 msgid "Confirm Password"
 msgstr "Typ Nogmaals uw paswoord"
@@ -1545,43 +1556,43 @@ msgstr "Pas toe op iedereen"
 msgid "description"
 msgstr "beschrijving"
 
-#: ../../templates/show_user_registration.inc.php:55
+#: ../../templates/show_user_registration.inc.php:54
 msgid "Ampache New User Registration"
 msgstr "Ampache Nieuwe Gebruikers Registratie"
 
-#: ../../templates/show_user_registration.inc.php:70
+#: ../../templates/show_user_registration.inc.php:69
 msgid "User Agreement"
 msgstr "Gebruikers Overeenkomst"
 
-#: ../../templates/show_user_registration.inc.php:80
+#: ../../templates/show_user_registration.inc.php:79
 msgid "I Accept"
 msgstr "Ik ben Akkoord"
 
-#: ../../templates/show_user_registration.inc.php:94
+#: ../../templates/show_user_registration.inc.php:93
 msgid "User Information"
 msgstr "Gebruikers Informatie"
 
-#: ../../templates/show_user_registration.inc.php:109
+#: ../../templates/show_user_registration.inc.php:108
 #: ../../templates/show_edit_user.inc.php:48
 msgid "Full Name"
 msgstr "Volledige Naam"
 
-#: ../../templates/show_user_registration.inc.php:156
+#: ../../templates/show_user_registration.inc.php:155
 msgid "Clear Info"
 msgstr "Wis Formulier"
 
-#: ../../templates/show_user_registration.inc.php:157
+#: ../../templates/show_user_registration.inc.php:156
 msgid "Register User"
 msgstr "Registreer Gebruiker"
 
-#: ../../templates/show_install_lang.inc.php:15
-#: ../../templates/show_install.inc:16
+#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install.inc:38
 msgid "Requirements"
 msgstr "Vereisten"
 
-#: ../../templates/show_install_lang.inc.php:21
+#: ../../templates/show_install_lang.inc.php:43
 #: ../../templates/show_install_config.inc:46
-#: ../../templates/show_install.inc:22
+#: ../../templates/show_install.inc:44
 msgid ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
 "ampache.cfg.php.dist file"
@@ -1589,7 +1600,7 @@ msgstr ""
 "Uw webserver leesrechten heeft op de files /sql/ampache.sql en de file /"
 "config/ampache.cfg.php.dist"
 
-#: ../../templates/show_install_lang.inc.php:50
+#: ../../templates/show_install_lang.inc.php:72
 msgid "Start configuration"
 msgstr "Start Configuratie"
 
@@ -1618,7 +1629,7 @@ msgstr "Deactiveer"
 
 #: ../../templates/show_modules.inc.php:61
 #: ../../templates/show_modules.inc.php:96
-#: ../../templates/show_flagged.inc.php:50
+#: ../../templates/show_flagged.inc.php:57
 #: ../../templates/show_list_duplicates.inc.php:81
 #: ../../templates/show_localplay_playlist.inc.php:51
 #: ../../templates/show_disabled_songs.inc:44
@@ -1697,7 +1708,7 @@ msgid "Mail to"
 msgstr "Mail naar"
 
 #: ../../templates/show_mail_users.inc.php:45
-#: ../../templates/show_all_popular.inc.php:30 ../../index.php:66
+#: ../../templates/show_all_popular.inc.php:29
 msgid "Most Popular Albums"
 msgstr "Meest Populaire Albums"
 
@@ -1707,7 +1718,7 @@ msgid "Latest Artist Additions"
 msgstr "Laatste Toegevoegde Artiesten"
 
 #: ../../templates/show_mail_users.inc.php:56
-#: ../../templates/show_all_popular.inc.php:27 ../../index.php:75
+#: ../../templates/show_all_popular.inc.php:26
 msgid "Most Popular Artists"
 msgstr "Meest Populaire Artiesten"
 
@@ -1717,38 +1728,43 @@ msgid "Latest Album Additions"
 msgstr "Laatste Toegevoegde Albums"
 
 #: ../../templates/show_mail_users.inc.php:67
-#: ../../templates/show_all_popular.inc.php:40
+#: ../../templates/show_all_popular.inc.php:38
 msgid "Most Popular Songs"
 msgstr "Meest Populaire Nummers"
 
 #: ../../templates/show_mail_users.inc.php:73
+msgid "Flagged Songs"
+msgstr ""
+
+#: ../../templates/show_mail_users.inc.php:77
+#: ../../templates/show_admin_info.inc.php:36
+#, fuzzy
+msgid "Disabled Songs"
+msgstr "Laat gedeactiveerde Liedjes Zien"
+
+#: ../../templates/show_mail_users.inc.php:85
 #, fuzzy
 msgid "Most Popular Threshold in days"
 msgstr "Meest Populaire Nummers"
 
-#: ../../templates/show_mail_users.inc.php:84
+#: ../../templates/show_mail_users.inc.php:96
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: ../../templates/show_mail_users.inc.php:91
+#: ../../templates/show_mail_users.inc.php:103
 msgid "Message"
 msgstr "Bericht"
 
-#: ../../templates/show_mail_users.inc.php:101
+#: ../../templates/show_mail_users.inc.php:113
 msgid "Send Mail"
 msgstr "Verzend Mail"
 
-#: ../../templates/show_admin_info.inc.php:33
+#: ../../templates/show_admin_info.inc.php:32
 msgid "Last Ten Flagged Records"
 msgstr "Laatste tien gemarkeerde records"
 
-#: ../../templates/show_admin_info.inc.php:37
-#, fuzzy
-msgid "Disabled Songs"
-msgstr "Laat gedeactiveerde Liedjes Zien"
-
-#: ../../templates/show_admin_info.inc.php:41
-#: ../../templates/show_flagged.inc.php:57
+#: ../../templates/show_admin_info.inc.php:40
+#: ../../templates/show_flagged.inc.php:73
 #: ../../templates/show_ip_history.inc.php:28
 #, fuzzy
 msgid "Show All"
@@ -1783,24 +1799,38 @@ msgid "Continue"
 msgstr "Ga Verder"
 
 #: ../../templates/show_confirmation.inc.php:28
-#: ../../templates/show_preferences.inc:95
+#: ../../templates/show_preferences.inc:96
 #: ../../templates/show_similar_artists.inc:74
 msgid "Cancel"
 msgstr "Annuleer"
 
-#: ../../templates/show_flagged.inc.php:26
+#: ../../templates/show_flagged.inc.php:27
+#: ../../templates/show_disabled_songs.inc:25
+#: ../../templates/show_artist.inc:33
+msgid "Select"
+msgstr "Selecteer"
+
+#: ../../templates/show_flagged.inc.php:28
 msgid "Object"
 msgstr ""
 
-#: ../../templates/show_flagged.inc.php:28
+#: ../../templates/show_flagged.inc.php:29
+#: ../../templates/show_preference_admin.inc.php:38
+#: ../../templates/show_add_access.inc:47
+#: ../../templates/show_access_list.inc:49
+#: ../../templates/show_edit_access.inc:47
+msgid "User"
+msgstr "Gebruiker"
+
+#: ../../templates/show_flagged.inc.php:31
 msgid "Status"
 msgstr ""
 
-#: ../../templates/show_flagged.inc.php:39
+#: ../../templates/show_flagged.inc.php:63
 msgid "Reject"
 msgstr "Wijgeren"
 
-#: ../../templates/show_flagged.inc.php:43
+#: ../../templates/show_flagged.inc.php:64
 msgid "Approve"
 msgstr "Goedkeuren"
 
@@ -1817,14 +1847,18 @@ msgstr "Voeg Huidige Toe"
 msgid "Update id3 tags"
 msgstr "Werk id3 tags bij"
 
-#: ../../templates/show_all_recent.inc.php:27
+#: ../../templates/show_all_recent.inc.php:25
 msgid "Newest Artist Additions"
 msgstr "Laatste Toegevoegde Artiesten"
 
-#: ../../templates/show_all_recent.inc.php:30 ../../index.php:82
+#: ../../templates/show_all_recent.inc.php:28
 msgid "Newest Album Additions"
 msgstr "Laatste Toegevoegde Albums"
 
+#: ../../templates/show_all_recent.inc.php:31
+msgid "Newest Live Stream Additions"
+msgstr ""
+
 #: ../../templates/show_get_albumart.inc.php:23
 msgid "Customize Search"
 msgstr "Pas Zoekopdracht aan"
@@ -1882,10 +1916,18 @@ msgstr "Maak Nieuwe Speellijst aan"
 msgid "Delete Empty Playlists"
 msgstr "Verwijder Lege Speellijst"
 
-#: ../../templates/show_all_popular.inc.php:37
+#: ../../templates/show_all_popular.inc.php:32
 msgid "Most Popular Genres"
 msgstr "Meest Populaire Genres"
 
+#: ../../templates/show_all_popular.inc.php:41
+msgid "Most Popular Live Streams"
+msgstr ""
+
+#: ../../templates/show_all_popular.inc.php:44
+msgid "Most Popular Tags"
+msgstr ""
+
 #: ../../templates/show_play_selected.inc.php:28
 msgid "Play Selected"
 msgstr "Speel Geselecteerde"
@@ -2032,22 +2074,10 @@ msgid "Filename Pattern"
 msgstr "Bestands Patroon"
 
 #: ../../templates/show_add_catalog.inc.php:82
-msgid "ID3V2 Tags"
-msgstr ""
-
-#: ../../templates/show_add_catalog.inc.php:86
-msgid "Amazon"
-msgstr ""
-
-#: ../../templates/show_add_catalog.inc.php:90
-msgid "File Folder"
-msgstr "Bestanden Folder"
-
-#: ../../templates/show_add_catalog.inc.php:98
 msgid "Build Playlists from m3u Files"
 msgstr "Maak Speellijsten van m3u bestanden"
 
-#: ../../templates/show_add_catalog.inc.php:106
+#: ../../templates/show_add_catalog.inc.php:90
 msgid "Add Catalog"
 msgstr "Voeg Catalogus Toe"
 
@@ -2111,9 +2141,8 @@ msgid "Recommendations"
 msgstr "Aanbevelingen"
 
 #: ../../templates/show_user_recommendations.inc.php:29
-#, fuzzy
-msgid "Recommended Aritsts"
-msgstr "Hernoem Artiest"
+msgid "Recommended Artists"
+msgstr ""
 
 #: ../../templates/show_user_recommendations.inc.php:40
 msgid "Recommended Albums"
@@ -2139,13 +2168,6 @@ msgstr "Niveau"
 msgid "Guest"
 msgstr "Gast"
 
-#: ../../templates/show_preference_admin.inc.php:38
-#: ../../templates/show_add_access.inc:47
-#: ../../templates/show_access_list.inc:49
-#: ../../templates/show_edit_access.inc:47
-msgid "User"
-msgstr "Gebruiker"
-
 #: ../../templates/show_edit_album.inc.php:23
 #, fuzzy
 msgid "Edit Album"
@@ -2194,11 +2216,19 @@ msgstr "jaren geleden"
 msgid "Recently Played"
 msgstr "Minst Gespeeld"
 
+#: ../../templates/show_recently_played.inc.php:33
+msgid "Last Played"
+msgstr ""
+
 #: ../../templates/show_edit_artist.inc.php:23
 #, fuzzy
 msgid "Edit Artist"
 msgstr "Artiest"
 
+#: ../../templates/show_random_albums.inc.php:23
+msgid "Albums of the Moment"
+msgstr ""
+
 #: ../../localplay.php:50 ../../localplay.php:58
 msgid "Song(s) Removed from Playlist"
 msgstr "Liedje(s) Verwijderd van Speellijst "
@@ -2208,7 +2238,7 @@ msgstr "Liedje(s) Verwijderd van Speellijst "
 msgid "Localplay Init Failed"
 msgstr "Lokale Afspeel Initialisatie Gefaalt"
 
-#: ../../browse.php:48 ../../albums.php:191
+#: ../../browse.php:48 ../../albums.php:213
 msgid "Show Albums starting with"
 msgstr "Albums beginnend met"
 
@@ -2216,7 +2246,7 @@ msgstr "Albums beginnend met"
 msgid "Show Artists starting with"
 msgstr "Artiesten beginnend met"
 
-#: ../../browse.php:123
+#: ../../browse.php:124
 #, fuzzy
 msgid "Show Titles Starting With"
 msgstr "Titels beginnend met"
@@ -2225,6 +2255,10 @@ msgstr "Titels beginnend met"
 msgid "Error: No Keyword Entered"
 msgstr "Fout: Geen Zoekwoord opgegeven"
 
+#: ../../ampache/templates/sidebar.inc.php:38
+msgid "Lists"
+msgstr "Lijsten"
+
 #: ../../ratings.php:33
 msgid "Rating Updated"
 msgstr "Waardering Bijgewerkt"
@@ -2245,7 +2279,7 @@ msgstr "Niet in staat op nieuw account aan te maken"
 msgid "No local account found"
 msgstr "Geen lokaal account gevonden"
 
-#: ../../login.php:177
+#: ../../login.php:176
 msgid "Message of the Day"
 msgstr "Bericht van de Dag"
 
@@ -2263,36 +2297,36 @@ msgstr "Paswoord bijgewerkt"
 msgid "Ampache Update"
 msgstr "Ampache Bijwerken"
 
-#: ../../tv.php:61
+#: ../../tv.php:62
 #, fuzzy
 msgid "Playlist Cleared"
 msgstr "Speellijst aangemaakt"
 
-#: ../../artists.php:91 ../../albums.php:169
+#: ../../artists.php:91 ../../albums.php:191
 msgid "Starting Update from Tags"
 msgstr "Start met bijwerken vanuit Tags"
 
-#: ../../artists.php:96 ../../albums.php:174
+#: ../../artists.php:96 ../../albums.php:196
 msgid "Update From Tags Complete"
 msgstr "Bijwerken vanuit Tags voltooid"
 
-#: ../../artists.php:97 ../../albums.php:175
+#: ../../artists.php:97 ../../albums.php:197
 msgid "Return"
 msgstr "Terug"
 
-#: ../../activate.php:44
+#: ../../activate.php:43
 msgid "No user with this name registered"
 msgstr "Geen Gebruiker met deze naam geregistreerd"
 
-#: ../../activate.php:48
+#: ../../activate.php:47
 msgid "The validation key used isn't correct."
 msgstr "De validatie key die u gebuikt is niet correct"
 
-#: ../../activate.php:53
+#: ../../activate.php:52
 msgid "User activated"
 msgstr "Gebruiker geactiveerd"
 
-#: ../../activate.php:53
+#: ../../activate.php:52
 msgid "This User ID is activated and can be used"
 msgstr "Dit Gebruikers Account is Geactiveerd en kan gebruikt worden"
 
@@ -2363,11 +2397,11 @@ msgstr "Album Hoes verwijderd"
 msgid "Album Art information has been removed from the database"
 msgstr "Album Hoes informatie is verwijderd uit de database"
 
-#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:133
+#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:159
 msgid "Album Art Not Located"
 msgstr "Album Hoesje niet Gevonden"
 
-#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:133
+#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:159
 #, fuzzy
 msgid ""
 "Album Art could not be located at this time. This may be due to write access "
@@ -2376,7 +2410,7 @@ msgstr ""
 "Album Hoesje kon op dit moment niet gevonden worden. Dit kan komen door de "
 "drukte bij Amazon, of omdat het album niet in hun collectie aanwezig is."
 
-#: ../../albums.php:79 ../../albums.php:162
+#: ../../albums.php:79 ../../albums.php:106 ../../albums.php:185
 msgid "Album Art Inserted"
 msgstr "Album Hoesje Toegevoegd"
 
@@ -2412,11 +2446,11 @@ msgstr "Uw opgegeven paswoorden komen niet overeen"
 msgid "Error: Insert Failed"
 msgstr "Fout: Gebruiker kon niet worden aangemaakt"
 
-#: ../../register.php:170
+#: ../../register.php:169
 msgid "Registration Complete"
 msgstr "Registratie Compleet"
 
-#: ../../bin/print_tags.php.inc:63
+#: ../../bin/print_tags.php.inc:64
 msgid ""
 "[print_tags.php.inc]\n"
 "This commandline script will display the tag information for the specified "
@@ -2425,7 +2459,7 @@ msgid ""
 "        \n"
 msgstr ""
 
-#: ../../bin/print_tags.php.inc:69
+#: ../../bin/print_tags.php.inc:70
 msgid "Filename:"
 msgstr "Bestandsnaam"
 
@@ -2485,16 +2519,11 @@ msgstr "Album Hoes"
 msgid "Click to close window"
 msgstr "Klik om venster te sluiten"
 
-#: ../../templates/show_disabled_songs.inc:25
-#: ../../templates/show_artist.inc:33
-msgid "Select"
-msgstr "Selecteer"
-
 #: ../../templates/show_disabled_songs.inc:30
 msgid "Addition Time"
 msgstr "Tijd van toevoegen"
 
-#: ../../templates/show_disabled_songs.inc:48
+#: ../../templates/show_disabled_songs.inc:49
 #, fuzzy
 msgid "Remove"
 msgstr "Verwijder"
@@ -2507,10 +2536,14 @@ msgstr "Vorige"
 msgid "Next"
 msgstr "Volgende"
 
-#: ../../templates/header.inc:64 ../../ampache/templates/header.inc:64
+#: ../../templates/header.inc:63 ../../ampache/templates/header.inc:64
 msgid "You are currently logged in as"
 msgstr "U Bent ingelogd als"
 
+#: ../../templates/header.inc:74
+msgid "Error Config File Out of Date"
+msgstr ""
+
 #: ../../templates/show_songs.inc:47
 msgid "Song title"
 msgstr "Naam Liedje"
@@ -2519,17 +2552,12 @@ msgstr "Naam Liedje"
 msgid "Rating"
 msgstr "Waardering"
 
-#: ../../templates/show_songs.inc:176
+#: ../../templates/show_songs.inc:183
 msgid "Total"
 msgstr "Totaal"
 
-#: ../../templates/show_songs.inc:194
-#, fuzzy
-msgid "** Indicates flagged songs"
-msgstr "** Indicatie gemarkeerde liedjes"
-
 #: ../../templates/show_install_config.inc:53
-#: ../../templates/show_install.inc:34
+#: ../../templates/show_install.inc:56
 msgid "Step 2 - Creating the Ampache.cfg.php file"
 msgstr " Stap 2 - Creeer het ampache.cfg.php bestand"
 
@@ -2549,12 +2577,12 @@ msgid "Web Path"
 msgstr "Web Directory"
 
 #: ../../templates/show_install_config.inc:68
-#: ../../templates/show_install.inc:42
+#: ../../templates/show_install.inc:64
 msgid "Desired Database Name"
 msgstr "Gewenste Database Naam"
 
 #: ../../templates/show_install_config.inc:72
-#: ../../templates/show_install.inc:46
+#: ../../templates/show_install.inc:68
 msgid "MySQL Hostname"
 msgstr "MySQL Hostnaam"
 
@@ -2600,45 +2628,45 @@ msgstr "Reset Album Hoes"
 msgid "Find Album Art"
 msgstr "Zoek Album Hoes"
 
-#: ../../templates/show_preferences.inc:52
+#: ../../templates/show_preferences.inc:53
 msgid "Editing"
 msgstr "Bezig met Bewerken"
 
-#: ../../templates/show_preferences.inc:52
+#: ../../templates/show_preferences.inc:53
 msgid "preferences"
 msgstr "instellingen"
 
-#: ../../templates/show_preferences.inc:54
+#: ../../templates/show_preferences.inc:55
 msgid "Rebuild Preferences"
 msgstr "Herlaad Instellingen"
 
-#: ../../templates/show_preferences.inc:61
+#: ../../templates/show_preferences.inc:62
 msgid "Interface"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:64
+#: ../../templates/show_preferences.inc:65
 msgid "Streaming"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:67
+#: ../../templates/show_preferences.inc:68
 #, fuzzy
 msgid "Options"
 msgstr "Acties"
 
-#: ../../templates/show_preferences.inc:71
+#: ../../templates/show_preferences.inc:72
 #, fuzzy
 msgid "Account"
 msgstr "Maak Account aan"
 
-#: ../../templates/show_preferences.inc:75
+#: ../../templates/show_preferences.inc:76
 msgid "System"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:78
+#: ../../templates/show_preferences.inc:79
 msgid "Modules"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:91
+#: ../../templates/show_preferences.inc:92
 msgid "Update Preferences"
 msgstr "Werk Instellingen bij"
 
@@ -2679,7 +2707,7 @@ msgstr "Grootte Limiet"
 msgid "Unlimited"
 msgstr "Ongelimiteerd"
 
-#: ../../templates/show_install.inc:32
+#: ../../templates/show_install.inc:54
 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 "
@@ -2689,27 +2717,27 @@ msgstr ""
 "met rechten om een database aan te mogen maken. Dit kan even duren naar "
 "gelang de snelheid van uw computer"
 
-#: ../../templates/show_install.inc:50
+#: ../../templates/show_install.inc:72
 msgid "MySQL Administrative Username"
 msgstr "MySQl Administratieve Gebruikersnaam"
 
-#: ../../templates/show_install.inc:54
+#: ../../templates/show_install.inc:76
 msgid "MySQL Administrative Password"
 msgstr "MySQl Administratieve Paswoord"
 
-#: ../../templates/show_install.inc:58
+#: ../../templates/show_install.inc:80
 msgid "Create Database User for New Database"
 msgstr "Maak Database Gebruiker aan voor nieuwe Database"
 
-#: ../../templates/show_install.inc:62
+#: ../../templates/show_install.inc:84
 msgid "Ampache Database Username"
 msgstr "Ampache Database Gebruikersnaam"
 
-#: ../../templates/show_install.inc:66
+#: ../../templates/show_install.inc:88
 msgid "Ampache Database User Password"
 msgstr "Ampache Database Gebruikers Paswoord"
 
-#: ../../templates/show_install.inc:71
+#: ../../templates/show_install.inc:93
 msgid "Insert Database"
 msgstr "Maak Database"
 
@@ -2823,12 +2851,12 @@ msgstr "Registratie Datum"
 msgid "Activity"
 msgstr "Activiteit"
 
-#: ../../templates/show_users.inc:60
+#: ../../templates/show_users.inc:61
 #, fuzzy
 msgid "Last Ip"
 msgstr "Laatste Ip Adres"
 
-#: ../../templates/show_users.inc:65
+#: ../../templates/show_users.inc:66
 msgid "On-line"
 msgstr "Actief"
 
@@ -3109,6 +3137,17 @@ msgstr "Sla Zoekopdracht op in Speellijst"
 msgid "Save"
 msgstr "Opslaan"
 
+#~ msgid "File Folder"
+#~ msgstr "Bestanden Folder"
+
+#, fuzzy
+#~ msgid "Recommended Aritsts"
+#~ msgstr "Hernoem Artiest"
+
+#, fuzzy
+#~ msgid "** Indicates flagged songs"
+#~ msgstr "** Indicatie gemarkeerde liedjes"
+
 #~ msgid "Found in ID3"
 #~ msgstr "Gevonden in  ID3"
 
diff --git a/locale/tr_TR/LC_MESSAGES/messages.po b/locale/tr_TR/LC_MESSAGES/messages.po
index 12983e34..e90e1c9e 100644
--- a/locale/tr_TR/LC_MESSAGES/messages.po
+++ b/locale/tr_TR/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-01 20:33-0800\n"
+"POT-Creation-Date: 2007-01-22 19:07-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../play/index.php:64 ../../download/index.php:62
+#: ../../play/index.php:64 ../../download/index.php:61
 msgid "Session Expired: please log in again at"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:299 ../../lib/class/catalog.class.php:592
-#: ../../lib/class/album.class.php:325
+#: ../../lib/class/catalog.class.php:303 ../../lib/class/catalog.class.php:621
+#: ../../lib/class/album.class.php:328
 msgid "Error: Unable to open"
 msgstr ""
 
@@ -29,184 +29,189 @@ msgstr ""
 msgid "Error: Unable to change to directory"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:375
+#: ../../lib/class/catalog.class.php:374
 msgid "Error: Unable to get filesize for"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:412
+#: ../../lib/class/catalog.class.php:411
 msgid "is not readable by ampache"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:501
+#: ../../lib/class/catalog.class.php:530
 #, fuzzy
 msgid "album's with art"
 msgstr "Kapaksz Albmler"
 
-#: ../../lib/class/catalog.class.php:772
+#: ../../lib/class/catalog.class.php:812
 msgid "Starting Catalog Build"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:776
+#: ../../lib/class/catalog.class.php:816
 msgid "Running Remote Sync"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:781 ../../lib/class/catalog.class.php:947
+#: ../../lib/class/catalog.class.php:821 ../../lib/class/catalog.class.php:992
 msgid "Found"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:781 ../../lib/class/catalog.class.php:804
-#: ../../lib/class/catalog.class.php:947 ../../lib/class/catalog.class.php:977
-#: ../../lib/preferences.php:269 ../../lib/preferences.php:319
-#: ../../lib/ui.lib.php:1186 ../../admin/catalog.php:259
+#: ../../lib/class/catalog.class.php:821 ../../lib/class/catalog.class.php:848
+#: ../../lib/class/catalog.class.php:992
+#: ../../lib/class/catalog.class.php:1025 ../../lib/preferences.php:269
+#: ../../lib/preferences.php:319 ../../lib/ui.lib.php:1194
+#: ../../admin/catalog.php:259
 msgid "None"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:796 ../../lib/class/catalog.class.php:965
+#: ../../lib/class/catalog.class.php:840
+#: ../../lib/class/catalog.class.php:1014
 msgid "Added Playlist From"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:803 ../../lib/class/catalog.class.php:976
-#: ../../admin/catalog.php:258
+#: ../../lib/class/catalog.class.php:847
+#: ../../lib/class/catalog.class.php:1024 ../../admin/catalog.php:258
 msgid "Starting Album Art Search"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:804 ../../lib/class/catalog.class.php:977
-#: ../../admin/catalog.php:259
+#: ../../lib/class/catalog.class.php:848
+#: ../../lib/class/catalog.class.php:1025 ../../admin/catalog.php:259
 msgid "Searched"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:814
+#: ../../lib/class/catalog.class.php:858
 msgid "Catalog Finished"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:814 ../../lib/class/catalog.class.php:997
+#: ../../lib/class/catalog.class.php:858
+#: ../../lib/class/catalog.class.php:1044
 msgid "Total Time"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:814 ../../lib/class/catalog.class.php:998
+#: ../../lib/class/catalog.class.php:858
+#: ../../lib/class/catalog.class.php:1045
 msgid "Total Songs"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:815 ../../lib/class/catalog.class.php:998
+#: ../../lib/class/catalog.class.php:859
+#: ../../lib/class/catalog.class.php:1045
 msgid "Songs Per Seconds"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:849
-#: ../../lib/class/catalog.class.php:1634
+#: ../../lib/class/catalog.class.php:894
+#: ../../lib/class/catalog.class.php:1565
 msgid "Updated"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:856
+#: ../../lib/class/catalog.class.php:901
 msgid "No Update Needed"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:938
+#: ../../lib/class/catalog.class.php:983
 msgid "Starting New Song Search on"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:938
+#: ../../lib/class/catalog.class.php:983
 msgid "catalog"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:942
+#: ../../lib/class/catalog.class.php:987
 msgid "Running Remote Update"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:997
+#: ../../lib/class/catalog.class.php:1044
 msgid "Catalog Update Finished"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1017
+#: ../../lib/class/catalog.class.php:1064
 msgid "Error"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1017
+#: ../../lib/class/catalog.class.php:1064
 msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Error connecting to"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Code"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Reason"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1076
+#: ../../lib/class/catalog.class.php:1123
 msgid "Completed updating remote catalog(s)"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1111
+#: ../../lib/class/catalog.class.php:1158
 msgid "Added"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1193
+#: ../../lib/class/catalog.class.php:1240
 msgid "Cleaning the"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1193
-#: ../../lib/class/catalog.class.php:1589 ../../templates/sidebar.inc.php:30
+#: ../../lib/class/catalog.class.php:1240
+#: ../../lib/class/catalog.class.php:1520 ../../templates/sidebar.inc.php:30
 #: ../../ampache/templates/sidebar.inc.php:30
 msgid "Catalog"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1194
+#: ../../lib/class/catalog.class.php:1241
 msgid "Checking"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1265
+#: ../../lib/class/catalog.class.php:1313
 msgid "Catalog Clean Done"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1265
+#: ../../lib/class/catalog.class.php:1313
 msgid "files removed"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1589
+#: ../../lib/class/catalog.class.php:1520
 msgid "Updating the"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1590
+#: ../../lib/class/catalog.class.php:1521
 msgid "songs found checking tag information."
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1591
+#: ../../lib/class/catalog.class.php:1522
 msgid "Verifed"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1643
+#: ../../lib/class/catalog.class.php:1574
 msgid " FOUND"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1645
+#: ../../lib/class/catalog.class.php:1576
 msgid "Searching for new Album Art"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1649
+#: ../../lib/class/catalog.class.php:1580
 msgid "Album Art Already Found"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 #, fuzzy
 msgid "Update Finished."
 msgstr "Profil gncelleme"
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 msgid "Checked"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 msgid "songs updated."
 msgstr ""
 
-#: ../../lib/class/song.class.php:360
+#: ../../lib/class/song.class.php:361
 #: ../../templates/show_duplicates.inc.php:35
 #: ../../templates/show_edit_song.inc.php:31
 #: ../../templates/show_disabled_songs.inc:26
@@ -214,53 +219,53 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
-#: ../../lib/class/song.class.php:360 ../../lib/class/song.class.php:364
-#: ../../lib/class/song.class.php:368 ../../lib/class/song.class.php:372
-#: ../../lib/class/song.class.php:376 ../../lib/class/song.class.php:380
-#: ../../lib/class/song.class.php:384 ../../lib/class/song.class.php:389
-#: ../../lib/class/song.class.php:394 ../../lib/class/song.class.php:398
-#: ../../lib/class/song.class.php:402 ../../lib/class/song.class.php:407
+#: ../../lib/class/song.class.php:361 ../../lib/class/song.class.php:365
+#: ../../lib/class/song.class.php:369 ../../lib/class/song.class.php:373
+#: ../../lib/class/song.class.php:377 ../../lib/class/song.class.php:381
+#: ../../lib/class/song.class.php:385 ../../lib/class/song.class.php:390
+#: ../../lib/class/song.class.php:395 ../../lib/class/song.class.php:399
+#: ../../lib/class/song.class.php:403 ../../lib/class/song.class.php:408
 msgid "updated to"
 msgstr ""
 
-#: ../../lib/class/song.class.php:364
+#: ../../lib/class/song.class.php:365
 #: ../../templates/show_list_duplicates.inc.php:35
 #: ../../templates/show_songs.inc:53
 msgid "Bitrate"
 msgstr ""
 
-#: ../../lib/class/song.class.php:368
+#: ../../lib/class/song.class.php:369
 msgid "Rate"
 msgstr ""
 
-#: ../../lib/class/song.class.php:372
+#: ../../lib/class/song.class.php:373
 msgid "Mode"
 msgstr ""
 
-#: ../../lib/class/song.class.php:376
+#: ../../lib/class/song.class.php:377
 #: ../../templates/show_tv_playlist.inc.php:46
 #: ../../templates/show_songs.inc:51
 msgid "Time"
 msgstr ""
 
-#: ../../lib/class/song.class.php:380
+#: ../../lib/class/song.class.php:381
 #: ../../templates/show_edit_song.inc.php:61
 #: ../../templates/show_localplay_playlist.inc.php:27
 #: ../../templates/show_songs.inc:45 ../../templates/show_songs.inc:50
 msgid "Track"
 msgstr ""
 
-#: ../../lib/class/song.class.php:384
+#: ../../lib/class/song.class.php:385
 msgid "Filesize"
 msgstr ""
 
-#: ../../lib/class/song.class.php:389
+#: ../../lib/class/song.class.php:390
 #: ../../templates/show_edit_song.inc.php:45
 #: ../../templates/show_get_albumart.inc.php:30
 #: ../../templates/show_play_selected.inc.php:60
 #: ../../templates/show_list_duplicates.inc.php:32
 #: ../../templates/show_recently_played.inc.php:32
-#: ../../templates/show_artists.inc:40 ../../templates/show_artists.inc:65
+#: ../../templates/show_artists.inc:40 ../../templates/show_artists.inc:71
 #: ../../templates/show_disabled_songs.inc:28
 #: ../../templates/show_songs.inc:48 ../../templates/show_albums.inc:41
 #: ../../templates/show_albums.inc:84
@@ -269,7 +274,7 @@ msgstr ""
 msgid "Artist"
 msgstr ""
 
-#: ../../lib/class/song.class.php:394
+#: ../../lib/class/song.class.php:395
 #: ../../templates/show_edit_song.inc.php:37
 #: ../../templates/show_get_albumart.inc.php:38
 #: ../../templates/show_play_selected.inc.php:59
@@ -281,7 +286,7 @@ msgstr ""
 msgid "Album"
 msgstr ""
 
-#: ../../lib/class/song.class.php:398
+#: ../../lib/class/song.class.php:399
 #: ../../templates/show_edit_song.inc.php:67
 #: ../../templates/show_play_selected.inc.php:61
 #: ../../templates/show_edit_album.inc.php:33
@@ -290,13 +295,13 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
-#: ../../lib/class/song.class.php:402 ../../templates/show_flag.inc.php:64
+#: ../../lib/class/song.class.php:403 ../../templates/show_flag.inc.php:64
 #: ../../templates/show_edit_song.inc.php:73
 #: ../../templates/show_search.inc:37
 msgid "Comment"
 msgstr ""
 
-#: ../../lib/class/song.class.php:407 ../../lib/ui.lib.php:843
+#: ../../lib/class/song.class.php:408 ../../lib/ui.lib.php:851
 #: ../../templates/sidebar.inc.php:36
 #: ../../templates/show_edit_song.inc.php:53
 #: ../../templates/show_genre.inc.php:29
@@ -311,34 +316,34 @@ msgstr ""
 msgid "Error: Name Identical"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:263
+#: ../../lib/class/flag.class.php:264
 #, fuzzy
 msgid "Approved"
 msgstr "Kip"
 
-#: ../../lib/class/flag.class.php:264
+#: ../../lib/class/flag.class.php:265
 msgid "Pending"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:276 ../../templates/show_flag.inc.php:56
+#: ../../lib/class/flag.class.php:277 ../../templates/show_flag.inc.php:56
 #: ../../templates/show_playlists.inc.php:57
 #: ../../templates/show_admin_tools.inc.php:50
 msgid "Delete"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:279
+#: ../../lib/class/flag.class.php:280
 msgid "Re-Tag"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:282 ../../templates/show_flag.inc.php:58
+#: ../../lib/class/flag.class.php:283 ../../templates/show_flag.inc.php:58
 msgid "Re-encode"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:285 ../../templates/show_flag.inc.php:59
+#: ../../lib/class/flag.class.php:286 ../../templates/show_flag.inc.php:59
 msgid "Other"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:288 ../../lib/class/localplay.class.php:569
+#: ../../lib/class/flag.class.php:289 ../../lib/class/localplay.class.php:570
 #: ../../lib/general.lib.php:890
 #: ../../modules/localplay/icecast.controller.php:292
 #: ../../modules/localplay/mpd.controller.php:354
@@ -346,24 +351,24 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: ../../lib/class/localplay.class.php:560 ../../templates/show_tv.inc.php:81
+#: ../../lib/class/localplay.class.php:561 ../../templates/show_tv.inc.php:64
 #: ../../templates/show_now_playing.inc:32
 msgid "Now Playing"
 msgstr ""
 
-#: ../../lib/class/localplay.class.php:563
+#: ../../lib/class/localplay.class.php:564
 msgid "Stopped"
 msgstr ""
 
-#: ../../lib/class/localplay.class.php:566
+#: ../../lib/class/localplay.class.php:567
 msgid "Paused"
 msgstr ""
 
-#: ../../lib/class/album.class.php:162
+#: ../../lib/class/album.class.php:163
 msgid "Various"
 msgstr ""
 
-#: ../../lib/class/genre.class.php:284
+#: ../../lib/class/genre.class.php:285
 msgid "Show Genres starting with"
 msgstr ""
 
@@ -405,30 +410,30 @@ msgid "Disable"
 msgstr ""
 
 #: ../../lib/preferences.php:271 ../../templates/show_tv_adminctl.inc.php:41
-#: ../../templates/show_playtype_switch.inc.php:9
+#: ../../templates/show_playtype_switch.inc.php:30
 msgid "Stream"
 msgstr ""
 
 #: ../../lib/preferences.php:274 ../../templates/show_tv_adminctl.inc.php:42
-#: ../../templates/show_playtype_switch.inc.php:13
+#: ../../templates/show_playtype_switch.inc.php:34
 msgid "Downsample"
 msgstr ""
 
 #: ../../lib/preferences.php:277
-#: ../../templates/show_playtype_switch.inc.php:15
+#: ../../templates/show_playtype_switch.inc.php:36
 msgid "Democratic"
 msgstr ""
 
-#: ../../lib/preferences.php:280 ../../templates/sidebar.inc.php:170
+#: ../../lib/preferences.php:280 ../../templates/sidebar.inc.php:168
 #: ../../templates/show_tv_adminctl.inc.php:40
 #: ../../templates/show_localplay.inc.php:26
-#: ../../templates/show_playtype_switch.inc.php:11
+#: ../../templates/show_playtype_switch.inc.php:32
 #: ../../ampache/templates/sidebar.inc.php:170
 msgid "Localplay"
 msgstr ""
 
 #: ../../lib/preferences.php:282
-#: ../../templates/show_playtype_switch.inc.php:17
+#: ../../templates/show_playtype_switch.inc.php:38
 msgid "XSPF Player"
 msgstr ""
 
@@ -473,11 +478,11 @@ msgstr ""
 msgid "No songs in this playlist."
 msgstr ""
 
-#: ../../lib/playlist.lib.php:191 ../../lib/ui.lib.php:892
-#: ../../templates/sidebar.inc.php:150
+#: ../../lib/playlist.lib.php:191 ../../lib/ui.lib.php:900
+#: ../../templates/sidebar.inc.php:148
 #: ../../templates/show_admin_tools.inc.php:48
 #: ../../ampache/templates/sidebar.inc.php:150
-#: ../../templates/show_artists.inc:55 ../../templates/show_random_play.inc:40
+#: ../../templates/show_random_play.inc:40
 #: ../../templates/show_add_access.inc:59
 #: ../../templates/show_edit_access.inc:69
 msgid "All"
@@ -491,7 +496,7 @@ msgstr ""
 msgid "Error Access Denied"
 msgstr ""
 
-#: ../../lib/ui.lib.php:194 ../../templates/sidebar.inc.php:89
+#: ../../lib/ui.lib.php:194 ../../templates/sidebar.inc.php:87
 #: ../../ampache/templates/sidebar.inc.php:89
 msgid "Browse"
 msgstr ""
@@ -504,137 +509,131 @@ msgstr ""
 msgid "Show all"
 msgstr ""
 
-#: ../../lib/ui.lib.php:538 ../../admin/mail.php:80
+#: ../../lib/ui.lib.php:539 ../../admin/mail.php:81
 msgid "No Catalogs Found!"
 msgstr ""
 
-#: ../../lib/ui.lib.php:539 ../../admin/mail.php:81
-#: ../../templates/show_admin_tools.inc.php:67
+#: ../../lib/ui.lib.php:540 ../../admin/mail.php:82
+#: ../../templates/show_admin_tools.inc.php:75
 #: ../../templates/show_add_catalog.inc.php:28
 msgid "Add a Catalog"
 msgstr ""
 
-#: ../../lib/ui.lib.php:540 ../../admin/mail.php:82
-#: ../../templates/show_mail_users.inc.php:41
-#: ../../templates/show_local_catalog_info.inc.php:23
-msgid "Catalog Statistics"
-msgstr ""
-
-#: ../../lib/ui.lib.php:576 ../../admin/mail.php:119
+#: ../../lib/ui.lib.php:578 ../../admin/mail.php:120
 msgid "day"
 msgstr ""
 
-#: ../../lib/ui.lib.php:576 ../../admin/mail.php:119
+#: ../../lib/ui.lib.php:578 ../../admin/mail.php:120
 msgid "days"
 msgstr ""
 
-#: ../../lib/ui.lib.php:578 ../../admin/mail.php:121
+#: ../../lib/ui.lib.php:580 ../../admin/mail.php:122
 msgid "hour"
 msgstr ""
 
-#: ../../lib/ui.lib.php:578 ../../admin/mail.php:121
+#: ../../lib/ui.lib.php:580 ../../admin/mail.php:122
 msgid "hours"
 msgstr ""
 
-#: ../../lib/ui.lib.php:782 ../../templates/show_tv.inc.php:58
-#: ../../templates/sidebar.inc.php:50
+#: ../../lib/ui.lib.php:790 ../../templates/sidebar.inc.php:48
 #: ../../ampache/templates/sidebar.inc.php:50
 msgid "Home"
 msgstr ""
 
-#: ../../lib/ui.lib.php:785
+#: ../../lib/ui.lib.php:793
 msgid "Upload"
 msgstr ""
 
-#: ../../lib/ui.lib.php:788
+#: ../../lib/ui.lib.php:796
 msgid "Local Play"
 msgstr ""
 
-#: ../../lib/ui.lib.php:791
+#: ../../lib/ui.lib.php:799
 msgid "Random Play"
 msgstr ""
 
-#: ../../lib/ui.lib.php:794 ../../templates/show_play_selected.inc.php:47
+#: ../../lib/ui.lib.php:802 ../../templates/show_play_selected.inc.php:47
 msgid "Playlist"
 msgstr ""
 
-#: ../../lib/ui.lib.php:797 ../../templates/show_duplicates.inc.php:51
-#: ../../templates/sidebar.inc.php:118 ../../templates/sidebar.inc.php:124
+#: ../../lib/ui.lib.php:805 ../../templates/show_duplicates.inc.php:51
+#: ../../templates/sidebar.inc.php:116 ../../templates/sidebar.inc.php:122
 #: ../../ampache/templates/sidebar.inc.php:118
 #: ../../ampache/templates/sidebar.inc.php:124
 #: ../../templates/show_search_bar.inc:31 ../../templates/show_search.inc:133
 msgid "Search"
 msgstr ""
 
-#: ../../lib/ui.lib.php:800 ../../templates/sidebar.inc.php:81
+#: ../../lib/ui.lib.php:808 ../../templates/sidebar.inc.php:79
 #: ../../ampache/templates/sidebar.inc.php:81
 msgid "Preferences"
 msgstr ""
 
-#: ../../lib/ui.lib.php:803 ../../lib/ui.lib.php:807
+#: ../../lib/ui.lib.php:811 ../../lib/ui.lib.php:815
 msgid "Admin-Catalog"
 msgstr ""
 
-#: ../../lib/ui.lib.php:811
+#: ../../lib/ui.lib.php:819
 #, fuzzy
 msgid "Admin-User Management"
 msgstr "Kullanc ad"
 
-#: ../../lib/ui.lib.php:815
+#: ../../lib/ui.lib.php:823
 msgid "Admin-Mail Users"
 msgstr ""
 
-#: ../../lib/ui.lib.php:819
+#: ../../lib/ui.lib.php:827
 #, fuzzy
 msgid "Admin-Manage Access Lists"
 msgstr "Eriim listesi"
 
-#: ../../lib/ui.lib.php:823
+#: ../../lib/ui.lib.php:831
 #, fuzzy
 msgid "Admin-Site Preferences"
 msgstr "Ynetici tercihleri"
 
-#: ../../lib/ui.lib.php:827
+#: ../../lib/ui.lib.php:835
 msgid "Admin-Manage Modules"
 msgstr ""
 
-#: ../../lib/ui.lib.php:831
+#: ../../lib/ui.lib.php:839
 msgid "Browse Music"
 msgstr ""
 
-#: ../../lib/ui.lib.php:835 ../../admin/mail.php:133
-#: ../../templates/sidebar.inc.php:34 ../../templates/sidebar.inc.php:158
+#: ../../lib/ui.lib.php:843 ../../admin/mail.php:134
+#: ../../templates/sidebar.inc.php:34 ../../templates/sidebar.inc.php:156
 #: ../../templates/show_genre.inc.php:32
-#: ../../templates/show_local_catalog_info.inc.php:34
+#: ../../templates/show_local_catalog_info.inc.php:28
 #: ../../ampache/templates/sidebar.inc.php:34
 #: ../../ampache/templates/sidebar.inc.php:158
-#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:68
+#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:74
 msgid "Albums"
 msgstr ""
 
-#: ../../lib/ui.lib.php:839 ../../admin/mail.php:134
-#: ../../templates/sidebar.inc.php:35 ../../templates/sidebar.inc.php:157
+#: ../../lib/ui.lib.php:847 ../../admin/mail.php:135
+#: ../../templates/sidebar.inc.php:35 ../../templates/sidebar.inc.php:155
 #: ../../templates/show_genre.inc.php:35
-#: ../../templates/show_local_catalog_info.inc.php:38
+#: ../../templates/show_local_catalog_info.inc.php:29
 #: ../../ampache/templates/sidebar.inc.php:35
 #: ../../ampache/templates/sidebar.inc.php:157
 msgid "Artists"
 msgstr ""
 
-#: ../../lib/ui.lib.php:847 ../../templates/sidebar.inc.php:112
+#: ../../lib/ui.lib.php:855 ../../templates/sidebar.inc.php:110
 #: ../../ampache/templates/sidebar.inc.php:112
 msgid "Statistics"
 msgstr ""
 
-#: ../../lib/ui.lib.php:1421
+#: ../../lib/ui.lib.php:1429
 msgid "Manage Users"
 msgstr ""
 
-#: ../../lib/ui.lib.php:1422
+#: ../../lib/ui.lib.php:1430
 msgid "Add a new user"
 msgstr ""
 
-#: ../../lib/general.lib.php:670 ../../templates/show_user_stats.inc.php:32
+#: ../../lib/general.lib.php:670 ../../templates/show_box.inc.php:30
+#: ../../templates/show_user_stats.inc.php:32
 #: ../../templates/show_user_stats.inc.php:43
 #: ../../templates/show_user_stats.inc.php:54
 #: ../../templates/show_user_recommendations.inc.php:32
@@ -760,7 +759,7 @@ msgstr ""
 msgid "Do you really want to clear the statistics for this catalog?"
 msgstr ""
 
-#: ../../admin/catalog.php:230 ../../templates/show_admin_tools.inc.php:68
+#: ../../admin/catalog.php:230 ../../templates/show_admin_tools.inc.php:76
 msgid "Clear Catalog Stats"
 msgstr ""
 
@@ -812,28 +811,32 @@ msgstr "Seilmileri iaretle"
 msgid "Flag Removed from"
 msgstr ""
 
-#: ../../admin/flag.php:274
+#: ../../admin/flag.php:270
+msgid "Flags Updated"
+msgstr ""
+
+#: ../../admin/flag.php:289
 msgid "Songs Disabled"
 msgstr ""
 
-#: ../../admin/flag.php:274
+#: ../../admin/flag.php:289
 msgid "The requested song(s) have been disabled"
 msgstr ""
 
-#: ../../admin/flag.php:285
+#: ../../admin/flag.php:300
 msgid "Songs Enabled"
 msgstr ""
 
-#: ../../admin/flag.php:285
+#: ../../admin/flag.php:300
 msgid "The requested song(s) have been enabled"
 msgstr ""
 
-#: ../../admin/flag.php:290
+#: ../../admin/flag.php:305
 #, fuzzy
 msgid "Flagged Records"
 msgstr "aretleyen"
 
-#: ../../admin/preferences.php:59 ../../admin/preferences.php:82
+#: ../../admin/preferences.php:60 ../../admin/preferences.php:83
 msgid "Site"
 msgstr ""
 
@@ -879,66 +882,71 @@ msgstr ""
 msgid "Error Passwords don't match"
 msgstr ""
 
-#: ../../admin/users.php:117 ../../register.php:138
+#: ../../admin/users.php:120 ../../register.php:138
 msgid "Error Username already exists"
 msgstr ""
 
-#: ../../admin/users.php:139
+#: ../../admin/users.php:142
 msgid "Deletion Request"
 msgstr ""
 
-#: ../../admin/users.php:140
+#: ../../admin/users.php:143
 msgid "Are you sure you want to permanently delete"
 msgstr ""
 
-#: ../../admin/users.php:145 ../../templates/show_confirm_action.inc.php:29
+#: ../../admin/users.php:148 ../../templates/show_confirm_action.inc.php:29
 #: ../../templates/show_search.inc:78
 msgid "No"
 msgstr ""
 
-#: ../../admin/users.php:147
+#: ../../admin/users.php:150
 msgid "User Deleted"
 msgstr ""
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:153
 msgid "Delete Error"
 msgstr ""
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:153
 msgid "Unable to delete last Admin User"
 msgstr ""
 
-#: ../../admin/mail.php:131 ../../templates/show_local_catalog_info.inc.php:26
+#: ../../admin/mail.php:83 ../../templates/show_mail_users.inc.php:41
+#: ../../templates/show_local_catalog_info.inc.php:23
+msgid "Catalog Statistics"
+msgstr ""
+
+#: ../../admin/mail.php:132 ../../templates/show_local_catalog_info.inc.php:27
 msgid "Total Users"
 msgstr ""
 
-#: ../../admin/mail.php:132 ../../templates/show_local_catalog_info.inc.php:30
+#: ../../admin/mail.php:133 ../../templates/show_local_catalog_info.inc.php:26
 msgid "Connected Users"
 msgstr ""
 
-#: ../../admin/mail.php:135 ../../templates/sidebar.inc.php:155
+#: ../../admin/mail.php:136 ../../templates/sidebar.inc.php:153
 #: ../../templates/show_genre.inc.php:38
-#: ../../templates/show_local_catalog_info.inc.php:42
+#: ../../templates/show_local_catalog_info.inc.php:30
 #: ../../templates/show_genres.inc.php:37
 #: ../../ampache/templates/sidebar.inc.php:155
-#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:67
+#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:73
 #: ../../templates/show_albums.inc:43 ../../templates/show_albums.inc:86
 msgid "Songs"
 msgstr ""
 
-#: ../../admin/mail.php:136 ../../templates/show_local_catalog_info.inc.php:46
+#: ../../admin/mail.php:137 ../../templates/show_local_catalog_info.inc.php:31
 msgid "Catalog Size"
 msgstr ""
 
-#: ../../admin/mail.php:137 ../../templates/show_local_catalog_info.inc.php:50
+#: ../../admin/mail.php:138 ../../templates/show_local_catalog_info.inc.php:32
 msgid "Catalog Time"
 msgstr ""
 
-#: ../../admin/mail.php:219
+#: ../../admin/mail.php:252
 msgid "E-mail Sent"
 msgstr ""
 
-#: ../../admin/mail.php:220
+#: ../../admin/mail.php:253
 msgid "Your E-mail was successfully sent."
 msgstr ""
 
@@ -992,21 +1000,21 @@ msgid "Incorrect Tags"
 msgstr ""
 
 #: ../../templates/show_flag.inc.php:70
-#: ../../templates/show_flagged.inc.php:27
+#: ../../templates/show_flagged.inc.php:30
 msgid "Flag"
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:36
-#: ../../templates/show_install_lang.inc.php:10
+#: ../../templates/show_install_lang.inc.php:32
 #: ../../templates/show_install_config.inc:36
-#: ../../templates/show_install.inc:10
+#: ../../templates/show_install.inc:32
 msgid "Ampache Installation"
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:43
-#: ../../templates/show_install_lang.inc.php:17
+#: ../../templates/show_install_lang.inc.php:39
 #: ../../templates/show_install_config.inc:42
-#: ../../templates/show_install.inc:18
+#: ../../templates/show_install.inc:40
 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 "
@@ -1014,9 +1022,9 @@ msgid ""
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:46
-#: ../../templates/show_install_lang.inc.php:20
+#: ../../templates/show_install_lang.inc.php:42
 #: ../../templates/show_install_config.inc:45
-#: ../../templates/show_install.inc:21
+#: ../../templates/show_install.inc:43
 msgid ""
 "A MySQL Server with a username and password that can create/modify databases"
 msgstr ""
@@ -1028,9 +1036,9 @@ msgid ""
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:49
-#: ../../templates/show_install_lang.inc.php:24
+#: ../../templates/show_install_lang.inc.php:46
 #: ../../templates/show_install_config.inc:48
-#: ../../templates/show_install.inc:25
+#: ../../templates/show_install.inc:47
 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 "
@@ -1040,7 +1048,7 @@ msgstr ""
 
 #: ../../templates/show_install_account.inc.php:53
 #: ../../templates/show_install_config.inc:52
-#: ../../templates/show_install.inc:30
+#: ../../templates/show_install.inc:52
 msgid "Step 1 - Creating and Inserting the Ampache Database"
 msgstr ""
 
@@ -1050,7 +1058,7 @@ msgstr ""
 
 #: ../../templates/show_install_account.inc.php:55
 #: ../../templates/show_install_config.inc:57
-#: ../../templates/show_install.inc:35
+#: ../../templates/show_install.inc:57
 msgid "Step 3 - Setup Initial Account"
 msgstr ""
 
@@ -1065,7 +1073,7 @@ msgid "Create Admin Account"
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:65
-#: ../../templates/show_user_registration.inc.php:99
+#: ../../templates/show_user_registration.inc.php:98
 #: ../../templates/show_edit_user.inc.php:40
 #: ../../templates/show_recently_played.inc.php:29
 #: ../../templates/show_users.inc:43
@@ -1073,7 +1081,7 @@ msgid "Username"
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:69
-#: ../../templates/show_user_registration.inc.php:127
+#: ../../templates/show_user_registration.inc.php:126
 #: ../../templates/show_edit_user.inc.php:63
 #: ../../templates/show_login_form.inc:37
 msgid "Password"
@@ -1084,7 +1092,7 @@ msgid "Create Account"
 msgstr ""
 
 #: ../../templates/show_playlists.inc.php:28
-#: ../../templates/sidebar.inc.php:106
+#: ../../templates/sidebar.inc.php:104
 #: ../../ampache/templates/sidebar.inc.php:106
 msgid "Playlists"
 msgstr ""
@@ -1116,22 +1124,20 @@ msgstr ""
 
 #: ../../templates/show_playlists.inc.php:55
 #: ../../templates/show_play_selected.inc.php:50
-#: ../../templates/show_artists.inc:58 ../../templates/show_access_list.inc:67
+#: ../../templates/show_access_list.inc:67
 msgid "Edit"
 msgstr ""
 
 #: ../../templates/show_playlists.inc.php:61
 #: ../../templates/show_tv_adminctl.inc.php:44
-#: ../../templates/show_genres.inc.php:47 ../../templates/show_artists.inc:54
 #: ../../templates/show_random_play.inc:82
 msgid "Play"
 msgstr ""
 
 #: ../../templates/show_playlists.inc.php:63
-#: ../../templates/sidebar.inc.php:135
+#: ../../templates/sidebar.inc.php:133
 #: ../../templates/show_localplay_status.inc.php:62
 #: ../../ampache/templates/sidebar.inc.php:135
-#: ../../templates/show_artists.inc:56
 msgid "Random"
 msgstr ""
 
@@ -1170,11 +1176,11 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: ../../templates/show_tv.inc.php:56
+#: ../../templates/show_tv.inc.php:42
 msgid "Controls"
 msgstr ""
 
-#: ../../templates/show_tv.inc.php:74
+#: ../../templates/show_tv.inc.php:57
 #: ../../templates/show_localplay.inc.php:42
 msgid "Current Playlist"
 msgstr ""
@@ -1200,7 +1206,7 @@ msgstr ""
 
 #: ../../templates/show_playlist_edit.inc.php:36
 #: ../../templates/show_add_playlist.inc.php:32
-#: ../../templates/show_random_play.inc:50
+#: ../../templates/show_random_play.inc:49
 #: ../../templates/show_access_list.inc:51
 msgid "Type"
 msgstr ""
@@ -1216,6 +1222,7 @@ msgstr "Size zel"
 
 #: ../../templates/show_playlist_edit.inc.php:48
 #: ../../templates/show_tv_adminctl.inc.php:51
+#: ../../templates/show_flagged.inc.php:66
 #: ../../templates/show_play_selected.inc.php:64
 #: ../../templates/show_preference_admin.inc.php:47
 #: ../../templates/show_edit_access.inc:78
@@ -1248,41 +1255,36 @@ msgstr ""
 msgid "Song Title"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:38
-#: ../../ampache/templates/sidebar.inc.php:38
-msgid "Lists"
-msgstr ""
-
-#: ../../templates/sidebar.inc.php:62
+#: ../../templates/sidebar.inc.php:60
 #: ../../templates/show_tv_playlist.inc.php:48
 #: ../../templates/show_preference_admin.inc.php:39
 #: ../../ampache/templates/sidebar.inc.php:62
 msgid "Admin"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:156
+#: ../../templates/sidebar.inc.php:154
 #: ../../ampache/templates/sidebar.inc.php:156
 #: ../../templates/show_random_play.inc:56
 msgid "Minutes"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:159
+#: ../../templates/sidebar.inc.php:157
 #: ../../ampache/templates/sidebar.inc.php:159
 #: ../../templates/show_random_play.inc:53
 msgid "Less Played"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:164
+#: ../../templates/sidebar.inc.php:162
 #: ../../ampache/templates/sidebar.inc.php:164
 msgid "Enqueue"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:187
+#: ../../templates/sidebar.inc.php:185
 #: ../../ampache/templates/sidebar.inc.php:187
 msgid "Democratic View"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:191
+#: ../../templates/sidebar.inc.php:189
 #: ../../ampache/templates/sidebar.inc.php:191
 msgid "Logout"
 msgstr ""
@@ -1297,9 +1299,9 @@ msgstr "Katalogdan"
 #: ../../templates/show_modules.inc.php:42
 #: ../../templates/show_modules.inc.php:75
 #: ../../templates/show_genres.inc.php:38
-#: ../../templates/show_flagged.inc.php:29
+#: ../../templates/show_flagged.inc.php:32
 #: ../../templates/show_localplay_playlist.inc.php:29
-#: ../../templates/show_artists.inc:44 ../../templates/show_artists.inc:69
+#: ../../templates/show_artists.inc:44 ../../templates/show_artists.inc:75
 #: ../../templates/show_songs.inc:55 ../../templates/show_albums.inc:47
 #: ../../templates/show_albums.inc:90 ../../templates/show_access_list.inc:52
 #: ../../templates/show_artist.inc:39
@@ -1319,60 +1321,68 @@ msgstr ""
 msgid "Clean"
 msgstr "sil"
 
+#: ../../templates/show_admin_tools.inc.php:56
+msgid "Fast"
+msgstr ""
+
 #: ../../templates/show_admin_tools.inc.php:57
+msgid "Gather Art"
+msgstr ""
+
+#: ../../templates/show_admin_tools.inc.php:65
 #, fuzzy
 msgid "No Catalogs Found"
 msgstr "Sonu bulunamad"
 
-#: ../../templates/show_admin_tools.inc.php:63
+#: ../../templates/show_admin_tools.inc.php:71
 msgid "Clean All"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:64
+#: ../../templates/show_admin_tools.inc.php:72
 #, fuzzy
 msgid "Verify All"
 msgstr "Hepsini grntle"
 
-#: ../../templates/show_admin_tools.inc.php:65
+#: ../../templates/show_admin_tools.inc.php:73
 msgid "Add to All"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:66
+#: ../../templates/show_admin_tools.inc.php:74
 #, fuzzy
 msgid "Update All"
 msgstr "Profil gncelleme"
 
-#: ../../templates/show_admin_tools.inc.php:69
+#: ../../templates/show_admin_tools.inc.php:77
 #: ../../templates/show_add_catalog.inc.php:78
 msgid "Gather Album Art"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:73
+#: ../../templates/show_admin_tools.inc.php:81
 msgid "Other Tools"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:75
+#: ../../templates/show_admin_tools.inc.php:83
 msgid "Show Duplicate Songs"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:76
+#: ../../templates/show_admin_tools.inc.php:84
 msgid "Clear Now Playing"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:78
+#: ../../templates/show_admin_tools.inc.php:85 ../../templates/header.inc:75
 msgid "Generate New Config"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:79
+#: ../../templates/show_admin_tools.inc.php:86
 #, fuzzy
 msgid "Preferences Permissions"
 msgstr "Eriim listesindeki izinleri dzenle"
 
-#: ../../templates/show_admin_tools.inc.php:81
+#: ../../templates/show_admin_tools.inc.php:87
 msgid "Export To Itunes DB"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:82
+#: ../../templates/show_admin_tools.inc.php:88
 msgid "Check for New Version"
 msgstr ""
 
@@ -1406,7 +1416,7 @@ msgid "Find duplicate artists"
 msgstr ""
 
 #: ../../templates/show_user.inc.php:30
-#: ../../templates/show_user_registration.inc.php:118
+#: ../../templates/show_user_registration.inc.php:117
 #: ../../templates/show_edit_user.inc.php:55
 msgid "E-mail"
 msgstr ""
@@ -1421,7 +1431,7 @@ msgid "New Password"
 msgstr "Parola deitirme"
 
 #: ../../templates/show_user.inc.php:49
-#: ../../templates/show_user_registration.inc.php:136
+#: ../../templates/show_user_registration.inc.php:135
 #: ../../templates/show_edit_user.inc.php:72
 msgid "Confirm Password"
 msgstr ""
@@ -1483,49 +1493,49 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:55
+#: ../../templates/show_user_registration.inc.php:54
 msgid "Ampache New User Registration"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:70
+#: ../../templates/show_user_registration.inc.php:69
 msgid "User Agreement"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:80
+#: ../../templates/show_user_registration.inc.php:79
 msgid "I Accept"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:94
+#: ../../templates/show_user_registration.inc.php:93
 msgid "User Information"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:109
+#: ../../templates/show_user_registration.inc.php:108
 #: ../../templates/show_edit_user.inc.php:48
 msgid "Full Name"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:156
+#: ../../templates/show_user_registration.inc.php:155
 msgid "Clear Info"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:157
+#: ../../templates/show_user_registration.inc.php:156
 msgid "Register User"
 msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:15
-#: ../../templates/show_install.inc:16
+#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install.inc:38
 msgid "Requirements"
 msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:21
+#: ../../templates/show_install_lang.inc.php:43
 #: ../../templates/show_install_config.inc:46
-#: ../../templates/show_install.inc:22
+#: ../../templates/show_install.inc:44
 msgid ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
 "ampache.cfg.php.dist file"
 msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:50
+#: ../../templates/show_install_lang.inc.php:72
 msgid "Start configuration"
 msgstr ""
 
@@ -1551,7 +1561,7 @@ msgstr ""
 
 #: ../../templates/show_modules.inc.php:61
 #: ../../templates/show_modules.inc.php:96
-#: ../../templates/show_flagged.inc.php:50
+#: ../../templates/show_flagged.inc.php:57
 #: ../../templates/show_list_duplicates.inc.php:81
 #: ../../templates/show_localplay_playlist.inc.php:51
 #: ../../templates/show_disabled_songs.inc:44
@@ -1626,7 +1636,7 @@ msgid "Mail to"
 msgstr ""
 
 #: ../../templates/show_mail_users.inc.php:45
-#: ../../templates/show_all_popular.inc.php:30 ../../index.php:66
+#: ../../templates/show_all_popular.inc.php:29
 msgid "Most Popular Albums"
 msgstr ""
 
@@ -1635,7 +1645,7 @@ msgid "Latest Artist Additions"
 msgstr ""
 
 #: ../../templates/show_mail_users.inc.php:56
-#: ../../templates/show_all_popular.inc.php:27 ../../index.php:75
+#: ../../templates/show_all_popular.inc.php:26
 msgid "Most Popular Artists"
 msgstr ""
 
@@ -1644,36 +1654,41 @@ msgid "Latest Album Additions"
 msgstr ""
 
 #: ../../templates/show_mail_users.inc.php:67
-#: ../../templates/show_all_popular.inc.php:40
+#: ../../templates/show_all_popular.inc.php:38
 msgid "Most Popular Songs"
 msgstr ""
 
 #: ../../templates/show_mail_users.inc.php:73
+msgid "Flagged Songs"
+msgstr ""
+
+#: ../../templates/show_mail_users.inc.php:77
+#: ../../templates/show_admin_info.inc.php:36
+msgid "Disabled Songs"
+msgstr ""
+
+#: ../../templates/show_mail_users.inc.php:85
 msgid "Most Popular Threshold in days"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:84
+#: ../../templates/show_mail_users.inc.php:96
 msgid "Subject"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:91
+#: ../../templates/show_mail_users.inc.php:103
 msgid "Message"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:101
+#: ../../templates/show_mail_users.inc.php:113
 msgid "Send Mail"
 msgstr ""
 
-#: ../../templates/show_admin_info.inc.php:33
+#: ../../templates/show_admin_info.inc.php:32
 msgid "Last Ten Flagged Records"
 msgstr ""
 
-#: ../../templates/show_admin_info.inc.php:37
-msgid "Disabled Songs"
-msgstr ""
-
-#: ../../templates/show_admin_info.inc.php:41
-#: ../../templates/show_flagged.inc.php:57
+#: ../../templates/show_admin_info.inc.php:40
+#: ../../templates/show_flagged.inc.php:73
 #: ../../templates/show_ip_history.inc.php:28
 #, fuzzy
 msgid "Show All"
@@ -1709,25 +1724,39 @@ msgid "Continue"
 msgstr ""
 
 #: ../../templates/show_confirmation.inc.php:28
-#: ../../templates/show_preferences.inc:95
+#: ../../templates/show_preferences.inc:96
 #: ../../templates/show_similar_artists.inc:74
 msgid "Cancel"
 msgstr ""
 
-#: ../../templates/show_flagged.inc.php:26
+#: ../../templates/show_flagged.inc.php:27
+#: ../../templates/show_disabled_songs.inc:25
+#: ../../templates/show_artist.inc:33
+msgid "Select"
+msgstr ""
+
+#: ../../templates/show_flagged.inc.php:28
 #, fuzzy
 msgid "Object"
 msgstr "Nesne tr"
 
-#: ../../templates/show_flagged.inc.php:28
+#: ../../templates/show_flagged.inc.php:29
+#: ../../templates/show_preference_admin.inc.php:38
+#: ../../templates/show_add_access.inc:47
+#: ../../templates/show_access_list.inc:49
+#: ../../templates/show_edit_access.inc:47
+msgid "User"
+msgstr ""
+
+#: ../../templates/show_flagged.inc.php:31
 msgid "Status"
 msgstr ""
 
-#: ../../templates/show_flagged.inc.php:39
+#: ../../templates/show_flagged.inc.php:63
 msgid "Reject"
 msgstr ""
 
-#: ../../templates/show_flagged.inc.php:43
+#: ../../templates/show_flagged.inc.php:64
 msgid "Approve"
 msgstr ""
 
@@ -1744,14 +1773,18 @@ msgstr ""
 msgid "Update id3 tags"
 msgstr ""
 
-#: ../../templates/show_all_recent.inc.php:27
+#: ../../templates/show_all_recent.inc.php:25
 msgid "Newest Artist Additions"
 msgstr ""
 
-#: ../../templates/show_all_recent.inc.php:30 ../../index.php:82
+#: ../../templates/show_all_recent.inc.php:28
 msgid "Newest Album Additions"
 msgstr ""
 
+#: ../../templates/show_all_recent.inc.php:31
+msgid "Newest Live Stream Additions"
+msgstr ""
+
 #: ../../templates/show_get_albumart.inc.php:23
 msgid "Customize Search"
 msgstr ""
@@ -1805,10 +1838,18 @@ msgstr ""
 msgid "Delete Empty Playlists"
 msgstr "Yeni ark listesi"
 
-#: ../../templates/show_all_popular.inc.php:37
+#: ../../templates/show_all_popular.inc.php:32
 msgid "Most Popular Genres"
 msgstr ""
 
+#: ../../templates/show_all_popular.inc.php:41
+msgid "Most Popular Live Streams"
+msgstr ""
+
+#: ../../templates/show_all_popular.inc.php:44
+msgid "Most Popular Tags"
+msgstr ""
+
 #: ../../templates/show_play_selected.inc.php:28
 msgid "Play Selected"
 msgstr ""
@@ -1949,22 +1990,10 @@ msgid "Filename Pattern"
 msgstr ""
 
 #: ../../templates/show_add_catalog.inc.php:82
-msgid "ID3V2 Tags"
-msgstr ""
-
-#: ../../templates/show_add_catalog.inc.php:86
-msgid "Amazon"
-msgstr ""
-
-#: ../../templates/show_add_catalog.inc.php:90
-msgid "File Folder"
-msgstr ""
-
-#: ../../templates/show_add_catalog.inc.php:98
 msgid "Build Playlists from m3u Files"
 msgstr ""
 
-#: ../../templates/show_add_catalog.inc.php:106
+#: ../../templates/show_add_catalog.inc.php:90
 msgid "Add Catalog"
 msgstr ""
 
@@ -2027,7 +2056,7 @@ msgid "Recommendations"
 msgstr ""
 
 #: ../../templates/show_user_recommendations.inc.php:29
-msgid "Recommended Aritsts"
+msgid "Recommended Artists"
 msgstr ""
 
 #: ../../templates/show_user_recommendations.inc.php:40
@@ -2053,13 +2082,6 @@ msgstr ""
 msgid "Guest"
 msgstr ""
 
-#: ../../templates/show_preference_admin.inc.php:38
-#: ../../templates/show_add_access.inc:47
-#: ../../templates/show_access_list.inc:49
-#: ../../templates/show_edit_access.inc:47
-msgid "User"
-msgstr ""
-
 #: ../../templates/show_edit_album.inc.php:23
 #, fuzzy
 msgid "Edit Album"
@@ -2103,11 +2125,19 @@ msgstr ""
 msgid "Recently Played"
 msgstr ""
 
+#: ../../templates/show_recently_played.inc.php:33
+msgid "Last Played"
+msgstr ""
+
 #: ../../templates/show_edit_artist.inc.php:23
 #, fuzzy
 msgid "Edit Artist"
 msgstr "Tm Sanatlar"
 
+#: ../../templates/show_random_albums.inc.php:23
+msgid "Albums of the Moment"
+msgstr ""
+
 #: ../../localplay.php:50 ../../localplay.php:58
 msgid "Song(s) Removed from Playlist"
 msgstr ""
@@ -2117,7 +2147,7 @@ msgstr ""
 msgid "Localplay Init Failed"
 msgstr "Yerel alma Dzeni"
 
-#: ../../browse.php:48 ../../albums.php:191
+#: ../../browse.php:48 ../../albums.php:213
 msgid "Show Albums starting with"
 msgstr ""
 
@@ -2125,7 +2155,7 @@ msgstr ""
 msgid "Show Artists starting with"
 msgstr ""
 
-#: ../../browse.php:123
+#: ../../browse.php:124
 msgid "Show Titles Starting With"
 msgstr ""
 
@@ -2133,6 +2163,10 @@ msgstr ""
 msgid "Error: No Keyword Entered"
 msgstr ""
 
+#: ../../ampache/templates/sidebar.inc.php:38
+msgid "Lists"
+msgstr ""
+
 #: ../../ratings.php:33
 msgid "Rating Updated"
 msgstr ""
@@ -2153,7 +2187,7 @@ msgstr ""
 msgid "No local account found"
 msgstr ""
 
-#: ../../login.php:177
+#: ../../login.php:176
 msgid "Message of the Day"
 msgstr ""
 
@@ -2169,35 +2203,35 @@ msgstr ""
 msgid "Ampache Update"
 msgstr ""
 
-#: ../../tv.php:61
+#: ../../tv.php:62
 msgid "Playlist Cleared"
 msgstr ""
 
-#: ../../artists.php:91 ../../albums.php:169
+#: ../../artists.php:91 ../../albums.php:191
 msgid "Starting Update from Tags"
 msgstr ""
 
-#: ../../artists.php:96 ../../albums.php:174
+#: ../../artists.php:96 ../../albums.php:196
 msgid "Update From Tags Complete"
 msgstr ""
 
-#: ../../artists.php:97 ../../albums.php:175
+#: ../../artists.php:97 ../../albums.php:197
 msgid "Return"
 msgstr ""
 
-#: ../../activate.php:44
+#: ../../activate.php:43
 msgid "No user with this name registered"
 msgstr ""
 
-#: ../../activate.php:48
+#: ../../activate.php:47
 msgid "The validation key used isn't correct."
 msgstr ""
 
-#: ../../activate.php:53
+#: ../../activate.php:52
 msgid "User activated"
 msgstr ""
 
-#: ../../activate.php:53
+#: ../../activate.php:52
 msgid "This User ID is activated and can be used"
 msgstr ""
 
@@ -2264,17 +2298,17 @@ msgstr ""
 msgid "Album Art information has been removed from the database"
 msgstr "Albm kapa ile ilgili bilgiler veritabanndan silindi"
 
-#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:133
+#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:159
 msgid "Album Art Not Located"
 msgstr ""
 
-#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:133
+#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:159
 msgid ""
 "Album Art could not be located at this time. This may be due to write access "
 "error, or the file is not received corectly."
 msgstr ""
 
-#: ../../albums.php:79 ../../albums.php:162
+#: ../../albums.php:79 ../../albums.php:106 ../../albums.php:185
 msgid "Album Art Inserted"
 msgstr ""
 
@@ -2310,11 +2344,11 @@ msgstr ""
 msgid "Error: Insert Failed"
 msgstr ""
 
-#: ../../register.php:170
+#: ../../register.php:169
 msgid "Registration Complete"
 msgstr ""
 
-#: ../../bin/print_tags.php.inc:63
+#: ../../bin/print_tags.php.inc:64
 msgid ""
 "[print_tags.php.inc]\n"
 "This commandline script will display the tag information for the specified "
@@ -2323,7 +2357,7 @@ msgid ""
 "        \n"
 msgstr ""
 
-#: ../../bin/print_tags.php.inc:69
+#: ../../bin/print_tags.php.inc:70
 msgid "Filename:"
 msgstr ""
 
@@ -2383,16 +2417,11 @@ msgstr ""
 msgid "Click to close window"
 msgstr ""
 
-#: ../../templates/show_disabled_songs.inc:25
-#: ../../templates/show_artist.inc:33
-msgid "Select"
-msgstr ""
-
 #: ../../templates/show_disabled_songs.inc:30
 msgid "Addition Time"
 msgstr ""
 
-#: ../../templates/show_disabled_songs.inc:48
+#: ../../templates/show_disabled_songs.inc:49
 msgid "Remove"
 msgstr ""
 
@@ -2404,10 +2433,14 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: ../../templates/header.inc:64 ../../ampache/templates/header.inc:64
+#: ../../templates/header.inc:63 ../../ampache/templates/header.inc:64
 msgid "You are currently logged in as"
 msgstr ""
 
+#: ../../templates/header.inc:74
+msgid "Error Config File Out of Date"
+msgstr ""
+
 #: ../../templates/show_songs.inc:47
 msgid "Song title"
 msgstr ""
@@ -2416,16 +2449,12 @@ msgstr ""
 msgid "Rating"
 msgstr ""
 
-#: ../../templates/show_songs.inc:176
+#: ../../templates/show_songs.inc:183
 msgid "Total"
 msgstr ""
 
-#: ../../templates/show_songs.inc:194
-msgid "** Indicates flagged songs"
-msgstr ""
-
 #: ../../templates/show_install_config.inc:53
-#: ../../templates/show_install.inc:34
+#: ../../templates/show_install.inc:56
 msgid "Step 2 - Creating the Ampache.cfg.php file"
 msgstr ""
 
@@ -2441,12 +2470,12 @@ msgid "Web Path"
 msgstr ""
 
 #: ../../templates/show_install_config.inc:68
-#: ../../templates/show_install.inc:42
+#: ../../templates/show_install.inc:64
 msgid "Desired Database Name"
 msgstr ""
 
 #: ../../templates/show_install_config.inc:72
-#: ../../templates/show_install.inc:46
+#: ../../templates/show_install.inc:68
 msgid "MySQL Hostname"
 msgstr ""
 
@@ -2492,43 +2521,43 @@ msgstr ""
 msgid "Find Album Art"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:52
+#: ../../templates/show_preferences.inc:53
 msgid "Editing"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:52
+#: ../../templates/show_preferences.inc:53
 msgid "preferences"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:54
+#: ../../templates/show_preferences.inc:55
 msgid "Rebuild Preferences"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:61
+#: ../../templates/show_preferences.inc:62
 msgid "Interface"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:64
+#: ../../templates/show_preferences.inc:65
 msgid "Streaming"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:67
+#: ../../templates/show_preferences.inc:68
 msgid "Options"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:71
+#: ../../templates/show_preferences.inc:72
 msgid "Account"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:75
+#: ../../templates/show_preferences.inc:76
 msgid "System"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:78
+#: ../../templates/show_preferences.inc:79
 msgid "Modules"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:91
+#: ../../templates/show_preferences.inc:92
 msgid "Update Preferences"
 msgstr ""
 
@@ -2570,34 +2599,34 @@ msgstr "Snrlar grntle"
 msgid "Unlimited"
 msgstr ""
 
-#: ../../templates/show_install.inc:32
+#: ../../templates/show_install.inc:54
 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:50
+#: ../../templates/show_install.inc:72
 msgid "MySQL Administrative Username"
 msgstr ""
 
-#: ../../templates/show_install.inc:54
+#: ../../templates/show_install.inc:76
 msgid "MySQL Administrative Password"
 msgstr ""
 
-#: ../../templates/show_install.inc:58
+#: ../../templates/show_install.inc:80
 msgid "Create Database User for New Database"
 msgstr ""
 
-#: ../../templates/show_install.inc:62
+#: ../../templates/show_install.inc:84
 msgid "Ampache Database Username"
 msgstr ""
 
-#: ../../templates/show_install.inc:66
+#: ../../templates/show_install.inc:88
 msgid "Ampache Database User Password"
 msgstr ""
 
-#: ../../templates/show_install.inc:71
+#: ../../templates/show_install.inc:93
 msgid "Insert Database"
 msgstr ""
 
@@ -2705,11 +2734,11 @@ msgstr ""
 msgid "Activity"
 msgstr ""
 
-#: ../../templates/show_users.inc:60
+#: ../../templates/show_users.inc:61
 msgid "Last Ip"
 msgstr ""
 
-#: ../../templates/show_users.inc:65
+#: ../../templates/show_users.inc:66
 msgid "On-line"
 msgstr ""
 
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 9defaed8..d36cec56 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: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-01 20:33-0800\n"
+"POT-Creation-Date: 2007-01-22 19:07-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../play/index.php:64 ../../download/index.php:62
+#: ../../play/index.php:64 ../../download/index.php:61
 msgid "Session Expired: please log in again at"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:299 ../../lib/class/catalog.class.php:592
-#: ../../lib/class/album.class.php:325
+#: ../../lib/class/catalog.class.php:303 ../../lib/class/catalog.class.php:621
+#: ../../lib/class/album.class.php:328
 msgid "Error: Unable to open"
 msgstr ""
 
@@ -29,182 +29,187 @@ msgstr ""
 msgid "Error: Unable to change to directory"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:375
+#: ../../lib/class/catalog.class.php:374
 msgid "Error: Unable to get filesize for"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:412
+#: ../../lib/class/catalog.class.php:411
 msgid "is not readable by ampache"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:501
+#: ../../lib/class/catalog.class.php:530
 msgid "album's with art"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:772
+#: ../../lib/class/catalog.class.php:812
 msgid "Starting Catalog Build"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:776
+#: ../../lib/class/catalog.class.php:816
 msgid "Running Remote Sync"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:781 ../../lib/class/catalog.class.php:947
+#: ../../lib/class/catalog.class.php:821 ../../lib/class/catalog.class.php:992
 msgid "Found"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:781 ../../lib/class/catalog.class.php:804
-#: ../../lib/class/catalog.class.php:947 ../../lib/class/catalog.class.php:977
-#: ../../lib/preferences.php:269 ../../lib/preferences.php:319
-#: ../../lib/ui.lib.php:1186 ../../admin/catalog.php:259
+#: ../../lib/class/catalog.class.php:821 ../../lib/class/catalog.class.php:848
+#: ../../lib/class/catalog.class.php:992
+#: ../../lib/class/catalog.class.php:1025 ../../lib/preferences.php:269
+#: ../../lib/preferences.php:319 ../../lib/ui.lib.php:1194
+#: ../../admin/catalog.php:259
 msgid "None"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:796 ../../lib/class/catalog.class.php:965
+#: ../../lib/class/catalog.class.php:840
+#: ../../lib/class/catalog.class.php:1014
 msgid "Added Playlist From"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:803 ../../lib/class/catalog.class.php:976
-#: ../../admin/catalog.php:258
+#: ../../lib/class/catalog.class.php:847
+#: ../../lib/class/catalog.class.php:1024 ../../admin/catalog.php:258
 msgid "Starting Album Art Search"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:804 ../../lib/class/catalog.class.php:977
-#: ../../admin/catalog.php:259
+#: ../../lib/class/catalog.class.php:848
+#: ../../lib/class/catalog.class.php:1025 ../../admin/catalog.php:259
 msgid "Searched"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:814
+#: ../../lib/class/catalog.class.php:858
 msgid "Catalog Finished"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:814 ../../lib/class/catalog.class.php:997
+#: ../../lib/class/catalog.class.php:858
+#: ../../lib/class/catalog.class.php:1044
 msgid "Total Time"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:814 ../../lib/class/catalog.class.php:998
+#: ../../lib/class/catalog.class.php:858
+#: ../../lib/class/catalog.class.php:1045
 msgid "Total Songs"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:815 ../../lib/class/catalog.class.php:998
+#: ../../lib/class/catalog.class.php:859
+#: ../../lib/class/catalog.class.php:1045
 msgid "Songs Per Seconds"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:849
-#: ../../lib/class/catalog.class.php:1634
+#: ../../lib/class/catalog.class.php:894
+#: ../../lib/class/catalog.class.php:1565
 msgid "Updated"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:856
+#: ../../lib/class/catalog.class.php:901
 msgid "No Update Needed"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:938
+#: ../../lib/class/catalog.class.php:983
 msgid "Starting New Song Search on"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:938
+#: ../../lib/class/catalog.class.php:983
 msgid "catalog"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:942
+#: ../../lib/class/catalog.class.php:987
 msgid "Running Remote Update"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:997
+#: ../../lib/class/catalog.class.php:1044
 msgid "Catalog Update Finished"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1017
+#: ../../lib/class/catalog.class.php:1064
 msgid "Error"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1017
+#: ../../lib/class/catalog.class.php:1064
 msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Error connecting to"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Code"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1060
-#: ../../lib/class/catalog.class.php:1115
+#: ../../lib/class/catalog.class.php:1107
+#: ../../lib/class/catalog.class.php:1162
 msgid "Reason"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1076
+#: ../../lib/class/catalog.class.php:1123
 msgid "Completed updating remote catalog(s)"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1111
+#: ../../lib/class/catalog.class.php:1158
 msgid "Added"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1193
+#: ../../lib/class/catalog.class.php:1240
 msgid "Cleaning the"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1193
-#: ../../lib/class/catalog.class.php:1589 ../../templates/sidebar.inc.php:30
+#: ../../lib/class/catalog.class.php:1240
+#: ../../lib/class/catalog.class.php:1520 ../../templates/sidebar.inc.php:30
 #: ../../ampache/templates/sidebar.inc.php:30
 msgid "Catalog"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1194
+#: ../../lib/class/catalog.class.php:1241
 msgid "Checking"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1265
+#: ../../lib/class/catalog.class.php:1313
 msgid "Catalog Clean Done"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1265
+#: ../../lib/class/catalog.class.php:1313
 msgid "files removed"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1589
+#: ../../lib/class/catalog.class.php:1520
 msgid "Updating the"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1590
+#: ../../lib/class/catalog.class.php:1521
 msgid "songs found checking tag information."
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1591
+#: ../../lib/class/catalog.class.php:1522
 msgid "Verifed"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1643
+#: ../../lib/class/catalog.class.php:1574
 msgid " FOUND"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1645
+#: ../../lib/class/catalog.class.php:1576
 msgid "Searching for new Album Art"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1649
+#: ../../lib/class/catalog.class.php:1580
 msgid "Album Art Already Found"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 msgid "Update Finished."
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 msgid "Checked"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1701
+#: ../../lib/class/catalog.class.php:1634
 msgid "songs updated."
 msgstr ""
 
-#: ../../lib/class/song.class.php:360
+#: ../../lib/class/song.class.php:361
 #: ../../templates/show_duplicates.inc.php:35
 #: ../../templates/show_edit_song.inc.php:31
 #: ../../templates/show_disabled_songs.inc:26
@@ -212,53 +217,53 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
-#: ../../lib/class/song.class.php:360 ../../lib/class/song.class.php:364
-#: ../../lib/class/song.class.php:368 ../../lib/class/song.class.php:372
-#: ../../lib/class/song.class.php:376 ../../lib/class/song.class.php:380
-#: ../../lib/class/song.class.php:384 ../../lib/class/song.class.php:389
-#: ../../lib/class/song.class.php:394 ../../lib/class/song.class.php:398
-#: ../../lib/class/song.class.php:402 ../../lib/class/song.class.php:407
+#: ../../lib/class/song.class.php:361 ../../lib/class/song.class.php:365
+#: ../../lib/class/song.class.php:369 ../../lib/class/song.class.php:373
+#: ../../lib/class/song.class.php:377 ../../lib/class/song.class.php:381
+#: ../../lib/class/song.class.php:385 ../../lib/class/song.class.php:390
+#: ../../lib/class/song.class.php:395 ../../lib/class/song.class.php:399
+#: ../../lib/class/song.class.php:403 ../../lib/class/song.class.php:408
 msgid "updated to"
 msgstr ""
 
-#: ../../lib/class/song.class.php:364
+#: ../../lib/class/song.class.php:365
 #: ../../templates/show_list_duplicates.inc.php:35
 #: ../../templates/show_songs.inc:53
 msgid "Bitrate"
 msgstr ""
 
-#: ../../lib/class/song.class.php:368
+#: ../../lib/class/song.class.php:369
 msgid "Rate"
 msgstr ""
 
-#: ../../lib/class/song.class.php:372
+#: ../../lib/class/song.class.php:373
 msgid "Mode"
 msgstr ""
 
-#: ../../lib/class/song.class.php:376
+#: ../../lib/class/song.class.php:377
 #: ../../templates/show_tv_playlist.inc.php:46
 #: ../../templates/show_songs.inc:51
 msgid "Time"
 msgstr ""
 
-#: ../../lib/class/song.class.php:380
+#: ../../lib/class/song.class.php:381
 #: ../../templates/show_edit_song.inc.php:61
 #: ../../templates/show_localplay_playlist.inc.php:27
 #: ../../templates/show_songs.inc:45 ../../templates/show_songs.inc:50
 msgid "Track"
 msgstr ""
 
-#: ../../lib/class/song.class.php:384
+#: ../../lib/class/song.class.php:385
 msgid "Filesize"
 msgstr ""
 
-#: ../../lib/class/song.class.php:389
+#: ../../lib/class/song.class.php:390
 #: ../../templates/show_edit_song.inc.php:45
 #: ../../templates/show_get_albumart.inc.php:30
 #: ../../templates/show_play_selected.inc.php:60
 #: ../../templates/show_list_duplicates.inc.php:32
 #: ../../templates/show_recently_played.inc.php:32
-#: ../../templates/show_artists.inc:40 ../../templates/show_artists.inc:65
+#: ../../templates/show_artists.inc:40 ../../templates/show_artists.inc:71
 #: ../../templates/show_disabled_songs.inc:28
 #: ../../templates/show_songs.inc:48 ../../templates/show_albums.inc:41
 #: ../../templates/show_albums.inc:84
@@ -267,7 +272,7 @@ msgstr ""
 msgid "Artist"
 msgstr ""
 
-#: ../../lib/class/song.class.php:394
+#: ../../lib/class/song.class.php:395
 #: ../../templates/show_edit_song.inc.php:37
 #: ../../templates/show_get_albumart.inc.php:38
 #: ../../templates/show_play_selected.inc.php:59
@@ -279,7 +284,7 @@ msgstr ""
 msgid "Album"
 msgstr ""
 
-#: ../../lib/class/song.class.php:398
+#: ../../lib/class/song.class.php:399
 #: ../../templates/show_edit_song.inc.php:67
 #: ../../templates/show_play_selected.inc.php:61
 #: ../../templates/show_edit_album.inc.php:33
@@ -288,13 +293,13 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
-#: ../../lib/class/song.class.php:402 ../../templates/show_flag.inc.php:64
+#: ../../lib/class/song.class.php:403 ../../templates/show_flag.inc.php:64
 #: ../../templates/show_edit_song.inc.php:73
 #: ../../templates/show_search.inc:37
 msgid "Comment"
 msgstr ""
 
-#: ../../lib/class/song.class.php:407 ../../lib/ui.lib.php:843
+#: ../../lib/class/song.class.php:408 ../../lib/ui.lib.php:851
 #: ../../templates/sidebar.inc.php:36
 #: ../../templates/show_edit_song.inc.php:53
 #: ../../templates/show_genre.inc.php:29
@@ -309,33 +314,33 @@ msgstr ""
 msgid "Error: Name Identical"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:263
+#: ../../lib/class/flag.class.php:264
 msgid "Approved"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:264
+#: ../../lib/class/flag.class.php:265
 msgid "Pending"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:276 ../../templates/show_flag.inc.php:56
+#: ../../lib/class/flag.class.php:277 ../../templates/show_flag.inc.php:56
 #: ../../templates/show_playlists.inc.php:57
 #: ../../templates/show_admin_tools.inc.php:50
 msgid "Delete"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:279
+#: ../../lib/class/flag.class.php:280
 msgid "Re-Tag"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:282 ../../templates/show_flag.inc.php:58
+#: ../../lib/class/flag.class.php:283 ../../templates/show_flag.inc.php:58
 msgid "Re-encode"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:285 ../../templates/show_flag.inc.php:59
+#: ../../lib/class/flag.class.php:286 ../../templates/show_flag.inc.php:59
 msgid "Other"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:288 ../../lib/class/localplay.class.php:569
+#: ../../lib/class/flag.class.php:289 ../../lib/class/localplay.class.php:570
 #: ../../lib/general.lib.php:890
 #: ../../modules/localplay/icecast.controller.php:292
 #: ../../modules/localplay/mpd.controller.php:354
@@ -343,24 +348,24 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: ../../lib/class/localplay.class.php:560 ../../templates/show_tv.inc.php:81
+#: ../../lib/class/localplay.class.php:561 ../../templates/show_tv.inc.php:64
 #: ../../templates/show_now_playing.inc:32
 msgid "Now Playing"
 msgstr ""
 
-#: ../../lib/class/localplay.class.php:563
+#: ../../lib/class/localplay.class.php:564
 msgid "Stopped"
 msgstr ""
 
-#: ../../lib/class/localplay.class.php:566
+#: ../../lib/class/localplay.class.php:567
 msgid "Paused"
 msgstr ""
 
-#: ../../lib/class/album.class.php:162
+#: ../../lib/class/album.class.php:163
 msgid "Various"
 msgstr ""
 
-#: ../../lib/class/genre.class.php:284
+#: ../../lib/class/genre.class.php:285
 msgid "Show Genres starting with"
 msgstr ""
 
@@ -402,30 +407,30 @@ msgid "Disable"
 msgstr ""
 
 #: ../../lib/preferences.php:271 ../../templates/show_tv_adminctl.inc.php:41
-#: ../../templates/show_playtype_switch.inc.php:9
+#: ../../templates/show_playtype_switch.inc.php:30
 msgid "Stream"
 msgstr ""
 
 #: ../../lib/preferences.php:274 ../../templates/show_tv_adminctl.inc.php:42
-#: ../../templates/show_playtype_switch.inc.php:13
+#: ../../templates/show_playtype_switch.inc.php:34
 msgid "Downsample"
 msgstr ""
 
 #: ../../lib/preferences.php:277
-#: ../../templates/show_playtype_switch.inc.php:15
+#: ../../templates/show_playtype_switch.inc.php:36
 msgid "Democratic"
 msgstr ""
 
-#: ../../lib/preferences.php:280 ../../templates/sidebar.inc.php:170
+#: ../../lib/preferences.php:280 ../../templates/sidebar.inc.php:168
 #: ../../templates/show_tv_adminctl.inc.php:40
 #: ../../templates/show_localplay.inc.php:26
-#: ../../templates/show_playtype_switch.inc.php:11
+#: ../../templates/show_playtype_switch.inc.php:32
 #: ../../ampache/templates/sidebar.inc.php:170
 msgid "Localplay"
 msgstr ""
 
 #: ../../lib/preferences.php:282
-#: ../../templates/show_playtype_switch.inc.php:17
+#: ../../templates/show_playtype_switch.inc.php:38
 msgid "XSPF Player"
 msgstr ""
 
@@ -469,11 +474,11 @@ msgstr ""
 msgid "No songs in this playlist."
 msgstr ""
 
-#: ../../lib/playlist.lib.php:191 ../../lib/ui.lib.php:892
-#: ../../templates/sidebar.inc.php:150
+#: ../../lib/playlist.lib.php:191 ../../lib/ui.lib.php:900
+#: ../../templates/sidebar.inc.php:148
 #: ../../templates/show_admin_tools.inc.php:48
 #: ../../ampache/templates/sidebar.inc.php:150
-#: ../../templates/show_artists.inc:55 ../../templates/show_random_play.inc:40
+#: ../../templates/show_random_play.inc:40
 #: ../../templates/show_add_access.inc:59
 #: ../../templates/show_edit_access.inc:69
 msgid "All"
@@ -487,7 +492,7 @@ msgstr ""
 msgid "Error Access Denied"
 msgstr ""
 
-#: ../../lib/ui.lib.php:194 ../../templates/sidebar.inc.php:89
+#: ../../lib/ui.lib.php:194 ../../templates/sidebar.inc.php:87
 #: ../../ampache/templates/sidebar.inc.php:89
 msgid "Browse"
 msgstr ""
@@ -500,134 +505,128 @@ msgstr ""
 msgid "Show all"
 msgstr ""
 
-#: ../../lib/ui.lib.php:538 ../../admin/mail.php:80
+#: ../../lib/ui.lib.php:539 ../../admin/mail.php:81
 msgid "No Catalogs Found!"
 msgstr ""
 
-#: ../../lib/ui.lib.php:539 ../../admin/mail.php:81
-#: ../../templates/show_admin_tools.inc.php:67
+#: ../../lib/ui.lib.php:540 ../../admin/mail.php:82
+#: ../../templates/show_admin_tools.inc.php:75
 #: ../../templates/show_add_catalog.inc.php:28
 msgid "Add a Catalog"
 msgstr ""
 
-#: ../../lib/ui.lib.php:540 ../../admin/mail.php:82
-#: ../../templates/show_mail_users.inc.php:41
-#: ../../templates/show_local_catalog_info.inc.php:23
-msgid "Catalog Statistics"
-msgstr ""
-
-#: ../../lib/ui.lib.php:576 ../../admin/mail.php:119
+#: ../../lib/ui.lib.php:578 ../../admin/mail.php:120
 msgid "day"
 msgstr ""
 
-#: ../../lib/ui.lib.php:576 ../../admin/mail.php:119
+#: ../../lib/ui.lib.php:578 ../../admin/mail.php:120
 msgid "days"
 msgstr ""
 
-#: ../../lib/ui.lib.php:578 ../../admin/mail.php:121
+#: ../../lib/ui.lib.php:580 ../../admin/mail.php:122
 msgid "hour"
 msgstr ""
 
-#: ../../lib/ui.lib.php:578 ../../admin/mail.php:121
+#: ../../lib/ui.lib.php:580 ../../admin/mail.php:122
 msgid "hours"
 msgstr ""
 
-#: ../../lib/ui.lib.php:782 ../../templates/show_tv.inc.php:58
-#: ../../templates/sidebar.inc.php:50
+#: ../../lib/ui.lib.php:790 ../../templates/sidebar.inc.php:48
 #: ../../ampache/templates/sidebar.inc.php:50
 msgid "Home"
 msgstr ""
 
-#: ../../lib/ui.lib.php:785
+#: ../../lib/ui.lib.php:793
 msgid "Upload"
 msgstr ""
 
-#: ../../lib/ui.lib.php:788
+#: ../../lib/ui.lib.php:796
 msgid "Local Play"
 msgstr ""
 
-#: ../../lib/ui.lib.php:791
+#: ../../lib/ui.lib.php:799
 msgid "Random Play"
 msgstr ""
 
-#: ../../lib/ui.lib.php:794 ../../templates/show_play_selected.inc.php:47
+#: ../../lib/ui.lib.php:802 ../../templates/show_play_selected.inc.php:47
 msgid "Playlist"
 msgstr ""
 
-#: ../../lib/ui.lib.php:797 ../../templates/show_duplicates.inc.php:51
-#: ../../templates/sidebar.inc.php:118 ../../templates/sidebar.inc.php:124
+#: ../../lib/ui.lib.php:805 ../../templates/show_duplicates.inc.php:51
+#: ../../templates/sidebar.inc.php:116 ../../templates/sidebar.inc.php:122
 #: ../../ampache/templates/sidebar.inc.php:118
 #: ../../ampache/templates/sidebar.inc.php:124
 #: ../../templates/show_search_bar.inc:31 ../../templates/show_search.inc:133
 msgid "Search"
 msgstr ""
 
-#: ../../lib/ui.lib.php:800 ../../templates/sidebar.inc.php:81
+#: ../../lib/ui.lib.php:808 ../../templates/sidebar.inc.php:79
 #: ../../ampache/templates/sidebar.inc.php:81
 msgid "Preferences"
 msgstr ""
 
-#: ../../lib/ui.lib.php:803 ../../lib/ui.lib.php:807
+#: ../../lib/ui.lib.php:811 ../../lib/ui.lib.php:815
 msgid "Admin-Catalog"
 msgstr ""
 
-#: ../../lib/ui.lib.php:811
+#: ../../lib/ui.lib.php:819
 msgid "Admin-User Management"
 msgstr ""
 
-#: ../../lib/ui.lib.php:815
+#: ../../lib/ui.lib.php:823
 msgid "Admin-Mail Users"
 msgstr ""
 
-#: ../../lib/ui.lib.php:819
+#: ../../lib/ui.lib.php:827
 msgid "Admin-Manage Access Lists"
 msgstr ""
 
-#: ../../lib/ui.lib.php:823
+#: ../../lib/ui.lib.php:831
 msgid "Admin-Site Preferences"
 msgstr ""
 
-#: ../../lib/ui.lib.php:827
+#: ../../lib/ui.lib.php:835
 msgid "Admin-Manage Modules"
 msgstr ""
 
-#: ../../lib/ui.lib.php:831
+#: ../../lib/ui.lib.php:839
 msgid "Browse Music"
 msgstr ""
 
-#: ../../lib/ui.lib.php:835 ../../admin/mail.php:133
-#: ../../templates/sidebar.inc.php:34 ../../templates/sidebar.inc.php:158
+#: ../../lib/ui.lib.php:843 ../../admin/mail.php:134
+#: ../../templates/sidebar.inc.php:34 ../../templates/sidebar.inc.php:156
 #: ../../templates/show_genre.inc.php:32
-#: ../../templates/show_local_catalog_info.inc.php:34
+#: ../../templates/show_local_catalog_info.inc.php:28
 #: ../../ampache/templates/sidebar.inc.php:34
 #: ../../ampache/templates/sidebar.inc.php:158
-#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:68
+#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:74
 msgid "Albums"
 msgstr ""
 
-#: ../../lib/ui.lib.php:839 ../../admin/mail.php:134
-#: ../../templates/sidebar.inc.php:35 ../../templates/sidebar.inc.php:157
+#: ../../lib/ui.lib.php:847 ../../admin/mail.php:135
+#: ../../templates/sidebar.inc.php:35 ../../templates/sidebar.inc.php:155
 #: ../../templates/show_genre.inc.php:35
-#: ../../templates/show_local_catalog_info.inc.php:38
+#: ../../templates/show_local_catalog_info.inc.php:29
 #: ../../ampache/templates/sidebar.inc.php:35
 #: ../../ampache/templates/sidebar.inc.php:157
 msgid "Artists"
 msgstr ""
 
-#: ../../lib/ui.lib.php:847 ../../templates/sidebar.inc.php:112
+#: ../../lib/ui.lib.php:855 ../../templates/sidebar.inc.php:110
 #: ../../ampache/templates/sidebar.inc.php:112
 msgid "Statistics"
 msgstr ""
 
-#: ../../lib/ui.lib.php:1421
+#: ../../lib/ui.lib.php:1429
 msgid "Manage Users"
 msgstr ""
 
-#: ../../lib/ui.lib.php:1422
+#: ../../lib/ui.lib.php:1430
 msgid "Add a new user"
 msgstr ""
 
-#: ../../lib/general.lib.php:670 ../../templates/show_user_stats.inc.php:32
+#: ../../lib/general.lib.php:670 ../../templates/show_box.inc.php:30
+#: ../../templates/show_user_stats.inc.php:32
 #: ../../templates/show_user_stats.inc.php:43
 #: ../../templates/show_user_stats.inc.php:54
 #: ../../templates/show_user_recommendations.inc.php:32
@@ -749,7 +748,7 @@ msgstr ""
 msgid "Do you really want to clear the statistics for this catalog?"
 msgstr ""
 
-#: ../../admin/catalog.php:230 ../../templates/show_admin_tools.inc.php:68
+#: ../../admin/catalog.php:230 ../../templates/show_admin_tools.inc.php:76
 msgid "Clear Catalog Stats"
 msgstr ""
 
@@ -800,27 +799,31 @@ msgstr ""
 msgid "Flag Removed from"
 msgstr ""
 
-#: ../../admin/flag.php:274
+#: ../../admin/flag.php:270
+msgid "Flags Updated"
+msgstr ""
+
+#: ../../admin/flag.php:289
 msgid "Songs Disabled"
 msgstr ""
 
-#: ../../admin/flag.php:274
+#: ../../admin/flag.php:289
 msgid "The requested song(s) have been disabled"
 msgstr ""
 
-#: ../../admin/flag.php:285
+#: ../../admin/flag.php:300
 msgid "Songs Enabled"
 msgstr ""
 
-#: ../../admin/flag.php:285
+#: ../../admin/flag.php:300
 msgid "The requested song(s) have been enabled"
 msgstr ""
 
-#: ../../admin/flag.php:290
+#: ../../admin/flag.php:305
 msgid "Flagged Records"
 msgstr ""
 
-#: ../../admin/preferences.php:59 ../../admin/preferences.php:82
+#: ../../admin/preferences.php:60 ../../admin/preferences.php:83
 msgid "Site"
 msgstr ""
 
@@ -865,66 +868,71 @@ msgstr ""
 msgid "Error Passwords don't match"
 msgstr ""
 
-#: ../../admin/users.php:117 ../../register.php:138
+#: ../../admin/users.php:120 ../../register.php:138
 msgid "Error Username already exists"
 msgstr ""
 
-#: ../../admin/users.php:139
+#: ../../admin/users.php:142
 msgid "Deletion Request"
 msgstr ""
 
-#: ../../admin/users.php:140
+#: ../../admin/users.php:143
 msgid "Are you sure you want to permanently delete"
 msgstr ""
 
-#: ../../admin/users.php:145 ../../templates/show_confirm_action.inc.php:29
+#: ../../admin/users.php:148 ../../templates/show_confirm_action.inc.php:29
 #: ../../templates/show_search.inc:78
 msgid "No"
 msgstr ""
 
-#: ../../admin/users.php:147
+#: ../../admin/users.php:150
 msgid "User Deleted"
 msgstr ""
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:153
 msgid "Delete Error"
 msgstr ""
 
-#: ../../admin/users.php:150
+#: ../../admin/users.php:153
 msgid "Unable to delete last Admin User"
 msgstr ""
 
-#: ../../admin/mail.php:131 ../../templates/show_local_catalog_info.inc.php:26
+#: ../../admin/mail.php:83 ../../templates/show_mail_users.inc.php:41
+#: ../../templates/show_local_catalog_info.inc.php:23
+msgid "Catalog Statistics"
+msgstr ""
+
+#: ../../admin/mail.php:132 ../../templates/show_local_catalog_info.inc.php:27
 msgid "Total Users"
 msgstr ""
 
-#: ../../admin/mail.php:132 ../../templates/show_local_catalog_info.inc.php:30
+#: ../../admin/mail.php:133 ../../templates/show_local_catalog_info.inc.php:26
 msgid "Connected Users"
 msgstr ""
 
-#: ../../admin/mail.php:135 ../../templates/sidebar.inc.php:155
+#: ../../admin/mail.php:136 ../../templates/sidebar.inc.php:153
 #: ../../templates/show_genre.inc.php:38
-#: ../../templates/show_local_catalog_info.inc.php:42
+#: ../../templates/show_local_catalog_info.inc.php:30
 #: ../../templates/show_genres.inc.php:37
 #: ../../ampache/templates/sidebar.inc.php:155
-#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:67
+#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:73
 #: ../../templates/show_albums.inc:43 ../../templates/show_albums.inc:86
 msgid "Songs"
 msgstr ""
 
-#: ../../admin/mail.php:136 ../../templates/show_local_catalog_info.inc.php:46
+#: ../../admin/mail.php:137 ../../templates/show_local_catalog_info.inc.php:31
 msgid "Catalog Size"
 msgstr ""
 
-#: ../../admin/mail.php:137 ../../templates/show_local_catalog_info.inc.php:50
+#: ../../admin/mail.php:138 ../../templates/show_local_catalog_info.inc.php:32
 msgid "Catalog Time"
 msgstr ""
 
-#: ../../admin/mail.php:219
+#: ../../admin/mail.php:252
 msgid "E-mail Sent"
 msgstr ""
 
-#: ../../admin/mail.php:220
+#: ../../admin/mail.php:253
 msgid "Your E-mail was successfully sent."
 msgstr ""
 
@@ -978,21 +986,21 @@ msgid "Incorrect Tags"
 msgstr ""
 
 #: ../../templates/show_flag.inc.php:70
-#: ../../templates/show_flagged.inc.php:27
+#: ../../templates/show_flagged.inc.php:30
 msgid "Flag"
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:36
-#: ../../templates/show_install_lang.inc.php:10
+#: ../../templates/show_install_lang.inc.php:32
 #: ../../templates/show_install_config.inc:36
-#: ../../templates/show_install.inc:10
+#: ../../templates/show_install.inc:32
 msgid "Ampache Installation"
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:43
-#: ../../templates/show_install_lang.inc.php:17
+#: ../../templates/show_install_lang.inc.php:39
 #: ../../templates/show_install_config.inc:42
-#: ../../templates/show_install.inc:18
+#: ../../templates/show_install.inc:40
 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 "
@@ -1000,9 +1008,9 @@ msgid ""
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:46
-#: ../../templates/show_install_lang.inc.php:20
+#: ../../templates/show_install_lang.inc.php:42
 #: ../../templates/show_install_config.inc:45
-#: ../../templates/show_install.inc:21
+#: ../../templates/show_install.inc:43
 msgid ""
 "A MySQL Server with a username and password that can create/modify databases"
 msgstr ""
@@ -1014,9 +1022,9 @@ msgid ""
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:49
-#: ../../templates/show_install_lang.inc.php:24
+#: ../../templates/show_install_lang.inc.php:46
 #: ../../templates/show_install_config.inc:48
-#: ../../templates/show_install.inc:25
+#: ../../templates/show_install.inc:47
 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 "
@@ -1026,7 +1034,7 @@ msgstr ""
 
 #: ../../templates/show_install_account.inc.php:53
 #: ../../templates/show_install_config.inc:52
-#: ../../templates/show_install.inc:30
+#: ../../templates/show_install.inc:52
 msgid "Step 1 - Creating and Inserting the Ampache Database"
 msgstr ""
 
@@ -1036,7 +1044,7 @@ msgstr ""
 
 #: ../../templates/show_install_account.inc.php:55
 #: ../../templates/show_install_config.inc:57
-#: ../../templates/show_install.inc:35
+#: ../../templates/show_install.inc:57
 msgid "Step 3 - Setup Initial Account"
 msgstr ""
 
@@ -1051,7 +1059,7 @@ msgid "Create Admin Account"
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:65
-#: ../../templates/show_user_registration.inc.php:99
+#: ../../templates/show_user_registration.inc.php:98
 #: ../../templates/show_edit_user.inc.php:40
 #: ../../templates/show_recently_played.inc.php:29
 #: ../../templates/show_users.inc:43
@@ -1059,7 +1067,7 @@ msgid "Username"
 msgstr ""
 
 #: ../../templates/show_install_account.inc.php:69
-#: ../../templates/show_user_registration.inc.php:127
+#: ../../templates/show_user_registration.inc.php:126
 #: ../../templates/show_edit_user.inc.php:63
 #: ../../templates/show_login_form.inc:37
 msgid "Password"
@@ -1070,7 +1078,7 @@ msgid "Create Account"
 msgstr ""
 
 #: ../../templates/show_playlists.inc.php:28
-#: ../../templates/sidebar.inc.php:106
+#: ../../templates/sidebar.inc.php:104
 #: ../../ampache/templates/sidebar.inc.php:106
 msgid "Playlists"
 msgstr ""
@@ -1102,22 +1110,20 @@ msgstr ""
 
 #: ../../templates/show_playlists.inc.php:55
 #: ../../templates/show_play_selected.inc.php:50
-#: ../../templates/show_artists.inc:58 ../../templates/show_access_list.inc:67
+#: ../../templates/show_access_list.inc:67
 msgid "Edit"
 msgstr ""
 
 #: ../../templates/show_playlists.inc.php:61
 #: ../../templates/show_tv_adminctl.inc.php:44
-#: ../../templates/show_genres.inc.php:47 ../../templates/show_artists.inc:54
 #: ../../templates/show_random_play.inc:82
 msgid "Play"
 msgstr ""
 
 #: ../../templates/show_playlists.inc.php:63
-#: ../../templates/sidebar.inc.php:135
+#: ../../templates/sidebar.inc.php:133
 #: ../../templates/show_localplay_status.inc.php:62
 #: ../../ampache/templates/sidebar.inc.php:135
-#: ../../templates/show_artists.inc:56
 msgid "Random"
 msgstr ""
 
@@ -1155,11 +1161,11 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: ../../templates/show_tv.inc.php:56
+#: ../../templates/show_tv.inc.php:42
 msgid "Controls"
 msgstr ""
 
-#: ../../templates/show_tv.inc.php:74
+#: ../../templates/show_tv.inc.php:57
 #: ../../templates/show_localplay.inc.php:42
 msgid "Current Playlist"
 msgstr ""
@@ -1185,7 +1191,7 @@ msgstr ""
 
 #: ../../templates/show_playlist_edit.inc.php:36
 #: ../../templates/show_add_playlist.inc.php:32
-#: ../../templates/show_random_play.inc:50
+#: ../../templates/show_random_play.inc:49
 #: ../../templates/show_access_list.inc:51
 msgid "Type"
 msgstr ""
@@ -1200,6 +1206,7 @@ msgstr ""
 
 #: ../../templates/show_playlist_edit.inc.php:48
 #: ../../templates/show_tv_adminctl.inc.php:51
+#: ../../templates/show_flagged.inc.php:66
 #: ../../templates/show_play_selected.inc.php:64
 #: ../../templates/show_preference_admin.inc.php:47
 #: ../../templates/show_edit_access.inc:78
@@ -1232,41 +1239,36 @@ msgstr ""
 msgid "Song Title"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:38
-#: ../../ampache/templates/sidebar.inc.php:38
-msgid "Lists"
-msgstr ""
-
-#: ../../templates/sidebar.inc.php:62
+#: ../../templates/sidebar.inc.php:60
 #: ../../templates/show_tv_playlist.inc.php:48
 #: ../../templates/show_preference_admin.inc.php:39
 #: ../../ampache/templates/sidebar.inc.php:62
 msgid "Admin"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:156
+#: ../../templates/sidebar.inc.php:154
 #: ../../ampache/templates/sidebar.inc.php:156
 #: ../../templates/show_random_play.inc:56
 msgid "Minutes"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:159
+#: ../../templates/sidebar.inc.php:157
 #: ../../ampache/templates/sidebar.inc.php:159
 #: ../../templates/show_random_play.inc:53
 msgid "Less Played"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:164
+#: ../../templates/sidebar.inc.php:162
 #: ../../ampache/templates/sidebar.inc.php:164
 msgid "Enqueue"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:187
+#: ../../templates/sidebar.inc.php:185
 #: ../../ampache/templates/sidebar.inc.php:187
 msgid "Democratic View"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:191
+#: ../../templates/sidebar.inc.php:189
 #: ../../ampache/templates/sidebar.inc.php:191
 msgid "Logout"
 msgstr ""
@@ -1280,9 +1282,9 @@ msgstr ""
 #: ../../templates/show_modules.inc.php:42
 #: ../../templates/show_modules.inc.php:75
 #: ../../templates/show_genres.inc.php:38
-#: ../../templates/show_flagged.inc.php:29
+#: ../../templates/show_flagged.inc.php:32
 #: ../../templates/show_localplay_playlist.inc.php:29
-#: ../../templates/show_artists.inc:44 ../../templates/show_artists.inc:69
+#: ../../templates/show_artists.inc:44 ../../templates/show_artists.inc:75
 #: ../../templates/show_songs.inc:55 ../../templates/show_albums.inc:47
 #: ../../templates/show_albums.inc:90 ../../templates/show_access_list.inc:52
 #: ../../templates/show_artist.inc:39
@@ -1301,57 +1303,65 @@ msgstr ""
 msgid "Clean"
 msgstr ""
 
+#: ../../templates/show_admin_tools.inc.php:56
+msgid "Fast"
+msgstr ""
+
 #: ../../templates/show_admin_tools.inc.php:57
+msgid "Gather Art"
+msgstr ""
+
+#: ../../templates/show_admin_tools.inc.php:65
 msgid "No Catalogs Found"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:63
+#: ../../templates/show_admin_tools.inc.php:71
 msgid "Clean All"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:64
+#: ../../templates/show_admin_tools.inc.php:72
 msgid "Verify All"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:65
+#: ../../templates/show_admin_tools.inc.php:73
 msgid "Add to All"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:66
+#: ../../templates/show_admin_tools.inc.php:74
 #, fuzzy
 msgid "Update All"
 msgstr "ID3 "
 
-#: ../../templates/show_admin_tools.inc.php:69
+#: ../../templates/show_admin_tools.inc.php:77
 #: ../../templates/show_add_catalog.inc.php:78
 msgid "Gather Album Art"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:73
+#: ../../templates/show_admin_tools.inc.php:81
 msgid "Other Tools"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:75
+#: ../../templates/show_admin_tools.inc.php:83
 msgid "Show Duplicate Songs"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:76
+#: ../../templates/show_admin_tools.inc.php:84
 msgid "Clear Now Playing"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:78
+#: ../../templates/show_admin_tools.inc.php:85 ../../templates/header.inc:75
 msgid "Generate New Config"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:79
+#: ../../templates/show_admin_tools.inc.php:86
 msgid "Preferences Permissions"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:81
+#: ../../templates/show_admin_tools.inc.php:87
 msgid "Export To Itunes DB"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:82
+#: ../../templates/show_admin_tools.inc.php:88
 msgid "Check for New Version"
 msgstr ""
 
@@ -1385,7 +1395,7 @@ msgid "Find duplicate artists"
 msgstr ""
 
 #: ../../templates/show_user.inc.php:30
-#: ../../templates/show_user_registration.inc.php:118
+#: ../../templates/show_user_registration.inc.php:117
 #: ../../templates/show_edit_user.inc.php:55
 msgid "E-mail"
 msgstr ""
@@ -1399,7 +1409,7 @@ msgid "New Password"
 msgstr ""
 
 #: ../../templates/show_user.inc.php:49
-#: ../../templates/show_user_registration.inc.php:136
+#: ../../templates/show_user_registration.inc.php:135
 #: ../../templates/show_edit_user.inc.php:72
 msgid "Confirm Password"
 msgstr ""
@@ -1459,49 +1469,49 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:55
+#: ../../templates/show_user_registration.inc.php:54
 msgid "Ampache New User Registration"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:70
+#: ../../templates/show_user_registration.inc.php:69
 msgid "User Agreement"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:80
+#: ../../templates/show_user_registration.inc.php:79
 msgid "I Accept"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:94
+#: ../../templates/show_user_registration.inc.php:93
 msgid "User Information"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:109
+#: ../../templates/show_user_registration.inc.php:108
 #: ../../templates/show_edit_user.inc.php:48
 msgid "Full Name"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:156
+#: ../../templates/show_user_registration.inc.php:155
 msgid "Clear Info"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:157
+#: ../../templates/show_user_registration.inc.php:156
 msgid "Register User"
 msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:15
-#: ../../templates/show_install.inc:16
+#: ../../templates/show_install_lang.inc.php:37
+#: ../../templates/show_install.inc:38
 msgid "Requirements"
 msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:21
+#: ../../templates/show_install_lang.inc.php:43
 #: ../../templates/show_install_config.inc:46
-#: ../../templates/show_install.inc:22
+#: ../../templates/show_install.inc:44
 msgid ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
 "ampache.cfg.php.dist file"
 msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:50
+#: ../../templates/show_install_lang.inc.php:72
 msgid "Start configuration"
 msgstr ""
 
@@ -1526,7 +1536,7 @@ msgstr ""
 
 #: ../../templates/show_modules.inc.php:61
 #: ../../templates/show_modules.inc.php:96
-#: ../../templates/show_flagged.inc.php:50
+#: ../../templates/show_flagged.inc.php:57
 #: ../../templates/show_list_duplicates.inc.php:81
 #: ../../templates/show_localplay_playlist.inc.php:51
 #: ../../templates/show_disabled_songs.inc:44
@@ -1599,7 +1609,7 @@ msgid "Mail to"
 msgstr ""
 
 #: ../../templates/show_mail_users.inc.php:45
-#: ../../templates/show_all_popular.inc.php:30 ../../index.php:66
+#: ../../templates/show_all_popular.inc.php:29
 msgid "Most Popular Albums"
 msgstr ""
 
@@ -1608,7 +1618,7 @@ msgid "Latest Artist Additions"
 msgstr ""
 
 #: ../../templates/show_mail_users.inc.php:56
-#: ../../templates/show_all_popular.inc.php:27 ../../index.php:75
+#: ../../templates/show_all_popular.inc.php:26
 msgid "Most Popular Artists"
 msgstr ""
 
@@ -1617,36 +1627,41 @@ msgid "Latest Album Additions"
 msgstr ""
 
 #: ../../templates/show_mail_users.inc.php:67
-#: ../../templates/show_all_popular.inc.php:40
+#: ../../templates/show_all_popular.inc.php:38
 msgid "Most Popular Songs"
 msgstr ""
 
 #: ../../templates/show_mail_users.inc.php:73
+msgid "Flagged Songs"
+msgstr ""
+
+#: ../../templates/show_mail_users.inc.php:77
+#: ../../templates/show_admin_info.inc.php:36
+msgid "Disabled Songs"
+msgstr ""
+
+#: ../../templates/show_mail_users.inc.php:85
 msgid "Most Popular Threshold in days"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:84
+#: ../../templates/show_mail_users.inc.php:96
 msgid "Subject"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:91
+#: ../../templates/show_mail_users.inc.php:103
 msgid "Message"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:101
+#: ../../templates/show_mail_users.inc.php:113
 msgid "Send Mail"
 msgstr ""
 
-#: ../../templates/show_admin_info.inc.php:33
+#: ../../templates/show_admin_info.inc.php:32
 msgid "Last Ten Flagged Records"
 msgstr ""
 
-#: ../../templates/show_admin_info.inc.php:37
-msgid "Disabled Songs"
-msgstr ""
-
-#: ../../templates/show_admin_info.inc.php:41
-#: ../../templates/show_flagged.inc.php:57
+#: ../../templates/show_admin_info.inc.php:40
+#: ../../templates/show_flagged.inc.php:73
 #: ../../templates/show_ip_history.inc.php:28
 msgid "Show All"
 msgstr ""
@@ -1678,24 +1693,38 @@ msgid "Continue"
 msgstr ""
 
 #: ../../templates/show_confirmation.inc.php:28
-#: ../../templates/show_preferences.inc:95
+#: ../../templates/show_preferences.inc:96
 #: ../../templates/show_similar_artists.inc:74
 msgid "Cancel"
 msgstr ""
 
-#: ../../templates/show_flagged.inc.php:26
-msgid "Object"
+#: ../../templates/show_flagged.inc.php:27
+#: ../../templates/show_disabled_songs.inc:25
+#: ../../templates/show_artist.inc:33
+msgid "Select"
 msgstr ""
 
 #: ../../templates/show_flagged.inc.php:28
+msgid "Object"
+msgstr ""
+
+#: ../../templates/show_flagged.inc.php:29
+#: ../../templates/show_preference_admin.inc.php:38
+#: ../../templates/show_add_access.inc:47
+#: ../../templates/show_access_list.inc:49
+#: ../../templates/show_edit_access.inc:47
+msgid "User"
+msgstr ""
+
+#: ../../templates/show_flagged.inc.php:31
 msgid "Status"
 msgstr ""
 
-#: ../../templates/show_flagged.inc.php:39
+#: ../../templates/show_flagged.inc.php:63
 msgid "Reject"
 msgstr ""
 
-#: ../../templates/show_flagged.inc.php:43
+#: ../../templates/show_flagged.inc.php:64
 msgid "Approve"
 msgstr ""
 
@@ -1712,14 +1741,18 @@ msgstr ""
 msgid "Update id3 tags"
 msgstr ""
 
-#: ../../templates/show_all_recent.inc.php:27
+#: ../../templates/show_all_recent.inc.php:25
 msgid "Newest Artist Additions"
 msgstr ""
 
-#: ../../templates/show_all_recent.inc.php:30 ../../index.php:82
+#: ../../templates/show_all_recent.inc.php:28
 msgid "Newest Album Additions"
 msgstr ""
 
+#: ../../templates/show_all_recent.inc.php:31
+msgid "Newest Live Stream Additions"
+msgstr ""
+
 #: ../../templates/show_get_albumart.inc.php:23
 msgid "Customize Search"
 msgstr ""
@@ -1772,10 +1805,18 @@ msgstr ""
 msgid "Delete Empty Playlists"
 msgstr ""
 
-#: ../../templates/show_all_popular.inc.php:37
+#: ../../templates/show_all_popular.inc.php:32
 msgid "Most Popular Genres"
 msgstr ""
 
+#: ../../templates/show_all_popular.inc.php:41
+msgid "Most Popular Live Streams"
+msgstr ""
+
+#: ../../templates/show_all_popular.inc.php:44
+msgid "Most Popular Tags"
+msgstr ""
+
 #: ../../templates/show_play_selected.inc.php:28
 msgid "Play Selected"
 msgstr ""
@@ -1916,22 +1957,10 @@ msgid "Filename Pattern"
 msgstr ""
 
 #: ../../templates/show_add_catalog.inc.php:82
-msgid "ID3V2 Tags"
-msgstr ""
-
-#: ../../templates/show_add_catalog.inc.php:86
-msgid "Amazon"
-msgstr ""
-
-#: ../../templates/show_add_catalog.inc.php:90
-msgid "File Folder"
-msgstr ""
-
-#: ../../templates/show_add_catalog.inc.php:98
 msgid "Build Playlists from m3u Files"
 msgstr ""
 
-#: ../../templates/show_add_catalog.inc.php:106
+#: ../../templates/show_add_catalog.inc.php:90
 msgid "Add Catalog"
 msgstr ""
 
@@ -1993,7 +2022,7 @@ msgid "Recommendations"
 msgstr ""
 
 #: ../../templates/show_user_recommendations.inc.php:29
-msgid "Recommended Aritsts"
+msgid "Recommended Artists"
 msgstr ""
 
 #: ../../templates/show_user_recommendations.inc.php:40
@@ -2019,13 +2048,6 @@ msgstr ""
 msgid "Guest"
 msgstr ""
 
-#: ../../templates/show_preference_admin.inc.php:38
-#: ../../templates/show_add_access.inc:47
-#: ../../templates/show_access_list.inc:49
-#: ../../templates/show_edit_access.inc:47
-msgid "User"
-msgstr ""
-
 #: ../../templates/show_edit_album.inc.php:23
 msgid "Edit Album"
 msgstr ""
@@ -2067,10 +2089,18 @@ msgstr ""
 msgid "Recently Played"
 msgstr ""
 
+#: ../../templates/show_recently_played.inc.php:33
+msgid "Last Played"
+msgstr ""
+
 #: ../../templates/show_edit_artist.inc.php:23
 msgid "Edit Artist"
 msgstr ""
 
+#: ../../templates/show_random_albums.inc.php:23
+msgid "Albums of the Moment"
+msgstr ""
+
 #: ../../localplay.php:50 ../../localplay.php:58
 msgid "Song(s) Removed from Playlist"
 msgstr ""
@@ -2079,7 +2109,7 @@ msgstr ""
 msgid "Localplay Init Failed"
 msgstr ""
 
-#: ../../browse.php:48 ../../albums.php:191
+#: ../../browse.php:48 ../../albums.php:213
 msgid "Show Albums starting with"
 msgstr ""
 
@@ -2087,7 +2117,7 @@ msgstr ""
 msgid "Show Artists starting with"
 msgstr ""
 
-#: ../../browse.php:123
+#: ../../browse.php:124
 msgid "Show Titles Starting With"
 msgstr ""
 
@@ -2095,6 +2125,10 @@ msgstr ""
 msgid "Error: No Keyword Entered"
 msgstr ""
 
+#: ../../ampache/templates/sidebar.inc.php:38
+msgid "Lists"
+msgstr ""
+
 #: ../../ratings.php:33
 msgid "Rating Updated"
 msgstr ""
@@ -2115,7 +2149,7 @@ msgstr ""
 msgid "No local account found"
 msgstr ""
 
-#: ../../login.php:177
+#: ../../login.php:176
 msgid "Message of the Day"
 msgstr ""
 
@@ -2131,35 +2165,35 @@ msgstr ""
 msgid "Ampache Update"
 msgstr ""
 
-#: ../../tv.php:61
+#: ../../tv.php:62
 msgid "Playlist Cleared"
 msgstr ""
 
-#: ../../artists.php:91 ../../albums.php:169
+#: ../../artists.php:91 ../../albums.php:191
 msgid "Starting Update from Tags"
 msgstr ""
 
-#: ../../artists.php:96 ../../albums.php:174
+#: ../../artists.php:96 ../../albums.php:196
 msgid "Update From Tags Complete"
 msgstr ""
 
-#: ../../artists.php:97 ../../albums.php:175
+#: ../../artists.php:97 ../../albums.php:197
 msgid "Return"
 msgstr ""
 
-#: ../../activate.php:44
+#: ../../activate.php:43
 msgid "No user with this name registered"
 msgstr ""
 
-#: ../../activate.php:48
+#: ../../activate.php:47
 msgid "The validation key used isn't correct."
 msgstr ""
 
-#: ../../activate.php:53
+#: ../../activate.php:52
 msgid "User activated"
 msgstr ""
 
-#: ../../activate.php:53
+#: ../../activate.php:52
 msgid "This User ID is activated and can be used"
 msgstr ""
 
@@ -2223,17 +2257,17 @@ msgstr ""
 msgid "Album Art information has been removed from the database"
 msgstr ""
 
-#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:133
+#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:159
 msgid "Album Art Not Located"
 msgstr ""
 
-#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:133
+#: ../../albums.php:66 ../../albums.php:83 ../../albums.php:159
 msgid ""
 "Album Art could not be located at this time. This may be due to write access "
 "error, or the file is not received corectly."
 msgstr ""
 
-#: ../../albums.php:79 ../../albums.php:162
+#: ../../albums.php:79 ../../albums.php:106 ../../albums.php:185
 msgid "Album Art Inserted"
 msgstr ""
 
@@ -2269,11 +2303,11 @@ msgstr ""
 msgid "Error: Insert Failed"
 msgstr ""
 
-#: ../../register.php:170
+#: ../../register.php:169
 msgid "Registration Complete"
 msgstr ""
 
-#: ../../bin/print_tags.php.inc:63
+#: ../../bin/print_tags.php.inc:64
 msgid ""
 "[print_tags.php.inc]\n"
 "This commandline script will display the tag information for the specified "
@@ -2282,7 +2316,7 @@ msgid ""
 "        \n"
 msgstr ""
 
-#: ../../bin/print_tags.php.inc:69
+#: ../../bin/print_tags.php.inc:70
 msgid "Filename:"
 msgstr ""
 
@@ -2342,16 +2376,11 @@ msgstr ""
 msgid "Click to close window"
 msgstr ""
 
-#: ../../templates/show_disabled_songs.inc:25
-#: ../../templates/show_artist.inc:33
-msgid "Select"
-msgstr ""
-
 #: ../../templates/show_disabled_songs.inc:30
 msgid "Addition Time"
 msgstr ""
 
-#: ../../templates/show_disabled_songs.inc:48
+#: ../../templates/show_disabled_songs.inc:49
 msgid "Remove"
 msgstr ""
 
@@ -2363,10 +2392,14 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: ../../templates/header.inc:64 ../../ampache/templates/header.inc:64
+#: ../../templates/header.inc:63 ../../ampache/templates/header.inc:64
 msgid "You are currently logged in as"
 msgstr ""
 
+#: ../../templates/header.inc:74
+msgid "Error Config File Out of Date"
+msgstr ""
+
 #: ../../templates/show_songs.inc:47
 msgid "Song title"
 msgstr ""
@@ -2375,16 +2408,12 @@ msgstr ""
 msgid "Rating"
 msgstr ""
 
-#: ../../templates/show_songs.inc:176
+#: ../../templates/show_songs.inc:183
 msgid "Total"
 msgstr ""
 
-#: ../../templates/show_songs.inc:194
-msgid "** Indicates flagged songs"
-msgstr ""
-
 #: ../../templates/show_install_config.inc:53
-#: ../../templates/show_install.inc:34
+#: ../../templates/show_install.inc:56
 msgid "Step 2 - Creating the Ampache.cfg.php file"
 msgstr ""
 
@@ -2400,12 +2429,12 @@ msgid "Web Path"
 msgstr ""
 
 #: ../../templates/show_install_config.inc:68
-#: ../../templates/show_install.inc:42
+#: ../../templates/show_install.inc:64
 msgid "Desired Database Name"
 msgstr ""
 
 #: ../../templates/show_install_config.inc:72
-#: ../../templates/show_install.inc:46
+#: ../../templates/show_install.inc:68
 msgid "MySQL Hostname"
 msgstr ""
 
@@ -2451,43 +2480,43 @@ msgstr ""
 msgid "Find Album Art"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:52
+#: ../../templates/show_preferences.inc:53
 msgid "Editing"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:52
+#: ../../templates/show_preferences.inc:53
 msgid "preferences"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:54
+#: ../../templates/show_preferences.inc:55
 msgid "Rebuild Preferences"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:61
+#: ../../templates/show_preferences.inc:62
 msgid "Interface"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:64
+#: ../../templates/show_preferences.inc:65
 msgid "Streaming"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:67
+#: ../../templates/show_preferences.inc:68
 msgid "Options"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:71
+#: ../../templates/show_preferences.inc:72
 msgid "Account"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:75
+#: ../../templates/show_preferences.inc:76
 msgid "System"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:78
+#: ../../templates/show_preferences.inc:79
 msgid "Modules"
 msgstr ""
 
-#: ../../templates/show_preferences.inc:91
+#: ../../templates/show_preferences.inc:92
 msgid "Update Preferences"
 msgstr ""
 
@@ -2527,34 +2556,34 @@ msgstr ""
 msgid "Unlimited"
 msgstr ""
 
-#: ../../templates/show_install.inc:32
+#: ../../templates/show_install.inc:54
 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:50
+#: ../../templates/show_install.inc:72
 msgid "MySQL Administrative Username"
 msgstr ""
 
-#: ../../templates/show_install.inc:54
+#: ../../templates/show_install.inc:76
 msgid "MySQL Administrative Password"
 msgstr ""
 
-#: ../../templates/show_install.inc:58
+#: ../../templates/show_install.inc:80
 msgid "Create Database User for New Database"
 msgstr ""
 
-#: ../../templates/show_install.inc:62
+#: ../../templates/show_install.inc:84
 msgid "Ampache Database Username"
 msgstr ""
 
-#: ../../templates/show_install.inc:66
+#: ../../templates/show_install.inc:88
 msgid "Ampache Database User Password"
 msgstr ""
 
-#: ../../templates/show_install.inc:71
+#: ../../templates/show_install.inc:93
 msgid "Insert Database"
 msgstr ""
 
@@ -2662,11 +2691,11 @@ msgstr ""
 msgid "Activity"
 msgstr ""
 
-#: ../../templates/show_users.inc:60
+#: ../../templates/show_users.inc:61
 msgid "Last Ip"
 msgstr ""
 
-#: ../../templates/show_users.inc:65
+#: ../../templates/show_users.inc:66
 msgid "On-line"
 msgstr ""