Updated: message merged r1861

2 files changed, 146 insertions, 119 deletions

diff --git a/locale/en_GB/LC_MESSAGES/messages.mo b/locale/en_GB/LC_MESSAGES/messages.mo
index f5e2bff6..f5443f47 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 9fe3225d..d09bc4f5 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-02 07:43+0900\n"
+"POT-Creation-Date: 2009-02-05 10:49+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,8 +30,11 @@ 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_add_live_stream.inc.php:68
 #: ../../templates/show_catalog_row.inc.php:28
+#: ../../templates/show_video_row.inc.php:23
 #: ../../templates/show_artist_row.inc.php:23
 #: ../../templates/show_genres.inc.php:36
 #: ../../templates/show_genres.inc.php:72
@@ -51,15 +54,15 @@ msgid "Add"
 msgstr "Add"
 
 #: ../../templates/show_album_row.inc.php:24
-#: ../../templates/sidebar_home.inc.php:102
+#: ../../templates/sidebar_home.inc.php:103
 #: ../../templates/show_artist_row.inc.php:24
-#: ../../templates/show_localplay_status.inc.php:36
+#: ../../templates/show_localplay_status.inc.php:43
 #: ../../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:494
+#: ../../modules/localplay/httpq.controller.php:493
 msgid "Random"
 msgstr "Random"
 
@@ -98,14 +101,14 @@ msgstr "Editing %s preferences"
 #: ../../templates/show_preference_box.inc.php:70
 #: ../../templates/show_preference_admin.inc.php:30
 #: ../../templates/show_preference_admin.inc.php:49
-#: ../../templates/show_debug.inc.php:85
+#: ../../templates/show_debug.inc.php:93
 msgid "Preference"
 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_debug.inc.php:37 ../../templates/show_debug.inc.php:86
+#: ../../templates/show_debug.inc.php:45 ../../templates/show_debug.inc.php:94
 msgid "Value"
 msgstr "Value"
 
@@ -310,7 +313,7 @@ msgstr "Cover"
 
 #: ../../templates/show_albums.inc.php:44
 #: ../../templates/show_albums.inc.php:75
-#: ../../templates/sidebar_home.inc.php:104
+#: ../../templates/sidebar_home.inc.php:105
 #: ../../templates/show_edit_song.inc.php:37
 #: ../../templates/show_play_selected.inc.php:59
 #: ../../templates/show_search.inc.php:50
@@ -333,8 +336,8 @@ 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:79
-#: ../../templates/sidebar_home.inc.php:105
+#: ../../templates/sidebar_home.inc.php:80
+#: ../../templates/sidebar_home.inc.php:106
 #: ../../templates/show_similar_artists.inc.php:33
 #: ../../templates/show_similar_artists.inc.php:86
 #: ../../templates/show_edit_song.inc.php:45
@@ -363,7 +366,7 @@ msgstr "Artist"
 #: ../../templates/show_genre.inc.php:38
 #: ../../templates/show_genres.inc.php:38
 #: ../../templates/show_genres.inc.php:74
-#: ../../lib/class/browse.class.php:1081
+#: ../../lib/class/browse.class.php:1096
 msgid "Songs"
 msgstr "Songs"
 
@@ -380,6 +383,8 @@ 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_random.inc.php:41
 msgid "Tags"
@@ -410,8 +415,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_objects.inc.php:44
-#: ../../templates/rightbar.inc.php:106 ../../templates/show_genres.inc.php:68
+#: ../../templates/rightbar.inc.php:108 ../../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
@@ -479,8 +485,8 @@ msgstr "Last Ip"
 #: ../../templates/show_genres.inc.php:39
 #: ../../templates/show_genres.inc.php:75
 #: ../../templates/show_localplay_instances.inc.php:29
-#: ../../templates/show_localplay_playlist.inc.php:33
-#: ../../templates/show_localplay_playlist.inc.php:59
+#: ../../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
 #: ../../templates/show_song.inc.php:27
 #: ../../templates/show_admin_tools.inc.php:34
