Updated: merge from r1937

2 files changed, 384 insertions, 298 deletions

diff --git a/locale/en_GB/LC_MESSAGES/messages.mo b/locale/en_GB/LC_MESSAGES/messages.mo
index 7016af86..32a027d5 100644
--- a/locale/en_GB/LC_MESSAGES/messages.mo
+++ b/locale/en_GB/LC_MESSAGES/messages.mo
diff --git a/locale/en_GB/LC_MESSAGES/messages.po b/locale/en_GB/LC_MESSAGES/messages.po
index 4e228ce8..d08c0b97 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 3.5.0\n"
 "Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2009-02-24 14:20+0900\n"
+"POT-Creation-Date: 2009-03-09 08:54+0900\n"
 "PO-Revision-Date: 2009-02-02 07:46+0900\n"
 "Last-Translator: momo-i <webmaster at momo-i.org>\n"
 "Language-Team: English (British)\n"
@@ -30,10 +30,10 @@ msgstr "Error: No Keyword Entered"
 #: ../../templates/show_live_streams.inc.php:57
 #: ../../templates/show_playlists.inc.php:34
 #: ../../templates/show_playlists.inc.php:57
-#: ../../templates/show_videos.inc.php:34
-#: ../../templates/show_videos.inc.php:56
+#: ../../templates/show_videos.inc.php:35
+#: ../../templates/show_videos.inc.php:58
 #: ../../templates/show_add_live_stream.inc.php:68
-#: ../../templates/show_catalog_row.inc.php:28
+#: ../../templates/show_catalog_row.inc.php:29
 #: ../../templates/show_video_row.inc.php:23
 #: ../../templates/show_artist_row.inc.php:23
 #: ../../templates/show_genres.inc.php:36
@@ -60,7 +60,6 @@ msgstr "Add"
 #: ../../templates/show_artist.inc.php:41
 #: ../../templates/show_album.inc.php:55
 #: ../../templates/show_playlist_row.inc.php:24
-#: ../../lib/class/stream.class.php:400
 #: ../../modules/localplay/mpd.controller.php:495
 #: ../../modules/localplay/httpq.controller.php:492
 msgid "Random"
@@ -75,7 +74,7 @@ msgstr "Post Shout"
 #: ../../templates/show_playlist.inc.php:36
 #: ../../templates/rightbar.inc.php:49
 #: ../../templates/show_artist_row.inc.php:35
-#: ../../templates/show_search_options.inc.php:28
+#: ../../templates/show_search_options.inc.php:33
 #: ../../templates/show_playlist_row.inc.php:33
 msgid "Batch Download"
 msgstr "Batch Download"
@@ -108,8 +107,8 @@ msgstr "Preference"
 #: ../../templates/show_user_preferences.inc.php:37
 #: ../../templates/show_preference_box.inc.php:41
 #: ../../templates/show_preference_box.inc.php:71
-#: ../../templates/show_random_rules.inc.php:33
-#: ../../templates/show_random.inc.php:32
+#: ../../templates/show_random_rules.inc.php:34
+#: ../../templates/show_random.inc.php:33
 #: ../../templates/show_debug.inc.php:45 ../../templates/show_debug.inc.php:94
 msgid "Value"
 msgstr "Value"
@@ -182,11 +181,12 @@ msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
 
 #: ../../templates/show_test.inc.php:45
-#: ../../templates/show_install_lang.inc.php:54
+#: ../../templates/show_install_check.inc.php:24
+#: ../../templates/show_install_check.inc.php:29
 msgid "PHP Version"
 msgstr "PHP Version"
 
-#: ../../templates/show_test.inc.php:60
+#: ../../templates/show_test.inc.php:58
 msgid ""
 "This tests to make sure that you are running a version of PHP that is known "
 "to work with Ampache."
@@ -194,12 +194,13 @@ msgstr ""
 "This tests to make sure that you are running a version of PHP that is known "
 "to work with Ampache."
 
-#: ../../templates/show_test.inc.php:64
-#: ../../templates/show_install_lang.inc.php:64
+#: ../../templates/show_test.inc.php:62
+#: ../../templates/show_install_check.inc.php:36
+#: ../../templates/show_install_check.inc.php:40
 msgid "Mysql for PHP"
 msgstr "Mysql for PHP"
 
-#: ../../templates/show_test.inc.php:79
+#: ../../templates/show_test.inc.php:75
 msgid ""
 "This test checks to see if you have the mysql extensions loaded for PHP. "
 "These are required for Ampache to work."
@@ -207,12 +208,13 @@ msgstr ""
 "This test checks to see if you have the mysql extensions loaded for PHP. "
 "These are required for Ampache to work."
 
-#: ../../templates/show_test.inc.php:83
-#: ../../templates/show_install_lang.inc.php:79
+#: ../../templates/show_test.inc.php:79
+#: ../../templates/show_install_check.inc.php:47
+#: ../../templates/show_install_check.inc.php:51
 msgid "PHP Session Support"
 msgstr "PHP Session Support"
 
-#: ../../templates/show_test.inc.php:98
+#: ../../templates/show_test.inc.php:92
 msgid ""
 "This test checks to make sure that you have PHP session support enabled. "
 "Sessions are required for Ampache to work."
@@ -220,12 +222,13 @@ msgstr ""
 "This test checks to make sure that you have PHP session support enabled. "
 "Sessions are required for Ampache to work."
 
-#: ../../templates/show_test.inc.php:102
-#: ../../templates/show_install_lang.inc.php:89
+#: ../../templates/show_test.inc.php:96
+#: ../../templates/show_install_check.inc.php:58
+#: ../../templates/show_install_check.inc.php:62
 msgid "PHP ICONV Support"
 msgstr "PHP ICONV Support"
 
-#: ../../templates/show_test.inc.php:116
+#: ../../templates/show_test.inc.php:108
 msgid ""
 "This test checks to make sure you have Iconv support installed. Iconv "
 "support is required for Ampache"
@@ -233,12 +236,13 @@ msgstr ""
 "This test checks to make sure you have Iconv support installed. Iconv "
 "support is required for Ampache"
 
-#: ../../templates/show_test.inc.php:120
-#: ../../templates/show_install_lang.inc.php:99
+#: ../../templates/show_test.inc.php:112
+#: ../../templates/show_install_check.inc.php:69
+#: ../../templates/show_install_check.inc.php:73
 msgid "PHP PCRE Support"
 msgstr "PHP PCRE Support"
 
-#: ../../templates/show_test.inc.php:133
+#: ../../templates/show_test.inc.php:124
 msgid ""
 "This test makes sure you have PCRE support compiled into your version of "
 "PHP, this is required for Ampache."
@@ -246,12 +250,13 @@ msgstr ""
 "This test makes sure you have PCRE support compiled into your version of "
 "PHP, this is required for Ampache."
 
-#: ../../templates/show_test.inc.php:137
-#: ../../templates/show_install_lang.inc.php:109
+#: ../../templates/show_test.inc.php:128
+#: ../../templates/show_install_check.inc.php:80
+#: ../../templates/show_install_check.inc.php:84
 msgid "PHP PutENV Support"
 msgstr "PHP PutENV Support"
 
-#: ../../templates/show_test.inc.php:150
+#: ../../templates/show_test.inc.php:140
 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 "
@@ -261,12 +266,12 @@ msgstr ""
 "to modify the memory limits. While not required, without these abilities "
 "some features of ampache may not work correctly"
 
-#: ../../templates/show_test.inc.php:154
+#: ../../templates/show_test.inc.php:144
 #: ../../templates/show_install_config.inc.php:91
 msgid "Ampache.cfg.php Exists"
 msgstr "Ampache.cfg.php Exists"
 
-#: ../../templates/show_test.inc.php:167
+#: ../../templates/show_test.inc.php:157
 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"
@@ -276,12 +281,12 @@ msgstr ""
 "ampache.cfg.php is not in the correct locations or\n"
 "\tit is not currently readable by your webserver."
 
-#: ../../templates/show_test.inc.php:173
-#: ../../templates/show_install_config.inc.php:108
+#: ../../templates/show_test.inc.php:163
+#: ../../templates/show_install_config.inc.php:106
 msgid "Ampache.cfg.php Configured?"
 msgstr "Ampache.cfg.php Configured?"
 
