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

1 files changed, 357 insertions, 316 deletions

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"