@@ -499,8 +505,8 @@ 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:152
-#: ../../lib/class/catalog.class.php:153 ../../lib/preferences.php:261
+#: ../../lib/class/user.class.php:663 ../../lib/class/catalog.class.php:161
+#: ../../lib/class/catalog.class.php:162 ../../lib/preferences.php:261
 msgid "Never"
 msgstr "Never"
 
@@ -508,7 +514,7 @@ msgstr "Never"
 #: ../../lib/class/flag.class.php:282 ../../lib/class/localplay.class.php:648
 #: ../../lib/class/user.class.php:667 ../../lib/general.lib.php:337
 #: ../../modules/localplay/mpd.controller.php:511
-#: ../../modules/localplay/httpq.controller.php:510
+#: ../../modules/localplay/httpq.controller.php:508
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -635,8 +641,8 @@ msgstr "Update User"
 #: ../../templates/show_account.inc.php:27
 #: ../../templates/show_edit_album.inc.php:27
 #: ../../templates/show_add_access_current.inc.php:26
-#: ../../templates/show_localplay_playlist.inc.php:32
-#: ../../templates/show_localplay_playlist.inc.php:58
+#: ../../templates/show_localplay_playlist.inc.php:34
+#: ../../templates/show_localplay_playlist.inc.php:60
 #: ../../templates/show_add_playlist.inc.php:28
 #: ../../templates/show_admin_tools.inc.php:33
 #: ../../templates/show_admin_tools.inc.php:73
@@ -689,7 +695,7 @@ msgstr "Activate"
 #: ../../templates/show_localplay_controllers.inc.php:59
 #: ../../templates/show_plugins.inc.php:57
 #: ../../templates/show_flagged.inc.php:49
-#: ../../templates/show_localplay_playlist.inc.php:53
+#: ../../templates/show_localplay_playlist.inc.php:55
 #: ../../templates/show_disabled_songs.inc.php:52
 #: ../../templates/show_manage_shoutbox.inc.php:54
 msgid "No Records Found"
@@ -726,10 +732,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:76
+#: ../../templates/sidebar_home.inc.php:77
 #: ../../templates/show_local_catalog_info.inc.php:29
 #: ../../templates/show_genre.inc.php:32 ../../lib/ui.lib.php:408
-#: ../../lib/class/browse.class.php:1087
+#: ../../lib/class/browse.class.php:1102
 msgid "Albums"
 msgstr "Albums"
 
@@ -754,6 +760,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_edit_song.inc.php:31
 #: ../../templates/show_search.inc.php:40
 #: ../../templates/show_disabled_songs.inc.php:34
@@ -829,7 +837,7 @@ msgid "Browse"
 msgstr "Browse"
 
 #: ../../templates/sidebar_home.inc.php:32
-#: ../../templates/sidebar_home.inc.php:73
+#: ../../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
@@ -837,72 +845,76 @@ msgid "Song Title"
 msgstr "Song Title"
 
 #: ../../templates/sidebar_home.inc.php:35
-#: ../../lib/class/browse.class.php:1141
+#: ../../lib/class/browse.class.php:1156
 msgid "Tag Cloud"
 msgstr "Tag Cloud"
 
 #: ../../templates/sidebar_home.inc.php:36
-#: ../../templates/sidebar_home.inc.php:85
-#: ../../templates/sidebar_home.inc.php:106
+#: ../../templates/sidebar_home.inc.php:86
+#: ../../templates/sidebar_home.inc.php:107
 #: ../../templates/show_manage_democratic.inc.php:34
 #: ../../templates/show_play_selected.inc.php:47 ../../lib/ui.lib.php:367
 msgid "Playlist"
 msgstr "Playlist"
 
 #: ../../templates/sidebar_home.inc.php:37
-#: ../../lib/class/browse.class.php:1104
+#: ../../lib/class/browse.class.php:1119
 msgid "Radio Stations"
 msgstr "Radio Stations"
 
-#: ../../templates/sidebar_home.inc.php:41
+#: ../../templates/sidebar_home.inc.php:38
+msgid "Video"
+msgstr "Video"
+
+#: ../../templates/sidebar_home.inc.php:42
 msgid "Filters"
 msgstr "Filters"
 