-#: ../../templates/show_test.inc.php:190
+#: ../../templates/show_test.inc.php:179
 msgid ""
 "This test makes sure that you have set all of the required configuration "
 "variables and that we are able to completely parse your config file"
@@ -289,11 +294,11 @@ msgstr ""
 "This test makes sure that you have set all of the required configuration "
 "variables and that we are able to completely parse your config file"
 
-#: ../../templates/show_test.inc.php:194
+#: ../../templates/show_test.inc.php:183
 msgid "DB Connection"
 msgstr "DB Connection"
 
-#: ../../templates/show_test.inc.php:210
+#: ../../templates/show_test.inc.php:197
 msgid ""
 "This attempts to connect to your database using the values from your ampache."
 "cfg.php"
@@ -301,15 +306,28 @@ msgstr ""
 "This attempts to connect to your database using the values from your ampache."
 "cfg.php"
 
-#: ../../templates/show_test.inc.php:214
+#: ../../templates/show_test.inc.php:201
 msgid "DB Inserted"
 msgstr "DB Inserted"
 
-#: ../../templates/show_test.inc.php:236
+#: ../../templates/show_test.inc.php:215
+msgid ""
+"This checks a few key tables to make sure that you have successfully "
+"inserted the ampache database and that the user has access to the database"
+msgstr ""
+
+#: ../../templates/show_test.inc.php:220
 #: ../../templates/show_install_config.inc.php:63
 msgid "Web Path"
 msgstr "Web Path"
 
+#: ../../templates/show_test.inc.php:244
+msgid ""
+"This test makes sure that your web_path variable is set correctly and that "
+"we are able to get to the index page. If you do not see a check mark here "
+"then your web_path is not set correctly."
+msgstr ""
+
 #: ../../templates/show_albums.inc.php:42
 #: ../../templates/show_albums.inc.php:73
 msgid "Cover"
@@ -342,7 +360,7 @@ msgstr "Album"
 #: ../../templates/show_artists.inc.php:37
 #: ../../templates/show_artists.inc.php:65
 #: ../../templates/sidebar_home.inc.php:34
-#: ../../templates/sidebar_home.inc.php:81
+#: ../../templates/sidebar_home.inc.php:80
 #: ../../templates/sidebar_home.inc.php:107
 #: ../../templates/show_similar_artists.inc.php:33
 #: ../../templates/show_similar_artists.inc.php:86
@@ -370,17 +388,17 @@ msgstr "Artist"
 #: ../../templates/show_artists.inc.php:38
 #: ../../templates/show_artists.inc.php:66
 #: ../../templates/show_manage_democratic.inc.php:39
-#: ../../templates/show_local_catalog_info.inc.php:31
-#: ../../templates/show_genre.inc.php:38
+#: ../../templates/show_popular.inc.php:23
+#: ../../templates/show_genre.inc.php:38 ../../templates/show_stats.inc.php:32
+#: ../../templates/show_stats.inc.php:68
 #: ../../templates/show_genres.inc.php:38
-#: ../../templates/show_genres.inc.php:74
-#: ../../lib/class/browse.class.php:1097
+#: ../../templates/show_genres.inc.php:74 ../../lib/class/browse.class.php:303
 msgid "Songs"
 msgstr "Songs"
 
 #: ../../templates/show_albums.inc.php:47
 #: ../../templates/show_albums.inc.php:78
-#: ../../templates/show_edit_song.inc.php:67
+#: ../../templates/show_edit_song.inc.php:59
 #: ../../templates/show_play_selected.inc.php:61
 #: ../../templates/show_edit_album.inc.php:33
 #: ../../templates/show_search.inc.php:60
@@ -391,9 +409,10 @@ msgstr "Year"
 #: ../../templates/show_albums.inc.php:79
 #: ../../templates/show_artists.inc.php:41
 #: ../../templates/show_artists.inc.php:69
-#: ../../templates/show_videos.inc.php:38
-#: ../../templates/show_videos.inc.php:60
-#: ../../templates/show_songs.inc.php:43 ../../templates/show_songs.inc.php:72
+#: ../../templates/show_videos.inc.php:40
+#: ../../templates/show_videos.inc.php:62
+#: ../../templates/show_stats.inc.php:34 ../../templates/show_songs.inc.php:43
+#: ../../templates/show_songs.inc.php:72
 msgid "Tags"
 msgstr "Tags"
 
@@ -409,8 +428,8 @@ msgstr "Rating"
 
 #: ../../templates/show_albums.inc.php:50
 #: ../../templates/show_albums.inc.php:81
-#: ../../templates/show_catalogs.inc.php:36
-#: ../../templates/show_catalogs.inc.php:52
+#: ../../templates/show_catalogs.inc.php:38
+#: ../../templates/show_catalogs.inc.php:55
 #: ../../templates/show_playlists.inc.php:39
 #: ../../templates/show_playlists.inc.php:62
 #: ../../templates/show_album.inc.php:48
@@ -422,9 +441,9 @@ msgstr "Actions"
 #: ../../templates/show_live_streams.inc.php:53
 #: ../../templates/show_playlists.inc.php:53
 #: ../../templates/show_manage_democratic.inc.php:63
-#: ../../templates/show_videos.inc.php:52
+#: ../../templates/show_videos.inc.php:54
 #: ../../templates/show_objects.inc.php:44
-#: ../../templates/rightbar.inc.php:108 ../../templates/show_genres.inc.php:68
+#: ../../templates/rightbar.inc.php:105 ../../templates/show_genres.inc.php:68
 #: ../../templates/show_user_recommendations.inc.php:32
 #: ../../templates/show_user_recommendations.inc.php:43
 #: ../../templates/show_user_recommendations.inc.php:54
@@ -448,7 +467,7 @@ msgstr "Fullname"
 #: ../../templates/show_install_account.inc.php:61
 #: ../../templates/show_recently_played.inc.php:41
 #: ../../templates/show_recently_played.inc.php:100
-#: ../../templates/show_login_form.inc.php:58
+#: ../../templates/show_login_form.inc.php:57
 #: ../../templates/show_user_registration.inc.php:73
 #: ../../templates/show_now_playing_row.inc.php:29
 msgid "Username"
@@ -492,7 +511,7 @@ msgstr "Last Ip"
 #: ../../templates/show_genres.inc.php:39
 #: ../../templates/show_genres.inc.php:75
 #: ../../templates/show_localplay_instances.inc.php:29
-#: ../../templates/show_random_rules.inc.php:34
+#: ../../templates/show_random_rules.inc.php:36
 #: ../../templates/show_localplay_playlist.inc.php:35
 #: ../../templates/show_localplay_playlist.inc.php:61
 #: ../../templates/show_songs.inc.php:51 ../../templates/show_songs.inc.php:78
@@ -513,16 +532,16 @@ msgid "On-line"
 msgstr "On-line"
 
 #: ../../templates/show_users.inc.php:53 ../../templates/show_user.inc.php:22
-#: ../../lib/class/user.class.php:663 ../../lib/class/catalog.class.php:145
-#: ../../lib/class/catalog.class.php:146 ../../lib/preferences.php:261
+#: ../../lib/class/user.class.php:663 ../../lib/class/catalog.class.php:146
+#: ../../lib/class/catalog.class.php:147 ../../lib/class/catalog.class.php:148
+#: ../../lib/preferences.php:261
 msgid "Never"
 msgstr "Never"
 
 #: ../../templates/show_users.inc.php:54 ../../templates/show_user.inc.php:23
-#: ../../lib/class/flag.class.php:332 ../../lib/class/localplay.class.php:648
+#: ../../lib/class/flag.class.php:337 ../../lib/class/localplay.class.php:648
 #: ../../lib/class/user.class.php:667 ../../lib/general.lib.php:338
-#: ../../modules/localplay/mpd.controller.php:511
-#: ../../modules/localplay/httpq.controller.php:507
+#: ../../modules/localplay/mpd.controller.php:525
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -547,7 +566,7 @@ msgstr "E-mail"
 #: ../../templates/show_edit_user.inc.php:52
 #: ../../templates/show_add_user.inc.php:52
 #: ../../templates/show_install_account.inc.php:65
-#: ../../templates/show_login_form.inc.php:62
+#: ../../templates/show_login_form.inc.php:61
 #: ../../templates/show_user_registration.inc.php:101
 #: ../../modules/localplay/mpd.controller.php:235
 #: ../../modules/localplay/httpq.controller.php:219