-#: ../../templates/sidebar_home.inc.php:45
+#: ../../templates/sidebar_home.inc.php:46
 msgid "Starts With"
 msgstr "Starts With"
 
-#: ../../templates/sidebar_home.inc.php:51
+#: ../../templates/sidebar_home.inc.php:52
 msgid "Minimum Count"
 msgstr "Minimum Count"
 
-#: ../../templates/sidebar_home.inc.php:55
+#: ../../templates/sidebar_home.inc.php:56
 msgid "Rated"
 msgstr "Rated"
 
-#: ../../templates/sidebar_home.inc.php:59
+#: ../../templates/sidebar_home.inc.php:60
 msgid "Unplayed"
 msgstr "Unplayed"
 
-#: ../../templates/sidebar_home.inc.php:63
+#: ../../templates/sidebar_home.inc.php:64
 #: ../../templates/show_artist.inc.php:55
 msgid "Show Art"
 msgstr "Show Art"
 
-#: ../../templates/sidebar_home.inc.php:68
+#: ../../templates/sidebar_home.inc.php:69
 msgid "All Playlists"
 msgstr "All Playlists"
 
-#: ../../templates/sidebar_home.inc.php:87
+#: ../../templates/sidebar_home.inc.php:88
 msgid "Currently Playing"
 msgstr "Currently Playing"
 
-#: ../../templates/sidebar_home.inc.php:89
+#: ../../templates/sidebar_home.inc.php:90
 #: ../../templates/show_playtype_switch.inc.php:36
 #: ../../templates/sidebar_modules.inc.php:46 ../../lib/preferences.php:179
 #: ../../modules/localplay/mpd.controller.php:491
-#: ../../modules/localplay/httpq.controller.php:490
+#: ../../modules/localplay/httpq.controller.php:489
 msgid "Democratic"
 msgstr "Democratic"
 
-#: ../../templates/sidebar_home.inc.php:98
+#: ../../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:107
+#: ../../templates/sidebar_home.inc.php:108
 msgid "Advanced"
 msgstr "Advanced"
 
@@ -1252,6 +1264,16 @@ msgstr "Queries:"
 msgid "Cache Hits:"
 msgstr "Cache Hits:"
 
+#: ../../templates/show_videos.inc.php:36
+#: ../../templates/show_videos.inc.php:58
+msgid "Codec"
+msgstr "Codec"
+
+#: ../../templates/show_videos.inc.php:37
+#: ../../templates/show_videos.inc.php:59
+msgid "Resolution"
+msgstr "Resolution"
+
 #: ../../templates/show_add_access_rpc.inc.php:22
 #: ../../templates/show_access_list.inc.php:36
 #: ../../templates/show_access_list.inc.php:37
@@ -1393,12 +1415,12 @@ msgstr "Item"
 msgid "Reason to flag"
 msgstr "Reason to flag"
 
-#: ../../templates/show_flag.inc.php:56 ../../templates/rightbar.inc.php:103
+#: ../../templates/show_flag.inc.php:56 ../../templates/rightbar.inc.php:105
 #: ../../templates/show_catalog_row.inc.php:33
 #: ../../templates/show_democratic_playlist.inc.php:78
 #: ../../templates/show_live_stream_row.inc.php:34
 #: ../../templates/show_localplay_instances.inc.php:40
-#: ../../templates/show_localplay_playlist.inc.php:48
+#: ../../templates/show_localplay_playlist.inc.php:50
 #: ../../templates/show_playlist_song_row.inc.php:38
 #: ../../templates/show_playlist_row.inc.php:38
 #: ../../templates/show_admin_tools.inc.php:53
@@ -1593,7 +1615,7 @@ msgstr "Advanced Add"
 
 #: ../../templates/sidebar_admin.inc.php:24
 #: ../../templates/show_admin_tools.inc.php:26
-#: ../../lib/class/browse.class.php:1125
+#: ../../lib/class/browse.class.php:1140
 msgid "Catalogs"
 msgstr "Catalogs"
 
@@ -1682,7 +1704,7 @@ 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:1098 ../../lib/class/album.class.php:256
+#: ../../lib/class/browse.class.php:1113 ../../lib/class/album.class.php:256
 msgid "Artists"
 msgstr "Artists"
 