@@ -629,8 +648,8 @@ msgstr "Admin"
 msgid "Update User"
 msgstr "Update User"
 
-#: ../../templates/show_catalogs.inc.php:32
-#: ../../templates/show_catalogs.inc.php:48
+#: ../../templates/show_catalogs.inc.php:33
+#: ../../templates/show_catalogs.inc.php:50
 #: ../../templates/show_localplay_controllers.inc.php:32
 #: ../../templates/show_localplay_controllers.inc.php:63
 #: ../../templates/show_edit_live_stream_row.inc.php:26
@@ -647,6 +666,7 @@ msgstr "Update User"
 #: ../../templates/show_plugins.inc.php:61
 #: ../../templates/show_create_democratic.inc.php:26
 #: ../../templates/show_account.inc.php:27
+#: ../../templates/show_stats.inc.php:63
 #: ../../templates/show_edit_album.inc.php:27
 #: ../../templates/show_add_access_current.inc.php:26
 #: ../../templates/show_localplay_playlist.inc.php:34
@@ -659,22 +679,32 @@ msgstr "Update User"
 msgid "Name"
 msgstr "Name"
 
-#: ../../templates/show_catalogs.inc.php:33
-#: ../../templates/show_catalogs.inc.php:49
+#: ../../templates/show_catalogs.inc.php:34
+#: ../../templates/show_catalogs.inc.php:51
+#: ../../templates/show_stats.inc.php:64
 #: ../../templates/show_add_catalog.inc.php:47
 msgid "Path"
 msgstr "Path"
 
-#: ../../templates/show_catalogs.inc.php:34
-#: ../../templates/show_catalogs.inc.php:50
+#: ../../templates/show_catalogs.inc.php:35
+#: ../../templates/show_catalogs.inc.php:52
+#: ../../templates/show_stats.inc.php:65
 msgid "Last Verify"
 msgstr "Last Verify"
 
-#: ../../templates/show_catalogs.inc.php:35
-#: ../../templates/show_catalogs.inc.php:51
+#: ../../templates/show_catalogs.inc.php:36
+#: ../../templates/show_catalogs.inc.php:53
+#: ../../templates/show_stats.inc.php:66
 msgid "Last Add"
 msgstr "Last Add"
 
+#: ../../templates/show_catalogs.inc.php:37
+#: ../../templates/show_catalogs.inc.php:54
+#: ../../templates/show_stats.inc.php:67
+#, fuzzy
+msgid "Last Clean"
+msgstr "Last Seen"
+
 #: ../../templates/show_localplay_controllers.inc.php:33
 #: ../../templates/show_localplay_controllers.inc.php:64
 #: ../../templates/show_plugins.inc.php:33
@@ -741,10 +771,10 @@ msgstr "Save Changes"
 #: ../../templates/show_artists.inc.php:39
 #: ../../templates/show_artists.inc.php:67
 #: ../../templates/sidebar_home.inc.php:33
-#: ../../templates/sidebar_home.inc.php:78
-#: ../../templates/show_local_catalog_info.inc.php:29
-#: ../../templates/show_genre.inc.php:32 ../../lib/ui.lib.php:408
-#: ../../lib/class/browse.class.php:1103
+#: ../../templates/sidebar_home.inc.php:77
+#: ../../templates/show_popular.inc.php:26
+#: ../../templates/show_genre.inc.php:32 ../../templates/show_stats.inc.php:30
+#: ../../lib/ui.lib.php:362 ../../lib/class/browse.class.php:309
 msgid "Albums"
 msgstr "Albums"
 
@@ -769,8 +799,8 @@ msgid "Search Type"
 msgstr "Search Type"
 
 #: ../../templates/show_duplicate.inc.php:33
-#: ../../templates/show_videos.inc.php:35
-#: ../../templates/show_videos.inc.php:57
+#: ../../templates/show_videos.inc.php:36
+#: ../../templates/show_videos.inc.php:59
 #: ../../templates/show_edit_song.inc.php:31
 #: ../../templates/show_democratic_playlist.inc.php:55
 #: ../../templates/show_democratic_playlist.inc.php:95
@@ -810,7 +840,6 @@ msgid "Playlist Type"
 msgstr "Playlist Type"
 
 #: ../../templates/show_import_playlist.inc.php:46
-#: ../../templates/sidebar_home.inc.php:39
 msgid "Import Playlist"
 msgstr "Import Playlist"
 
@@ -849,7 +878,7 @@ msgid "Browse"
 msgstr "Browse"
 
 #: ../../templates/sidebar_home.inc.php:32
-#: ../../templates/sidebar_home.inc.php:75
+#: ../../templates/sidebar_home.inc.php:74
 #: ../../templates/show_songs.inc.php:40 ../../templates/show_songs.inc.php:69
 #: ../../templates/show_playlist_songs.inc.php:42
 #: ../../templates/show_playlist_songs.inc.php:63
@@ -857,79 +886,106 @@ msgid "Song Title"
 msgstr "Song Title"
 
 #: ../../templates/sidebar_home.inc.php:35
-#: ../../lib/class/browse.class.php:1157
+#: ../../lib/class/browse.class.php:364
 msgid "Tag Cloud"
 msgstr "Tag Cloud"
 
 #: ../../templates/sidebar_home.inc.php:36
-#: ../../templates/sidebar_home.inc.php:87
+#: ../../templates/sidebar_home.inc.php:86
 #: ../../templates/sidebar_home.inc.php:108
 #: ../../templates/show_manage_democratic.inc.php:34
-#: ../../templates/show_play_selected.inc.php:47 ../../lib/ui.lib.php:367
+#: ../../templates/show_play_selected.inc.php:47 ../../lib/ui.lib.php:321
 msgid "Playlist"
 msgstr "Playlist"
 
 #: ../../templates/sidebar_home.inc.php:37
-#: ../../lib/class/browse.class.php:1120
+#: ../../lib/class/browse.class.php:327
 msgid "Radio Stations"
 msgstr "Radio Stations"
 
 #: ../../templates/sidebar_home.inc.php:38
+#: ../../templates/show_stats.inc.php:33 ../../templates/show_stats.inc.php:69
 msgid "Video"
 msgstr "Video"
 
-#: ../../templates/sidebar_home.inc.php:43
+#: ../../templates/sidebar_home.inc.php:42
 msgid "Filters"
 msgstr "Filters"
 
-#: ../../templates/sidebar_home.inc.php:47
+#: ../../templates/sidebar_home.inc.php:46
 msgid "Starts With"
 msgstr "Starts With"
 
-#: ../../templates/sidebar_home.inc.php:53
+#: ../../templates/sidebar_home.inc.php:52
 msgid "Minimum Count"
 msgstr "Minimum Count"
 
-#: ../../templates/sidebar_home.inc.php:57
+#: ../../templates/sidebar_home.inc.php:56
 msgid "Rated"
 msgstr "Rated"
 
-#: ../../templates/sidebar_home.inc.php:61
+#: ../../templates/sidebar_home.inc.php:60
 msgid "Unplayed"
 msgstr "Unplayed"
 
-#: ../../templates/sidebar_home.inc.php:65
+#: ../../templates/sidebar_home.inc.php:64
 #: ../../templates/show_artist.inc.php:55
 msgid "Show Art"
 msgstr "Show Art"
 
-#: ../../templates/sidebar_home.inc.php:70
+#: ../../templates/sidebar_home.inc.php:69
 msgid "All Playlists"
 msgstr "All Playlists"
 
-#: ../../templates/sidebar_home.inc.php:89
+#: ../../templates/sidebar_home.inc.php:88
 msgid "Currently Playing"
 msgstr "Currently Playing"
 
-#: ../../templates/sidebar_home.inc.php:91
+#: ../../templates/sidebar_home.inc.php:90
 #: ../../templates/show_playtype_switch.inc.php:36
-#: ../../templates/sidebar_modules.inc.php:46 ../../lib/preferences.php:179
+#: ../../templates/sidebar_modules.inc.php:40 ../../lib/preferences.php:179
 #: ../../modules/localplay/mpd.controller.php:491
 #: ../../modules/localplay/httpq.controller.php:488
 msgid "Democratic"
 msgstr "Democratic"
 
-#: ../../templates/sidebar_home.inc.php:100
+#: ../../templates/sidebar_home.inc.php:99
 #: ../../templates/sidebar_localplay.inc.php:32
 #: ../../templates/show_playtype_switch.inc.php:34
 #: ../../templates/sidebar.inc.php:28 ../../lib/preferences.php:182
 msgid "Localplay"
 msgstr "Localplay"
 