@@ -1713,7 +1735,7 @@ msgid "Optional"
 msgstr "Optional"
 
 #: ../../templates/show_install_lang.inc.php:121
-#: ../../templates/show_debug.inc.php:72
+#: ../../templates/show_debug.inc.php:80
 msgid "Gettext Support"
 msgstr "Gettext Support"
 
@@ -1750,7 +1772,7 @@ msgid "Add to New Playlist"
 msgstr "Add to New Playlist"
 
 #: ../../templates/rightbar.inc.php:54
-#: ../../templates/show_localplay_status.inc.php:39
+#: ../../templates/show_localplay_status.inc.php:46
 msgid "Clear Playlist"
 msgstr "Clear Playlist"
 
@@ -1758,15 +1780,15 @@ msgstr "Clear Playlist"
 msgid "Add Dynamic Items"
 msgstr "Add Dynamic Items"
 
-#: ../../templates/rightbar.inc.php:60 ../../lib/class/random.class.php:432
+#: ../../templates/rightbar.inc.php:60 ../../lib/class/random.class.php:416
 msgid "Pure Random"
 msgstr "Pure Random"
 
-#: ../../templates/rightbar.inc.php:63 ../../lib/class/random.class.php:429
+#: ../../templates/rightbar.inc.php:63 ../../lib/class/random.class.php:413
 msgid "Related Artist"
 msgstr "Related Artist"
 
-#: ../../templates/rightbar.inc.php:66 ../../lib/class/random.class.php:423
+#: ../../templates/rightbar.inc.php:66 ../../lib/class/random.class.php:407
 msgid "Related Album"
 msgstr "Related Album"
 
@@ -1774,11 +1796,12 @@ msgstr "Related Album"
 msgid "Related Tag"
 msgstr "Related Tag"
 
-#: ../../templates/rightbar.inc.php:110
+#: ../../templates/rightbar.inc.php:112
 msgid "More"
 msgstr "More"
 
 #: ../../templates/header.inc.php:35
+#: ../../templates/show_localplay_status.inc.php:26
 #: ../../templates/show_now_playing.inc.php:33
 #: ../../lib/class/localplay.class.php:639
 #: ../../lib/class/ampacherss.class.php:70
@@ -1928,8 +1951,8 @@ msgid "Genre"
 msgstr "Genre"
 
 #: ../../templates/show_edit_song.inc.php:61
-#: ../../templates/show_localplay_playlist.inc.php:31
-#: ../../templates/show_localplay_playlist.inc.php:57
+#: ../../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
 #: ../../templates/show_playlist_songs.inc.php:41
 #: ../../templates/show_playlist_songs.inc.php:46
@@ -2140,23 +2163,23 @@ msgstr "Select"
 msgid "Localplay Control"
 msgstr "Localplay Control"
 
-#: ../../templates/show_localplay_status.inc.php:28
+#: ../../templates/show_localplay_status.inc.php:30
 msgid "Mute"
 msgstr "Mute"
 
-#: ../../templates/show_localplay_status.inc.php:29
+#: ../../templates/show_localplay_status.inc.php:31
 msgid "Decrease Volume"
 msgstr "Decrease Volume"
 
-#: ../../templates/show_localplay_status.inc.php:30
+#: ../../templates/show_localplay_status.inc.php:32
 msgid "Increase Volume"
 msgstr "Increase Volume"
 
-#: ../../templates/show_localplay_status.inc.php:31
+#: ../../templates/show_localplay_status.inc.php:33
 msgid "Volume"
 msgstr "Volume"
 
-#: ../../templates/show_localplay_status.inc.php:33
+#: ../../templates/show_localplay_status.inc.php:38
 msgid "Repeat"
 msgstr "Repeat"
 
@@ -2652,8 +2675,8 @@ msgid "Disk"
 msgstr "Disk"
 
 #: ../../templates/show_album.inc.php:34