+#: ../../templates/sidebar_home.inc.php:101
+#: ../../templates/show_live_stream.inc.php:29
+#, fuzzy
+msgid "Import"
+msgstr "Export"
+
 #: ../../templates/sidebar_home.inc.php:109
 msgid "Advanced"
 msgstr "Advanced"
 
+#: ../../templates/sidebar_home.inc.php:112
+#: ../../templates/show_popular.inc.php:22
+#: ../../templates/show_newest.inc.php:22
+msgid "Information"
+msgstr "Information"
+
+#: ../../templates/sidebar_home.inc.php:114
+#: ../../templates/show_stats.inc.php:24 ../../lib/ui.lib.php:374
+msgid "Statistics"
+msgstr "Statistics"
+
+#: ../../templates/sidebar_home.inc.php:115
+#, fuzzy
+msgid "Newest"
+msgstr "Newest Albums"
+
+#: ../../templates/sidebar_home.inc.php:116
+msgid "Popular"
+msgstr ""
+
 #: ../../templates/show_confirmation.inc.php:27
 #: ../../templates/show_update_items.inc.php:27
 msgid "Continue"
@@ -1121,8 +1177,7 @@ msgstr "Read/Write"
 #: ../../templates/show_export.inc.php:35
 #: ../../templates/show_add_access_current.inc.php:40
 #: ../../templates/show_mail_users.inc.php:30
-#: ../../templates/show_admin_tools.inc.php:51 ../../lib/ui.lib.php:141
-#: ../../lib/ui.lib.php:150 ../../lib/ui.lib.php:632
+#: ../../templates/show_admin_tools.inc.php:51 ../../lib/ui.lib.php:543
 #: ../../lib/class/access.class.php:407 ../../lib/class/access.class.php:427
 msgid "All"
 msgstr "All"
@@ -1232,7 +1287,6 @@ msgid "Show instances"
 msgstr "Show instances"
 
 #: ../../templates/sidebar_localplay.inc.php:38
-#: ../../templates/sidebar_modules.inc.php:48
 msgid "Show Playlist"
 msgstr "Show Playlist"
 
@@ -1242,7 +1296,7 @@ msgstr "Active Instance"
 
 #: ../../templates/sidebar_localplay.inc.php:44
 #: ../../templates/show_gather_art.inc.php:24
-#: ../../templates/show_adds_catalog.inc.php:25 ../../lib/ui.lib.php:660
+#: ../../templates/show_adds_catalog.inc.php:25 ../../lib/ui.lib.php:571
 #: ../../lib/preferences.php:174 ../../lib/preferences.php:216
 msgid "None"
 msgstr "None"
@@ -1276,16 +1330,22 @@ msgstr "Queries:"
 msgid "Cache Hits:"
 msgstr "Cache Hits:"
 
-#: ../../templates/show_videos.inc.php:36
-#: ../../templates/show_videos.inc.php:58
+#: ../../templates/show_videos.inc.php:37
+#: ../../templates/show_videos.inc.php:60
 msgid "Codec"
 msgstr "Codec"
 
-#: ../../templates/show_videos.inc.php:37
-#: ../../templates/show_videos.inc.php:59
+#: ../../templates/show_videos.inc.php:38
+#: ../../templates/show_videos.inc.php:61
 msgid "Resolution"
 msgstr "Resolution"
 
+#: ../../templates/show_videos.inc.php:39
+#: ../../templates/show_duplicates.inc.php:40
+#: ../../templates/show_duplicates.inc.php:79
+msgid "Length"
+msgstr "Length"
+
 #: ../../templates/show_add_access_rpc.inc.php:22
 #: ../../templates/show_access_list.inc.php:36
 #: ../../templates/show_access_list.inc.php:37
@@ -1301,7 +1361,7 @@ msgid "RPC"
 msgstr "RPC"
 
 #: ../../templates/show_add_live_stream.inc.php:24
-#: ../../templates/sidebar_modules.inc.php:42
+#: ../../templates/show_live_stream.inc.php:26
 msgid "Add Radio Station"
 msgstr "Add Radio Station"
 
@@ -1324,7 +1384,7 @@ msgid "Edit Artist"
 msgstr "Edit Artist"
 
 #: ../../templates/show_edit_artist.inc.php:35
-#: ../../templates/show_edit_song.inc.php:81
+#: ../../templates/show_edit_song.inc.php:73
 #: ../../templates/show_edit_album.inc.php:41
 msgid "Flag for Retagging"
 msgstr "Flag for Retagging"
@@ -1344,7 +1404,7 @@ msgstr "ACL Type"
 
 #: ../../templates/show_edit_access.inc.php:84
 #: ../../templates/show_preference_admin.inc.php:55
-#: ../../templates/show_catalog_row.inc.php:31
+#: ../../templates/show_catalog_row.inc.php:32
 #: ../../templates/show_play_selected.inc.php:64
 #: ../../templates/show_edit_shout.inc.php:41
 #: ../../templates/show_manage_catalogs.inc.php:42
@@ -1352,6 +1412,13 @@ msgstr "ACL Type"
 msgid "Update"
 msgstr "Update"
 
+#: ../../templates/show_popular.inc.php:29
+#: ../../templates/show_genre.inc.php:35 ../../templates/show_stats.inc.php:31
+#: ../../lib/ui.lib.php:366 ../../lib/class/browse.class.php:320
+#: ../../lib/class/album.class.php:256
+msgid "Artists"
+msgstr "Artists"
+
 #: ../../templates/show_similar_artists.inc.php:23
 msgid "Similar Artists"
 msgstr "Similar Artists"
@@ -1393,12 +1460,12 @@ msgstr "Checking"
 #: ../../templates/show_run_add_catalog.inc.php:25
 #: ../../templates/show_gather_art.inc.php:25
 #: ../../templates/show_adds_catalog.inc.php:26
-#: ../../templates/show_verify_catalog.inc.php:26
+#: ../../templates/show_verify_catalog.inc.php:28
 msgid "Reading"
 msgstr "Reading"
 
 #: ../../templates/sidebar_preferences.inc.php:9
-#: ../../templates/sidebar.inc.php:29 ../../lib/ui.lib.php:373
+#: ../../templates/sidebar.inc.php:29 ../../lib/ui.lib.php:327
 msgid "Preferences"
 msgstr "Preferences"
 
@@ -1427,8 +1494,8 @@ msgstr "Item"
 msgid "Reason to flag"
 msgstr "Reason to flag"
 
-#: ../../templates/show_flag.inc.php:56 ../../templates/rightbar.inc.php:105
-#: ../../templates/show_catalog_row.inc.php:33
+#: ../../templates/show_flag.inc.php:56 ../../templates/rightbar.inc.php:102
+#: ../../templates/show_catalog_row.inc.php:34
 #: ../../templates/show_democratic_playlist.inc.php:85
 #: ../../templates/show_live_stream_row.inc.php:34
 #: ../../templates/show_localplay_instances.inc.php:40
@@ -1436,7 +1503,7 @@ msgstr "Reason to flag"
 #: ../../templates/show_playlist_song_row.inc.php:38
 #: ../../templates/show_playlist_row.inc.php:38
 #: ../../templates/show_admin_tools.inc.php:53
-#: ../../lib/class/flag.class.php:320
+#: ../../lib/class/flag.class.php:325
 msgid "Delete"
 msgstr "Delete"
 
@@ -1444,16 +1511,16 @@ msgstr "Delete"
 msgid "Incorrect Tags"
 msgstr "Incorrect Tags"
 
-#: ../../templates/show_flag.inc.php:58 ../../lib/class/flag.class.php:326
+#: ../../templates/show_flag.inc.php:58 ../../lib/class/flag.class.php:331
 msgid "Re-encode"
 msgstr "Re-encode"
 
-#: ../../templates/show_flag.inc.php:59 ../../lib/class/flag.class.php:329
+#: ../../templates/show_flag.inc.php:59 ../../lib/class/flag.class.php:334
 msgid "Other"
 msgstr "Other"
 
 #: ../../templates/show_flag.inc.php:64
-#: ../../templates/show_edit_song.inc.php:73
+#: ../../templates/show_edit_song.inc.php:65
 #: ../../templates/show_flagged.inc.php:37
 #: ../../templates/show_flagged.inc.php:56
 #: ../../templates/show_search.inc.php:34
@@ -1589,11 +1656,11 @@ msgstr "MySQL Password"
 msgid "Write Config"
 msgstr "Write Config"
 
-#: ../../templates/show_install_config.inc.php:129
+#: ../../templates/show_install_config.inc.php:125
 msgid "Check for Config"
 msgstr "Check for Config"
 
-#: ../../templates/show_install_config.inc.php:135
+#: ../../templates/show_install_config.inc.php:131
 msgid "Continue to Step 3"
 msgstr "Continue to Step 3"
 
@@ -1626,8 +1693,9 @@ msgid "Advanced Add"
 msgstr "Advanced Add"
 
 #: ../../templates/sidebar_admin.inc.php:24
+#: ../../templates/show_stats.inc.php:25
 #: ../../templates/show_admin_tools.inc.php:26
-#: ../../lib/class/browse.class.php:1141
+#: ../../lib/class/browse.class.php:348
 msgid "Catalogs"
 msgstr "Catalogs"
 
@@ -1688,7 +1756,42 @@ msgstr "Export Catalog"
 msgid "Manage Shoutbox"
 msgstr "Manage Shoutbox"
 
-#: ../../templates/sidebar.inc.php:27 ../../lib/ui.lib.php:355
+#: ../../templates/show_install_check.inc.php:23
+#, fuzzy
+msgid "Required"
+msgstr "Requirements"
+
+#: ../../templates/show_install_check.inc.php:27
+msgid "Hash Function Exists"
+msgstr ""
+
+#: ../../templates/show_install_check.inc.php:27
+#, fuzzy
+msgid "SHA256 Support"
+msgstr "GD Support"
+
+#: ../../templates/show_install_check.inc.php:92
+msgid "Optional"
+msgstr "Optional"
+
+#: ../../templates/show_install_check.inc.php:93
+#: ../../templates/show_debug.inc.php:80
+msgid "Gettext Support"
+msgstr "Gettext Support"
+
+#: ../../templates/show_install_check.inc.php:96
+msgid "Gettext Emulator will be used"
+msgstr ""
+
+#: ../../templates/show_install_check.inc.php:103
+msgid "Mbstring Support"
+msgstr "Mbstring Support"
+
+#: ../../templates/show_install_check.inc.php:106
+msgid "Multibyte Chracter may not detect correct"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:27 ../../lib/ui.lib.php:309
 msgid "Home"
 msgstr "Home"
 
@@ -1701,80 +1804,23 @@ msgstr "Modules"
 msgid "Logout"
 msgstr "Logout"
 
-#: ../../templates/show_local_catalog_info.inc.php:24
-#: ../../templates/show_mail_users.inc.php:42
-msgid "Catalog Statistics"
-msgstr "Catalog Statistics"
-
-#: ../../templates/show_local_catalog_info.inc.php:27
-msgid "Connected Users"
-msgstr "Connected Users"
-
-#: ../../templates/show_local_catalog_info.inc.php:28
-msgid "Total Users"
-msgstr "Total Users"
-
-#: ../../templates/show_local_catalog_info.inc.php:30
-#: ../../templates/show_genre.inc.php:35 ../../lib/ui.lib.php:412
-#: ../../lib/class/browse.class.php:1114 ../../lib/class/album.class.php:256
-msgid "Artists"
-msgstr "Artists"
-
-#: ../../templates/show_local_catalog_info.inc.php:32
-msgid "Genres"
-msgstr "Genres"
-
-#: ../../templates/show_local_catalog_info.inc.php:33
-msgid "Catalog Size"
-msgstr "Catalog Size"
-
-#: ../../templates/show_local_catalog_info.inc.php:34
-msgid "Catalog Time"
-msgstr "Catalog Time"
-
 #: ../../templates/show_install_lang.inc.php:39
-#: ../../templates/show_install_lang.inc.php:53
 #: ../../templates/show_install.inc.php:39
 msgid "Requirements"
 msgstr "Requirements"
 
-#: ../../templates/show_install_lang.inc.php:52
-msgid "System Checks"
-msgstr "System Checks"
-
-#: ../../templates/show_install_lang.inc.php:120
-msgid "Optional"
-msgstr "Optional"
-
-#: ../../templates/show_install_lang.inc.php:121
-#: ../../templates/show_debug.inc.php:80
-msgid "Gettext Support"
-msgstr "Gettext Support"
-
-#: ../../templates/show_install_lang.inc.php:124
-msgid "WARNING: This server will use gettext emulator."
-msgstr "WARNING: This server will use gettext emulator."
-
-#: ../../templates/show_install_lang.inc.php:130
-msgid "Mbstring Support"
-msgstr "Mbstring Support"
+#: ../../templates/show_install_lang.inc.php:54
+msgid "Minimum Requirements not met. Unable to Install Ampache."
+msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:142
+#: ../../templates/show_install_lang.inc.php:59
 msgid "Choose installation language."
 msgstr "Choose installation language."
 
-#: ../../templates/show_install_lang.inc.php:163
+#: ../../templates/show_install_lang.inc.php:80
 msgid "Start configuration"
 msgstr "Start configuration"
 
-#: ../../templates/show_install_lang.inc.php:169
-msgid "Ampache does not <strong>run</strong> correctly by this server."
-msgstr "Ampache does not <strong>run</strong> correctly by this server."
-
-#: ../../templates/show_install_lang.inc.php:170
-msgid "Please contact your server administrator, and fix them."
-msgstr "Please contact your server administrator, and fix them."
-
 #: ../../templates/rightbar.inc.php:28
 msgid "Add to Playlist"
 msgstr "Add to Playlist"
@@ -1810,7 +1856,7 @@ msgstr "Related Album"
 msgid "Related Tag"
 msgstr "Related Tag"
 
-#: ../../templates/rightbar.inc.php:112
+#: ../../templates/rightbar.inc.php:109
 msgid "More"
 msgstr "More"
 
@@ -1892,17 +1938,17 @@ msgstr "Refresh"
 msgid "Play Album"
 msgstr "Play Album"
 
-#: ../../templates/show_catalog_row.inc.php:29
+#: ../../templates/show_catalog_row.inc.php:30
 #: ../../templates/show_admin_tools.inc.php:47
 msgid "Verify"
 msgstr "Verify"
 
-#: ../../templates/show_catalog_row.inc.php:30
+#: ../../templates/show_catalog_row.inc.php:31
 #: ../../templates/show_admin_tools.inc.php:49
 msgid "Clean"
 msgstr "Clean"
 
-#: ../../templates/show_catalog_row.inc.php:32
+#: ../../templates/show_catalog_row.inc.php:33
 #: ../../templates/show_admin_tools.inc.php:60
 msgid "Gather Art"
 msgstr "Gather Art"
@@ -1916,7 +1962,7 @@ msgid "Cooldown Time"
 msgstr "Cooldown Time"
 
 #: ../../templates/show_create_democratic.inc.php:35
-#: ../../lib/class/democratic.class.php:98
+#: ../../lib/class/democratic.class.php:98 ../../lib/class/video.class.php:66
 msgid "minutes"
 msgstr "minutes"
 
@@ -1949,22 +1995,13 @@ msgstr "Edit Song"
 
 #: ../../templates/show_edit_song.inc.php:40
 #: ../../templates/show_edit_song.inc.php:48
-#: ../../templates/show_edit_song.inc.php:56
 #: ../../templates/show_search.inc.php:106
+#: ../../templates/show_random.inc.php:64
 #: ../../templates/show_rename_artist.inc.php:33
 msgid "OR"
 msgstr "OR"
 
 #: ../../templates/show_edit_song.inc.php:53
-#: ../../templates/show_play_selected.inc.php:58
-#: ../../templates/show_genres.inc.php:37
-#: ../../templates/show_genres.inc.php:73
-#: ../../templates/show_playlist_songs.inc.php:45
-#: ../../templates/show_playlist_songs.inc.php:66 ../../lib/ui.lib.php:416
-msgid "Genre"
-msgstr "Genre"
-
-#: ../../templates/show_edit_song.inc.php:61
 #: ../../templates/show_localplay_playlist.inc.php:33
 #: ../../templates/show_localplay_playlist.inc.php:59
 #: ../../templates/show_songs.inc.php:44 ../../templates/show_songs.inc.php:73