-#: ../../lib/class/catalog.class.php:1931
-#: ../../lib/class/catalog.class.php:2002
+#: ../../lib/class/catalog.class.php:1940
+#: ../../lib/class/catalog.class.php:2011
 msgid "Unknown (Orphaned)"
 msgstr "Unknown (Orphaned)"
 
@@ -2917,59 +2940,59 @@ msgstr "Return to Login Page"
 msgid "Debug Tools"
 msgstr "Debug Tools"
 
-#: ../../templates/show_debug.inc.php:25
+#: ../../templates/show_debug.inc.php:28
 msgid "Generate Configuration"
 msgstr "Generate Configuration"
 
-#: ../../templates/show_debug.inc.php:26
+#: ../../templates/show_debug.inc.php:32
 msgid "Set Database Charset"
 msgstr "Set Database Charset"
 
-#: ../../templates/show_debug.inc.php:29
+#: ../../templates/show_debug.inc.php:37
 msgid "PHP Settings"
 msgstr "PHP Settings"
 
-#: ../../templates/show_debug.inc.php:36
+#: ../../templates/show_debug.inc.php:44
 msgid "Setting"
 msgstr "Setting"
 
-#: ../../templates/show_debug.inc.php:40
+#: ../../templates/show_debug.inc.php:48
 msgid "Memory Limit"
 msgstr "Memory Limit"
 
-#: ../../templates/show_debug.inc.php:44
+#: ../../templates/show_debug.inc.php:52
 msgid "Maximum Execution Time"
 msgstr "Maximum Execution Time"
 
-#: ../../templates/show_debug.inc.php:48
+#: ../../templates/show_debug.inc.php:56
 msgid "Override Execution Time"
 msgstr "Override Execution Time"
 
-#: ../../templates/show_debug.inc.php:49
+#: ../../templates/show_debug.inc.php:57
 msgid "Failed"
 msgstr "Failed"
 
-#: ../../templates/show_debug.inc.php:49
+#: ../../templates/show_debug.inc.php:57
 msgid "Succeeded"
 msgstr "Succeeded"
 
-#: ../../templates/show_debug.inc.php:52
+#: ../../templates/show_debug.inc.php:60
 msgid "Safe Mode"
 msgstr "Safe Mode"
 
-#: ../../templates/show_debug.inc.php:60
+#: ../../templates/show_debug.inc.php:68
 msgid "Zlib Support"
 msgstr "Zlib Support"
 
-#: ../../templates/show_debug.inc.php:64
+#: ../../templates/show_debug.inc.php:72
 msgid "GD Support"
 msgstr "GD Support"
 
-#: ../../templates/show_debug.inc.php:68
+#: ../../templates/show_debug.inc.php:76
 msgid "Iconv Support"
 msgstr "Iconv Support"
 
-#: ../../templates/show_debug.inc.php:78
+#: ../../templates/show_debug.inc.php:86
 msgid "Current Configuration"
 msgstr "Current Configuration"
 
@@ -3151,30 +3174,34 @@ msgstr "Browse Music"
 msgid "Add New"
 msgstr "Add New"
 
-#: ../../lib/class/browse.class.php:1093
+#: ../../lib/class/browse.class.php:1108
 msgid "Manage Users"
 msgstr "Manage Users"
 
-#: ../../lib/class/browse.class.php:1110
+#: ../../lib/class/browse.class.php:1125
 msgid "Playlists"
 msgstr "Playlists"
 
-#: ../../lib/class/browse.class.php:1115
+#: ../../lib/class/browse.class.php:1130
 msgid "Playlist Songs"
 msgstr "Playlist Songs"
 
-#: ../../lib/class/browse.class.php:1120
+#: ../../lib/class/browse.class.php:1135
 msgid "Current Playlist"
 msgstr "Current Playlist"
 
-#: ../../lib/class/browse.class.php:1130
+#: ../../lib/class/browse.class.php:1145
 msgid "Shoutbox Records"
 msgstr "Shoutbox Records"
 
-#: ../../lib/class/browse.class.php:1135
+#: ../../lib/class/browse.class.php:1150
 msgid "Flagged Records"
 msgstr "Flagged Records"
 