@@ -1975,7 +2012,7 @@ msgstr "Genre"
 msgid "Track"
 msgstr "Track"
 
-#: ../../templates/show_edit_song.inc.php:88
+#: ../../templates/show_edit_song.inc.php:80
 msgid "Update Song"
 msgstr "Update Song"
 
@@ -2005,7 +2042,7 @@ msgid "Update Instance"
 msgstr "Update Instance"
 
 #: ../../templates/show_search_bar.inc.php:29
-#: ../../templates/show_search.inc.php:131 ../../lib/ui.lib.php:370
+#: ../../templates/show_search.inc.php:131 ../../lib/ui.lib.php:324
 msgid "Search"
 msgstr "Search"
 
@@ -2013,10 +2050,21 @@ msgstr "Search"
 msgid "Advanced Search"
 msgstr "Advanced Search"
 
-#: ../../templates/show_stats.inc.php:22
-#: ../../templates/sidebar_modules.inc.php:41 ../../lib/ui.lib.php:420
-msgid "Statistics"
-msgstr "Statistics"
+#: ../../templates/show_stats.inc.php:28
+msgid "Connected Users"
+msgstr "Connected Users"
+
+#: ../../templates/show_stats.inc.php:29
+msgid "Total Users"
+msgstr "Total Users"
+
+#: ../../templates/show_stats.inc.php:35 ../../templates/show_stats.inc.php:70
+msgid "Catalog Size"
+msgstr "Catalog Size"
+
+#: ../../templates/show_stats.inc.php:36
+msgid "Catalog Time"
+msgstr "Catalog Time"
 
 #: ../../templates/show_ip_history.inc.php:23
 #, php-format
@@ -2066,6 +2114,14 @@ msgstr "Remove Selected Tracks"
 msgid "Add to"
 msgstr "Add to"
 
+#: ../../templates/show_play_selected.inc.php:58
+#: ../../templates/show_genres.inc.php:37
+#: ../../templates/show_genres.inc.php:73
+#: ../../templates/show_playlist_songs.inc.php:45
+#: ../../templates/show_playlist_songs.inc.php:66 ../../lib/ui.lib.php:370
+msgid "Genre"
+msgstr "Genre"
+
 #: ../../templates/show_flagged.inc.php:34
 #: ../../templates/show_flagged.inc.php:53
 #: ../../templates/show_manage_shoutbox.inc.php:34
@@ -2158,6 +2214,11 @@ msgid "Update Album"
 msgstr "Update Album"
 
 #: ../../templates/show_album_art.inc.php:47
+#, fuzzy
+msgid "Invalid"
+msgstr "Invalid Request"
+
+#: ../../templates/show_album_art.inc.php:49
 #: ../../templates/show_disabled_songs.inc.php:33
 #: ../../templates/show_disabled_songs.inc.php:56
 msgid "Select"
@@ -2235,18 +2296,24 @@ msgstr "Favorite Songs"
 msgid "Rules"
 msgstr "Modules"
 
-#: ../../templates/show_random_rules.inc.php:31
-#: ../../templates/show_random.inc.php:30
+#: ../../templates/show_random_rules.inc.php:32
+#: ../../templates/show_random.inc.php:31
 #, fuzzy
 msgid "Field"
 msgstr "Failed"
 
-#: ../../templates/show_random_rules.inc.php:32
+#: ../../templates/show_random_rules.inc.php:33
 #: ../../templates/show_search.inc.php:102
-#: ../../templates/show_random.inc.php:31
+#: ../../templates/show_random.inc.php:32
 msgid "Operator"
 msgstr "Operator"
 
+#: ../../templates/show_random_rules.inc.php:35
+#: ../../templates/show_search.inc.php:111
+#: ../../templates/show_random.inc.php:34
+msgid "Method"
+msgstr "Method"
+
 #: ../../templates/show_shoutbox.inc.php:22
 msgid "Shoutbox"
 msgstr "Shoutbox"
@@ -2296,13 +2363,10 @@ msgid "Five Stars"
 msgstr "Five Stars"
 
 #: ../../templates/show_search.inc.php:105
+#: ../../templates/show_random.inc.php:65
 msgid "AND"
 msgstr "AND"
 
-#: ../../templates/show_search.inc.php:111
-msgid "Method"
-msgstr "Method"
-
 #: ../../templates/show_search.inc.php:114
 msgid "Fuzzy"
 msgstr "Fuzzy"
@@ -2436,6 +2500,10 @@ msgstr "Mail to"
 msgid "Inactive Users"
 msgstr "Inactive Users"
 
+#: ../../templates/show_mail_users.inc.php:42
+msgid "Catalog Statistics"
+msgstr "Catalog Statistics"
+
 #: ../../templates/show_mail_users.inc.php:53
 msgid "Latest Artist Additions"
 msgstr "Latest Artist Additions"
@@ -2474,20 +2542,20 @@ msgstr "Send Mail"
 msgid "Advanced Random Rules"
 msgstr "Add Random"
 
-#: ../../templates/show_random.inc.php:54
+#: ../../templates/show_random.inc.php:56
 msgid "Like"
 msgstr ""
 
-#: ../../templates/show_random.inc.php:63
+#: ../../templates/show_random.inc.php:71
 #, fuzzy
 msgid "Add Rule"
 msgstr "Add All"
 
-#: ../../templates/show_random.inc.php:66
+#: ../../templates/show_random.inc.php:74
 msgid "Save Rules As"
 msgstr ""
 
-#: ../../templates/show_random.inc.php:69
+#: ../../templates/show_random.inc.php:77
 msgid "Load Saved Rules"
 msgstr ""
 
@@ -2495,7 +2563,8 @@ msgstr ""
 msgid "Options"
 msgstr "Options"
 
-#: ../../templates/show_search_options.inc.php:26
+#: ../../templates/show_search_options.inc.php:27
+#: ../../templates/show_search_options.inc.php:28
 msgid "Add Search Results"
 msgstr "Add Search Results"
 
@@ -2608,11 +2677,14 @@ msgstr "%s Playlist"
 msgid "Updating the %s catalog"
 msgstr "Updating the %s catalog"
 
-#: ../../templates/show_verify_catalog.inc.php:24
-msgid "songs found checking tag information."
-msgstr "songs found checking tag information."
-
 #: ../../templates/show_verify_catalog.inc.php:25
+#, fuzzy, php-format
+msgid "%s item found checking tag information"
+msgid_plural "%s items found checking tag information"
+msgstr[0] "songs found checking tag information."
+msgstr[1] "songs found checking tag information."
+
+#: ../../templates/show_verify_catalog.inc.php:27
 msgid "Verifed"
 msgstr "Verifed"
 
@@ -2655,8 +2727,8 @@ msgid "Disk"
 msgstr "Disk"
 
 #: ../../templates/show_album.inc.php:34
-#: ../../lib/class/catalog.class.php:1909
-#: ../../lib/class/catalog.class.php:1980
+#: ../../lib/class/catalog.class.php:1928
+#: ../../lib/class/catalog.class.php:1999
 msgid "Unknown (Orphaned)"
 msgstr "Unknown (Orphaned)"
 
@@ -2681,7 +2753,7 @@ msgstr "Find Album Art"
 msgid "%s Lyrics"
 msgstr "Show Playlist"
 
-#: ../../templates/show_lyrics.inc.php:40 ../../lib/class/artist.class.php:323
+#: ../../templates/show_lyrics.inc.php:39 ../../lib/class/artist.class.php:345
 msgid "Sorry Lyrics Not Found."
 msgstr ""
 
@@ -2689,19 +2761,19 @@ msgstr ""
 msgid "Add Localplay Instance"
 msgstr "Add Localplay Instance"
 
-#: ../../templates/show_login_form.inc.php:66
+#: ../../templates/show_login_form.inc.php:65
 msgid "Remember Me"
 msgstr "Remember Me"
 
-#: ../../templates/show_login_form.inc.php:73
+#: ../../templates/show_login_form.inc.php:72
 msgid "Login"
 msgstr "Login"
 
-#: ../../templates/show_login_form.inc.php:78
+#: ../../templates/show_login_form.inc.php:77
 msgid "Register"
 msgstr "Register"
 
-#: ../../templates/show_login_form.inc.php:90
+#: ../../templates/show_login_form.inc.php:89
 msgid "Message of the Day"
 msgstr "Message of the Day"
 
@@ -2743,11 +2815,6 @@ msgstr "Prev"
 msgid "Duplicate Songs"
 msgstr "Duplicate Songs"
 
-#: ../../templates/show_duplicates.inc.php:40
-#: ../../templates/show_duplicates.inc.php:79
-msgid "Length"
-msgstr "Length"
-
 #: ../../templates/show_duplicates.inc.php:41
 #: ../../templates/show_duplicates.inc.php:80
 msgid "Bitrate"
@@ -2758,6 +2825,11 @@ msgstr "Bitrate"
 msgid "Size"
 msgstr "Size"
 
+#: ../../templates/show_live_stream.inc.php:22
+#, fuzzy
+msgid "Manage Radio Stations"
+msgstr "Radio Stations"
+
 #: ../../templates/show_manage_catalogs.inc.php:28
 msgid "Gather All Art"
 msgstr "Gather All Art"
@@ -3010,11 +3082,7 @@ msgstr "Manage Flagged"
 msgid "Show Disabled"
 msgstr "Show Disabled"
 
-#: ../../templates/sidebar_modules.inc.php:39
-msgid "Information"
-msgstr "Information"
-
-#: ../../templates/sidebar_modules.inc.php:49
+#: ../../templates/sidebar_modules.inc.php:42
 msgid "Manage Playlist"
 msgstr "Manage Playlist"
 
@@ -3124,79 +3192,79 @@ msgstr "It's Insane"
 msgid "Off the Charts!"
 msgstr "Off the Charts!"
 
-#: ../../lib/ui.lib.php:358
+#: ../../lib/ui.lib.php:312
 msgid "Upload"
 msgstr "Upload"
 
-#: ../../lib/ui.lib.php:361
+#: ../../lib/ui.lib.php:315
 msgid "Local Play"
 msgstr "Local Play"
 
-#: ../../lib/ui.lib.php:364
+#: ../../lib/ui.lib.php:318
 msgid "Random Play"
 msgstr "Random Play"
 
-#: ../../lib/ui.lib.php:376 ../../lib/ui.lib.php:380
+#: ../../lib/ui.lib.php:330 ../../lib/ui.lib.php:334
 msgid "Admin-Catalog"
 msgstr "Admin-Catalog"
 
-#: ../../lib/ui.lib.php:384
+#: ../../lib/ui.lib.php:338
 msgid "Admin-User Management"
 msgstr "Admin-User Management"
 
-#: ../../lib/ui.lib.php:388
+#: ../../lib/ui.lib.php:342
 msgid "Admin-Mail Users"
 msgstr "Admin-Mail Users"
 
-#: ../../lib/ui.lib.php:392
+#: ../../lib/ui.lib.php:346
 msgid "Admin-Manage Access Lists"
 msgstr "Admin-Manage Access Lists"
 
-#: ../../lib/ui.lib.php:396
+#: ../../lib/ui.lib.php:350
 msgid "Admin-Site Preferences"
 msgstr "Admin-Site Preferences"
 
-#: ../../lib/ui.lib.php:400
+#: ../../lib/ui.lib.php:354
 msgid "Admin-Manage Modules"
 msgstr "Admin-Manage Modules"
 
-#: ../../lib/ui.lib.php:404
+#: ../../lib/ui.lib.php:358
 msgid "Browse Music"
 msgstr "Browse Music"
 
-#: ../../lib/ui.lib.php:511
+#: ../../lib/ui.lib.php:465
 msgid "Add New"
 msgstr "Add New"
 
-#: ../../lib/class/browse.class.php:1109
+#: ../../lib/class/browse.class.php:315
 msgid "Manage Users"
 msgstr "Manage Users"
 
-#: ../../lib/class/browse.class.php:1126
+#: ../../lib/class/browse.class.php:333
 msgid "Playlists"
 msgstr "Playlists"
 
-#: ../../lib/class/browse.class.php:1131
+#: ../../lib/class/browse.class.php:338
 msgid "Playlist Songs"
 msgstr "Playlist Songs"
 
-#: ../../lib/class/browse.class.php:1136
+#: ../../lib/class/browse.class.php:343
 msgid "Current Playlist"
 msgstr "Current Playlist"
 
-#: ../../lib/class/browse.class.php:1146
+#: ../../lib/class/browse.class.php:353
 msgid "Shoutbox Records"
 msgstr "Shoutbox Records"
 
-#: ../../lib/class/browse.class.php:1151
+#: ../../lib/class/browse.class.php:358
 msgid "Flagged Records"
 msgstr "Flagged Records"
 
-#: ../../lib/class/browse.class.php:1162
+#: ../../lib/class/browse.class.php:369
 msgid "Videos"
 msgstr "Videos"
 
-#: ../../lib/class/browse.class.php:1167
+#: ../../lib/class/browse.class.php:374
 #, fuzzy
 msgid "Democratic Playlist"
 msgstr "Create Democratic Playlist"
@@ -3215,15 +3283,15 @@ msgstr "IP Address Version Mismatch"
 msgid "API/RPC"
 msgstr "API/RPC"
 
-#: ../../lib/class/flag.class.php:307
+#: ../../lib/class/flag.class.php:312
 msgid "Approved"
 msgstr "Approved"
 
-#: ../../lib/class/flag.class.php:308
+#: ../../lib/class/flag.class.php:313
 msgid "Pending"
 msgstr "Pending"
 
-#: ../../lib/class/flag.class.php:323
+#: ../../lib/class/flag.class.php:328
 msgid "Re-Tag"
 msgstr "Re-Tag"
 
@@ -3239,12 +3307,12 @@ msgstr "Paused"
 msgid "Primary"
 msgstr "Primary"
 
-#: ../../lib/class/artist.class.php:311
+#: ../../lib/class/artist.class.php:333
 #, fuzzy
 msgid "Fault"
 msgstr "Default"
 
-#: ../../lib/class/artist.class.php:318 ../../lib/class/catalog.class.php:1185
+#: ../../lib/class/artist.class.php:340 ../../lib/class/catalog.class.php:1234
 #: ../../admin/users.php:142
 msgid "Error"
 msgstr "Error"
@@ -3259,7 +3327,7 @@ msgstr "Error Username Required"
 msgid "Error Passwords don't match"
 msgstr "Error Passwords don't match"
 
-#: ../../lib/class/album.class.php:479 ../../lib/class/catalog.class.php:426
+#: ../../lib/class/album.class.php:479 ../../lib/class/catalog.class.php:462
 msgid "Error: Unable to open"
 msgstr "Error: Unable to open"
 
@@ -3267,144 +3335,144 @@ msgstr "Error: Unable to open"
 msgid "RSS Feed"
 msgstr "RSS Feed"
 
-#: ../../lib/class/catalog.class.php:204
+#: ../../lib/class/catalog.class.php:208
 msgid "day"
 msgid_plural "days"
 msgstr[0] "day"
 msgstr[1] "days"
 
-#: ../../lib/class/catalog.class.php:206
+#: ../../lib/class/catalog.class.php:210
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: ../../lib/class/catalog.class.php:306
+#: ../../lib/class/catalog.class.php:308
 msgid "Running Remote Sync"
 msgstr "Running Remote Sync"
 
-#: ../../lib/class/catalog.class.php:433 ../../lib/class/catalog.class.php:476
+#: ../../lib/class/catalog.class.php:469 ../../lib/class/catalog.class.php:512
 msgid "Error: Unable to change to directory"
 msgstr "Error: Unable to change to directory"
 
-#: ../../lib/class/catalog.class.php:512
+#: ../../lib/class/catalog.class.php:548
 #, php-format
 msgid "Error: Unable to get filesize for %s"
 msgstr "Error: Unable to get filesize for %s"
 
-#: ../../lib/class/catalog.class.php:518
+#: ../../lib/class/catalog.class.php:554
 #, php-format
 msgid "%s is not readable by ampache"
 msgstr "%s is not readable by ampache"
 
-#: ../../lib/class/catalog.class.php:526
+#: ../../lib/class/catalog.class.php:562
 #, php-format
 msgid "%s does not match site charset"
 msgstr "%s does not match site charset"
 
-#: ../../lib/class/catalog.class.php:981
-#: ../../lib/class/catalog.class.php:1850 ../../preferences.php:111
+#: ../../lib/class/catalog.class.php:1029
+#: ../../lib/class/catalog.class.php:1869 ../../preferences.php:111
 #: ../../admin/access.php:109
 msgid "Updated"
 msgstr "Updated"
 