+#: ../../lib/class/browse.class.php:1161
+msgid "Videos"
+msgstr "Videos"
+
 #: ../../lib/class/access.class.php:102 ../../lib/class/access.class.php:106
 #: ../../lib/class/access.class.php:146 ../../lib/class/access.class.php:150
 msgid "Invalid IPv4 / IPv6 Address Entered"
@@ -3223,8 +3250,8 @@ 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:433
-#: ../../lib/class/catalog.class.php:783
+#: ../../lib/class/album.class.php:479 ../../lib/class/catalog.class.php:442
+#: ../../lib/class/catalog.class.php:792
 msgid "Error: Unable to open"
 msgstr "Error: Unable to open"
 
@@ -3232,154 +3259,154 @@ msgstr "Error: Unable to open"
 msgid "RSS Feed"
 msgstr "RSS Feed"
 
-#: ../../lib/class/catalog.class.php:211
+#: ../../lib/class/catalog.class.php:220
 msgid "day"
 msgid_plural "days"
 msgstr[0] "day"
 msgstr[1] "days"
 
-#: ../../lib/class/catalog.class.php:213
+#: ../../lib/class/catalog.class.php:222
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: ../../lib/class/catalog.class.php:313
+#: ../../lib/class/catalog.class.php:322
 msgid "Running Remote Sync"
 msgstr "Running Remote Sync"
 
-#: ../../lib/class/catalog.class.php:440 ../../lib/class/catalog.class.php:483
+#: ../../lib/class/catalog.class.php:449 ../../lib/class/catalog.class.php:492
 msgid "Error: Unable to change to directory"
 msgstr "Error: Unable to change to directory"
 
-#: ../../lib/class/catalog.class.php:519
+#: ../../lib/class/catalog.class.php:528
 #, php-format
 msgid "Error: Unable to get filesize for %s"
 msgstr "Error: Unable to get filesize for %s"
 
-#: ../../lib/class/catalog.class.php:525
+#: ../../lib/class/catalog.class.php:534
 #, php-format
 msgid "%s is not readable by ampache"
 msgstr "%s is not readable by ampache"
 
-#: ../../lib/class/catalog.class.php:533
+#: ../../lib/class/catalog.class.php:542
 #, php-format
 msgid "%s does not match site charset"
 msgstr "%s does not match site charset"
 
-#: ../../lib/class/catalog.class.php:1072 ../../preferences.php:111
+#: ../../lib/class/catalog.class.php:1081 ../../preferences.php:111
 #: ../../admin/access.php:109
 msgid "Updated"
 msgstr "Updated"
 
-#: ../../lib/class/catalog.class.php:1079
+#: ../../lib/class/catalog.class.php:1088
 msgid "No Update Needed"
 msgstr "No Update Needed"
 
-#: ../../lib/class/catalog.class.php:1179
+#: ../../lib/class/catalog.class.php:1188
 msgid "Running Remote Update"
 msgstr "Running Remote Update"
 
-#: ../../lib/class/catalog.class.php:1206
+#: ../../lib/class/catalog.class.php:1215
 msgid "Added Playlist From"
 msgstr "Added Playlist From"
 
-#: ../../lib/class/catalog.class.php:1235
+#: ../../lib/class/catalog.class.php:1244
 msgid "Catalog Update Finished"
 msgstr "Catalog Update Finished"
 
-#: ../../lib/class/catalog.class.php:1235
+#: ../../lib/class/catalog.class.php:1244
 msgid "Total Time"
 msgstr "Total Time"
 
-#: ../../lib/class/catalog.class.php:1236
+#: ../../lib/class/catalog.class.php:1245
 msgid "Total Songs"
 msgstr "Total Songs"
 
-#: ../../lib/class/catalog.class.php:1236
+#: ../../lib/class/catalog.class.php:1245
 msgid "Songs Per Seconds"
 msgstr "Songs Per Seconds"
 
-#: ../../lib/class/catalog.class.php:1250 ../../admin/users.php:142
+#: ../../lib/class/catalog.class.php:1259 ../../admin/users.php:142
 msgid "Error"
 msgstr "Error"
 
-#: ../../lib/class/catalog.class.php:1250
+#: ../../lib/class/catalog.class.php:1259
 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:1282
-#: ../../lib/class/catalog.class.php:1356
-#: ../../lib/class/catalog.class.php:1389
+#: ../../lib/class/catalog.class.php:1291
+#: ../../lib/class/catalog.class.php:1365
+#: ../../lib/class/catalog.class.php:1398
 #: ../../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:1282
-#: ../../lib/class/catalog.class.php:1356
-#: ../../lib/class/catalog.class.php:1389
+#: ../../lib/class/catalog.class.php:1291
+#: ../../lib/class/catalog.class.php:1365
+#: ../../lib/class/catalog.class.php:1398
 #: ../../lib/class/xmlrpcclient.class.php:64
 #: ../../lib/class/xmlrpcclient.class.php:97
 msgid "Code"
 msgstr "Code"
 
-#: ../../lib/class/catalog.class.php:1282
-#: ../../lib/class/catalog.class.php:1356
-#: ../../lib/class/catalog.class.php:1389
+#: ../../lib/class/catalog.class.php:1291
+#: ../../lib/class/catalog.class.php:1365
+#: ../../lib/class/catalog.class.php:1398
 #: ../../lib/class/xmlrpcclient.class.php:64
 msgid "Reason"
 msgstr "Reason"
 
-#: ../../lib/class/catalog.class.php:1311
+#: ../../lib/class/catalog.class.php:1320
 msgid "Completed updating remote catalog(s)"
 msgstr "Completed updating remote catalog(s)"
 
-#: ../../lib/class/catalog.class.php:1315
+#: ../../lib/class/catalog.class.php:1324
 msgid "Starting synchronisation of album images"
 msgstr "Starting synchronisation of album images"
 
-#: ../../lib/class/catalog.class.php:1317
+#: ../../lib/class/catalog.class.php:1326
 msgid "Completed synchronisation of album images"
 msgstr "Completed synchronisation of album images"
 
-#: ../../lib/class/catalog.class.php:1352 ../../admin/access.php:93
+#: ../../lib/class/catalog.class.php:1361 ../../admin/access.php:93
 msgid "Added"
 msgstr "Added"
 
-#: ../../lib/class/catalog.class.php:1385
+#: ../../lib/class/catalog.class.php:1394
 msgid "images synchronized: "
 msgstr "images synchronized: "
 
-#: ../../lib/class/catalog.class.php:1514
+#: ../../lib/class/catalog.class.php:1523
 msgid "Catalog Root unreadable, stopping clean"
 msgstr "Catalog Root unreadable, stopping clean"
 
-#: ../../lib/class/catalog.class.php:1571
+#: ../../lib/class/catalog.class.php:1580
 msgid "Catalog Clean Done"
 msgstr "Catalog Clean Done"
 
-#: ../../lib/class/catalog.class.php:1571
+#: ../../lib/class/catalog.class.php:1580
 msgid "files removed"
 msgstr "files removed"
 
-#: ../../lib/class/catalog.class.php:1572
+#: ../../lib/class/catalog.class.php:1581
 msgid "Optimizing Tables"
 msgstr "Optimizing Tables"
 
-#: ../../lib/class/catalog.class.php:1872
+#: ../../lib/class/catalog.class.php:1881
 msgid "Update Finished."
 msgstr "Update Finished."
 
-#: ../../lib/class/catalog.class.php:1872
+#: ../../lib/class/catalog.class.php:1881
 msgid "Checked"
 msgstr "Checked"
 
-#: ../../lib/class/catalog.class.php:1872
+#: ../../lib/class/catalog.class.php:1881
 msgid "songs updated."
 msgstr "songs updated."
 
-#: ../../lib/class/random.class.php:426
+#: ../../lib/class/random.class.php:410
 msgid "Related Genre"
 msgstr "Related Genre"
 
@@ -3562,7 +3589,7 @@ msgstr "Error Update Failed"
 msgid "Your Account has been updated"
 msgstr "Your Account has been updated"
 
-#: ../../play/index.php:81
+#: ../../play/index.php:82
 msgid "Session Expired: please log in again at"
 msgstr "Session Expired: please log in again at"