-#: ../../lib/class/catalog.class.php:988
+#: ../../lib/class/catalog.class.php:1036
 msgid "No Update Needed"
 msgstr "No Update Needed"
 
-#: ../../lib/class/catalog.class.php:1114
+#: ../../lib/class/catalog.class.php:1163
 msgid "Running Remote Update"
 msgstr "Running Remote Update"
 
-#: ../../lib/class/catalog.class.php:1141
+#: ../../lib/class/catalog.class.php:1190
 msgid "Added Playlist From"
 msgstr "Added Playlist From"
 
-#: ../../lib/class/catalog.class.php:1170
+#: ../../lib/class/catalog.class.php:1219
 msgid "Catalog Update Finished"
 msgstr "Catalog Update Finished"
 
-#: ../../lib/class/catalog.class.php:1170
+#: ../../lib/class/catalog.class.php:1219
 msgid "Total Time"
 msgstr "Total Time"
 
-#: ../../lib/class/catalog.class.php:1171
+#: ../../lib/class/catalog.class.php:1220
 msgid "Total Songs"
 msgstr "Total Songs"
 
-#: ../../lib/class/catalog.class.php:1171
+#: ../../lib/class/catalog.class.php:1220
 msgid "Songs Per Seconds"
 msgstr "Songs Per Seconds"
 
-#: ../../lib/class/catalog.class.php:1185
+#: ../../lib/class/catalog.class.php:1234
 msgid "Unable to load pear XMLRPC library, make sure XML-RPC is enabled"
 msgstr "Unable to load pear XMLRPC library, make sure XML-RPC is enabled"
 
-#: ../../lib/class/catalog.class.php:1217
-#: ../../lib/class/catalog.class.php:1291
-#: ../../lib/class/catalog.class.php:1324
+#: ../../lib/class/catalog.class.php:1266
+#: ../../lib/class/catalog.class.php:1340
+#: ../../lib/class/catalog.class.php:1373
 #: ../../lib/class/xmlrpcclient.class.php:64
 #: ../../lib/class/xmlrpcclient.class.php:97
 msgid "Error connecting to"
 msgstr "Error connecting to"
 
-#: ../../lib/class/catalog.class.php:1217
-#: ../../lib/class/catalog.class.php:1291
-#: ../../lib/class/catalog.class.php:1324
+#: ../../lib/class/catalog.class.php:1266
+#: ../../lib/class/catalog.class.php:1340
+#: ../../lib/class/catalog.class.php:1373
 #: ../../lib/class/xmlrpcclient.class.php:64
 #: ../../lib/class/xmlrpcclient.class.php:97
 msgid "Code"
 msgstr "Code"
 
-#: ../../lib/class/catalog.class.php:1217
-#: ../../lib/class/catalog.class.php:1291
-#: ../../lib/class/catalog.class.php:1324
+#: ../../lib/class/catalog.class.php:1266
+#: ../../lib/class/catalog.class.php:1340
+#: ../../lib/class/catalog.class.php:1373
 #: ../../lib/class/xmlrpcclient.class.php:64
 msgid "Reason"
 msgstr "Reason"
 
-#: ../../lib/class/catalog.class.php:1246
+#: ../../lib/class/catalog.class.php:1295
 msgid "Completed updating remote catalog(s)"
 msgstr "Completed updating remote catalog(s)"
 
-#: ../../lib/class/catalog.class.php:1250
+#: ../../lib/class/catalog.class.php:1299
 msgid "Starting synchronisation of album images"
 msgstr "Starting synchronisation of album images"
 
-#: ../../lib/class/catalog.class.php:1252
+#: ../../lib/class/catalog.class.php:1301
 msgid "Completed synchronisation of album images"
 msgstr "Completed synchronisation of album images"
 
-#: ../../lib/class/catalog.class.php:1287 ../../admin/access.php:93
+#: ../../lib/class/catalog.class.php:1336 ../../admin/access.php:93
 msgid "Added"
 msgstr "Added"
 
-#: ../../lib/class/catalog.class.php:1320
+#: ../../lib/class/catalog.class.php:1369
 msgid "images synchronized: "
 msgstr "images synchronized: "
 
-#: ../../lib/class/catalog.class.php:1449
+#: ../../lib/class/catalog.class.php:1498
 msgid "Catalog Root unreadable, stopping clean"
 msgstr "Catalog Root unreadable, stopping clean"
 
-#: ../../lib/class/catalog.class.php:1510
+#: ../../lib/class/catalog.class.php:1559
 msgid "Catalog Clean Done"
 msgstr "Catalog Clean Done"
 
-#: ../../lib/class/catalog.class.php:1510
+#: ../../lib/class/catalog.class.php:1559
 msgid "files removed"
 msgstr "files removed"
 
-#: ../../lib/class/catalog.class.php:1511
+#: ../../lib/class/catalog.class.php:1560
 msgid "Optimizing Tables"
 msgstr "Optimizing Tables"
 
-#: ../../lib/class/catalog.class.php:1850
+#: ../../lib/class/catalog.class.php:1869
 #, fuzzy
 msgid "Update Finished"
 msgstr "Update Finished."
 
-#: ../../lib/class/catalog.class.php:1850
+#: ../../lib/class/catalog.class.php:1869
 msgid "Checked"
 msgstr "Checked"
 
@@ -3412,12 +3480,8 @@ msgstr "Checked"
 msgid "Related Genre"
 msgstr "Related Genre"
 
-#: ../../lib/class/stream.class.php:399
-msgid "Ampache"
-msgstr "Ampache"
-
-#: ../../lib/class/vauth.class.php:478 ../../lib/class/vauth.class.php:502
-#: ../../lib/class/vauth.class.php:541
+#: ../../lib/class/vauth.class.php:480 ../../lib/class/vauth.class.php:504
+#: ../../lib/class/vauth.class.php:543
 msgid "Error Username or Password incorrect, please try again"
 msgstr "Error Username or Password incorrect, please try again"
 
@@ -3555,7 +3619,7 @@ msgstr "Unable to select database, check your ampache config"
 msgid "Existing Database detected, unable to continue installation"
 msgstr "Existing Database detected, unable to continue installation"
 
-#: ../../lib/install.php:135 ../../install.php:93
+#: ../../lib/install.php:135 ../../install.php:94
 msgid "Error: Unable to make Database Connection"
 msgstr "Error: Unable to make Database Connection"
 
@@ -3571,11 +3635,11 @@ msgstr "Passwords do not match"
 msgid "Invalid Object Selected"
 msgstr "Invalid Object Selected"
 
-#: ../../server/xml.server.php:85
+#: ../../server/xml.server.php:80
 msgid "Error Invalid Handshake - "
 msgstr "Error Invalid Handshake - "
 
-#: ../../server/xml.server.php:315
+#: ../../server/xml.server.php:321 ../../server/xml.server.php:328
 msgid "Invalid Request"
 msgstr "Invalid Request"
 
@@ -3599,7 +3663,7 @@ msgstr "Session Expired: please log in again at"
 msgid "Radio Station Added"
 msgstr "Radio Station Added"
 
-#: ../../install.php:176
+#: ../../install.php:177
 msgid "Error: Config file not found or Unreadable"
 msgstr "Error: Config file not found or Unreadable"
 
@@ -4097,6 +4161,28 @@ msgstr "System"
 msgid "Show Lyrics"
 msgstr "Show Playlist"
 
+#~ msgid "System Checks"
+#~ msgstr "System Checks"
+
+#~ msgid "WARNING: This server will use gettext emulator."
+#~ msgstr "WARNING: This server will use gettext emulator."
+
+#~ msgid "Ampache does not <strong>run</strong> correctly by this server."
+#~ msgstr "Ampache does not <strong>run</strong> correctly by this server."
+
+#~ msgid "Please contact your server administrator, and fix them."
+#~ msgstr "Please contact your server administrator, and fix them."
+
+#~ msgid "Genres"
+#~ msgstr "Genres"
+
+#~ msgid "Ampache"
+#~ msgstr "Ampache"
+
+#, fuzzy
+#~ msgid "Last Updated"
+#~ msgstr "Flags Updated"
+
 #, fuzzy
 #~ msgid "Lyrics %s"
 #~ msgstr "Show Playlist"