update languages

1 files changed, 2238 insertions, 1817 deletions

diff --git a/locale/base/messages.pot b/locale/base/messages.pot
index c9cd31d8..0fdfd37e 100644
--- a/locale/base/messages.pot
+++ b/locale/base/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2011-02-05 10:48+0900\n"
+"POT-Creation-Date: 2011-10-11 14:17+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,40 +18,40 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../flag.php:56
+#: ../../flag.php:51
 msgid "Item Flagged"
 msgstr ""
 
-#: ../../flag.php:56
+#: ../../flag.php:51
 msgid "The specified item has been flagged"
 msgstr ""
 
-#: ../../playlist.php:77
+#: ../../playlist.php:72
 msgid "Playlist Created"
 msgstr ""
 
-#: ../../playlist.php:77
+#: ../../playlist.php:72
 #, php-format
 msgid "%1$s (%2$s) has been created"
 msgstr ""
 
-#: ../../playlist.php:113
+#: ../../playlist.php:108
 msgid "Playlist Not Imported"
 msgstr ""
 
-#: ../../playlist.php:117
+#: ../../playlist.php:112
 msgid "Playlist Imported"
 msgstr ""
 
-#: ../../playlist.php:149
+#: ../../playlist.php:144
 msgid "Empty Playlists Deleted"
 msgstr ""
 
-#: ../../update.php:60 ../../update.php:64
+#: ../../update.php:55 ../../update.php:59
 msgid "Ampache Update"
 msgstr ""
 
-#: ../../update.php:69
+#: ../../update.php:64
 #, php-format
 msgid ""
 "This page handles all database updates to Ampache starting with "
@@ -59,622 +59,892 @@ msgid ""
 "is: <strong>%s</strong>."
 msgstr ""
 
-#: ../../update.php:70
+#: ../../update.php:65
 msgid "the following updates need to be performed"
 msgstr ""
 
-#: ../../update.php:77
+#: ../../update.php:72
 msgid "Update Now!"
 msgstr ""
 
-#: ../../update.php:81
+#: ../../update.php:76
 msgid "Ampache Installation."
 msgstr ""
 
-#: ../../shout.php:60
+#: ../../shout.php:55
 msgid "Invalid Object Selected"
 msgstr ""
 
-#: ../../lib/general.lib.php:247 ../../lib/class/flag.class.php:359
-#: ../../lib/class/localplay.class.php:674 ../../lib/class/user.class.php:710
-#: ../../templates/show_user.inc.php:35 ../../templates/show_users.inc.php:66
-#: ../../modules/localplay/mpd.controller.php:513
+#: ../../lib/general.lib.php:241 ../../lib/class/flag.class.php:350
+#: ../../lib/class/localplay.class.php:665 ../../lib/class/user.class.php:701
+#: ../../templates/show_user.inc.php:30 ../../templates/show_users.inc.php:61
+#: ../../modules/localplay/mpd.controller.php:506
 msgid "Unknown"
 msgstr ""
 
-#: ../../lib/rating.lib.php:63
+#: ../../lib/rating.lib.php:58
 msgid "Don't Play"
 msgstr ""
 
-#: ../../lib/rating.lib.php:66
+#: ../../lib/rating.lib.php:61
 msgid "It's Pretty Bad"
 msgstr ""
 
-#: ../../lib/rating.lib.php:69
+#: ../../lib/rating.lib.php:64
 msgid "It's Ok"
 msgstr ""
 
-#: ../../lib/rating.lib.php:72
+#: ../../lib/rating.lib.php:67
 msgid "It's Pretty Good"
 msgstr ""
 
-#: ../../lib/rating.lib.php:75
+#: ../../lib/rating.lib.php:70
 msgid "I Love It!"
 msgstr ""
 
-#: ../../lib/rating.lib.php:78
+#: ../../lib/rating.lib.php:73
 msgid "It's Insane"
 msgstr ""
 
-#: ../../lib/rating.lib.php:82
+#: ../../lib/rating.lib.php:77
 msgid "Off the Charts!"
 msgstr ""
 
-#: ../../lib/install.php:83
+#: ../../lib/install.php:78
 msgid "Config file already exists, install is probably completed"
 msgstr ""
 
-#: ../../lib/install.php:94
+#: ../../lib/install.php:89
 msgid "Unable to connect to database, check your ampache config"
 msgstr ""
 
-#: ../../lib/install.php:101
+#: ../../lib/install.php:96
 msgid "Unable to select database, check your ampache config"
 msgstr ""
 
-#: ../../lib/install.php:111
+#: ../../lib/install.php:106
 msgid "Existing Database detected, unable to continue installation"
 msgstr ""
 
-#: ../../lib/install.php:148 ../../install.php:121
+#: ../../lib/install.php:143 ../../install.php:116
 msgid "Error: Unable to make Database Connection"
 msgstr ""
 
-#: ../../lib/install.php:307
+#: ../../lib/install.php:302
 msgid "No Username/Password specified"
 msgstr ""
 
-#: ../../lib/install.php:312
+#: ../../lib/install.php:307
 msgid "Passwords do not match"
 msgstr ""
 
-#: ../../lib/preferences.php:179 ../../lib/preferences.php:298
-#: ../../templates/show_flag_row.inc.php:45
-#: ../../templates/show_user_row.inc.php:56
+#: ../../lib/javascript/search-data.php:48
+#: ../../templates/show_disabled_songs.inc.php:74
+msgid "Remove"
+msgstr ""
+
+#: ../../lib/preferences.php:174 ../../lib/preferences.php:293
+#: ../../templates/show_flag_row.inc.php:40
+#: ../../templates/show_user_row.inc.php:51
 msgid "Enable"
 msgstr ""
 
-#: ../../lib/preferences.php:180 ../../lib/preferences.php:299
-#: ../../templates/show_localplay_controllers.inc.php:57
-#: ../../templates/show_duplicates.inc.php:49
-#: ../../templates/show_duplicates.inc.php:88
-#: ../../templates/show_user_row.inc.php:59
+#: ../../lib/preferences.php:175 ../../lib/preferences.php:294
+#: ../../templates/show_localplay_controllers.inc.php:52
+#: ../../templates/show_duplicates.inc.php:44
+#: ../../templates/show_duplicates.inc.php:83
+#: ../../templates/show_user_row.inc.php:54
 msgid "Disable"
 msgstr ""
 
-#: ../../lib/preferences.php:189 ../../lib/preferences.php:231
-#: ../../lib/ui.lib.php:455 ../../templates/sidebar_localplay.inc.php:57
-#: ../../templates/show_gather_art.inc.php:36
-#: ../../templates/show_adds_catalog.inc.php:38
+#: ../../lib/preferences.php:184 ../../lib/preferences.php:226
+#: ../../lib/ui.lib.php:450 ../../templates/sidebar_localplay.inc.php:52
+#: ../../templates/show_gather_art.inc.php:31
+#: ../../templates/show_adds_catalog.inc.php:33
 msgid "None"
 msgstr ""
 
-#: ../../lib/preferences.php:191 ../../templates/show_edit_user.inc.php:108
-#: ../../templates/show_playtype_switch.inc.php:45
+#: ../../lib/preferences.php:186 ../../templates/show_edit_user.inc.php:103
+#: ../../templates/show_playtype_switch.inc.php:40
 msgid "Stream"
 msgstr ""
 
-#: ../../lib/preferences.php:194 ../../templates/sidebar_modules.inc.php:53
-#: ../../templates/sidebar_home.inc.php:61
-#: ../../templates/show_edit_user.inc.php:105
-#: ../../templates/show_playtype_switch.inc.php:49
-#: ../../modules/localplay/httpq.controller.php:510
-#: ../../modules/localplay/mpd.controller.php:479
-#: ../../modules/localplay/vlc.controller.php:542
+#: ../../lib/preferences.php:189 ../../templates/sidebar_modules.inc.php:48
+#: ../../templates/sidebar_home.inc.php:57
+#: ../../templates/show_edit_user.inc.php:100
+#: ../../templates/show_playtype_switch.inc.php:44
+#: ../../modules/localplay/httpq.controller.php:503
+#: ../../modules/localplay/mpd.controller.php:472
+#: ../../modules/localplay/vlc.controller.php:535
 msgid "Democratic"
 msgstr ""
 
-#: ../../lib/preferences.php:197 ../../templates/sidebar_localplay.inc.php:45
-#: ../../templates/sidebar_home.inc.php:70
-#: ../../templates/show_edit_user.inc.php:106
-#: ../../templates/sidebar.inc.php:40
-#: ../../templates/show_playtype_switch.inc.php:47
+#: ../../lib/preferences.php:192 ../../templates/sidebar_localplay.inc.php:40
+#: ../../templates/sidebar_home.inc.php:66
+#: ../../templates/show_edit_user.inc.php:101
+#: ../../templates/sidebar.inc.php:35
+#: ../../templates/show_playtype_switch.inc.php:42
 msgid "Localplay"
 msgstr ""
 
-#: ../../lib/preferences.php:199
-#: ../../templates/show_playtype_switch.inc.php:51
+#: ../../lib/preferences.php:194
+#: ../../templates/show_playtype_switch.inc.php:46
 msgid "Flash Player"
 msgstr ""
 
-#: ../../lib/preferences.php:206
+#: ../../lib/preferences.php:201
 msgid "M3U"
 msgstr ""
 
-#: ../../lib/preferences.php:207
+#: ../../lib/preferences.php:202
 msgid "Simple M3U"
 msgstr ""
 
-#: ../../lib/preferences.php:208
+#: ../../lib/preferences.php:203
 msgid "PLS"
 msgstr ""
 
-#: ../../lib/preferences.php:209
+#: ../../lib/preferences.php:204
 msgid "Asx"
 msgstr ""
 
-#: ../../lib/preferences.php:210
+#: ../../lib/preferences.php:205
 msgid "RAM"
 msgstr ""
 
-#: ../../lib/preferences.php:211
+#: ../../lib/preferences.php:206
 msgid "XSPF"
 msgstr ""
 
-#: ../../lib/preferences.php:245
+#: ../../lib/preferences.php:240
 msgid "Disabled"
 msgstr ""
 
-#: ../../lib/preferences.php:246 ../../lib/class/democratic.class.php:170
-#: ../../templates/show_add_access_current.inc.php:58
-#: ../../templates/show_manage_shoutbox.inc.php:47
-#: ../../templates/show_manage_shoutbox.inc.php:71
-#: ../../templates/show_flagged.inc.php:47
-#: ../../templates/show_flagged.inc.php:66
-#: ../../templates/show_add_access.inc.php:55
-#: ../../templates/show_create_democratic.inc.php:54
-#: ../../templates/show_edit_user.inc.php:90
-#: ../../templates/show_access_list.inc.php:71
-#: ../../templates/show_edit_access.inc.php:73
-#: ../../templates/show_preference_box.inc.php:71
-#: ../../templates/show_add_access_rpc.inc.php:55
-#: ../../templates/show_add_access_local.inc.php:55
-#: ../../templates/show_preference_admin.inc.php:55
-#: ../../templates/show_mail_users.inc.php:44
-#: ../../templates/show_add_user.inc.php:87 ../../admin/users.php:138
+#: ../../lib/preferences.php:241 ../../lib/class/democratic.class.php:161
+#: ../../templates/show_add_access_current.inc.php:53
+#: ../../templates/show_manage_shoutbox.inc.php:42
+#: ../../templates/show_manage_shoutbox.inc.php:66
+#: ../../templates/show_flagged.inc.php:42
+#: ../../templates/show_flagged.inc.php:61
+#: ../../templates/show_add_access.inc.php:50
+#: ../../templates/show_create_democratic.inc.php:49
+#: ../../templates/show_edit_user.inc.php:85
+#: ../../templates/show_access_list.inc.php:66
+#: ../../templates/show_edit_access.inc.php:68
+#: ../../templates/show_preference_box.inc.php:66
+#: ../../templates/show_add_access_rpc.inc.php:50
+#: ../../templates/show_add_access_local.inc.php:50
+#: ../../templates/show_preference_admin.inc.php:50
+#: ../../templates/show_mail_users.inc.php:39
+#: ../../templates/show_add_user.inc.php:82 ../../admin/users.php:133
 msgid "User"
 msgstr ""
 
-#: ../../lib/preferences.php:247
+#: ../../lib/preferences.php:242
 msgid "Manager"
 msgstr ""
 
-#: ../../lib/preferences.php:248 ../../lib/class/democratic.class.php:179
-#: ../../templates/show_democratic_playlist.inc.php:74
-#: ../../templates/show_democratic_playlist.inc.php:114
-#: ../../templates/show_create_democratic.inc.php:57
-#: ../../templates/show_edit_user.inc.php:93
-#: ../../templates/sidebar.inc.php:43
-#: ../../templates/show_preference_box.inc.php:74
-#: ../../templates/show_preference_admin.inc.php:56
-#: ../../templates/show_mail_users.inc.php:45
-#: ../../templates/show_add_user.inc.php:90 ../../admin/users.php:139
+#: ../../lib/preferences.php:243 ../../lib/class/democratic.class.php:170
+#: ../../templates/show_democratic_playlist.inc.php:69
+#: ../../templates/show_democratic_playlist.inc.php:109
+#: ../../templates/show_create_democratic.inc.php:52
+#: ../../templates/show_edit_user.inc.php:88
+#: ../../templates/sidebar.inc.php:38
+#: ../../templates/show_preference_box.inc.php:69
+#: ../../templates/show_preference_admin.inc.php:51
+#: ../../templates/show_mail_users.inc.php:40
+#: ../../templates/show_add_user.inc.php:85 ../../admin/users.php:134
 msgid "Admin"
 msgstr ""
 
-#: ../../lib/preferences.php:264
+#: ../../lib/preferences.php:259
 msgid "Send on Add"
 msgstr ""
 
-#: ../../lib/preferences.php:265
+#: ../../lib/preferences.php:260
 msgid "Send and Clear on Add"
 msgstr ""
 
-#: ../../lib/preferences.php:266
+#: ../../lib/preferences.php:261
 msgid "Clear on Send"
 msgstr ""
 
-#: ../../lib/preferences.php:267 ../../lib/preferences.php:290
-#: ../../templates/show_manage_democratic.inc.php:50
+#: ../../lib/preferences.php:262 ../../lib/preferences.php:285
+#: ../../templates/show_manage_democratic.inc.php:45
 msgid "Default"
 msgstr ""
 
-#: ../../lib/preferences.php:273 ../../lib/preferences.php:281
+#: ../../lib/preferences.php:268 ../../lib/preferences.php:276
 msgid "Low"
 msgstr ""
 
-#: ../../lib/preferences.php:274 ../../lib/preferences.php:282
+#: ../../lib/preferences.php:269 ../../lib/preferences.php:277
 msgid "Medium"
 msgstr ""
 
-#: ../../lib/preferences.php:275 ../../lib/preferences.php:283
+#: ../../lib/preferences.php:270 ../../lib/preferences.php:278
 msgid "High"
 msgstr ""
 
-#: ../../lib/preferences.php:289 ../../lib/class/user.class.php:706
-#: ../../lib/class/catalog.class.php:168 ../../lib/class/catalog.class.php:169
-#: ../../lib/class/catalog.class.php:170 ../../templates/show_user.inc.php:34
-#: ../../templates/show_users.inc.php:65
+#: ../../lib/preferences.php:284 ../../lib/class/user.class.php:697
+#: ../../lib/class/catalog.class.php:173 ../../lib/class/catalog.class.php:174
+#: ../../lib/class/catalog.class.php:175 ../../templates/show_user.inc.php:29
+#: ../../templates/show_users.inc.php:60
 msgid "Never"
 msgstr ""
 
-#: ../../lib/preferences.php:291
+#: ../../lib/preferences.php:286
 msgid "Always"
 msgstr ""
 
-#: ../../lib/ui.lib.php:233 ../../templates/sidebar.inc.php:39
+#: ../../lib/ui.lib.php:228 ../../templates/sidebar.inc.php:34
 msgid "Home"
 msgstr ""
 
-#: ../../lib/ui.lib.php:236
+#: ../../lib/ui.lib.php:231
 msgid "Upload"
 msgstr ""
 
-#: ../../lib/ui.lib.php:239
+#: ../../lib/ui.lib.php:234
 msgid "Local Play"
 msgstr ""
 
-#: ../../lib/ui.lib.php:242
+#: ../../lib/ui.lib.php:237
 msgid "Random Play"
 msgstr ""
 
-#: ../../lib/ui.lib.php:245 ../../templates/sidebar_home.inc.php:57
-#: ../../templates/sidebar_home.inc.php:79
-#: ../../templates/show_manage_democratic.inc.php:46
+#: ../../lib/ui.lib.php:240 ../../lib/class/search.class.php:342
+#: ../../templates/sidebar_home.inc.php:53
+#: ../../templates/sidebar_home.inc.php:75
+#: ../../templates/show_manage_democratic.inc.php:41
 msgid "Playlist"
 msgstr ""
 
-#: ../../lib/ui.lib.php:248 ../../templates/show_search.inc.php:162
-#: ../../templates/show_search_bar.inc.php:41
+#: ../../lib/ui.lib.php:243 ../../templates/show_search.inc.php:63
+#: ../../templates/sidebar_home.inc.php:86
+#: ../../templates/show_search_bar.inc.php:43
 msgid "Search"
 msgstr ""
 
-#: ../../lib/ui.lib.php:251 ../../templates/sidebar.inc.php:41
-#: ../../templates/show_user_row.inc.php:52
-#: ../../templates/sidebar_preferences.inc.php:41
+#: ../../lib/ui.lib.php:246 ../../templates/sidebar.inc.php:36
+#: ../../templates/show_user_row.inc.php:47
+#: ../../templates/sidebar_preferences.inc.php:36
 msgid "Preferences"
 msgstr ""
 
-#: ../../lib/ui.lib.php:254 ../../lib/ui.lib.php:258
+#: ../../lib/ui.lib.php:249 ../../lib/ui.lib.php:253
 msgid "Admin-Catalog"
 msgstr ""
 
-#: ../../lib/ui.lib.php:262
+#: ../../lib/ui.lib.php:257
 msgid "Admin-User Management"
 msgstr ""
 
-#: ../../lib/ui.lib.php:266
+#: ../../lib/ui.lib.php:261
 msgid "Admin-Mail Users"
 msgstr ""
 
-#: ../../lib/ui.lib.php:270
+#: ../../lib/ui.lib.php:265
 msgid "Admin-Manage Access Lists"
 msgstr ""
 
-#: ../../lib/ui.lib.php:274
+#: ../../lib/ui.lib.php:269
 msgid "Admin-Site Preferences"
 msgstr ""
 
-#: ../../lib/ui.lib.php:278
+#: ../../lib/ui.lib.php:273
 msgid "Admin-Manage Modules"
 msgstr ""
 
-#: ../../lib/ui.lib.php:282
+#: ../../lib/ui.lib.php:277
 msgid "Browse Music"
 msgstr ""
 
-#: ../../lib/ui.lib.php:286 ../../lib/class/browse.class.php:153
-#: ../../templates/show_recommended_artists.inc.php:50
-#: ../../templates/show_recommended_artists.inc.php:78
-#: ../../templates/browse_filters.inc.php:75
-#: ../../templates/show_stats.inc.php:43
-#: ../../templates/show_artists.inc.php:54
-#: ../../templates/show_artists.inc.php:82
-#: ../../templates/sidebar_home.inc.php:47
+#: ../../lib/ui.lib.php:281 ../../lib/class/browse.class.php:146
+#: ../../templates/show_recommended_artists.inc.php:45
+#: ../../templates/show_recommended_artists.inc.php:73
+#: ../../templates/browse_filters.inc.php:65
+#: ../../templates/show_search.inc.php:39
+#: ../../templates/show_stats.inc.php:38
+#: ../../templates/show_artists.inc.php:49
+#: ../../templates/show_artists.inc.php:77
+#: ../../templates/sidebar_home.inc.php:42
+#: ../../templates/sidebar_home.inc.php:89
+#: ../../templates/show_random.inc.php:35
 msgid "Albums"
 msgstr ""
 
-#: ../../lib/ui.lib.php:290 ../../lib/class/browse.class.php:164
-#: ../../lib/class/album.class.php:272 ../../templates/show_stats.inc.php:44
-#: ../../templates/sidebar_home.inc.php:48
+#: ../../lib/ui.lib.php:285 ../../lib/class/browse.class.php:157
+#: ../../lib/class/album.class.php:263 ../../templates/show_search.inc.php:40
+#: ../../templates/show_stats.inc.php:39
+#: ../../templates/sidebar_home.inc.php:43
+#: ../../templates/sidebar_home.inc.php:90
+#: ../../templates/show_random.inc.php:36
 msgid "Artists"
 msgstr ""
 
-#: ../../lib/ui.lib.php:294 ../../templates/show_stats.inc.php:37
-#: ../../templates/sidebar_home.inc.php:85
+#: ../../lib/ui.lib.php:289 ../../templates/show_stats.inc.php:32
+#: ../../templates/sidebar_home.inc.php:81
 msgid "Statistics"
 msgstr ""
 
-#: ../../lib/ui.lib.php:348
+#: ../../lib/ui.lib.php:343
 msgid "Add New"
 msgstr ""
 
-#: ../../lib/ui.lib.php:428 ../../lib/class/access.class.php:501
-#: ../../lib/class/access.class.php:521
-#: ../../templates/show_add_access_current.inc.php:54
-#: ../../templates/show_admin_tools.inc.php:63
-#: ../../templates/show_add_access.inc.php:51
-#: ../../templates/show_edit_access.inc.php:91
-#: ../../templates/show_add_access_rpc.inc.php:51
-#: ../../templates/show_add_access_rpc.inc.php:66
-#: ../../templates/show_add_access_local.inc.php:51
-#: ../../templates/show_add_access_local.inc.php:66
-#: ../../templates/show_random.inc.php:52
-#: ../../templates/show_mail_users.inc.php:43
-#: ../../templates/show_export.inc.php:46
+#: ../../lib/ui.lib.php:423 ../../lib/class/access.class.php:485
+#: ../../lib/class/access.class.php:505
+#: ../../templates/show_add_access_current.inc.php:49
+#: ../../templates/show_admin_tools.inc.php:58
+#: ../../templates/show_add_access.inc.php:46
+#: ../../templates/show_edit_access.inc.php:86
+#: ../../templates/show_add_access_rpc.inc.php:46
+#: ../../templates/show_add_access_rpc.inc.php:61
+#: ../../templates/show_add_access_local.inc.php:46
+#: ../../templates/show_add_access_local.inc.php:61
+#: ../../templates/show_random.inc.php:62
+#: ../../templates/show_mail_users.inc.php:38
+#: ../../templates/show_export.inc.php:41
 msgid "All"
 msgstr ""
 
-#: ../../lib/ui.lib.php:772
+#: ../../lib/ui.lib.php:773
 msgid "On"
 msgstr ""
 
-#: ../../lib/ui.lib.php:775
+#: ../../lib/ui.lib.php:776
 msgid "Off"
 msgstr ""
 
-#: ../../lib/class/art.class.php:992 ../../lib/class/catalog.class.php:480
+#: ../../lib/class/art.class.php:979 ../../lib/class/catalog.class.php:490
 msgid "Error: Unable to open"
 msgstr ""
 
-#: ../../lib/class/access.class.php:172 ../../lib/class/access.class.php:176
-#: ../../lib/class/access.class.php:219 ../../lib/class/access.class.php:223
+#: ../../lib/class/access.class.php:163 ../../lib/class/access.class.php:167
+#: ../../lib/class/access.class.php:210 ../../lib/class/access.class.php:214
 msgid "Invalid IPv4 / IPv6 Address Entered"
 msgstr ""
 
-#: ../../lib/class/access.class.php:181 ../../lib/class/access.class.php:182
-#: ../../lib/class/access.class.php:228 ../../lib/class/access.class.php:229
+#: ../../lib/class/access.class.php:172 ../../lib/class/access.class.php:173
+#: ../../lib/class/access.class.php:219 ../../lib/class/access.class.php:220
 msgid "IP Address Version Mismatch"
 msgstr ""
 
-#: ../../lib/class/access.class.php:236
+#: ../../lib/class/access.class.php:227
 msgid "Duplicate ACL defined"
 msgstr ""
 
-#: ../../lib/class/access.class.php:504
-#: ../../templates/show_add_access_current.inc.php:51
-#: ../../templates/show_add_access.inc.php:48
-#: ../../templates/show_edit_access.inc.php:88
-#: ../../templates/show_add_access_rpc.inc.php:48
-#: ../../templates/show_add_access_local.inc.php:48
+#: ../../lib/class/access.class.php:488
+#: ../../templates/show_add_access_current.inc.php:46
+#: ../../templates/show_add_access.inc.php:43
+#: ../../templates/show_edit_access.inc.php:83
+#: ../../templates/show_add_access_rpc.inc.php:43
+#: ../../templates/show_add_access_local.inc.php:43
 msgid "View"
 msgstr ""
 
-#: ../../lib/class/access.class.php:507
-#: ../../templates/show_add_access_current.inc.php:52
-#: ../../templates/show_add_access.inc.php:49
-#: ../../templates/show_edit_access.inc.php:89
-#: ../../templates/show_add_access_rpc.inc.php:49
-#: ../../templates/show_add_access_local.inc.php:49
+#: ../../lib/class/access.class.php:491
+#: ../../templates/show_add_access_current.inc.php:47
+#: ../../templates/show_add_access.inc.php:44
+#: ../../templates/show_edit_access.inc.php:84
+#: ../../templates/show_add_access_rpc.inc.php:44
+#: ../../templates/show_add_access_local.inc.php:44
 msgid "Read"
 msgstr ""
 
-#: ../../lib/class/access.class.php:510
-#: ../../templates/show_add_access_current.inc.php:53
-#: ../../templates/show_add_access.inc.php:50
-#: ../../templates/show_edit_access.inc.php:90
-#: ../../templates/show_add_access_rpc.inc.php:50
-#: ../../templates/show_add_access_local.inc.php:50
+#: ../../lib/class/access.class.php:494
+#: ../../templates/show_add_access_current.inc.php:48
+#: ../../templates/show_add_access.inc.php:45
+#: ../../templates/show_edit_access.inc.php:85
+#: ../../templates/show_add_access_rpc.inc.php:45
+#: ../../templates/show_add_access_local.inc.php:45
 msgid "Read/Write"
 msgstr ""
 
-#: ../../lib/class/access.class.php:537
+#: ../../lib/class/access.class.php:521
 msgid "API/RPC"
 msgstr ""
 
-#: ../../lib/class/access.class.php:540
-#: ../../templates/show_add_access.inc.php:67
-#: ../../templates/show_edit_access.inc.php:49
-#: ../../templates/show_add_access_local.inc.php:64
-#: ../../templates/show_add_access_local.inc.php:65
-#: ../../templates/show_add_access_local.inc.php:66
+#: ../../lib/class/access.class.php:524
+#: ../../templates/show_add_access.inc.php:62
+#: ../../templates/show_edit_access.inc.php:44
+#: ../../templates/show_add_access_local.inc.php:59
+#: ../../templates/show_add_access_local.inc.php:60
+#: ../../templates/show_add_access_local.inc.php:61
 msgid "Local Network Definition"
 msgstr ""
 
-#: ../../lib/class/access.class.php:543
-#: ../../templates/show_add_access.inc.php:66
-#: ../../templates/show_edit_access.inc.php:48
-#: ../../templates/show_add_access_local.inc.php:65
+#: ../../lib/class/access.class.php:527
+#: ../../templates/show_add_access.inc.php:61
+#: ../../templates/show_edit_access.inc.php:43
+#: ../../templates/show_add_access_local.inc.php:60
 msgid "Web Interface"
 msgstr ""
 
-#: ../../lib/class/access.class.php:547
-#: ../../templates/show_add_access.inc.php:65
-#: ../../templates/show_edit_access.inc.php:47
-#: ../../templates/show_add_access_rpc.inc.php:65
-#: ../../templates/show_add_access_local.inc.php:65
+#: ../../lib/class/access.class.php:531
+#: ../../templates/show_add_access.inc.php:60
+#: ../../templates/show_edit_access.inc.php:42
+#: ../../templates/show_add_access_rpc.inc.php:60
+#: ../../templates/show_add_access_local.inc.php:60
 msgid "Stream Access"
 msgstr ""
 
-#: ../../lib/class/random.class.php:433 ../../templates/rightbar.inc.php:78
+#: ../../lib/class/random.class.php:371 ../../templates/rightbar.inc.php:73
 msgid "Related Album"
 msgstr ""
 
-#: ../../lib/class/random.class.php:436
+#: ../../lib/class/random.class.php:374
 msgid "Related Genre"
 msgstr ""
 
-#: ../../lib/class/random.class.php:439 ../../templates/rightbar.inc.php:75
+#: ../../lib/class/random.class.php:377 ../../templates/rightbar.inc.php:70
 msgid "Related Artist"
 msgstr ""
 
-#: ../../lib/class/random.class.php:442 ../../templates/rightbar.inc.php:72
+#: ../../lib/class/random.class.php:380 ../../templates/rightbar.inc.php:67
 msgid "Pure Random"
 msgstr ""
 
-#: ../../lib/class/api.class.php:245
+#: ../../lib/class/api.class.php:229
 msgid "Error Invalid Handshake - "
 msgstr ""
 
-#: ../../lib/class/api.class.php:245
+#: ../../lib/class/api.class.php:229
 msgid "Invalid Username/Password"
 msgstr ""
 
-#: ../../lib/class/api.class.php:673 ../../lib/class/api.class.php:729
-#: ../../server/xml.server.php:107
+#: ../../lib/class/api.class.php:656 ../../lib/class/api.class.php:712
+#: ../../server/xml.server.php:102
 msgid "Invalid Request"
 msgstr ""
 
-#: ../../lib/class/api.class.php:694 ../../lib/class/api.class.php:707
+#: ../../lib/class/api.class.php:677 ../../lib/class/api.class.php:690
 msgid "Media Object Invalid or Not Specified"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:334
+#: ../../lib/class/flag.class.php:325
 msgid "Approved"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:335
+#: ../../lib/class/flag.class.php:326
 msgid "Pending"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:347 ../../templates/rightbar.inc.php:117
-#: ../../templates/show_democratic_playlist.inc.php:99
-#: ../../templates/show_admin_tools.inc.php:65
-#: ../../templates/show_localplay_playlist.inc.php:63
-#: ../../templates/show_access_list.inc.php:90
-#: ../../templates/show_catalog_row.inc.php:47
-#: ../../templates/show_playlist_song_row.inc.php:54
-#: ../../templates/show_playlist_row.inc.php:51
-#: ../../templates/show_live_stream_row.inc.php:47
-#: ../../templates/show_localplay_instances.inc.php:52
-#: ../../templates/show_playlist.inc.php:77
-#: ../../templates/show_user_row.inc.php:62
-#: ../../templates/show_manage_democratic.inc.php:70
-#: ../../templates/show_shout_row.inc.php:48
+#: ../../lib/class/flag.class.php:338 ../../templates/rightbar.inc.php:112
+#: ../../templates/show_democratic_playlist.inc.php:94
+#: ../../templates/show_admin_tools.inc.php:60
+#: ../../templates/show_smartplaylist.inc.php:51
+#: ../../templates/show_localplay_playlist.inc.php:58
+#: ../../templates/show_access_list.inc.php:85
+#: ../../templates/show_catalog_row.inc.php:42
+#: ../../templates/show_playlist_song_row.inc.php:49
+#: ../../templates/show_playlist_row.inc.php:46
+#: ../../templates/show_live_stream_row.inc.php:42
+#: ../../templates/show_localplay_instances.inc.php:47
+#: ../../templates/show_smartplaylist_row.inc.php:37
+#: ../../templates/show_playlist.inc.php:72
+#: ../../templates/show_user_row.inc.php:57
+#: ../../templates/show_manage_democratic.inc.php:65
+#: ../../templates/show_shout_row.inc.php:43
 msgid "Delete"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:350
+#: ../../lib/class/flag.class.php:341
 msgid "Re-Tag"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:353
+#: ../../lib/class/flag.class.php:344
 msgid "Re-encode"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:356
+#: ../../lib/class/flag.class.php:347
 msgid "Other"
 msgstr ""
 
-#: ../../lib/class/browse.class.php:147
-#: ../../templates/show_recommended_artists.inc.php:49
-#: ../../templates/show_recommended_artists.inc.php:77
-#: ../../templates/show_albums.inc.php:59
-#: ../../templates/show_albums.inc.php:90
-#: ../../templates/show_stats.inc.php:45 ../../templates/show_stats.inc.php:81
-#: ../../templates/show_artists.inc.php:53
-#: ../../templates/show_artists.inc.php:81
-#: ../../templates/show_manage_democratic.inc.php:51
+#: ../../lib/class/browse.class.php:140
+#: ../../templates/show_recommended_artists.inc.php:44
+#: ../../templates/show_recommended_artists.inc.php:72
+#: ../../templates/show_albums.inc.php:54
+#: ../../templates/show_albums.inc.php:85
+#: ../../templates/show_search.inc.php:38
+#: ../../templates/show_stats.inc.php:40 ../../templates/show_stats.inc.php:76
+#: ../../templates/show_artists.inc.php:48
+#: ../../templates/show_artists.inc.php:76
+#: ../../templates/sidebar_home.inc.php:88
+#: ../../templates/show_random.inc.php:34
+#: ../../templates/show_manage_democratic.inc.php:46
 msgid "Songs"
 msgstr ""
 
-#: ../../lib/class/browse.class.php:159
+#: ../../lib/class/browse.class.php:152
 msgid "Manage Users"
 msgstr ""
 
-#: ../../lib/class/browse.class.php:171
-#: ../../templates/sidebar_home.inc.php:51
+#: ../../lib/class/browse.class.php:164
+#: ../../templates/sidebar_home.inc.php:47
 msgid "Radio Stations"
 msgstr ""
 
-#: ../../lib/class/browse.class.php:177
-#: ../../templates/sidebar_home.inc.php:50
+#: ../../lib/class/browse.class.php:170
+#: ../../templates/sidebar_home.inc.php:45
 msgid "Playlists"
 msgstr ""
 
-#: ../../lib/class/browse.class.php:182
+#: ../../lib/class/browse.class.php:175
 msgid "Playlist Songs"
 msgstr ""
 
-#: ../../lib/class/browse.class.php:187
+#: ../../lib/class/browse.class.php:180
 msgid "Current Playlist"
 msgstr ""
 
-#: ../../lib/class/browse.class.php:192
-#: ../../templates/show_admin_tools.inc.php:38
-#: ../../templates/show_stats.inc.php:38
-#: ../../templates/sidebar_admin.inc.php:36
+#: ../../lib/class/browse.class.php:185
+#: ../../templates/sidebar_home.inc.php:46
+msgid "Smart Playlists"
+msgstr ""
+
+#: ../../lib/class/browse.class.php:190
+#: ../../templates/show_admin_tools.inc.php:33
+#: ../../templates/show_stats.inc.php:33
+#: ../../templates/sidebar_admin.inc.php:31
 msgid "Catalogs"
 msgstr ""
 
-#: ../../lib/class/browse.class.php:197
+#: ../../lib/class/browse.class.php:195
 msgid "Shoutbox Records"
 msgstr ""
 
-#: ../../lib/class/browse.class.php:202
+#: ../../lib/class/browse.class.php:200
 msgid "Flagged Records"
 msgstr ""
 
-#: ../../lib/class/browse.class.php:208
-#: ../../templates/sidebar_home.inc.php:49 ../../browse.php:84
+#: ../../lib/class/browse.class.php:206
+#: ../../templates/sidebar_home.inc.php:44 ../../browse.php:79
 msgid "Tag Cloud"
 msgstr ""
 
-#: ../../lib/class/browse.class.php:214
-#: ../../templates/sidebar_home.inc.php:52
+#: ../../lib/class/browse.class.php:212 ../../templates/show_search.inc.php:41
+#: ../../templates/show_stats.inc.php:41 ../../templates/show_stats.inc.php:77
+#: ../../templates/sidebar_home.inc.php:48
+#: ../../templates/sidebar_home.inc.php:91
 msgid "Videos"
 msgstr ""
 
-#: ../../lib/class/browse.class.php:219
-#: ../../templates/show_democratic.inc.php:35
+#: ../../lib/class/browse.class.php:217
+#: ../../templates/show_democratic.inc.php:30
 msgid "Democratic Playlist"
 msgstr ""
 
-#: ../../lib/class/democratic.class.php:162
-#: ../../lib/class/video.class.php:103 ../../templates/show_search.inc.php:90
-#: ../../templates/show_create_democratic.inc.php:47
+#: ../../lib/class/search.class.php:56
+msgid "is greater than or equal to"
+msgstr ""
+
+#: ../../lib/class/search.class.php:62
+msgid "is less than or equal to"
+msgstr ""
+
+#: ../../lib/class/search.class.php:68 ../../lib/class/search.class.php:136
+#: ../../lib/class/search.class.php:155 ../../lib/class/search.class.php:168
+msgid "is"
+msgstr ""
+
+#: ../../lib/class/search.class.php:74 ../../lib/class/search.class.php:161
+#: ../../lib/class/search.class.php:174
+msgid "is not"
+msgstr ""
+
+#: ../../lib/class/search.class.php:80
+msgid "is greater than"
+msgstr ""
+
+#: ../../lib/class/search.class.php:86
+msgid "is less than"
+msgstr ""
+
+#: ../../lib/class/search.class.php:93
+msgid "is true"
+msgstr ""
+
+#: ../../lib/class/search.class.php:98
+msgid "is false"
+msgstr ""
+
+#: ../../lib/class/search.class.php:104
+msgid "contains"
+msgstr ""
+
+#: ../../lib/class/search.class.php:112
+msgid "does not contain"
+msgstr ""
+
+#: ../../lib/class/search.class.php:120
+msgid "starts with"
+msgstr ""
+
+#: ../../lib/class/search.class.php:128
+msgid "ends with"
+msgstr ""
+
+#: ../../lib/class/search.class.php:142
+msgid "sounds like"
+msgstr ""
+
+#: ../../lib/class/search.class.php:148
+msgid "does not sound like"
+msgstr ""
+
+#: ../../lib/class/search.class.php:181
+msgid "before"
+msgstr ""
+
+#: ../../lib/class/search.class.php:187
+msgid "after"
+msgstr ""
+
+#: ../../lib/class/search.class.php:195
+msgid "Any searchable text"
+msgstr ""
+
+#: ../../lib/class/search.class.php:202 ../../lib/class/search.class.php:363
+#: ../../templates/show_disabled_songs.inc.php:43
+#: ../../templates/show_disabled_songs.inc.php:66
+#: ../../templates/show_democratic_playlist.inc.php:64
+#: ../../templates/show_democratic_playlist.inc.php:104
+#: ../../templates/show_edit_song.inc.php:39
+#: ../../templates/show_song.inc.php:52
+#: ../../templates/show_search_bar.inc.php:38
+#: ../../templates/show_videos.inc.php:45
+#: ../../templates/show_videos.inc.php:69
+#: ../../templates/show_duplicate.inc.php:40
+msgid "Title"
+msgstr ""
+
+#: ../../lib/class/search.class.php:209 ../../templates/show_albums.inc.php:52
+#: ../../templates/show_albums.inc.php:83
+#: ../../templates/show_disabled_songs.inc.php:44
+#: ../../templates/show_disabled_songs.inc.php:67
+#: ../../templates/show_democratic_playlist.inc.php:65
+#: ../../templates/show_democratic_playlist.inc.php:105
+#: ../../templates/show_edit_song.inc.php:45
+#: ../../templates/show_song.inc.php:54
+#: ../../templates/show_recently_played.inc.php:46
+#: ../../templates/show_recently_played.inc.php:109
+#: ../../templates/sidebar_home.inc.php:73
+#: ../../templates/show_songs.inc.php:49 ../../templates/show_songs.inc.php:78
+#: ../../templates/show_playlist_songs.inc.php:52
+#: ../../templates/show_playlist_songs.inc.php:78
+#: ../../templates/show_get_albumart.inc.php:43
+#: ../../templates/show_duplicates.inc.php:47
+#: ../../templates/show_duplicates.inc.php:86
+#: ../../templates/show_search_bar.inc.php:39
+#: ../../templates/show_now_playing_row.inc.php:68
+#: ../../templates/show_lyrics_song.inc.php:56
+msgid "Album"
+msgstr ""
+
+#: ../../lib/class/search.class.php:216
+#: ../../templates/show_recommended_artists.inc.php:43
+#: ../../templates/show_recommended_artists.inc.php:71
+#: ../../templates/show_albums.inc.php:53
+#: ../../templates/show_albums.inc.php:84
+#: ../../templates/show_disabled_songs.inc.php:45
+#: ../../templates/show_disabled_songs.inc.php:68
+#: ../../templates/show_democratic_playlist.inc.php:66
+#: ../../templates/show_democratic_playlist.inc.php:106
+#: ../../templates/show_edit_song.inc.php:53
+#: ../../templates/show_song.inc.php:53
+#: ../../templates/browse_filters.inc.php:68
+#: ../../templates/show_recently_played.inc.php:47
+#: ../../templates/show_recently_played.inc.php:110
+#: ../../templates/show_artists.inc.php:47
+#: ../../templates/show_artists.inc.php:75
+#: ../../templates/sidebar_home.inc.php:74
+#: ../../templates/show_songs.inc.php:48 ../../templates/show_songs.inc.php:77
+#: ../../templates/show_playlist_songs.inc.php:51
+#: ../../templates/show_playlist_songs.inc.php:77
+#: ../../templates/show_get_albumart.inc.php:35
+#: ../../templates/show_duplicates.inc.php:46
+#: ../../templates/show_duplicates.inc.php:85
+#: ../../templates/show_search_bar.inc.php:40
+#: ../../templates/show_now_playing_row.inc.php:75
+#: ../../templates/show_lyrics_song.inc.php:63
+msgid "Artist"
+msgstr ""
+
+#: ../../lib/class/search.class.php:223
+#: ../../templates/show_edit_song.inc.php:73
+#: ../../templates/show_song.inc.php:57
+#: ../../templates/show_manage_shoutbox.inc.php:44
+#: ../../templates/show_manage_shoutbox.inc.php:68
+#: ../../templates/show_flagged.inc.php:44
+#: ../../templates/show_flagged.inc.php:63
+msgid "Comment"
+msgstr ""
+
+#: ../../lib/class/search.class.php:231 ../../lib/class/search.class.php:409
+#: ../../lib/class/search.class.php:431
+#: ../../templates/show_live_streams.inc.php:47
+#: ../../templates/show_live_streams.inc.php:69
+#: ../../templates/show_search_bar.inc.php:41
+msgid "Tag"
+msgstr ""
+
+#: ../../lib/class/search.class.php:238 ../../lib/class/search.class.php:417
+#: ../../templates/show_disabled_songs.inc.php:46
+#: ../../templates/show_disabled_songs.inc.php:69
+#: ../../templates/show_import_playlist.inc.php:35
+#: ../../templates/show_song.inc.php:63
+#: ../../templates/show_duplicates.inc.php:51
+#: ../../templates/show_duplicates.inc.php:90
+msgid "Filename"
+msgstr ""
+
+#: ../../lib/class/search.class.php:245 ../../lib/class/search.class.php:370
+#: ../../templates/show_albums.inc.php:55
+#: ../../templates/show_albums.inc.php:86
+#: ../../templates/show_edit_song.inc.php:67
+#: ../../templates/show_edit_album.inc.php:41
+msgid "Year"
+msgstr ""
+
+#: ../../lib/class/search.class.php:252
+msgid "Length (in minutes)"
+msgstr ""
+
+#: ../../lib/class/search.class.php:260 ../../lib/class/search.class.php:378
+#: ../../templates/show_recommended_artists.inc.php:48
+#: ../../templates/show_recommended_artists.inc.php:76
+#: ../../templates/show_albums.inc.php:57
+#: ../../templates/show_albums.inc.php:88 ../../templates/show_song.inc.php:35
+#: ../../templates/show_artists.inc.php:52
+#: ../../templates/show_artists.inc.php:80
+#: ../../templates/show_songs.inc.php:56 ../../templates/show_songs.inc.php:83
+#: ../../templates/show_playlist_songs.inc.php:59
+#: ../../templates/show_playlist_songs.inc.php:83
+#: ../../templates/show_now_playing_row.inc.php:43
+msgid "Rating"
+msgstr ""
+
+#: ../../lib/class/search.class.php:277 ../../templates/show_song.inc.php:61
+#: ../../templates/show_duplicates.inc.php:49
+#: ../../templates/show_duplicates.inc.php:88
+msgid "Bitrate"
+msgstr ""
+
+#: ../../lib/class/search.class.php:302
+msgid "Played"
+msgstr ""
+
+#: ../../lib/class/search.class.php:309 ../../lib/class/catalog.class.php:1392
+#: ../../templates/show_song.inc.php:68 ../../admin/access.php:110
+msgid "Added"
+msgstr ""
+
+#: ../../lib/class/search.class.php:316 ../../lib/class/catalog.class.php:1071
+#: ../../preferences.php:118 ../../admin/access.php:130
+msgid "Updated"
+msgstr ""
+
+#: ../../lib/class/search.class.php:329 ../../lib/class/search.class.php:401
+#: ../../templates/browse_filters.inc.php:74
+#: ../../templates/show_add_live_stream.inc.php:67
+#: ../../templates/show_export.inc.php:38
+msgid "Catalog"
+msgstr ""
+
+#: ../../lib/class/search.class.php:355
+msgid "Smart Playlist"
+msgstr ""
+
+#: ../../lib/class/search.class.php:425
+#: ../../templates/show_add_access_current.inc.php:35
+#: ../../templates/show_edit_catalog.inc.php:34
+#: ../../templates/show_admin_tools.inc.php:40
+#: ../../templates/show_admin_tools.inc.php:80
+#: ../../templates/show_edit_artist.inc.php:35
+#: ../../templates/show_localplay_controllers.inc.php:40
+#: ../../templates/show_localplay_controllers.inc.php:71
+#: ../../templates/show_stats.inc.php:71
+#: ../../templates/show_localplay_playlist.inc.php:42
+#: ../../templates/show_localplay_playlist.inc.php:68
+#: ../../templates/show_add_access.inc.php:35
+#: ../../templates/show_create_democratic.inc.php:33
+#: ../../templates/show_edit_album.inc.php:35
+#: ../../templates/show_live_streams.inc.php:44
+#: ../../templates/show_live_streams.inc.php:66
+#: ../../templates/show_account.inc.php:35
+#: ../../templates/show_add_live_stream.inc.php:34
+#: ../../templates/show_access_list.inc.php:62
+#: ../../templates/show_catalogs.inc.php:41
+#: ../../templates/show_catalogs.inc.php:65
+#: ../../templates/show_edit_access.inc.php:34
+#: ../../templates/show_add_playlist.inc.php:34
+#: ../../templates/show_edit_live_stream_row.inc.php:34
+#: ../../templates/show_plugins.inc.php:40
+#: ../../templates/show_plugins.inc.php:77
+#: ../../templates/show_add_access_rpc.inc.php:35
+#: ../../templates/show_add_access_local.inc.php:35
+msgid "Name"
+msgstr ""
+
+#: ../../lib/class/democratic.class.php:153 ../../lib/class/video.class.php:94
+#: ../../templates/show_create_democratic.inc.php:42
 msgid "minutes"
 msgstr ""
 
-#: ../../lib/class/democratic.class.php:163
+#: ../../lib/class/democratic.class.php:154
 msgid "Primary"
 msgstr ""
 
-#: ../../lib/class/democratic.class.php:167
-#: ../../templates/show_edit_user.inc.php:89
-#: ../../templates/show_preference_box.inc.php:70
-#: ../../templates/show_preference_admin.inc.php:54
-#: ../../templates/show_add_user.inc.php:86 ../../admin/users.php:137
+#: ../../lib/class/democratic.class.php:158
+#: ../../templates/show_edit_user.inc.php:84
+#: ../../templates/show_preference_box.inc.php:65
+#: ../../templates/show_preference_admin.inc.php:49
+#: ../../templates/show_add_user.inc.php:81 ../../admin/users.php:132
 msgid "Guest"
 msgstr ""
 
-#: ../../lib/class/democratic.class.php:173
-#: ../../templates/show_create_democratic.inc.php:55
-#: ../../templates/show_edit_user.inc.php:91
-#: ../../templates/show_preference_box.inc.php:72
-#: ../../templates/show_add_user.inc.php:88
+#: ../../lib/class/democratic.class.php:164
+#: ../../templates/show_create_democratic.inc.php:50
+#: ../../templates/show_edit_user.inc.php:86
+#: ../../templates/show_preference_box.inc.php:67
+#: ../../templates/show_add_user.inc.php:83
 msgid "Content Manager"
 msgstr ""
 
-#: ../../lib/class/democratic.class.php:176
-#: ../../templates/show_create_democratic.inc.php:56
-#: ../../templates/show_edit_user.inc.php:92
-#: ../../templates/show_preference_box.inc.php:73
-#: ../../templates/show_add_user.inc.php:89
+#: ../../lib/class/democratic.class.php:167
+#: ../../templates/show_create_democratic.inc.php:51
+#: ../../templates/show_edit_user.inc.php:87
+#: ../../templates/show_preference_box.inc.php:68
+#: ../../templates/show_add_user.inc.php:84
 msgid "Catalog Manager"
 msgstr ""
 
-#: ../../lib/class/localplay.class.php:665
-#: ../../lib/class/ampacherss.class.php:92 ../../templates/header.inc.php:55
-#: ../../templates/show_now_playing.inc.php:44
-#: ../../templates/show_localplay_status.inc.php:39
+#: ../../lib/class/localplay.class.php:656
+#: ../../lib/class/ampacherss.class.php:83 ../../templates/header.inc.php:50
+#: ../../templates/show_now_playing.inc.php:39
+#: ../../templates/show_localplay_status.inc.php:34
 msgid "Now Playing"
 msgstr ""
 
-#: ../../lib/class/localplay.class.php:668
+#: ../../lib/class/localplay.class.php:659
 msgid "Stopped"
 msgstr ""
 
-#: ../../lib/class/localplay.class.php:671
+#: ../../lib/class/localplay.class.php:662
 msgid "Paused"
 msgstr ""
 
-#: ../../lib/class/query.class.php:91
+#: ../../lib/class/query.class.php:82
 msgid "Browse not found or expired, try reloading the page"
 msgstr ""
 
-#: ../../lib/class/playlist.class.php:106
-#: ../../templates/show_edit_playlist_title.inc.php:45
-#: ../../templates/show_edit_playlist_row.inc.php:46
-msgid "Private"
-msgstr ""
-
-#: ../../lib/class/registration.class.php:71
+#: ../../lib/class/registration.class.php:62
 #, php-format
 msgid "New User Registration at %s"
 msgstr ""
 
-#: ../../lib/class/registration.class.php:73
+#: ../../lib/class/registration.class.php:64
 #, php-format
 msgid ""
 "Thank you for registering\n"
@@ -695,7 +965,7 @@ msgid ""
 "Thank you for registering\n"
 msgstr ""
 
-#: ../../lib/class/registration.class.php:94
+#: ../../lib/class/registration.class.php:85
 #, php-format
 msgid ""
 "A new user has registered\n"
@@ -707,275 +977,265 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../lib/class/album.class.php:258 ../../templates/show_album.inc.php:40
+#: ../../lib/class/playlist_object.abstract.php:42
+#: ../../templates/show_edit_playlist_title.inc.php:40
+#: ../../templates/show_edit_playlist_row.inc.php:41
+#: ../../templates/show_edit_smartplaylist_title.inc.php:33
+#: ../../templates/show_edit_smartplaylist_row.inc.php:34
+msgid "Private"
+msgstr ""
+
+#: ../../lib/class/album.class.php:249 ../../templates/show_album.inc.php:35
 msgid "Disk"
 msgstr ""
 
-#: ../../lib/class/album.class.php:272 ../../lib/class/album.class.php:273
-#: ../../templates/show_edit_album_row.inc.php:48
+#: ../../lib/class/album.class.php:263 ../../lib/class/album.class.php:264
+#: ../../templates/show_edit_album_row.inc.php:43
 msgid "Various"
 msgstr ""
 
-#: ../../lib/class/user.class.php:422 ../../admin/users.php:67
-#: ../../admin/users.php:117
+#: ../../lib/class/user.class.php:413 ../../admin/users.php:62
+#: ../../admin/users.php:112
 msgid "Error Username Required"
 msgstr ""
 
-#: ../../lib/class/user.class.php:426 ../../admin/users.php:70
-#: ../../admin/users.php:113
+#: ../../lib/class/user.class.php:417 ../../admin/users.php:65
+#: ../../admin/users.php:108
 msgid "Error Passwords don't match"
 msgstr ""
 
-#: ../../lib/class/user.class.php:732
-#: ../../templates/show_recommended_artists.inc.php:71
-#: ../../templates/show_albums.inc.php:80
-#: ../../templates/show_tagcloud.inc.php:45
-#: ../../templates/rightbar.inc.php:120
-#: ../../templates/show_user_recommendations.inc.php:45
-#: ../../templates/show_user_recommendations.inc.php:56
-#: ../../templates/show_user_recommendations.inc.php:67
-#: ../../templates/show_recently_played.inc.php:107
-#: ../../templates/show_artists.inc.php:75
-#: ../../templates/show_objects.inc.php:56
-#: ../../templates/show_songs.inc.php:76
-#: ../../templates/show_live_streams.inc.php:66
-#: ../../templates/show_playlists.inc.php:65
-#: ../../templates/show_user_stats.inc.php:47
-#: ../../templates/show_user_stats.inc.php:60
-#: ../../templates/show_user_stats.inc.php:73
-#: ../../templates/show_catalogs.inc.php:65
-#: ../../templates/show_videos.inc.php:69
-#: ../../templates/show_manage_democratic.inc.php:75
+#: ../../lib/class/user.class.php:723
+#: ../../templates/show_recommended_artists.inc.php:66
+#: ../../templates/show_albums.inc.php:75
+#: ../../templates/show_tagcloud.inc.php:40
+#: ../../templates/rightbar.inc.php:115
+#: ../../templates/show_user_recommendations.inc.php:40
+#: ../../templates/show_user_recommendations.inc.php:51
+#: ../../templates/show_user_recommendations.inc.php:62
+#: ../../templates/show_recently_played.inc.php:102
+#: ../../templates/show_artists.inc.php:70
+#: ../../templates/show_objects.inc.php:51
+#: ../../templates/show_songs.inc.php:71
+#: ../../templates/show_live_streams.inc.php:61
+#: ../../templates/show_playlists.inc.php:60
+#: ../../templates/show_smartplaylists.inc.php:52
+#: ../../templates/show_user_stats.inc.php:42
+#: ../../templates/show_user_stats.inc.php:55
+#: ../../templates/show_user_stats.inc.php:68
+#: ../../templates/show_catalogs.inc.php:60
+#: ../../templates/show_videos.inc.php:64
+#: ../../templates/show_manage_democratic.inc.php:70
 msgid "Not Enough Data"
 msgstr ""
 
-#: ../../lib/class/ampacherss.class.php:93 ../../templates/header.inc.php:56
-#: ../../templates/show_recently_played.inc.php:37
+#: ../../lib/class/ampacherss.class.php:84 ../../templates/header.inc.php:51
+#: ../../templates/show_recently_played.inc.php:32
 msgid "Recently Played"
 msgstr ""
 
-#: ../../lib/class/ampacherss.class.php:94
+#: ../../lib/class/ampacherss.class.php:85
 msgid "Newest Albums"
 msgstr ""
 
-#: ../../lib/class/ampacherss.class.php:95
+#: ../../lib/class/ampacherss.class.php:86
 msgid "Newest Artists"
 msgstr ""
 
-#: ../../lib/class/ampacherss.class.php:138
+#: ../../lib/class/ampacherss.class.php:129
 msgid "RSS Feed"
 msgstr ""
 
-#: ../../lib/class/ampacherss.class.php:197
-#: ../../templates/show_recently_played.inc.php:35
+#: ../../lib/class/ampacherss.class.php:188
+#: ../../templates/show_recently_played.inc.php:30
 msgid "seconds ago"
 msgstr ""
 
-#: ../../lib/class/ampacherss.class.php:197
-#: ../../templates/show_recently_played.inc.php:35
+#: ../../lib/class/ampacherss.class.php:188
+#: ../../templates/show_recently_played.inc.php:30
 msgid "minutes ago"
 msgstr ""
 
-#: ../../lib/class/ampacherss.class.php:197
-#: ../../templates/show_recently_played.inc.php:35
+#: ../../lib/class/ampacherss.class.php:188
+#: ../../templates/show_recently_played.inc.php:30
 msgid "hours ago"
 msgstr ""
 
-#: ../../lib/class/ampacherss.class.php:197
-#: ../../templates/show_recently_played.inc.php:35
+#: ../../lib/class/ampacherss.class.php:188
+#: ../../templates/show_recently_played.inc.php:30
 msgid "days ago"
 msgstr ""
 
-#: ../../lib/class/ampacherss.class.php:197
-#: ../../templates/show_recently_played.inc.php:35
+#: ../../lib/class/ampacherss.class.php:188
+#: ../../templates/show_recently_played.inc.php:30
 msgid "weeks ago"
 msgstr ""
 
-#: ../../lib/class/ampacherss.class.php:197
-#: ../../templates/show_recently_played.inc.php:35
+#: ../../lib/class/ampacherss.class.php:188
+#: ../../templates/show_recently_played.inc.php:30
 msgid "months ago"
 msgstr ""
 
-#: ../../lib/class/ampacherss.class.php:197
-#: ../../templates/show_recently_played.inc.php:35
+#: ../../lib/class/ampacherss.class.php:188
+#: ../../templates/show_recently_played.inc.php:30
 msgid "years ago"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:232
+#: ../../lib/class/catalog.class.php:237
 msgid "day"
 msgid_plural "days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../lib/class/catalog.class.php:234
+#: ../../lib/class/catalog.class.php:239
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../lib/class/catalog.class.php:319
+#: ../../lib/class/catalog.class.php:324
 msgid "Running Remote Sync"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:487 ../../lib/class/catalog.class.php:536
+#: ../../lib/class/catalog.class.php:497 ../../lib/class/catalog.class.php:543
 msgid "Error: Unable to change to directory"
 msgstr ""
 
 #. HINT: FullFile
-#: ../../lib/class/catalog.class.php:573
+#: ../../lib/class/catalog.class.php:580
 #, php-format
 msgid "Error: Unable to get filesize for %s"
 msgstr ""
 
 #. HINT: FullFile
-#: ../../lib/class/catalog.class.php:580
+#: ../../lib/class/catalog.class.php:587
 #, php-format
 msgid "%s is not readable by ampache"
 msgstr ""
 
 #. HINT: FullFile
-#: ../../lib/class/catalog.class.php:589
+#: ../../lib/class/catalog.class.php:596
 #, php-format
 msgid "%s does not match site charset"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1088
-#: ../../lib/class/catalog.class.php:1999 ../../preferences.php:123
-#: ../../admin/access.php:135
-msgid "Updated"
-msgstr ""
-
-#: ../../lib/class/catalog.class.php:1095
+#: ../../lib/class/catalog.class.php:1078
 msgid "No Update Needed"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1230
+#: ../../lib/class/catalog.class.php:1213
 msgid "Running Remote Update"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1257
+#: ../../lib/class/catalog.class.php:1240
 msgid "Added Playlist From"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1286
+#: ../../lib/class/catalog.class.php:1269
 msgid "Catalog Update Finished"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1286
+#: ../../lib/class/catalog.class.php:1269
 msgid "Total Time"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1287
+#: ../../lib/class/catalog.class.php:1270
 msgid "Total Songs"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1287
+#: ../../lib/class/catalog.class.php:1270
 msgid "Songs Per Seconds"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1301 ../../lib/class/artist.class.php:396
-#: ../../admin/users.php:155
+#: ../../lib/class/catalog.class.php:1284 ../../lib/class/artist.class.php:387
+#: ../../admin/users.php:150
 msgid "Error"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1301
+#: ../../lib/class/catalog.class.php:1284
 msgid "Unable to load pear XMLRPC library, make sure XML-RPC is enabled"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1339
-#: ../../lib/class/catalog.class.php:1413
-#: ../../lib/class/catalog.class.php:1446
-#: ../../lib/class/catalog.class.php:2478
+#: ../../lib/class/catalog.class.php:1322
+#: ../../lib/class/catalog.class.php:1396
+#: ../../lib/class/catalog.class.php:1429
+#: ../../lib/class/catalog.class.php:2405
 msgid "Error connecting to"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1339
-#: ../../lib/class/catalog.class.php:1413
-#: ../../lib/class/catalog.class.php:1446
-#: ../../lib/class/catalog.class.php:2478
+#: ../../lib/class/catalog.class.php:1322
+#: ../../lib/class/catalog.class.php:1396
+#: ../../lib/class/catalog.class.php:1429
+#: ../../lib/class/catalog.class.php:2405
 msgid "Code"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1339
-#: ../../lib/class/catalog.class.php:1413
-#: ../../lib/class/catalog.class.php:1446
-#: ../../lib/class/catalog.class.php:2478
+#: ../../lib/class/catalog.class.php:1322
+#: ../../lib/class/catalog.class.php:1396
+#: ../../lib/class/catalog.class.php:1429
+#: ../../lib/class/catalog.class.php:2405
 msgid "Reason"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1368
+#: ../../lib/class/catalog.class.php:1351
 msgid "Completed updating remote catalog(s)"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1372
+#: ../../lib/class/catalog.class.php:1355
 msgid "Starting synchronisation of album images"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1374
+#: ../../lib/class/catalog.class.php:1357
 msgid "Completed synchronisation of album images"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1409 ../../templates/show_song.inc.php:73
-#: ../../admin/access.php:115
-msgid "Added"
-msgstr ""
-
-#: ../../lib/class/catalog.class.php:1442
+#: ../../lib/class/catalog.class.php:1425
 msgid "images synchronized: "
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1577
+#: ../../lib/class/catalog.class.php:1555
 msgid "Catalog Root unreadable, stopping clean"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1614
-msgid "Error File Not Found or 0 Bytes:"
-msgstr ""
-
-#: ../../lib/class/catalog.class.php:1636
-msgid "Error Remote File Not Found or 0 Bytes:"
-msgstr ""
-
-#: ../../lib/class/catalog.class.php:1656
-msgid "Error All songs would be removed, doing nothing"
+#: ../../lib/class/catalog.class.php:1578
+msgid "All files would be removed. Doing nothing"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1682
+#: ../../lib/class/catalog.class.php:1596
 #, php-format
 msgid "Catalog Clean Done. %d file removed."
 msgid_plural "Catalog Clean Done. %d files removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../lib/class/catalog.class.php:1684
-msgid "Optimizing Tables"
+#: ../../lib/class/catalog.class.php:1626
+msgid "Error File Not Found or 0 Bytes:"
 msgstr ""
 
-#. HINT: Mediafile
-#: ../../lib/class/catalog.class.php:1979
-#, php-format
-msgid "%s does not exist or is not readable"
+#: ../../lib/class/catalog.class.php:1643
+msgid "Error Remote File Not Found or 0 Bytes:"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1999
-msgid "Update Finished"
+#: ../../lib/class/catalog.class.php:1860
+#, php-format
+msgid "Catalog Verify Done. %d of %d files updated."
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1999
-msgid "Checked"
+#: ../../lib/class/catalog.class.php:1896
+#, php-format
+msgid "%s does not exist or is not readable"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:2076
-#: ../../lib/class/catalog.class.php:2178
-#: ../../templates/show_album.inc.php:47
+#: ../../lib/class/catalog.class.php:1997
+#: ../../lib/class/catalog.class.php:2105
+#: ../../templates/show_album.inc.php:42
 msgid "Unknown (Orphaned)"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:2576
+#: ../../lib/class/catalog.class.php:2503
 msgid "Playlist creation error."
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:2583
+#: ../../lib/class/catalog.class.php:2510
 #, php-format
 msgid "Playlist Import and Recreate Successful. Total: %d Song"
 msgid_plural "Playlist Import and Recreate Successful. Total: %d Songs"
@@ -983,1580 +1243,1416 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. HINT: filename
-#: ../../lib/class/catalog.class.php:2589
+#: ../../lib/class/catalog.class.php:2516
 #, php-format
 msgid "Parsing %s - Not Found: %d Song. Please check your m3u file."
 msgid_plural "Parsing %s - Not Found: %d Songs. Please check your m3u file."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../lib/class/artist.class.php:388
+#: ../../lib/class/artist.class.php:379
 msgid "Fault"
 msgstr ""
 
-#: ../../lib/class/artist.class.php:401 ../../templates/show_lyrics.inc.php:53
+#: ../../lib/class/artist.class.php:392 ../../templates/show_lyrics.inc.php:47
 msgid "Sorry Lyrics Not Found."
 msgstr ""
 
-#: ../../lib/security.lib.php:59
+#: ../../lib/security.lib.php:53
 msgid "No problem found."
 msgstr ""
 
-#: ../../lib/security.lib.php:62
+#: ../../lib/security.lib.php:56
 #, php-format
 msgid "You are running old ampache: %s"
 msgstr ""
 
-#: ../../lib/security.lib.php:90
+#: ../../lib/security.lib.php:84
 #, php-format
 msgid "Your PHP version may be too old: %s"
 msgstr ""
 
-#: ../../lib/security.lib.php:94
+#: ../../lib/security.lib.php:88
 msgid "No probrem found."
 msgstr ""
 
-#: ../../lib/security.lib.php:97
+#: ../../lib/security.lib.php:91
 #, php-format
 msgid "You are running old php: %s"
 msgstr ""
 
-#: ../../register.php:85
+#: ../../lib/security.lib.php:180
+msgid "Provide useful information to attack the error information."
+msgstr ""
+
+#: ../../lib/security.lib.php:183
+msgid ""
+"Including the PHP version that is described in the HTTP header. It is "
+"\"INI_SYSTEM\" because it is set can be changed only in the server "
+"configuration."
+msgstr ""
+
+#: ../../lib/security.lib.php:186
+msgid ""
+"URL specified in session and the session ID is initialized using. "
+"(permissive session management. if you set 1 URL, POST in the session ID is "
+"ignored)"
+msgstr ""
+
+#: ../../lib/security.lib.php:190
+msgid "There is no probrem."
+msgstr ""
+
+#: ../../register.php:80
 msgid "Error Captcha Required"
 msgstr ""
 
-#: ../../register.php:92
+#: ../../register.php:87
 msgid "Error Captcha Failed"
 msgstr ""
 
-#: ../../register.php:99
+#: ../../register.php:94
 msgid "You <U>must</U> accept the user agreement"
 msgstr ""
 
-#: ../../register.php:104
+#: ../../register.php:99
 msgid "You did not enter a username"
 msgstr ""
 
-#: ../../register.php:108
+#: ../../register.php:103
 msgid "Please fill in your full name (Firstname Lastname)"
 msgstr ""
 
-#: ../../register.php:129
+#: ../../register.php:124
 msgid "Error Email address not confirmed"
 msgstr ""
 
-#: ../../register.php:135
+#: ../../register.php:130
 msgid "You must enter a password"
 msgstr ""
 
-#: ../../register.php:139
+#: ../../register.php:134
 msgid "Your passwords do not match"
 msgstr ""
 
-#: ../../register.php:143 ../../admin/users.php:122
+#: ../../register.php:138 ../../admin/users.php:117
 msgid "Error Username already exists"
 msgstr ""
 
-#: ../../register.php:171 ../../admin/users.php:129
+#: ../../register.php:166 ../../admin/users.php:124
 msgid "Error: Insert Failed"
 msgstr ""
 
-#: ../../install.php:206
+#: ../../install.php:204
 msgid "Error: Config file not found or Unreadable"
 msgstr ""
 
-#: ../../preferences.php:52 ../../preferences.php:87
+#: ../../preferences.php:47 ../../preferences.php:82
 msgid "Server"
 msgstr ""
 
-#: ../../preferences.php:119
+#: ../../preferences.php:114
 msgid "Error Update Failed"
 msgstr ""
 
-#: ../../preferences.php:124
+#: ../../preferences.php:119
 msgid "Your Account has been updated"
 msgstr ""
 
-#: ../../lostpassword.php:50
+#: ../../lostpassword.php:45
 msgid "Password has been sent"
 msgstr ""
 
-#: ../../lostpassword.php:52
+#: ../../lostpassword.php:47
 msgid "Password has not been sent"
 msgstr ""
 
-#: ../../lostpassword.php:70
+#: ../../lostpassword.php:65
 msgid "Lost Password"
 msgstr ""
 
-#: ../../lostpassword.php:74
+#: ../../lostpassword.php:69
 #, php-format
 msgid "A user from %s has requested a password reset for '%s'."
 msgstr ""
 
-#: ../../lostpassword.php:76
+#: ../../lostpassword.php:71
 #, php-format
 msgid "The password has been set to: %s"
 msgstr ""
 
 #. HINT: Artist Fullname
-#: ../../templates/show_song_row.inc.php:36
-#: ../../templates/show_recommended_artists.inc.php:47
-#: ../../templates/show_recommended_artists.inc.php:75
-#: ../../templates/show_albums.inc.php:53
-#: ../../templates/show_albums.inc.php:84
-#: ../../templates/show_admin_tools.inc.php:57
-#: ../../templates/show_song.inc.php:45
-#: ../../templates/show_artist_row.inc.php:36
-#: ../../templates/show_album_row.inc.php:36
-#: ../../templates/show_recently_played.inc.php:49
-#: ../../templates/show_recently_played.inc.php:92
-#: ../../templates/show_recently_played.inc.php:111
-#: ../../templates/show_artists.inc.php:51
-#: ../../templates/show_artists.inc.php:79
-#: ../../templates/show_artist.inc.php:62
-#: ../../templates/show_songs.inc.php:51 ../../templates/show_songs.inc.php:80
-#: ../../templates/show_live_stream.inc.php:39
-#: ../../templates/show_album.inc.php:64
-#: ../../templates/show_live_streams.inc.php:48
-#: ../../templates/show_live_streams.inc.php:70
-#: ../../templates/show_add_live_stream.inc.php:80
-#: ../../templates/show_playlists.inc.php:46
-#: ../../templates/show_playlists.inc.php:69
-#: ../../templates/show_catalog_row.inc.php:42
-#: ../../templates/show_playlist_song_row.inc.php:35
-#: ../../templates/show_videos.inc.php:49
-#: ../../templates/show_videos.inc.php:73
-#: ../../templates/show_playlist_row.inc.php:36
-#: ../../templates/show_live_stream_row.inc.php:36
-#: ../../templates/show_shoutbox.inc.php:47
-#: ../../templates/show_video_row.inc.php:36
+#: ../../templates/show_song_row.inc.php:31
+#: ../../templates/show_recommended_artists.inc.php:42
+#: ../../templates/show_recommended_artists.inc.php:70
+#: ../../templates/show_albums.inc.php:48
+#: ../../templates/show_albums.inc.php:79
+#: ../../templates/show_admin_tools.inc.php:52
+#: ../../templates/show_song.inc.php:40
+#: ../../templates/show_artist_row.inc.php:31
+#: ../../templates/show_album_row.inc.php:31
+#: ../../templates/show_recently_played.inc.php:44
+#: ../../templates/show_recently_played.inc.php:87
+#: ../../templates/show_recently_played.inc.php:106
+#: ../../templates/show_artists.inc.php:46
+#: ../../templates/show_artists.inc.php:74
+#: ../../templates/show_artist.inc.php:57
+#: ../../templates/show_songs.inc.php:46 ../../templates/show_songs.inc.php:75
+#: ../../templates/show_live_stream.inc.php:34
+#: ../../templates/show_album.inc.php:59
+#: ../../templates/show_live_streams.inc.php:43
+#: ../../templates/show_live_streams.inc.php:65
+#: ../../templates/show_add_live_stream.inc.php:75
+#: ../../templates/show_playlists.inc.php:41
+#: ../../templates/show_playlists.inc.php:64
+#: ../../templates/show_smartplaylists.inc.php:35
+#: ../../templates/show_smartplaylists.inc.php:56
+#: ../../templates/show_catalog_row.inc.php:37
+#: ../../templates/show_playlist_song_row.inc.php:30
+#: ../../templates/show_videos.inc.php:44
+#: ../../templates/show_videos.inc.php:68
+#: ../../templates/show_playlist_row.inc.php:31
+#: ../../templates/show_live_stream_row.inc.php:31
+#: ../../templates/show_shoutbox.inc.php:42
+#: ../../templates/show_smartplaylist_row.inc.php:24
+#: ../../templates/show_video_row.inc.php:31
 msgid "Add"
 msgstr ""
 
-#: ../../templates/show_song_row.inc.php:48
+#: ../../templates/show_song_row.inc.php:43
 msgid "Song Information"
 msgstr ""
 
-#: ../../templates/show_song_row.inc.php:51
-#: ../../templates/show_album_row.inc.php:58
+#: ../../templates/show_song_row.inc.php:46
+#: ../../templates/show_album_row.inc.php:53
 msgid "Post Shout"
 msgstr ""
 
-#: ../../templates/show_song_row.inc.php:56
-#: ../../templates/show_song.inc.php:48 ../../templates/show_artist.inc.php:78
-#: ../../templates/show_artist.inc.php:79
-#: ../../templates/show_album.inc.php:89 ../../templates/show_album.inc.php:90
-#: ../../templates/show_playlist_song_row.inc.php:49
-#: ../../templates/show_video_row.inc.php:45
+#: ../../templates/show_song_row.inc.php:51
+#: ../../templates/show_song.inc.php:43
+#: ../../templates/show_install_config.inc.php:69
+#: ../../templates/show_artist.inc.php:73
+#: ../../templates/show_artist.inc.php:74
+#: ../../templates/show_album.inc.php:84 ../../templates/show_album.inc.php:85
+#: ../../templates/show_playlist_song_row.inc.php:44
+#: ../../templates/show_video_row.inc.php:40
 msgid "Download"
 msgstr ""
 
-#: ../../templates/show_song_row.inc.php:60
-#: ../../templates/show_artist_row.inc.php:52
-#: ../../templates/show_album_row.inc.php:67
-#: ../../templates/show_access_list.inc.php:89
-#: ../../templates/show_playlist_song_row.inc.php:53
-#: ../../templates/show_playlist_row.inc.php:50
-#: ../../templates/show_live_stream_row.inc.php:44
-#: ../../templates/show_playlist.inc.php:70
-#: ../../templates/show_playlist.inc.php:71
-#: ../../templates/show_user_row.inc.php:51
-#: ../../templates/show_shout_row.inc.php:44
+#: ../../templates/show_song_row.inc.php:55
+#: ../../templates/show_smartplaylist.inc.php:44
+#: ../../templates/show_smartplaylist.inc.php:45
+#: ../../templates/show_artist_row.inc.php:47
+#: ../../templates/show_album_row.inc.php:62
+#: ../../templates/show_access_list.inc.php:84
+#: ../../templates/show_playlist_song_row.inc.php:48
+#: ../../templates/show_playlist_row.inc.php:45
+#: ../../templates/show_live_stream_row.inc.php:39
+#: ../../templates/show_smartplaylist_row.inc.php:36
+#: ../../templates/show_playlist.inc.php:65
+#: ../../templates/show_playlist.inc.php:66
+#: ../../templates/show_user_row.inc.php:46
+#: ../../templates/show_shout_row.inc.php:39
 msgid "Edit"
 msgstr ""
 
-#: ../../templates/show_add_access_current.inc.php:35
-#: ../../templates/show_access_list.inc.php:44
-#: ../../templates/show_access_list.inc.php:45
+#: ../../templates/show_add_access_current.inc.php:30
+#: ../../templates/show_access_list.inc.php:39
+#: ../../templates/show_access_list.inc.php:40
 msgid "Add Current Host"
 msgstr ""
 
-#: ../../templates/show_add_access_current.inc.php:40
-#: ../../templates/show_edit_catalog.inc.php:39
-#: ../../templates/show_admin_tools.inc.php:45
-#: ../../templates/show_admin_tools.inc.php:85
-#: ../../templates/show_edit_artist.inc.php:40
-#: ../../templates/show_localplay_controllers.inc.php:45
-#: ../../templates/show_localplay_controllers.inc.php:76
-#: ../../templates/show_stats.inc.php:76
-#: ../../templates/show_localplay_playlist.inc.php:47
-#: ../../templates/show_localplay_playlist.inc.php:73
-#: ../../templates/show_add_access.inc.php:40
-#: ../../templates/show_create_democratic.inc.php:38
-#: ../../templates/show_edit_album.inc.php:40
-#: ../../templates/show_live_streams.inc.php:49
-#: ../../templates/show_live_streams.inc.php:71
-#: ../../templates/show_account.inc.php:40
-#: ../../templates/show_add_live_stream.inc.php:39
-#: ../../templates/show_access_list.inc.php:67
-#: ../../templates/show_catalogs.inc.php:46
-#: ../../templates/show_catalogs.inc.php:70
-#: ../../templates/show_edit_access.inc.php:39
-#: ../../templates/show_add_playlist.inc.php:39
-#: ../../templates/show_edit_live_stream_row.inc.php:39
-#: ../../templates/show_plugins.inc.php:45
-#: ../../templates/show_plugins.inc.php:82
-#: ../../templates/show_add_access_rpc.inc.php:40
-#: ../../templates/show_add_access_local.inc.php:40
-msgid "Name"
-msgstr ""
-
-#: ../../templates/show_add_access_current.inc.php:46
-#: ../../templates/show_add_access.inc.php:83
-#: ../../templates/show_edit_access.inc.php:56
-#: ../../templates/show_add_access_rpc.inc.php:80
-#: ../../templates/show_add_access_local.inc.php:80
+#: ../../templates/show_add_access_current.inc.php:41
+#: ../../templates/show_add_access.inc.php:78
+#: ../../templates/show_edit_access.inc.php:51
+#: ../../templates/show_add_access_rpc.inc.php:75
+#: ../../templates/show_add_access_local.inc.php:75
 msgid "IPv4 or IPv6 Addresses"
 msgstr ""
 
-#: ../../templates/show_add_access_current.inc.php:49
-#: ../../templates/show_add_access.inc.php:46
-#: ../../templates/show_create_democratic.inc.php:51
-#: ../../templates/show_access_list.inc.php:70
-#: ../../templates/show_edit_access.inc.php:85
-#: ../../templates/show_add_access_rpc.inc.php:46
-#: ../../templates/show_add_access_local.inc.php:46
-#: ../../templates/show_preference_admin.inc.php:44
-#: ../../templates/show_preference_admin.inc.php:63
-#: ../../templates/show_manage_democratic.inc.php:49
+#: ../../templates/show_add_access_current.inc.php:44
+#: ../../templates/show_add_access.inc.php:41
+#: ../../templates/show_create_democratic.inc.php:46
+#: ../../templates/show_access_list.inc.php:65
+#: ../../templates/show_edit_access.inc.php:80
+#: ../../templates/show_add_access_rpc.inc.php:41
+#: ../../templates/show_add_access_local.inc.php:41
+#: ../../templates/show_preference_admin.inc.php:39
+#: ../../templates/show_preference_admin.inc.php:58
+#: ../../templates/show_manage_democratic.inc.php:44
 msgid "Level"
 msgstr ""
 
-#: ../../templates/show_add_access_current.inc.php:64
-#: ../../templates/show_add_access.inc.php:73
-#: ../../templates/show_add_access_rpc.inc.php:70
-#: ../../templates/show_add_access_local.inc.php:70
+#: ../../templates/show_add_access_current.inc.php:59
+#: ../../templates/show_add_access.inc.php:68
+#: ../../templates/show_add_access_rpc.inc.php:65
+#: ../../templates/show_add_access_local.inc.php:65
 msgid "RPC Options"
 msgstr ""
 
-#: ../../templates/show_add_access_current.inc.php:67
-#: ../../templates/show_add_access.inc.php:76
-#: ../../templates/show_edit_access.inc.php:79
-#: ../../templates/show_add_access_rpc.inc.php:73
-#: ../../templates/show_add_access_local.inc.php:73
+#: ../../templates/show_add_access_current.inc.php:62
+#: ../../templates/show_add_access.inc.php:71
+#: ../../templates/show_edit_access.inc.php:74
+#: ../../templates/show_add_access_rpc.inc.php:68
+#: ../../templates/show_add_access_local.inc.php:68
 msgid "Remote Key"
 msgstr ""
 
-#: ../../templates/show_add_access_current.inc.php:75
-#: ../../templates/show_add_access.inc.php:102
-#: ../../templates/show_add_access_rpc.inc.php:99
-#: ../../templates/show_add_access_local.inc.php:99
+#: ../../templates/show_add_access_current.inc.php:70
+#: ../../templates/show_add_access.inc.php:97
+#: ../../templates/show_add_access_rpc.inc.php:94
+#: ../../templates/show_add_access_local.inc.php:94
 msgid "Create ACL"
 msgstr ""
 
-#: ../../templates/show_recommended_artists.inc.php:35
-#: ../../templates/show_now_playing_row.inc.php:101
+#: ../../templates/show_recommended_artists.inc.php:30
+#: ../../templates/show_now_playing_row.inc.php:96
 msgid "Similar Artists"
 msgstr ""
 
-#: ../../templates/show_recommended_artists.inc.php:48
-#: ../../templates/show_recommended_artists.inc.php:76
-#: ../../templates/show_albums.inc.php:58
-#: ../../templates/show_albums.inc.php:89
-#: ../../templates/show_disabled_songs.inc.php:50
-#: ../../templates/show_disabled_songs.inc.php:73
-#: ../../templates/show_democratic_playlist.inc.php:71
-#: ../../templates/show_democratic_playlist.inc.php:111
-#: ../../templates/show_edit_song.inc.php:58
-#: ../../templates/show_song.inc.php:58
-#: ../../templates/browse_filters.inc.php:78
-#: ../../templates/show_search.inc.php:57
-#: ../../templates/show_recently_played.inc.php:52
-#: ../../templates/show_recently_played.inc.php:115
-#: ../../templates/show_artists.inc.php:52
-#: ../../templates/show_artists.inc.php:80
-#: ../../templates/sidebar_home.inc.php:78
-#: ../../templates/show_songs.inc.php:53 ../../templates/show_songs.inc.php:82
-#: ../../templates/show_playlist_songs.inc.php:56
-#: ../../templates/show_playlist_songs.inc.php:82
-#: ../../templates/show_get_albumart.inc.php:40
-#: ../../templates/show_duplicates.inc.php:51
-#: ../../templates/show_duplicates.inc.php:90
-#: ../../templates/show_now_playing_row.inc.php:80
-#: ../../templates/show_lyrics_song.inc.php:68
-msgid "Artist"
-msgstr ""
-
-#: ../../templates/show_recommended_artists.inc.php:51
-#: ../../templates/show_recommended_artists.inc.php:79
-#: ../../templates/show_democratic_playlist.inc.php:72
-#: ../../templates/show_democratic_playlist.inc.php:112
-#: ../../templates/show_search.inc.php:85
-#: ../../templates/show_artists.inc.php:55
-#: ../../templates/show_artists.inc.php:83
-#: ../../templates/show_songs.inc.php:57 ../../templates/show_songs.inc.php:86
-#: ../../templates/show_playlist_songs.inc.php:60
-#: ../../templates/show_playlist_songs.inc.php:86
-#: ../../templates/show_videos.inc.php:53
-#: ../../templates/show_videos.inc.php:77
+#: ../../templates/show_recommended_artists.inc.php:46
+#: ../../templates/show_recommended_artists.inc.php:74
+#: ../../templates/show_democratic_playlist.inc.php:67
+#: ../../templates/show_democratic_playlist.inc.php:107
+#: ../../templates/show_artists.inc.php:50
+#: ../../templates/show_artists.inc.php:78
+#: ../../templates/show_songs.inc.php:52 ../../templates/show_songs.inc.php:81
+#: ../../templates/show_playlist_songs.inc.php:55
+#: ../../templates/show_playlist_songs.inc.php:81
+#: ../../templates/show_videos.inc.php:48
+#: ../../templates/show_videos.inc.php:72
 msgid "Time"
 msgstr ""
 
-#: ../../templates/show_recommended_artists.inc.php:52
-#: ../../templates/show_recommended_artists.inc.php:80
-#: ../../templates/show_albums.inc.php:61
-#: ../../templates/show_albums.inc.php:92
-#: ../../templates/show_stats.inc.php:47
-#: ../../templates/show_artists.inc.php:56
-#: ../../templates/show_artists.inc.php:84
-#: ../../templates/show_songs.inc.php:55 ../../templates/show_songs.inc.php:84
-#: ../../templates/show_videos.inc.php:54
-#: ../../templates/show_videos.inc.php:78
+#: ../../templates/show_recommended_artists.inc.php:47
+#: ../../templates/show_recommended_artists.inc.php:75
+#: ../../templates/show_albums.inc.php:56
+#: ../../templates/show_albums.inc.php:87
+#: ../../templates/show_stats.inc.php:42
+#: ../../templates/show_artists.inc.php:51
+#: ../../templates/show_artists.inc.php:79
+#: ../../templates/show_songs.inc.php:50 ../../templates/show_songs.inc.php:79
+#: ../../templates/show_videos.inc.php:49
+#: ../../templates/show_videos.inc.php:73
 msgid "Tags"
 msgstr ""
 
-#: ../../templates/show_recommended_artists.inc.php:53
-#: ../../templates/show_recommended_artists.inc.php:81
-#: ../../templates/show_albums.inc.php:62
-#: ../../templates/show_albums.inc.php:93 ../../templates/show_song.inc.php:40
-#: ../../templates/show_search.inc.php:117
-#: ../../templates/show_artists.inc.php:57
-#: ../../templates/show_artists.inc.php:85
-#: ../../templates/show_songs.inc.php:61 ../../templates/show_songs.inc.php:88
-#: ../../templates/show_playlist_songs.inc.php:64
-#: ../../templates/show_playlist_songs.inc.php:88
-#: ../../templates/show_now_playing_row.inc.php:48
-msgid "Rating"
-msgstr ""
-
-#: ../../templates/show_recommended_artists.inc.php:54
-#: ../../templates/show_recommended_artists.inc.php:82
-#: ../../templates/show_democratic_playlist.inc.php:67
-#: ../../templates/show_democratic_playlist.inc.php:107
-#: ../../templates/show_admin_tools.inc.php:46
-#: ../../templates/show_admin_tools.inc.php:86
-#: ../../templates/show_song.inc.php:43
-#: ../../templates/show_manage_shoutbox.inc.php:51
-#: ../../templates/show_manage_shoutbox.inc.php:75
-#: ../../templates/show_flagged.inc.php:51
-#: ../../templates/show_flagged.inc.php:70
-#: ../../templates/show_localplay_controllers.inc.php:48
-#: ../../templates/show_localplay_controllers.inc.php:79
-#: ../../templates/show_random_rules.inc.php:49
-#: ../../templates/show_localplay_playlist.inc.php:48
-#: ../../templates/show_localplay_playlist.inc.php:74
-#: ../../templates/show_artists.inc.php:58
-#: ../../templates/show_artists.inc.php:86
-#: ../../templates/show_songs.inc.php:63 ../../templates/show_songs.inc.php:90
-#: ../../templates/show_playlist_songs.inc.php:66
-#: ../../templates/show_playlist_songs.inc.php:90
-#: ../../templates/show_live_streams.inc.php:53
-#: ../../templates/show_live_streams.inc.php:75
-#: ../../templates/show_users.inc.php:58 ../../templates/show_users.inc.php:80
-#: ../../templates/show_access_list.inc.php:73
-#: ../../templates/show_plugins.inc.php:49
-#: ../../templates/show_plugins.inc.php:85
-#: ../../templates/show_videos.inc.php:55
-#: ../../templates/show_videos.inc.php:79
-#: ../../templates/show_localplay_instances.inc.php:41
-#: ../../templates/show_manage_democratic.inc.php:52
+#: ../../templates/show_recommended_artists.inc.php:49
+#: ../../templates/show_recommended_artists.inc.php:77
+#: ../../templates/show_democratic_playlist.inc.php:62
+#: ../../templates/show_democratic_playlist.inc.php:102
+#: ../../templates/show_admin_tools.inc.php:41
+#: ../../templates/show_admin_tools.inc.php:81
+#: ../../templates/show_song.inc.php:38
+#: ../../templates/show_manage_shoutbox.inc.php:46
+#: ../../templates/show_manage_shoutbox.inc.php:70
+#: ../../templates/show_flagged.inc.php:46
+#: ../../templates/show_flagged.inc.php:65
+#: ../../templates/show_localplay_controllers.inc.php:43
+#: ../../templates/show_localplay_controllers.inc.php:74
+#: ../../templates/show_localplay_playlist.inc.php:43
+#: ../../templates/show_localplay_playlist.inc.php:69
+#: ../../templates/show_artists.inc.php:53
+#: ../../templates/show_artists.inc.php:81
+#: ../../templates/show_songs.inc.php:58 ../../templates/show_songs.inc.php:85
+#: ../../templates/show_playlist_songs.inc.php:61
+#: ../../templates/show_playlist_songs.inc.php:85
+#: ../../templates/show_live_streams.inc.php:48
+#: ../../templates/show_live_streams.inc.php:70
+#: ../../templates/show_users.inc.php:53 ../../templates/show_users.inc.php:75
+#: ../../templates/show_access_list.inc.php:68
+#: ../../templates/show_plugins.inc.php:44
+#: ../../templates/show_plugins.inc.php:80
+#: ../../templates/show_videos.inc.php:50
+#: ../../templates/show_videos.inc.php:74
+#: ../../templates/show_localplay_instances.inc.php:36
+#: ../../templates/show_manage_democratic.inc.php:47
 msgid "Action"
 msgstr ""
 
-#: ../../templates/show_albums.inc.php:55
-#: ../../templates/show_albums.inc.php:86
+#: ../../templates/show_albums.inc.php:50
+#: ../../templates/show_albums.inc.php:81
 msgid "Cover"
 msgstr ""
 
-#: ../../templates/show_albums.inc.php:57
-#: ../../templates/show_albums.inc.php:88
-#: ../../templates/show_disabled_songs.inc.php:49
-#: ../../templates/show_disabled_songs.inc.php:72
-#: ../../templates/show_democratic_playlist.inc.php:70
-#: ../../templates/show_democratic_playlist.inc.php:110
-#: ../../templates/show_edit_song.inc.php:50
-#: ../../templates/show_song.inc.php:59 ../../templates/show_search.inc.php:63
-#: ../../templates/show_recently_played.inc.php:51
-#: ../../templates/show_recently_played.inc.php:114
-#: ../../templates/sidebar_home.inc.php:77
-#: ../../templates/show_songs.inc.php:54 ../../templates/show_songs.inc.php:83
-#: ../../templates/show_playlist_songs.inc.php:57
-#: ../../templates/show_playlist_songs.inc.php:83
-#: ../../templates/show_get_albumart.inc.php:48
-#: ../../templates/show_duplicates.inc.php:52
-#: ../../templates/show_duplicates.inc.php:91
-#: ../../templates/show_now_playing_row.inc.php:73
-#: ../../templates/show_lyrics_song.inc.php:61
-msgid "Album"
-msgstr ""
-
-#: ../../templates/show_albums.inc.php:60
-#: ../../templates/show_albums.inc.php:91
-#: ../../templates/show_edit_song.inc.php:72
-#: ../../templates/show_search.inc.php:73
-#: ../../templates/show_edit_album.inc.php:46
-msgid "Year"
-msgstr ""
-
-#: ../../templates/show_albums.inc.php:63
-#: ../../templates/show_albums.inc.php:94
-#: ../../templates/show_artist.inc.php:47
-#: ../../templates/show_album.inc.php:61
-#: ../../templates/show_playlists.inc.php:51
-#: ../../templates/show_playlists.inc.php:74
-#: ../../templates/show_catalogs.inc.php:51
-#: ../../templates/show_catalogs.inc.php:75
+#: ../../templates/show_albums.inc.php:58
+#: ../../templates/show_albums.inc.php:89
+#: ../../templates/show_artist.inc.php:42
+#: ../../templates/show_album.inc.php:56
+#: ../../templates/show_playlists.inc.php:46
+#: ../../templates/show_playlists.inc.php:69
+#: ../../templates/show_smartplaylists.inc.php:39
+#: ../../templates/show_smartplaylists.inc.php:60
+#: ../../templates/show_catalogs.inc.php:46
+#: ../../templates/show_catalogs.inc.php:70
 msgid "Actions"
 msgstr ""
 
-#: ../../templates/show_disabled_songs.inc.php:47
-#: ../../templates/show_disabled_songs.inc.php:70
-#: ../../templates/show_album_art.inc.php:61
+#: ../../templates/show_disabled_songs.inc.php:42
+#: ../../templates/show_disabled_songs.inc.php:65
+#: ../../templates/show_album_art.inc.php:56
 msgid "Select"
 msgstr ""
 
-#: ../../templates/show_disabled_songs.inc.php:48
-#: ../../templates/show_disabled_songs.inc.php:71
-#: ../../templates/show_democratic_playlist.inc.php:69
-#: ../../templates/show_democratic_playlist.inc.php:109
-#: ../../templates/show_edit_song.inc.php:44
-#: ../../templates/show_song.inc.php:57 ../../templates/show_search.inc.php:53
-#: ../../templates/show_videos.inc.php:50
-#: ../../templates/show_videos.inc.php:74
-#: ../../templates/show_duplicate.inc.php:45
-msgid "Title"
-msgstr ""
-
-#: ../../templates/show_disabled_songs.inc.php:51
-#: ../../templates/show_disabled_songs.inc.php:74
-#: ../../templates/show_import_playlist.inc.php:40
-#: ../../templates/show_song.inc.php:68 ../../templates/show_search.inc.php:79
-#: ../../templates/show_duplicates.inc.php:56
-#: ../../templates/show_duplicates.inc.php:95
-msgid "Filename"
-msgstr ""
-
-#: ../../templates/show_disabled_songs.inc.php:52
-#: ../../templates/show_disabled_songs.inc.php:75
+#: ../../templates/show_disabled_songs.inc.php:47
+#: ../../templates/show_disabled_songs.inc.php:70
 msgid "Addition Time"
 msgstr ""
 
-#: ../../templates/show_disabled_songs.inc.php:66
-#: ../../templates/show_manage_shoutbox.inc.php:66
-#: ../../templates/show_flagged.inc.php:61
-#: ../../templates/show_localplay_controllers.inc.php:72
-#: ../../templates/show_localplay_playlist.inc.php:68
-#: ../../templates/show_plugins.inc.php:78
+#: ../../templates/show_disabled_songs.inc.php:61
+#: ../../templates/show_manage_shoutbox.inc.php:61
+#: ../../templates/show_flagged.inc.php:56
+#: ../../templates/show_localplay_controllers.inc.php:67
+#: ../../templates/show_localplay_playlist.inc.php:63
+#: ../../templates/show_plugins.inc.php:73
 msgid "No Records Found"
 msgstr ""
 
-#: ../../templates/show_disabled_songs.inc.php:79
-msgid "Remove"
+#: ../../templates/show_search_options.inc.php:29
+msgid "Options"
 msgstr ""
 
+#: ../../templates/show_search_options.inc.php:33
 #: ../../templates/show_search_options.inc.php:34
-msgid "Options"
+msgid "Add Search Results"
 msgstr ""
 
 #: ../../templates/show_search_options.inc.php:38
 #: ../../templates/show_search_options.inc.php:39
-msgid "Add Search Results"
-msgstr ""
-
-#: ../../templates/show_search_options.inc.php:43
-#: ../../templates/show_search_options.inc.php:44
-#: ../../templates/rightbar.inc.php:61
-#: ../../templates/show_artist_row.inc.php:48
-#: ../../templates/show_album_row.inc.php:63
-#: ../../templates/show_playlist_row.inc.php:46
-#: ../../templates/show_playlist.inc.php:56
-#: ../../templates/show_playlist.inc.php:57
+#: ../../templates/rightbar.inc.php:56
+#: ../../templates/show_smartplaylist.inc.php:34
+#: ../../templates/show_smartplaylist.inc.php:35
+#: ../../templates/show_artist_row.inc.php:43
+#: ../../templates/show_album_row.inc.php:58
+#: ../../templates/show_playlist_row.inc.php:41
+#: ../../templates/show_smartplaylist_row.inc.php:32
+#: ../../templates/show_playlist.inc.php:51
+#: ../../templates/show_playlist.inc.php:52
 msgid "Batch Download"
 msgstr ""
 
-#: ../../templates/rightbar.inc.php:37
-#: ../../templates/show_democratic.inc.php:52
-#: ../../templates/show_localplay_control.inc.php:39
-#: ../../templates/show_manage_democratic.inc.php:69
+#: ../../templates/rightbar.inc.php:32
+#: ../../templates/show_democratic.inc.php:47
+#: ../../templates/show_localplay_control.inc.php:34
+#: ../../templates/show_manage_democratic.inc.php:64
 msgid "Play"
 msgstr ""
 
-#: ../../templates/rightbar.inc.php:40
+#: ../../templates/rightbar.inc.php:35
 msgid "Add to Playlist"
 msgstr ""
 
-#: ../../templates/rightbar.inc.php:43
+#: ../../templates/rightbar.inc.php:38
 msgid "Add to New Playlist"
 msgstr ""
 
-#: ../../templates/rightbar.inc.php:66
-#: ../../templates/show_democratic.inc.php:56
-#: ../../templates/show_democratic.inc.php:57
-#: ../../templates/show_localplay_status.inc.php:59
+#: ../../templates/rightbar.inc.php:61
+#: ../../templates/show_democratic.inc.php:51
+#: ../../templates/show_democratic.inc.php:52
+#: ../../templates/show_localplay_status.inc.php:54
 msgid "Clear Playlist"
 msgstr ""
 
-#: ../../templates/rightbar.inc.php:69
+#: ../../templates/rightbar.inc.php:64
 msgid "Add Dynamic Items"
 msgstr ""
 
-#: ../../templates/rightbar.inc.php:81
+#: ../../templates/rightbar.inc.php:76
 msgid "Related Tag"
 msgstr ""
 
-#: ../../templates/rightbar.inc.php:124
+#: ../../templates/rightbar.inc.php:119
 msgid "More"
 msgstr ""
 
-#: ../../templates/show_democratic_playlist.inc.php:55
+#: ../../templates/show_democratic_playlist.inc.php:50
 msgid "Playing from base Playlist"
 msgstr ""
 
-#: ../../templates/show_democratic_playlist.inc.php:68
-#: ../../templates/show_democratic_playlist.inc.php:108
+#: ../../templates/show_democratic_playlist.inc.php:63
+#: ../../templates/show_democratic_playlist.inc.php:103
 msgid "Votes"
 msgstr ""
 
-#: ../../templates/show_democratic_playlist.inc.php:87
+#: ../../templates/show_democratic_playlist.inc.php:82
 msgid "Remove Vote"
 msgstr ""
 
-#: ../../templates/show_democratic_playlist.inc.php:89
+#: ../../templates/show_democratic_playlist.inc.php:84
 msgid "Add Vote"
 msgstr ""
 
-#: ../../templates/show_edit_playlist_song_row.inc.php:51
-#: ../../templates/show_edit_playlist_title.inc.php:50
-#: ../../templates/show_edit_song_row.inc.php:58
-#: ../../templates/show_edit_album_row.inc.php:61
-#: ../../templates/show_edit_playlist_row.inc.php:51
-#: ../../templates/show_edit_artist_row.inc.php:45
-#: ../../templates/show_edit_live_stream_row.inc.php:65
+#: ../../templates/show_edit_playlist_song_row.inc.php:46
+#: ../../templates/show_edit_playlist_title.inc.php:45
+#: ../../templates/show_smartplaylist.inc.php:62
+#: ../../templates/show_edit_song_row.inc.php:53
+#: ../../templates/show_edit_album_row.inc.php:56
+#: ../../templates/show_edit_playlist_row.inc.php:46
+#: ../../templates/show_edit_artist_row.inc.php:40
+#: ../../templates/show_edit_live_stream_row.inc.php:60
+#: ../../templates/show_edit_smartplaylist_title.inc.php:38
+#: ../../templates/show_edit_smartplaylist_row.inc.php:39
 msgid "Save Changes"
 msgstr ""
 
-#: ../../templates/show_big_art.inc.php:41
-#: ../../templates/show_album_art.inc.php:53
+#: ../../templates/show_big_art.inc.php:36
+#: ../../templates/show_album_art.inc.php:48
 msgid "Album Art"
 msgstr ""
 
-#: ../../templates/show_big_art.inc.php:45
+#: ../../templates/show_big_art.inc.php:40
 msgid "Click to close window"
 msgstr ""
 
-#: ../../templates/show_edit_playlist_title.inc.php:44
-#: ../../templates/show_edit_playlist_row.inc.php:45
+#: ../../templates/show_edit_playlist_title.inc.php:39
+#: ../../templates/show_edit_playlist_row.inc.php:40
+#: ../../templates/show_edit_smartplaylist_title.inc.php:32
+#: ../../templates/show_edit_smartplaylist_row.inc.php:33
 msgid "Public"
 msgstr ""
 
-#: ../../templates/show_import_playlist.inc.php:35
+#: ../../templates/show_import_playlist.inc.php:30
 msgid "Importing a Playlist from a File"
 msgstr ""
 
-#: ../../templates/show_import_playlist.inc.php:46
+#: ../../templates/show_import_playlist.inc.php:41
 msgid "Playlist Type"
 msgstr ""
 
-#: ../../templates/show_import_playlist.inc.php:58
+#: ../../templates/show_import_playlist.inc.php:53
 msgid "Import Playlist"
 msgstr ""
 
-#: ../../templates/footer.inc.php:36
+#: ../../templates/footer.inc.php:31
 msgid "Using Old Password Encryption, Please Reset your Password"
 msgstr ""
 
-#: ../../templates/footer.inc.php:43
-#: ../../templates/show_login_form.inc.php:113
-#: ../../templates/show_lostpassword_form.inc.php:86
-#: ../../templates/show_user_registration.inc.php:128
+#: ../../templates/footer.inc.php:38
+#: ../../templates/show_login_form.inc.php:108
+#: ../../templates/show_lostpassword_form.inc.php:81
+#: ../../templates/show_user_registration.inc.php:123
 msgid "Queries:"
 msgstr ""
 
-#: ../../templates/footer.inc.php:43
-#: ../../templates/show_login_form.inc.php:113
-#: ../../templates/show_lostpassword_form.inc.php:87
-#: ../../templates/show_user_registration.inc.php:128
+#: ../../templates/footer.inc.php:38
+#: ../../templates/show_login_form.inc.php:108
+#: ../../templates/show_lostpassword_form.inc.php:82
+#: ../../templates/show_user_registration.inc.php:123
 msgid "Cache Hits:"
 msgstr ""
 
-#: ../../templates/show_stats_popular.inc.php:38
-#: ../../templates/show_all_popular.inc.php:41
-#: ../../templates/show_mail_users.inc.php:59
+#: ../../templates/show_stats_popular.inc.php:33
+#: ../../templates/show_all_popular.inc.php:36
+#: ../../templates/show_mail_users.inc.php:54
 msgid "Most Popular Albums"
 msgstr ""
 
-#: ../../templates/show_stats_popular.inc.php:44
-#: ../../templates/show_all_popular.inc.php:38
-#: ../../templates/show_mail_users.inc.php:70
+#: ../../templates/show_stats_popular.inc.php:39
+#: ../../templates/show_all_popular.inc.php:33
+#: ../../templates/show_mail_users.inc.php:65
 msgid "Most Popular Artists"
 msgstr ""
 
-#: ../../templates/show_edit_song.inc.php:36
+#: ../../templates/show_edit_song.inc.php:31
 msgid "Edit Song"
 msgstr ""
 
-#: ../../templates/show_edit_song.inc.php:40
+#: ../../templates/show_edit_song.inc.php:35
 msgid "File"
 msgstr ""
 
-#: ../../templates/show_edit_song.inc.php:53
-#: ../../templates/show_edit_song.inc.php:61
-#: ../../templates/show_search.inc.php:137
-#: ../../templates/show_rename_artist.inc.php:45
-#: ../../templates/show_dynamic.inc.php:77
+#: ../../templates/show_edit_song.inc.php:48
+#: ../../templates/show_edit_song.inc.php:56
+#: ../../templates/show_rename_artist.inc.php:40
+#: ../../templates/show_dynamic.inc.php:72
 msgid "OR"
 msgstr ""
 
-#: ../../templates/show_edit_song.inc.php:66
-#: ../../templates/show_localplay_playlist.inc.php:46
-#: ../../templates/show_localplay_playlist.inc.php:72
-#: ../../templates/show_songs.inc.php:56 ../../templates/show_songs.inc.php:85
+#: ../../templates/show_edit_song.inc.php:61
+#: ../../templates/show_localplay_playlist.inc.php:41
+#: ../../templates/show_localplay_playlist.inc.php:67
+#: ../../templates/show_songs.inc.php:51 ../../templates/show_songs.inc.php:80
+#: ../../templates/show_playlist_songs.inc.php:49
 #: ../../templates/show_playlist_songs.inc.php:54
-#: ../../templates/show_playlist_songs.inc.php:59
+#: ../../templates/show_playlist_songs.inc.php:75
 #: ../../templates/show_playlist_songs.inc.php:80
-#: ../../templates/show_playlist_songs.inc.php:85
 msgid "Track"
 msgstr ""
 
-#: ../../templates/show_edit_song.inc.php:78
-#: ../../templates/show_song.inc.php:62
-#: ../../templates/show_manage_shoutbox.inc.php:49
-#: ../../templates/show_manage_shoutbox.inc.php:73
-#: ../../templates/show_search.inc.php:47
-#: ../../templates/show_flagged.inc.php:49
-#: ../../templates/show_flagged.inc.php:68
-msgid "Comment"
-msgstr ""
-
-#: ../../templates/show_edit_song.inc.php:86
-#: ../../templates/show_edit_artist.inc.php:48
-#: ../../templates/show_edit_album.inc.php:54
+#: ../../templates/show_edit_song.inc.php:81
+#: ../../templates/show_edit_artist.inc.php:43
+#: ../../templates/show_edit_album.inc.php:49
 msgid "Flag for Retagging"
 msgstr ""
 
-#: ../../templates/show_edit_song.inc.php:93
+#: ../../templates/show_edit_song.inc.php:88
 msgid "Update Song"
 msgstr ""
 
 #. HINT: Catalog Name
-#: ../../templates/show_edit_catalog.inc.php:35
+#: ../../templates/show_edit_catalog.inc.php:30
 #, php-format
 msgid "Settings for %s"
 msgstr ""
 
-#: ../../templates/show_edit_catalog.inc.php:42
-#: ../../templates/show_add_catalog.inc.php:46
+#: ../../templates/show_edit_catalog.inc.php:37
+#: ../../templates/show_add_catalog.inc.php:41
 msgid "Auto-inserted Fields"
 msgstr ""
 
-#: ../../templates/show_edit_catalog.inc.php:43
-#: ../../templates/show_add_catalog.inc.php:47
+#: ../../templates/show_edit_catalog.inc.php:38
+#: ../../templates/show_add_catalog.inc.php:42
 msgid "album name"
 msgstr ""
 
-#: ../../templates/show_edit_catalog.inc.php:44
-#: ../../templates/show_add_catalog.inc.php:48
+#: ../../templates/show_edit_catalog.inc.php:39
+#: ../../templates/show_add_catalog.inc.php:43
 msgid "artist name"
 msgstr ""
 
-#: ../../templates/show_edit_catalog.inc.php:45
-#: ../../templates/show_add_catalog.inc.php:49
+#: ../../templates/show_edit_catalog.inc.php:40
+#: ../../templates/show_add_catalog.inc.php:44
 msgid "id3 comment"
 msgstr ""
 
-#: ../../templates/show_edit_catalog.inc.php:46
-#: ../../templates/show_add_catalog.inc.php:50
+#: ../../templates/show_edit_catalog.inc.php:41
+#: ../../templates/show_add_catalog.inc.php:45
 msgid "track number (padded with leading 0)"
 msgstr ""
 
-#: ../../templates/show_edit_catalog.inc.php:47
-#: ../../templates/show_add_catalog.inc.php:51
+#: ../../templates/show_edit_catalog.inc.php:42
+#: ../../templates/show_add_catalog.inc.php:46
 msgid "song title"
 msgstr ""
 
-#: ../../templates/show_edit_catalog.inc.php:48
-#: ../../templates/show_add_catalog.inc.php:52
+#: ../../templates/show_edit_catalog.inc.php:43
+#: ../../templates/show_add_catalog.inc.php:47
 msgid "year"
 msgstr ""
 
-#: ../../templates/show_edit_catalog.inc.php:49
-#: ../../templates/show_add_catalog.inc.php:53
+#: ../../templates/show_edit_catalog.inc.php:44
+#: ../../templates/show_add_catalog.inc.php:48
 msgid "other"
 msgstr ""
 
-#: ../../templates/show_edit_catalog.inc.php:53
-#: ../../templates/show_add_catalog.inc.php:62
+#: ../../templates/show_edit_catalog.inc.php:48
+#: ../../templates/show_add_catalog.inc.php:57
 msgid "Catalog Type"
 msgstr ""
 
-#: ../../templates/show_edit_catalog.inc.php:57
+#: ../../templates/show_edit_catalog.inc.php:52
 msgid "XML-RPC Key"
 msgstr ""
 
-#: ../../templates/show_edit_catalog.inc.php:59
-#: ../../templates/show_add_catalog.inc.php:72
-#: ../../templates/show_add_catalog.inc.php:76
+#: ../../templates/show_edit_catalog.inc.php:54
+#: ../../templates/show_add_catalog.inc.php:67
+#: ../../templates/show_add_catalog.inc.php:71
 msgid "Required for Remote Catalogs"
 msgstr ""
 
-#: ../../templates/show_edit_catalog.inc.php:63
+#: ../../templates/show_edit_catalog.inc.php:58
 msgid "Filename pattern"
 msgstr ""
 
-#: ../../templates/show_edit_catalog.inc.php:70
-#: ../../templates/show_add_catalog.inc.php:84
+#: ../../templates/show_edit_catalog.inc.php:65
+#: ../../templates/show_add_catalog.inc.php:79
 msgid "Folder Pattern"
 msgstr ""
 
-#: ../../templates/show_edit_catalog.inc.php:70
-#: ../../templates/show_add_catalog.inc.php:84
+#: ../../templates/show_edit_catalog.inc.php:65
+#: ../../templates/show_add_catalog.inc.php:79
 msgid "(no leading or ending '/')"
 msgstr ""
 
-#: ../../templates/show_edit_catalog.inc.php:80
+#: ../../templates/show_edit_catalog.inc.php:75
 msgid "Save Catalog Settings"
 msgstr ""
 
-#: ../../templates/show_install_check.inc.php:36
+#: ../../templates/show_install_check.inc.php:31
 msgid "Required"
 msgstr ""
 
+#: ../../templates/show_install_check.inc.php:34
 #: ../../templates/show_install_check.inc.php:39
-#: ../../templates/show_install_check.inc.php:44
+#: ../../templates/show_install_check.inc.php:48
 #: ../../templates/show_install_check.inc.php:53
-#: ../../templates/show_install_check.inc.php:58
-#: ../../templates/show_test.inc.php:159
+#: ../../templates/show_test.inc.php:172
 #, php-format
 msgid "%s is readable"
 msgstr ""
 
-#: ../../templates/show_install_check.inc.php:67
-#: ../../templates/show_install_check.inc.php:80
-#: ../../templates/show_test.inc.php:57 ../../templates/show_info.inc.php:64
+#: ../../templates/show_install_check.inc.php:62
+#: ../../templates/show_install_check.inc.php:75
+#: ../../templates/show_test.inc.php:52 ../../templates/show_info.inc.php:60
 msgid "PHP Version"
 msgstr ""
 
-#: ../../templates/show_install_check.inc.php:78
-#: ../../templates/show_test.inc.php:63
+#: ../../templates/show_install_check.inc.php:73
+#: ../../templates/show_test.inc.php:58
 msgid "Hash Function Exists"
 msgstr ""
 
-#: ../../templates/show_install_check.inc.php:78
-#: ../../templates/show_test.inc.php:63
+#: ../../templates/show_install_check.inc.php:73
+#: ../../templates/show_test.inc.php:58
 msgid "SHA256 Support"
 msgstr ""
 
+#: ../../templates/show_install_check.inc.php:83
 #: ../../templates/show_install_check.inc.php:88
-#: ../../templates/show_install_check.inc.php:93
 msgid "PHP MySQL Support"
 msgstr ""
 
+#: ../../templates/show_install_check.inc.php:96
 #: ../../templates/show_install_check.inc.php:101
-#: ../../templates/show_install_check.inc.php:106
-#: ../../templates/show_test.inc.php:94
+#: ../../templates/show_test.inc.php:89
 msgid "PHP Session Support"
 msgstr ""
 
+#: ../../templates/show_install_check.inc.php:109
 #: ../../templates/show_install_check.inc.php:114
-#: ../../templates/show_install_check.inc.php:119
 msgid "PHP iconv Support"
 msgstr ""
 
+#: ../../templates/show_install_check.inc.php:122
 #: ../../templates/show_install_check.inc.php:127
-#: ../../templates/show_install_check.inc.php:132
-#: ../../templates/show_test.inc.php:127
+#: ../../templates/show_test.inc.php:122
 msgid "PHP PCRE Support"
 msgstr ""
 
-#: ../../templates/show_install_check.inc.php:140
-#: ../../templates/show_install_check.inc.php:145
-msgid "PHP putenv Support"
-msgstr ""
-
-#: ../../templates/show_install_check.inc.php:153
+#: ../../templates/show_install_check.inc.php:135
 msgid "Optional"
 msgstr ""
 
-#: ../../templates/show_install_check.inc.php:155
+#: ../../templates/show_install_check.inc.php:137
 msgid "PHP gettext Support"
 msgstr ""
 
-#: ../../templates/show_install_check.inc.php:159
+#: ../../templates/show_install_check.inc.php:141
 msgid "gettext emulation will be used"
 msgstr ""
 
-#: ../../templates/show_install_check.inc.php:167
+#: ../../templates/show_install_check.inc.php:149
 msgid "PHP mbstring Support"
 msgstr ""
 
-#: ../../templates/show_install_check.inc.php:171
+#: ../../templates/show_install_check.inc.php:153
 msgid "Multibyte character encodings may not be autodetected correctly"
 msgstr ""
 
-#: ../../templates/show_install_check.inc.php:179
+#: ../../templates/show_install_check.inc.php:161
+#: ../../templates/show_test.inc.php:138
+msgid "PHP Safe Mode"
+msgstr ""
+
+#: ../../templates/show_install_check.inc.php:164
+msgid "Safe mode enabled"
+msgstr ""
+
+#: ../../templates/show_install_check.inc.php:167
+msgid "Safe mode not enabled"
+msgstr ""
+
+#: ../../templates/show_install_check.inc.php:172
 msgid "PHP Memory Limit"
 msgstr ""
 
-#: ../../templates/show_install_check.inc.php:183
+#: ../../templates/show_install_check.inc.php:176
 msgid "Memory limit less than recommended size"
 msgstr ""
 
-#: ../../templates/show_install_check.inc.php:192
+#: ../../templates/show_install_check.inc.php:185
 msgid "PHP Execution Time Limit"
 msgstr ""
 
-#: ../../templates/show_install_check.inc.php:196
+#: ../../templates/show_install_check.inc.php:189
 msgid "Execution time limit less than recommended"
 msgstr ""
 
-#: ../../templates/show_install_check.inc.php:199
+#: ../../templates/show_install_check.inc.php:192
 msgid "seconds"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:59
-#: ../../templates/show_catalog_row.inc.php:43
+#: ../../templates/show_install_check.inc.php:197
+msgid "ampache.cfg.php is writable"
+msgstr ""
+
+#: ../../templates/show_admin_tools.inc.php:54
+#: ../../templates/show_catalog_row.inc.php:38
 msgid "Verify"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:61
-#: ../../templates/show_catalog_row.inc.php:44
+#: ../../templates/show_admin_tools.inc.php:56
+#: ../../templates/show_catalog_row.inc.php:39
 msgid "Clean"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:71
+#: ../../templates/show_admin_tools.inc.php:66
 msgid "Fast"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:72
-#: ../../templates/show_catalog_row.inc.php:46
-#: ../../bin/catalog_update.inc:179
+#: ../../templates/show_admin_tools.inc.php:67
+#: ../../templates/show_catalog_row.inc.php:41
+#: ../../bin/catalog_update.inc:180
 msgid "Gather Art"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:80
+#: ../../templates/show_admin_tools.inc.php:75
 msgid "No Catalogs Found"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:90
-#: ../../templates/show_manage_catalogs.inc.php:44
+#: ../../templates/show_admin_tools.inc.php:85
+#: ../../templates/show_manage_catalogs.inc.php:39
 msgid "Clean All"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:91
-#: ../../templates/show_manage_catalogs.inc.php:43
+#: ../../templates/show_admin_tools.inc.php:86
+#: ../../templates/show_manage_catalogs.inc.php:38
 msgid "Verify All"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:92
-#: ../../templates/show_manage_catalogs.inc.php:42
+#: ../../templates/show_admin_tools.inc.php:87
+#: ../../templates/show_manage_catalogs.inc.php:37
 msgid "Add to All"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:93
-#: ../../templates/show_manage_catalogs.inc.php:45
+#: ../../templates/show_admin_tools.inc.php:88
+#: ../../templates/show_manage_catalogs.inc.php:40
 msgid "Update All"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:94
-#: ../../templates/show_add_catalog.inc.php:37
-#: ../../templates/sidebar_admin.inc.php:38
+#: ../../templates/show_admin_tools.inc.php:89
+#: ../../templates/show_add_catalog.inc.php:32
+#: ../../templates/sidebar_admin.inc.php:33
 msgid "Add a Catalog"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:95
+#: ../../templates/show_admin_tools.inc.php:90
 msgid "Clear Catalog Stats"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:96
-#: ../../templates/show_add_catalog.inc.php:89
+#: ../../templates/show_admin_tools.inc.php:91
+#: ../../templates/show_add_catalog.inc.php:84
 msgid "Gather Album Art"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:100
-#: ../../templates/sidebar_modules.inc.php:43
-#: ../../templates/sidebar_admin.inc.php:55
+#: ../../templates/show_admin_tools.inc.php:95
+#: ../../templates/sidebar_modules.inc.php:38
+#: ../../templates/sidebar_admin.inc.php:50
 msgid "Other Tools"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:102
+#: ../../templates/show_admin_tools.inc.php:97
 msgid "Show Duplicate Songs"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:103
-#: ../../templates/sidebar_admin.inc.php:58
+#: ../../templates/show_admin_tools.inc.php:98
+#: ../../templates/sidebar_admin.inc.php:54
 msgid "Clear Now Playing"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:104
-#: ../../templates/header.inc.php:98
+#: ../../templates/show_admin_tools.inc.php:99
+#: ../../templates/header.inc.php:93
 msgid "Generate New Config"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:105
+#: ../../templates/show_admin_tools.inc.php:100
 msgid "Preferences Permissions"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:106
+#: ../../templates/show_admin_tools.inc.php:101
 msgid "Export To Itunes DB"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:107
+#: ../../templates/show_admin_tools.inc.php:102
 msgid "Show Inactive Users"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:108
+#: ../../templates/show_admin_tools.inc.php:103
 msgid "Check for New Version"
 msgstr ""
 
-#: ../../templates/sidebar_localplay.inc.php:48
-#: ../../templates/show_localplay_add_instance.inc.php:46
+#: ../../templates/show_smartplaylist.inc.php:39
+#: ../../templates/show_smartplaylist.inc.php:40
+#: ../../templates/show_playlist.inc.php:56
+#: ../../templates/show_playlist.inc.php:57
+msgid "Add All"
+msgstr ""
+
+#: ../../templates/sidebar_localplay.inc.php:43
+#: ../../templates/show_localplay_add_instance.inc.php:41
 msgid "Add Instance"
 msgstr ""
 
-#: ../../templates/sidebar_localplay.inc.php:49
+#: ../../templates/sidebar_localplay.inc.php:44
 msgid "Show instances"
 msgstr ""
 
-#: ../../templates/sidebar_localplay.inc.php:51
+#: ../../templates/sidebar_localplay.inc.php:46
 msgid "Show Playlist"
 msgstr ""
 
-#: ../../templates/sidebar_localplay.inc.php:55
+#: ../../templates/sidebar_localplay.inc.php:50
 msgid "Active Instance"
 msgstr ""
 
-#: ../../templates/sidebar_localplay.inc.php:73
+#: ../../templates/sidebar_localplay.inc.php:68
 msgid "Localplay Disabled"
 msgstr ""
 
-#: ../../templates/sidebar_localplay.inc.php:75
+#: ../../templates/sidebar_localplay.inc.php:70
 msgid "Allow Localplay set to False"
 msgstr ""
 
-#: ../../templates/sidebar_localplay.inc.php:77
+#: ../../templates/sidebar_localplay.inc.php:72
 msgid "Localplay Controller Not Defined"
 msgstr ""
 
-#: ../../templates/sidebar_localplay.inc.php:79
-#: ../../templates/show_denied.inc.php:44
+#: ../../templates/sidebar_localplay.inc.php:74
+#: ../../templates/show_denied.inc.php:39
 msgid "Access Denied"
 msgstr ""
 
-#: ../../templates/show_song.inc.php:37
+#: ../../templates/show_rules.inc.php:27
+msgid "Rules"
+msgstr ""
+
+#: ../../templates/show_rules.inc.php:31
+msgid "Match"
+msgstr ""
+
+#: ../../templates/show_rules.inc.php:34
+msgid "all rules"
+msgstr ""
+
+#: ../../templates/show_rules.inc.php:35
+msgid "any rule"
+msgstr ""
+
+#: ../../templates/show_rules.inc.php:43
+msgid "Add Another Rule"
+msgstr ""
+
+#: ../../templates/show_song.inc.php:32
 msgid "Details"
 msgstr ""
 
-#: ../../templates/show_song.inc.php:47
+#: ../../templates/show_song.inc.php:42
 msgid "Link"
 msgstr ""
 
-#: ../../templates/show_song.inc.php:60
-#: ../../templates/show_playlist_songs.inc.php:58
-#: ../../templates/show_playlist_songs.inc.php:84
+#: ../../templates/show_song.inc.php:55
+#: ../../templates/show_playlist_songs.inc.php:53
+#: ../../templates/show_playlist_songs.inc.php:79
 msgid "Genre"
 msgstr ""
 
-#: ../../templates/show_song.inc.php:61
-#: ../../templates/show_duplicates.inc.php:53
-#: ../../templates/show_duplicates.inc.php:92
-#: ../../templates/show_random.inc.php:57
+#: ../../templates/show_song.inc.php:56
+#: ../../templates/show_duplicates.inc.php:48
+#: ../../templates/show_duplicates.inc.php:87
+#: ../../templates/show_random.inc.php:67
 msgid "Length"
 msgstr ""
 
-#: ../../templates/show_song.inc.php:63
+#: ../../templates/show_song.inc.php:58
 msgid "Label"
 msgstr ""
 
-#: ../../templates/show_song.inc.php:64
+#: ../../templates/show_song.inc.php:59
 msgid "Song Language"
 msgstr ""
 
-#: ../../templates/show_song.inc.php:65
+#: ../../templates/show_song.inc.php:60
 msgid "Catalog Number"
 msgstr ""
 
 #: ../../templates/show_song.inc.php:66
-#: ../../templates/show_duplicates.inc.php:54
-#: ../../templates/show_duplicates.inc.php:93
-msgid "Bitrate"
+msgid "Last Updated"
 msgstr ""
 
-#: ../../templates/show_song.inc.php:71
-msgid "Last Updated"
+#: ../../templates/show_gather_art.inc.php:29
+msgid "Album Art Search"
 msgstr ""
 
-#: ../../templates/show_gather_art.inc.php:35 ../../bin/catalog_update.inc:137
+#: ../../templates/show_gather_art.inc.php:30 ../../bin/catalog_update.inc:133
 msgid "Starting Album Art Search"
 msgstr ""
 
-#: ../../templates/show_gather_art.inc.php:36
+#: ../../templates/show_gather_art.inc.php:31
 msgid "Searched"
 msgstr ""
 
-#: ../../templates/show_gather_art.inc.php:37
-#: ../../templates/show_clean_catalog.inc.php:39
-#: ../../templates/show_run_add_catalog.inc.php:37
-#: ../../templates/show_verify_catalog.inc.php:41
-#: ../../templates/show_adds_catalog.inc.php:39
+#: ../../templates/show_gather_art.inc.php:32
+#: ../../templates/show_clean_catalog.inc.php:34
+#: ../../templates/show_run_add_catalog.inc.php:32
+#: ../../templates/show_verify_catalog.inc.php:36
+#: ../../templates/show_adds_catalog.inc.php:34
 msgid "Reading"
 msgstr ""
 
-#: ../../templates/show_confirmation.inc.php:40
-#: ../../templates/show_update_items.inc.php:39
+#: ../../templates/show_confirmation.inc.php:35
+#: ../../templates/show_update_items.inc.php:34
 msgid "Continue"
 msgstr ""
 
-#: ../../templates/show_confirmation.inc.php:45
+#: ../../templates/show_confirmation.inc.php:40
 msgid "Cancel"
 msgstr ""
 
-#: ../../templates/show_edit_artist.inc.php:36
+#: ../../templates/show_edit_artist.inc.php:31
 msgid "Edit Artist"
 msgstr ""
 
-#: ../../templates/show_edit_artist.inc.php:54
+#: ../../templates/show_edit_artist.inc.php:49
 msgid "Update Artist"
 msgstr ""
 
 #. HINT: Artist Fullname
-#: ../../templates/show_artist_row.inc.php:37
-#: ../../templates/show_album_row.inc.php:37
-#: ../../templates/sidebar_home.inc.php:75
-#: ../../templates/show_artist.inc.php:67
-#: ../../templates/show_album.inc.php:68
-#: ../../templates/show_playlist_row.inc.php:37
-#: ../../templates/show_localplay_status.inc.php:56
-#: ../../modules/localplay/httpq.controller.php:514
-#: ../../modules/localplay/mpd.controller.php:483
-#: ../../modules/localplay/vlc.controller.php:546
+#: ../../templates/show_artist_row.inc.php:32
+#: ../../templates/show_album_row.inc.php:32
+#: ../../templates/sidebar_home.inc.php:71
+#: ../../templates/show_artist.inc.php:62
+#: ../../templates/show_album.inc.php:63
+#: ../../templates/show_playlist_row.inc.php:32
+#: ../../templates/show_localplay_status.inc.php:51
+#: ../../modules/localplay/httpq.controller.php:507
+#: ../../modules/localplay/mpd.controller.php:476
+#: ../../modules/localplay/vlc.controller.php:539
 msgid "Random"
 msgstr ""
 
-#: ../../templates/show_manage_shoutbox.inc.php:46
-#: ../../templates/show_manage_shoutbox.inc.php:70
-#: ../../templates/show_flagged.inc.php:46
-#: ../../templates/show_flagged.inc.php:65
+#: ../../templates/show_manage_shoutbox.inc.php:41
+#: ../../templates/show_manage_shoutbox.inc.php:65
+#: ../../templates/show_flagged.inc.php:41
+#: ../../templates/show_flagged.inc.php:60
 msgid "Object"
 msgstr ""
 
-#: ../../templates/show_manage_shoutbox.inc.php:48
-#: ../../templates/show_manage_shoutbox.inc.php:72
+#: ../../templates/show_manage_shoutbox.inc.php:43
+#: ../../templates/show_manage_shoutbox.inc.php:67
 msgid "Sticky"
 msgstr ""
 
-#: ../../templates/show_manage_shoutbox.inc.php:50
-#: ../../templates/show_manage_shoutbox.inc.php:74
+#: ../../templates/show_manage_shoutbox.inc.php:45
+#: ../../templates/show_manage_shoutbox.inc.php:69
 msgid "Date Added"
 msgstr ""
 
-#: ../../templates/browse_filters.inc.php:37
+#: ../../templates/browse_filters.inc.php:32
 msgid "Filters"
 msgstr ""
 
-#: ../../templates/browse_filters.inc.php:41
+#: ../../templates/browse_filters.inc.php:36
 msgid "Starts With"
 msgstr ""
 
-#: ../../templates/browse_filters.inc.php:47
+#: ../../templates/browse_filters.inc.php:42
 msgid "Minimum Count"
 msgstr ""
 
-#: ../../templates/browse_filters.inc.php:52
+#: ../../templates/browse_filters.inc.php:47
 msgid "Rated"
 msgstr ""
 
-#: ../../templates/browse_filters.inc.php:57
+#: ../../templates/browse_filters.inc.php:52
 msgid "Unplayed"
 msgstr ""
 
-#: ../../templates/browse_filters.inc.php:61
-#: ../../templates/show_artist.inc.php:83
-msgid "Show Art"
-msgstr ""
-
-#: ../../templates/browse_filters.inc.php:66
+#: ../../templates/browse_filters.inc.php:56
 msgid "All Playlists"
 msgstr ""
 
-#: ../../templates/browse_filters.inc.php:72
-#: ../../templates/show_songs.inc.php:52 ../../templates/show_songs.inc.php:81
-#: ../../templates/show_playlist_songs.inc.php:55
-#: ../../templates/show_playlist_songs.inc.php:81
+#: ../../templates/browse_filters.inc.php:62
+#: ../../templates/show_songs.inc.php:47 ../../templates/show_songs.inc.php:76
+#: ../../templates/show_playlist_songs.inc.php:50
+#: ../../templates/show_playlist_songs.inc.php:76
 msgid "Song Title"
 msgstr ""
 
-#: ../../templates/browse_filters.inc.php:84
-#: ../../templates/show_add_live_stream.inc.php:72
-#: ../../templates/show_export.inc.php:43
-msgid "Catalog"
+#: ../../templates/browse_filters.inc.php:98
+msgid "Toggle Artwork"
 msgstr ""
 
-#: ../../templates/header.inc.php:81
+#: ../../templates/header.inc.php:76
 msgid "Log out"
 msgstr ""
 
-#: ../../templates/header.inc.php:97
+#: ../../templates/header.inc.php:92
 msgid "Error Config File Out of Date"
 msgstr ""
 
-#: ../../templates/show_search.inc.php:39
+#: ../../templates/show_search.inc.php:34
 msgid "Search Ampache"
 msgstr ""
 
-#: ../../templates/show_search.inc.php:43
-msgid "Keywords"
-msgstr ""
-
-#: ../../templates/show_search.inc.php:67
-#: ../../templates/show_live_streams.inc.php:52
-#: ../../templates/show_live_streams.inc.php:74
-msgid "Tag"
-msgstr ""
-
-#: ../../templates/show_search.inc.php:92
-#: ../../templates/show_videos.inc.php:51
-#: ../../templates/show_videos.inc.php:75
-msgid "Codec"
-msgstr ""
-
-#: ../../templates/show_search.inc.php:98
-msgid "Played"
-msgstr ""
-
-#: ../../templates/show_search.inc.php:102
-msgid "Yes"
-msgstr ""
-
-#: ../../templates/show_search.inc.php:103
-msgid "No"
-msgstr ""
-
-#: ../../templates/show_search.inc.php:106
-msgid "Min Bitrate"
-msgstr ""
-
-#: ../../templates/show_search.inc.php:120
-msgid ">="
-msgstr ""
-
-#: ../../templates/show_search.inc.php:121
-msgid "<="
-msgstr ""
-
-#: ../../templates/show_search.inc.php:122
-msgid "="
-msgstr ""
-
-#: ../../templates/show_search.inc.php:126
-msgid "One Star"
-msgstr ""
-
-#: ../../templates/show_search.inc.php:127
-msgid "Two Stars"
-msgstr ""
-
-#: ../../templates/show_search.inc.php:128
-msgid "Three Stars"
-msgstr ""
-
-#: ../../templates/show_search.inc.php:129
-msgid "Four Stars"
-msgstr ""
-
-#: ../../templates/show_search.inc.php:130
-msgid "Five Stars"
-msgstr ""
-
-#: ../../templates/show_search.inc.php:133
-#: ../../templates/show_random_rules.inc.php:46
-#: ../../templates/show_dynamic.inc.php:45
-msgid "Operator"
-msgstr ""
-
-#: ../../templates/show_search.inc.php:136
-#: ../../templates/show_dynamic.inc.php:78
-msgid "AND"
-msgstr ""
-
-#: ../../templates/show_search.inc.php:142
-#: ../../templates/show_random_rules.inc.php:48
-#: ../../templates/show_dynamic.inc.php:47
-msgid "Method"
-msgstr ""
-
-#: ../../templates/show_search.inc.php:145
-msgid "Fuzzy"
-msgstr ""
-
-#: ../../templates/show_search.inc.php:146
-msgid "Exact"
-msgstr ""
-
-#: ../../templates/show_search.inc.php:149
+#: ../../templates/show_search.inc.php:47
 msgid "Maximum Results"
 msgstr ""
 
-#: ../../templates/show_search.inc.php:152
-#: ../../templates/show_random.inc.php:61
-#: ../../templates/show_random.inc.php:98
+#: ../../templates/show_search.inc.php:50
+#: ../../templates/show_random.inc.php:71
+#: ../../templates/show_random.inc.php:87
 msgid "Unlimited"
 msgstr ""
 
-#: ../../templates/show_user_recommendations.inc.php:42
+#: ../../templates/show_search.inc.php:65
+msgid "Save as Smart Playlist"
+msgstr ""
+
+#: ../../templates/show_user_recommendations.inc.php:37
 msgid "Recommended Artists"
 msgstr ""
 
-#: ../../templates/show_user_recommendations.inc.php:53
+#: ../../templates/show_user_recommendations.inc.php:48
 msgid "Recommended Albums"
 msgstr ""
 
-#: ../../templates/show_user_recommendations.inc.php:64
+#: ../../templates/show_user_recommendations.inc.php:59
 msgid "Recommended Songs"
 msgstr ""
 
-#: ../../templates/show_flagged.inc.php:48
-#: ../../templates/show_flagged.inc.php:67
+#: ../../templates/show_flagged.inc.php:43
+#: ../../templates/show_flagged.inc.php:62
 msgid "Flag"
 msgstr ""
 
-#: ../../templates/show_flagged.inc.php:50
-#: ../../templates/show_flagged.inc.php:69
+#: ../../templates/show_flagged.inc.php:45
+#: ../../templates/show_flagged.inc.php:64
 msgid "Status"
 msgstr ""
 
-#: ../../templates/show_random_albums.inc.php:35
+#: ../../templates/show_random_albums.inc.php:30
 msgid "Refresh"
 msgstr ""
 
-#: ../../templates/show_random_albums.inc.php:37
-#: ../../templates/show_index.inc.php:44
+#: ../../templates/show_random_albums.inc.php:32
+#: ../../templates/show_index.inc.php:39
 msgid "Albums of the Moment"
 msgstr ""
 
-#: ../../templates/show_random_albums.inc.php:61
+#: ../../templates/show_random_albums.inc.php:56
 msgid "Play Album"
 msgstr ""
 
 #. HINT: Song Title
-#: ../../templates/show_lyrics.inc.php:46
+#: ../../templates/show_lyrics.inc.php:40
 #, php-format
 msgid "%s Lyrics"
 msgstr ""
 
 #. HINT: Editing Username preferences
 #. HINT: Username
-#: ../../templates/show_user_preferences.inc.php:40
-#: ../../templates/show_preferences.inc.php:40
+#: ../../templates/show_user_preferences.inc.php:35
+#: ../../templates/show_preferences.inc.php:35
 #, php-format
 msgid "Editing %s preferences"
 msgstr ""
 
-#: ../../templates/show_user_preferences.inc.php:48
-#: ../../templates/show_debug.inc.php:105
-#: ../../templates/show_preference_box.inc.php:52
-#: ../../templates/show_preference_box.inc.php:82
-#: ../../templates/show_preference_admin.inc.php:43
-#: ../../templates/show_preference_admin.inc.php:62
+#: ../../templates/show_user_preferences.inc.php:43
+#: ../../templates/show_debug.inc.php:100
+#: ../../templates/show_preference_box.inc.php:47
+#: ../../templates/show_preference_box.inc.php:77
+#: ../../templates/show_preference_admin.inc.php:38
+#: ../../templates/show_preference_admin.inc.php:57
 msgid "Preference"
 msgstr ""
 
-#: ../../templates/show_user_preferences.inc.php:49
-#: ../../templates/show_random_rules.inc.php:47
-#: ../../templates/show_debug.inc.php:57
-#: ../../templates/show_debug.inc.php:106
-#: ../../templates/show_preference_box.inc.php:53
-#: ../../templates/show_preference_box.inc.php:83
-#: ../../templates/show_dynamic.inc.php:46
+#: ../../templates/show_user_preferences.inc.php:44
+#: ../../templates/show_debug.inc.php:52
+#: ../../templates/show_debug.inc.php:101
+#: ../../templates/show_preference_box.inc.php:48
+#: ../../templates/show_preference_box.inc.php:78
+#: ../../templates/show_dynamic.inc.php:41
 msgid "Value"
 msgstr ""
 
-#: ../../templates/show_user_preferences.inc.php:62
-#: ../../templates/show_preferences.inc.php:46
+#: ../../templates/show_user_preferences.inc.php:57
+#: ../../templates/show_preferences.inc.php:41
 msgid "Update Preferences"
 msgstr ""
 
-#: ../../templates/error_page.inc.php:42
+#: ../../templates/show_smartplaylist_title.inc.php:24
+#, php-format
+msgid "%s %s (Smart Playlist)"
+msgstr ""
+
+#: ../../templates/error_page.inc.php:37
 msgid "Ampache error page"
 msgstr ""
 
-#: ../../templates/error_page.inc.php:59
+#: ../../templates/error_page.inc.php:54
 msgid ""
 "The folowing error has occured, you will automaticly be redirected after 10 "
 "seconds."
 msgstr ""
 
-#: ../../templates/error_page.inc.php:61
+#: ../../templates/error_page.inc.php:56
 msgid "Error messages"
 msgstr ""
 
-#: ../../templates/show_add_catalog.inc.php:38
+#: ../../templates/show_add_catalog.inc.php:33
 msgid ""
 "In the form below enter either a local path (i.e. /data/music) or the URL to "
 "a remote Ampache installation (i.e http://theotherampache.com)"
 msgstr ""
 
-#: ../../templates/show_add_catalog.inc.php:43
+#: ../../templates/show_add_catalog.inc.php:38
 msgid "Catalog Name"
 msgstr ""
 
-#: ../../templates/show_add_catalog.inc.php:58
-#: ../../templates/show_stats.inc.php:77
-#: ../../templates/show_catalogs.inc.php:47
-#: ../../templates/show_catalogs.inc.php:71
+#: ../../templates/show_add_catalog.inc.php:53
+#: ../../templates/show_stats.inc.php:72
+#: ../../templates/show_catalogs.inc.php:42
+#: ../../templates/show_catalogs.inc.php:66
 msgid "Path"
 msgstr ""
 
-#: ../../templates/show_add_catalog.inc.php:65
+#: ../../templates/show_add_catalog.inc.php:60
 msgid "Local"
 msgstr ""
 
-#: ../../templates/show_add_catalog.inc.php:66
+#: ../../templates/show_add_catalog.inc.php:61
 msgid "Remote"
 msgstr ""
 
-#: ../../templates/show_add_catalog.inc.php:71
+#: ../../templates/show_add_catalog.inc.php:66
 msgid "Remote Catalog Username"
 msgstr ""
 
-#: ../../templates/show_add_catalog.inc.php:75
+#: ../../templates/show_add_catalog.inc.php:70
 msgid "Remote Catalog Password"
 msgstr ""
 
-#: ../../templates/show_add_catalog.inc.php:79
+#: ../../templates/show_add_catalog.inc.php:74
 msgid "Filename Pattern"
 msgstr ""
 
-#: ../../templates/show_add_catalog.inc.php:93
+#: ../../templates/show_add_catalog.inc.php:88
 msgid "Build Playlists from m3u Files"
 msgstr ""
 
-#: ../../templates/show_add_catalog.inc.php:100
+#: ../../templates/show_add_catalog.inc.php:95
 msgid "Add Catalog"
 msgstr ""
 
-#: ../../templates/show_add_shout.inc.php:35
+#: ../../templates/show_add_shout.inc.php:30
 msgid "Post to Shoutbox"
 msgstr ""
 
-#: ../../templates/show_add_shout.inc.php:39
-#: ../../templates/show_edit_shout.inc.php:43
+#: ../../templates/show_add_shout.inc.php:34
+#: ../../templates/show_edit_shout.inc.php:38
 msgid "Comment:"
 msgstr ""
 
-#: ../../templates/show_add_shout.inc.php:46
-#: ../../templates/show_edit_shout.inc.php:49
+#: ../../templates/show_add_shout.inc.php:41
+#: ../../templates/show_edit_shout.inc.php:44
 msgid "Make Sticky"
 msgstr ""
 
-#: ../../templates/show_add_shout.inc.php:54
-#: ../../templates/show_add_playlist.inc.php:53
+#: ../../templates/show_add_shout.inc.php:49
+#: ../../templates/show_add_playlist.inc.php:48
 msgid "Create"
 msgstr ""
 
-#: ../../templates/show_localplay_add_instance.inc.php:35
+#: ../../templates/show_localplay_add_instance.inc.php:30
 msgid "Add Localplay Instance"
 msgstr ""
 
-#: ../../templates/show_recently_played.inc.php:50
-#: ../../templates/show_recently_played.inc.php:113
-#: ../../templates/show_duplicates.inc.php:50
-#: ../../templates/show_duplicates.inc.php:89
-#: ../../templates/show_now_playing_row.inc.php:66
-#: ../../templates/show_lyrics_song.inc.php:54
+#: ../../templates/show_recently_played.inc.php:45
+#: ../../templates/show_recently_played.inc.php:108
+#: ../../templates/show_duplicates.inc.php:45
+#: ../../templates/show_duplicates.inc.php:84
+#: ../../templates/show_now_playing_row.inc.php:61
+#: ../../templates/show_lyrics_song.inc.php:49
 msgid "Song"
 msgstr ""
 
-#: ../../templates/show_recently_played.inc.php:53
-#: ../../templates/show_recently_played.inc.php:112
-#: ../../templates/show_users.inc.php:51 ../../templates/show_users.inc.php:73
-#: ../../templates/show_edit_user.inc.php:44
-#: ../../templates/show_login_form.inc.php:71
-#: ../../templates/show_now_playing_row.inc.php:41
-#: ../../templates/show_install_account.inc.php:50
-#: ../../templates/show_user_registration.inc.php:81
-#: ../../templates/show_add_user.inc.php:41
+#: ../../templates/show_recently_played.inc.php:48
+#: ../../templates/show_recently_played.inc.php:107
+#: ../../templates/show_users.inc.php:46 ../../templates/show_users.inc.php:68
+#: ../../templates/show_edit_user.inc.php:39
+#: ../../templates/show_login_form.inc.php:66
+#: ../../templates/show_now_playing_row.inc.php:36
+#: ../../templates/show_install_account.inc.php:45
+#: ../../templates/show_user_registration.inc.php:76
+#: ../../templates/show_add_user.inc.php:36
 msgid "Username"
 msgstr ""
 
-#: ../../templates/show_recently_played.inc.php:54
-#: ../../templates/show_recently_played.inc.php:116
+#: ../../templates/show_recently_played.inc.php:49
+#: ../../templates/show_recently_played.inc.php:111
 msgid "Last Played"
 msgstr ""
 
-#: ../../templates/show_localplay_controllers.inc.php:46
-#: ../../templates/show_localplay_controllers.inc.php:77
-#: ../../templates/show_plugins.inc.php:46
-#: ../../templates/show_plugins.inc.php:83
+#: ../../templates/show_localplay_controllers.inc.php:41
+#: ../../templates/show_localplay_controllers.inc.php:72
+#: ../../templates/show_plugins.inc.php:41
+#: ../../templates/show_plugins.inc.php:78
 msgid "Description"
 msgstr ""
 
-#: ../../templates/show_localplay_controllers.inc.php:47
-#: ../../templates/show_localplay_controllers.inc.php:78
-#: ../../templates/show_plugins.inc.php:47
-#: ../../templates/show_plugins.inc.php:84
+#: ../../templates/show_localplay_controllers.inc.php:42
+#: ../../templates/show_localplay_controllers.inc.php:73
+#: ../../templates/show_plugins.inc.php:42
+#: ../../templates/show_plugins.inc.php:79
 msgid "Version"
 msgstr ""
 
-#: ../../templates/show_localplay_controllers.inc.php:61
-#: ../../templates/show_plugins.inc.php:57
+#: ../../templates/show_localplay_controllers.inc.php:56
+#: ../../templates/show_plugins.inc.php:52
 msgid "Activate"
 msgstr ""
 
-#: ../../templates/show_playlist_title.inc.php:36
+#: ../../templates/show_playlist_title.inc.php:31
 #, php-format
 msgid "%s %s (Playlist)"
 msgstr ""
 
-#: ../../templates/show_random_rules.inc.php:35
-msgid "Rules"
-msgstr ""
-
-#: ../../templates/show_random_rules.inc.php:45
-#: ../../templates/show_dynamic.inc.php:44
-msgid "Field"
-msgstr ""
-
-#: ../../templates/show_stats.inc.php:41
+#: ../../templates/show_stats.inc.php:36
 msgid "Connected Users"
 msgstr ""
 
-#: ../../templates/show_stats.inc.php:42
+#: ../../templates/show_stats.inc.php:37
 msgid "Total Users"
 msgstr ""
 
-#: ../../templates/show_stats.inc.php:46 ../../templates/show_stats.inc.php:82
-msgid "Video"
-msgstr ""
-
-#: ../../templates/show_stats.inc.php:48 ../../templates/show_stats.inc.php:83
+#: ../../templates/show_stats.inc.php:43 ../../templates/show_stats.inc.php:78
 msgid "Catalog Size"
 msgstr ""
 
-#: ../../templates/show_stats.inc.php:49
+#: ../../templates/show_stats.inc.php:44
 msgid "Catalog Time"
 msgstr ""
 
-#: ../../templates/show_stats.inc.php:78
-#: ../../templates/show_catalogs.inc.php:48
-#: ../../templates/show_catalogs.inc.php:72
+#: ../../templates/show_stats.inc.php:73
+#: ../../templates/show_catalogs.inc.php:43
+#: ../../templates/show_catalogs.inc.php:67
 msgid "Last Verify"
 msgstr ""
 
-#: ../../templates/show_stats.inc.php:79
-#: ../../templates/show_catalogs.inc.php:49
-#: ../../templates/show_catalogs.inc.php:73
+#: ../../templates/show_stats.inc.php:74
+#: ../../templates/show_catalogs.inc.php:44
+#: ../../templates/show_catalogs.inc.php:68
 msgid "Last Add"
 msgstr ""
 
-#: ../../templates/show_stats.inc.php:80
-#: ../../templates/show_catalogs.inc.php:50
-#: ../../templates/show_catalogs.inc.php:74
+#: ../../templates/show_stats.inc.php:75
+#: ../../templates/show_catalogs.inc.php:45
+#: ../../templates/show_catalogs.inc.php:69
 msgid "Last Clean"
 msgstr ""
 
-#: ../../templates/show_install.inc.php:38
-#: ../../templates/show_install_config.inc.php:38
-#: ../../templates/show_install_account.inc.php:38
+#: ../../templates/show_install.inc.php:33
+#: ../../templates/show_install_config.inc.php:33
+#: ../../templates/show_install_account.inc.php:33
 msgid "Step 1 - Create the Ampache database"
 msgstr ""
 
-#: ../../templates/show_install.inc.php:40
+#: ../../templates/show_install.inc.php:35
 msgid ""
 "This step creates and inserts the Ampache database, so please provide a "
 "MySQL account with database creation rights. This step may take some time on "
 "slower computers."
 msgstr ""
 
-#: ../../templates/show_install.inc.php:42
-#: ../../templates/show_install_config.inc.php:39
-#: ../../templates/show_install_account.inc.php:39
+#: ../../templates/show_install.inc.php:37
+#: ../../templates/show_install_config.inc.php:34
+#: ../../templates/show_install_account.inc.php:34
 msgid "Step 2 - Create ampache.cfg.php"
 msgstr ""
 
-#: ../../templates/show_install.inc.php:43
-#: ../../templates/show_install_config.inc.php:43
-#: ../../templates/show_install_account.inc.php:40
+#: ../../templates/show_install.inc.php:38
+#: ../../templates/show_install_config.inc.php:38
+#: ../../templates/show_install_account.inc.php:35
 msgid "Step 3 - Set up the initial account"
 msgstr ""
 
-#: ../../templates/show_install.inc.php:47
+#: ../../templates/show_install.inc.php:42
 msgid "Insert Ampache Database"
 msgstr ""
 
-#: ../../templates/show_install.inc.php:51
+#: ../../templates/show_install.inc.php:46
 msgid "Desired Database Name"
 msgstr ""
 
-#: ../../templates/show_install.inc.php:55
-#: ../../templates/show_install_config.inc.php:60
+#: ../../templates/show_install.inc.php:50
+#: ../../templates/show_install_config.inc.php:55
 msgid "MySQL Hostname"
 msgstr ""
 
-#: ../../templates/show_install.inc.php:59
+#: ../../templates/show_install.inc.php:54
 msgid "MySQL Administrative Username"
 msgstr ""
 
-#: ../../templates/show_install.inc.php:63
+#: ../../templates/show_install.inc.php:58
 msgid "MySQL Administrative Password"
 msgstr ""
 
-#: ../../templates/show_install.inc.php:67
+#: ../../templates/show_install.inc.php:62
 msgid "Create Database User for New Database"
 msgstr ""
 
-#: ../../templates/show_install.inc.php:71
+#: ../../templates/show_install.inc.php:66
 msgid "Ampache Database Username"
 msgstr ""
 
-#: ../../templates/show_install.inc.php:75
+#: ../../templates/show_install.inc.php:70
 msgid "Ampache Database User Password"
 msgstr ""
 
-#: ../../templates/show_install.inc.php:79
+#: ../../templates/show_install.inc.php:74
 msgid "Overwrite Existing"
 msgstr ""
 
-#: ../../templates/show_install.inc.php:83
+#: ../../templates/show_install.inc.php:78
 msgid "Use Existing Database"
 msgstr ""
 
-#: ../../templates/show_install.inc.php:88
+#: ../../templates/show_install.inc.php:83
 msgid "Insert Database"
 msgstr ""
 
-#: ../../templates/show_newest.inc.php:35
-#: ../../templates/sidebar_home.inc.php:83
-#: ../../templates/show_popular.inc.php:35
+#: ../../templates/show_newest.inc.php:30
+#: ../../templates/sidebar_home.inc.php:79
+#: ../../templates/show_popular.inc.php:30
 msgid "Information"
 msgstr ""
 
-#: ../../templates/sidebar_modules.inc.php:37
-#: ../../templates/sidebar.inc.php:42
+#: ../../templates/sidebar_modules.inc.php:32
+#: ../../templates/sidebar.inc.php:37
 msgid "Modules"
 msgstr ""
 
-#: ../../templates/sidebar_modules.inc.php:39
+#: ../../templates/sidebar_modules.inc.php:34
 msgid "Localplay Modules"
 msgstr ""
 
-#: ../../templates/sidebar_modules.inc.php:40
+#: ../../templates/sidebar_modules.inc.php:35
 msgid "Available Plugins"
 msgstr ""
 
-#: ../../templates/sidebar_modules.inc.php:45
-#: ../../templates/show_duplicate.inc.php:35
-#: ../../templates/show_duplicate.inc.php:54
+#: ../../templates/sidebar_modules.inc.php:40
+#: ../../templates/show_duplicate.inc.php:30
+#: ../../templates/show_duplicate.inc.php:49
 msgid "Find Duplicates"
 msgstr ""
 
-#: ../../templates/sidebar_modules.inc.php:46
+#: ../../templates/sidebar_modules.inc.php:41
 msgid "Mail Users"
 msgstr ""
 
-#: ../../templates/sidebar_modules.inc.php:47
+#: ../../templates/sidebar_modules.inc.php:42
 msgid "Manage Flagged"
 msgstr ""
 
-#: ../../templates/sidebar_modules.inc.php:48
+#: ../../templates/sidebar_modules.inc.php:43
 msgid "Show Disabled"
 msgstr ""
 
-#: ../../templates/sidebar_modules.inc.php:55
+#: ../../templates/sidebar_modules.inc.php:50
 msgid "Manage Playlist"
 msgstr ""
 
-#: ../../templates/show_install_config.inc.php:41
+#: ../../templates/show_install_config.inc.php:36
 #, php-format
 msgid ""
 "This step takes the basic config values and generates the config file. It "
@@ -2564,1083 +2660,1129 @@ msgid ""
 "config file in %s"
 msgstr ""
 
-#: ../../templates/show_install_config.inc.php:47
+#: ../../templates/show_install_config.inc.php:42
 msgid "Generate Config File"
 msgstr ""
 
-#: ../../templates/show_install_config.inc.php:52
-#: ../../templates/show_test.inc.php:235
+#: ../../templates/show_install_config.inc.php:47
+#: ../../templates/show_test.inc.php:248
 msgid "Web Path"
 msgstr ""
 
-#: ../../templates/show_install_config.inc.php:56
+#: ../../templates/show_install_config.inc.php:51
 msgid "Database Name"
 msgstr ""
 
-#: ../../templates/show_install_config.inc.php:64
+#: ../../templates/show_install_config.inc.php:59
 msgid "MySQL Username"
 msgstr ""
 
-#: ../../templates/show_install_config.inc.php:68
+#: ../../templates/show_install_config.inc.php:63
 msgid "MySQL Password"
 msgstr ""
 
-#: ../../templates/show_install_config.inc.php:74
-msgid "Write Config"
+#: ../../templates/show_install_config.inc.php:70
+msgid "Write"
 msgstr ""
 
-#: ../../templates/show_install_config.inc.php:84
+#: ../../templates/show_install_config.inc.php:80
 msgid "ampache.cfg.php exists?"
 msgstr ""
 
-#: ../../templates/show_install_config.inc.php:99
+#: ../../templates/show_install_config.inc.php:95
 msgid "ampache.cfg.php configured?"
 msgstr ""
 
-#: ../../templates/show_install_config.inc.php:118
+#: ../../templates/show_install_config.inc.php:114
 msgid "Recheck Config"
 msgstr ""
 
-#: ../../templates/show_install_config.inc.php:124
+#: ../../templates/show_install_config.inc.php:120
 msgid "Continue to Step 3"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:35
+#: ../../templates/show_debug.inc.php:30
 msgid "Debug Tools"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:39 ../../templates/show_debug.inc.php:40
+#: ../../templates/show_debug.inc.php:34 ../../templates/show_debug.inc.php:35
 msgid "Generate Configuration"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:43 ../../templates/show_debug.inc.php:44
+#: ../../templates/show_debug.inc.php:38 ../../templates/show_debug.inc.php:39
 msgid "Set Database Charset"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:49
+#: ../../templates/show_debug.inc.php:44
 msgid "PHP Settings"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:56
+#: ../../templates/show_debug.inc.php:51
 msgid "Setting"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:60
+#: ../../templates/show_debug.inc.php:55
 msgid "Memory Limit"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:64
+#: ../../templates/show_debug.inc.php:59
 msgid "Maximum Execution Time"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:68
+#: ../../templates/show_debug.inc.php:63
 msgid "Override Execution Time"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:69
+#: ../../templates/show_debug.inc.php:64
 msgid "Failed"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:69
+#: ../../templates/show_debug.inc.php:64
 msgid "Succeeded"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:72
+#: ../../templates/show_debug.inc.php:67
 msgid "Safe Mode"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:80
+#: ../../templates/show_debug.inc.php:75
 msgid "Zlib Support"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:84
+#: ../../templates/show_debug.inc.php:79
 msgid "GD Support"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:88
+#: ../../templates/show_debug.inc.php:83
 msgid "Iconv Support"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:92
+#: ../../templates/show_debug.inc.php:87
 msgid "Gettext Support"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:98
+#: ../../templates/show_debug.inc.php:93
 msgid "Current Configuration"
 msgstr ""
 
-#: ../../templates/show_add_access.inc.php:35
-#: ../../templates/show_access_list.inc.php:55
-#: ../../templates/show_access_list.inc.php:56
+#: ../../templates/show_add_access.inc.php:30
+#: ../../templates/show_access_list.inc.php:50
+#: ../../templates/show_access_list.inc.php:51
 msgid "Advanced Add"
 msgstr ""
 
-#: ../../templates/show_add_access.inc.php:62
-#: ../../templates/show_edit_access.inc.php:43
+#: ../../templates/show_add_access.inc.php:57
+#: ../../templates/show_edit_access.inc.php:38
 msgid "ACL Type"
 msgstr ""
 
-#: ../../templates/show_add_access.inc.php:68
-#: ../../templates/show_edit_access.inc.php:50
-#: ../../templates/show_add_access_rpc.inc.php:64
-#: ../../templates/show_add_access_rpc.inc.php:65
-#: ../../templates/show_add_access_rpc.inc.php:66
+#: ../../templates/show_add_access.inc.php:63
+#: ../../templates/show_edit_access.inc.php:45
+#: ../../templates/show_add_access_rpc.inc.php:59
+#: ../../templates/show_add_access_rpc.inc.php:60
+#: ../../templates/show_add_access_rpc.inc.php:61
 msgid "RPC"
 msgstr ""
 
+#: ../../templates/show_add_access.inc.php:83
+#: ../../templates/show_edit_access.inc.php:56
+#: ../../templates/show_add_access_rpc.inc.php:80
+#: ../../templates/show_add_access_local.inc.php:80
+msgid "Start"
+msgstr ""
+
 #: ../../templates/show_add_access.inc.php:88
 #: ../../templates/show_edit_access.inc.php:61
 #: ../../templates/show_add_access_rpc.inc.php:85
 #: ../../templates/show_add_access_local.inc.php:85
-msgid "Start"
-msgstr ""
-
-#: ../../templates/show_add_access.inc.php:93
-#: ../../templates/show_edit_access.inc.php:66
-#: ../../templates/show_add_access_rpc.inc.php:90
-#: ../../templates/show_add_access_local.inc.php:90
 msgid "End"
 msgstr ""
 
-#: ../../templates/show_flag_row.inc.php:43
+#: ../../templates/show_flag_row.inc.php:38
 msgid "Reject"
 msgstr ""
 
-#: ../../templates/show_edit_shout.inc.php:35
+#: ../../templates/show_edit_shout.inc.php:30
 msgid "Edit existing Shoutbox Post"
 msgstr ""
 
 #. HINT: Client link, Object link
-#: ../../templates/show_edit_shout.inc.php:40
+#: ../../templates/show_edit_shout.inc.php:35
 #, php-format
 msgid "Created by: %s for %s"
 msgstr ""
 
-#: ../../templates/show_edit_shout.inc.php:53
-#: ../../templates/show_create_democratic.inc.php:72
-#: ../../templates/show_catalog_row.inc.php:45
-#: ../../templates/show_edit_access.inc.php:97
-#: ../../templates/show_manage_catalogs.inc.php:55
-#: ../../templates/show_preference_admin.inc.php:68
+#: ../../templates/show_edit_shout.inc.php:48
+#: ../../templates/show_create_democratic.inc.php:67
+#: ../../templates/show_catalog_row.inc.php:40
+#: ../../templates/show_edit_access.inc.php:92
+#: ../../templates/show_manage_catalogs.inc.php:50
+#: ../../templates/show_preference_admin.inc.php:63
 msgid "Update"
 msgstr ""
 
-#: ../../templates/show_create_democratic.inc.php:34
-#: ../../templates/show_democratic.inc.php:47
-#: ../../templates/show_democratic.inc.php:48
+#: ../../templates/show_create_democratic.inc.php:29
+#: ../../templates/show_democratic.inc.php:42
+#: ../../templates/show_democratic.inc.php:43
 msgid "Configure Democratic Playlist"
 msgstr ""
 
-#: ../../templates/show_create_democratic.inc.php:42
-#: ../../templates/show_manage_democratic.inc.php:47
+#: ../../templates/show_create_democratic.inc.php:37
+#: ../../templates/show_manage_democratic.inc.php:42
 msgid "Base Playlist"
 msgstr ""
 
-#: ../../templates/show_create_democratic.inc.php:46
+#: ../../templates/show_create_democratic.inc.php:41
 msgid "Cooldown Time"
 msgstr ""
 
-#: ../../templates/show_create_democratic.inc.php:61
+#: ../../templates/show_create_democratic.inc.php:56
 msgid "Make Default"
 msgstr ""
 
-#: ../../templates/show_create_democratic.inc.php:66
+#: ../../templates/show_create_democratic.inc.php:61
 msgid "Force Democratic Play"
 msgstr ""
 
-#: ../../templates/show_test.inc.php:44
-#: ../../templates/show_test_config.inc.php:52
-#: ../../templates/sidebar_admin.inc.php:57
+#: ../../templates/show_test.inc.php:39
+#: ../../templates/show_test_config.inc.php:47
+#: ../../templates/sidebar_admin.inc.php:52
 msgid "Ampache Debug"
 msgstr ""
 
-#: ../../templates/show_test.inc.php:45
+#: ../../templates/show_test.inc.php:40
 msgid ""
 "You've reached this page because a configuration error has occured. Debug "
 "Information below"
 msgstr ""
 
-#: ../../templates/show_test.inc.php:50 ../../templates/show_info.inc.php:50
+#: ../../templates/show_test.inc.php:45 ../../templates/show_info.inc.php:46
 msgid "CHECK"
 msgstr ""
 
-#: ../../templates/show_test.inc.php:52 ../../templates/show_info.inc.php:52
+#: ../../templates/show_test.inc.php:47 ../../templates/show_info.inc.php:48
 msgid "STATUS"
 msgstr ""
 
-#: ../../templates/show_test.inc.php:54 ../../templates/show_info.inc.php:54
+#: ../../templates/show_test.inc.php:49 ../../templates/show_info.inc.php:50
 msgid "DESCRIPTION"
 msgstr ""
 
-#: ../../templates/show_test.inc.php:72
+#: ../../templates/show_test.inc.php:67
 msgid ""
 "This tests to make sure that you are running a version of PHP that is known "
 "to work with Ampache."
 msgstr ""
 
-#: ../../templates/show_test.inc.php:77
+#: ../../templates/show_test.inc.php:72
 msgid "Mysql for PHP"
 msgstr ""
 
-#: ../../templates/show_test.inc.php:90
+#: ../../templates/show_test.inc.php:85
 msgid ""
 "This test checks to see if you have the mysql extensions loaded for PHP. "
 "These are required for Ampache to work."
 msgstr ""
 
-#: ../../templates/show_test.inc.php:107
+#: ../../templates/show_test.inc.php:102
 msgid ""
 "This test checks to make sure that you have PHP session support enabled. "
 "Sessions are required for Ampache to work."
 msgstr ""
 
-#: ../../templates/show_test.inc.php:111
+#: ../../templates/show_test.inc.php:106
 msgid "PHP ICONV Support"
 msgstr ""
 
-#: ../../templates/show_test.inc.php:123
+#: ../../templates/show_test.inc.php:118
 msgid ""
 "This test checks to make sure you have Iconv support installed. Iconv "
 "support is required for Ampache"
 msgstr ""
 
-#: ../../templates/show_test.inc.php:139
+#: ../../templates/show_test.inc.php:134
 msgid ""
 "This test makes sure you have PCRE support compiled into your version of "
 "PHP, this is required for Ampache."
 msgstr ""
 
-#: ../../templates/show_test.inc.php:143
-msgid "PHP PutENV Support"
+#: ../../templates/show_test.inc.php:150
+msgid ""
+"This test makes sure that PHP isn't running in safe mode.  Some features of "
+"Ampache may not work correctly in safe mode."
 msgstr ""
 
-#: ../../templates/show_test.inc.php:155
+#: ../../templates/show_test.inc.php:154
+msgid "Override Memory Limit"
+msgstr ""
+
+#: ../../templates/show_test.inc.php:159
 msgid ""
-"This test makes sure that PHP isn't running in SafeMode and that we are able "
-"to modify the memory limits. While not required, without these abilities "
-"some features of ampache may not work correctly"
+"This tests whether Ampache can override the memory limit.  This is not "
+"strictly necessary, but may result in a better experience."
 msgstr ""
 
-#: ../../templates/show_test.inc.php:172
+#: ../../templates/show_test.inc.php:163
+msgid "Override Execution Limit"
+msgstr ""
+
+#: ../../templates/show_test.inc.php:168
+msgid ""
+"This tests whether Ampache can override the limit on maximum execution "
+"time.  This is not strictly necessary, but may result in a better experience."
+msgstr ""
+
+#: ../../templates/show_test.inc.php:185
 msgid ""
 "This attempts to read /config/ampache.cfg.php If this fails either the "
 "ampache.cfg.php is not in the correct locations or\n"
 "\tit is not currently readable by your webserver."
 msgstr ""
 
-#: ../../templates/show_test.inc.php:178
+#: ../../templates/show_test.inc.php:191
 msgid "Ampache.cfg.php Configured?"
 msgstr ""
 
-#: ../../templates/show_test.inc.php:194
+#: ../../templates/show_test.inc.php:207
 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"
 msgstr ""
 
-#: ../../templates/show_test.inc.php:198
+#: ../../templates/show_test.inc.php:211
 msgid "DB Connection"
 msgstr ""
 
-#: ../../templates/show_test.inc.php:212
+#: ../../templates/show_test.inc.php:225
 msgid ""
 "This attempts to connect to your database using the values from your ampache."
 "cfg.php"
 msgstr ""
 
-#: ../../templates/show_test.inc.php:216
+#: ../../templates/show_test.inc.php:229
 msgid "DB Inserted"
 msgstr ""
 
-#: ../../templates/show_test.inc.php:230
+#: ../../templates/show_test.inc.php:243
 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:259
+#: ../../templates/show_test.inc.php:272
 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_object_rating.inc.php:47
-#: ../../templates/show_object_rating_static.inc.php:47
+#: ../../templates/show_object_rating.inc.php:42
+#: ../../templates/show_object_rating_static.inc.php:42
 msgid "Current rating: "
 msgstr ""
 
-#: ../../templates/show_object_rating.inc.php:49
-#: ../../templates/show_object_rating_static.inc.php:49
+#: ../../templates/show_object_rating.inc.php:44
+#: ../../templates/show_object_rating_static.inc.php:44
 msgid "not rated yet"
 msgstr ""
 
-#: ../../templates/show_object_rating.inc.php:51
-#: ../../templates/show_object_rating_static.inc.php:51
+#: ../../templates/show_object_rating.inc.php:46
+#: ../../templates/show_object_rating_static.inc.php:46
 #, php-format
 msgid "%s of 5"
 msgstr ""
 
 #. HINT: Artist Name
-#: ../../templates/show_rename_artist.inc.php:41
+#: ../../templates/show_rename_artist.inc.php:36
 #, php-format
 msgid "Rename %s"
 msgstr ""
 
-#: ../../templates/show_rename_artist.inc.php:47
+#: ../../templates/show_rename_artist.inc.php:42
 msgid "Insert current"
 msgstr ""
 
-#: ../../templates/show_rename_artist.inc.php:49
+#: ../../templates/show_rename_artist.inc.php:44
 msgid "Update id3 tags"
 msgstr ""
 
-#: ../../templates/show_rename_artist.inc.php:50
+#: ../../templates/show_rename_artist.inc.php:45
 msgid "Rename"
 msgstr ""
 
-#: ../../templates/sidebar_home.inc.php:37
+#: ../../templates/sidebar_home.inc.php:32
 msgid "Browse"
 msgstr ""
 
-#: ../../templates/sidebar_home.inc.php:46
+#: ../../templates/sidebar_home.inc.php:41
 msgid "Song Titles"
 msgstr ""
 
-#: ../../templates/sidebar_home.inc.php:59
+#: ../../templates/sidebar_home.inc.php:55
 msgid "Currently Playing"
 msgstr ""
 
-#: ../../templates/sidebar_home.inc.php:72
+#: ../../templates/sidebar_home.inc.php:68
 msgid "Import"
 msgstr ""
 
-#: ../../templates/sidebar_home.inc.php:80
+#: ../../templates/sidebar_home.inc.php:76
 msgid "Advanced"
 msgstr ""
 
-#: ../../templates/sidebar_home.inc.php:86
+#: ../../templates/sidebar_home.inc.php:82
 msgid "Newest"
 msgstr ""
 
-#: ../../templates/sidebar_home.inc.php:87
+#: ../../templates/sidebar_home.inc.php:83
 msgid "Popular"
 msgstr ""
 
-#: ../../templates/show_user_activate.inc.php:41
-#: ../../templates/show_user_activate.inc.php:48
-#: ../../templates/show_registration_confirmation.inc.php:41
-#: ../../templates/show_user_registration.inc.php:41
-#: ../../templates/show_user_registration.inc.php:53
+#: ../../templates/show_user_activate.inc.php:36
+#: ../../templates/show_user_activate.inc.php:43
+#: ../../templates/show_registration_confirmation.inc.php:36
+#: ../../templates/show_user_registration.inc.php:36
+#: ../../templates/show_user_registration.inc.php:48
 msgid "Registration"
 msgstr ""
 
-#: ../../templates/show_user_activate.inc.php:60
+#: ../../templates/show_user_activate.inc.php:55
 msgid "User Activated"
 msgstr ""
 
 #. HINT: Start A tag, End A tag
-#: ../../templates/show_user_activate.inc.php:64
+#: ../../templates/show_user_activate.inc.php:59
 #, php-format
 msgid "This User ID is activated and can be used %sLogin%s"
 msgstr ""
 
-#: ../../templates/show_user_activate.inc.php:67
+#: ../../templates/show_user_activate.inc.php:62
 msgid "Validation Failed"
 msgstr ""
 
-#: ../../templates/show_user_activate.inc.php:68
+#: ../../templates/show_user_activate.inc.php:63
 msgid "The validation key used isn't correct"
 msgstr ""
 
 #. HINT: Catalog Name
-#: ../../templates/show_clean_catalog.inc.php:36
+#: ../../templates/show_clean_catalog.inc.php:31
 #, php-format
 msgid "Cleaning the %s Catalog"
 msgstr ""
 
-#: ../../templates/show_clean_catalog.inc.php:38
+#: ../../templates/show_clean_catalog.inc.php:33
 msgid "Checking"
 msgstr ""
 
-#: ../../templates/show_user.inc.php:42
-#: ../../templates/show_edit_user.inc.php:52
-#: ../../templates/show_user_registration.inc.php:87
-#: ../../templates/show_add_user.inc.php:49
+#: ../../templates/show_user.inc.php:37
+#: ../../templates/show_edit_user.inc.php:47
+#: ../../templates/show_user_registration.inc.php:82
+#: ../../templates/show_add_user.inc.php:44
 msgid "Full Name"
 msgstr ""
 
-#: ../../templates/show_user.inc.php:43
+#: ../../templates/show_user.inc.php:38
 msgid "Create Date"
 msgstr ""
 
-#: ../../templates/show_user.inc.php:44 ../../templates/show_users.inc.php:52
-#: ../../templates/show_users.inc.php:74
+#: ../../templates/show_user.inc.php:39 ../../templates/show_users.inc.php:47
+#: ../../templates/show_users.inc.php:69
 msgid "Last Seen"
 msgstr ""
 
-#: ../../templates/show_user.inc.php:45 ../../templates/show_users.inc.php:54
-#: ../../templates/show_users.inc.php:76
+#: ../../templates/show_user.inc.php:40 ../../templates/show_users.inc.php:49
+#: ../../templates/show_users.inc.php:71
 msgid "Activity"
 msgstr ""
 
-#: ../../templates/show_user.inc.php:47
+#: ../../templates/show_user.inc.php:42
 msgid "User is Online Now"
 msgstr ""
 
-#: ../../templates/show_user.inc.php:49
+#: ../../templates/show_user.inc.php:44
 msgid "User is Offline Now"
 msgstr ""
 
-#: ../../templates/show_user.inc.php:54
+#: ../../templates/show_user.inc.php:49
 msgid "Active Playlist"
 msgstr ""
 
-#: ../../templates/show_artist.inc.php:52
-#: ../../templates/show_artist.inc.php:53
+#: ../../templates/show_artist.inc.php:47
+#: ../../templates/show_artist.inc.php:48
 #, php-format
 msgid "Show All Songs By %s"
 msgstr ""
 
-#: ../../templates/show_artist.inc.php:56
-#: ../../templates/show_artist.inc.php:57
+#: ../../templates/show_artist.inc.php:51
+#: ../../templates/show_artist.inc.php:52
 #, php-format
 msgid "Show Albums By %s"
 msgstr ""
 
-#: ../../templates/show_artist.inc.php:63
+#: ../../templates/show_artist.inc.php:58
 #, php-format
 msgid "Add All Songs By %s"
 msgstr ""
 
-#: ../../templates/show_artist.inc.php:68
+#: ../../templates/show_artist.inc.php:63
 #, php-format
 msgid "Add Random Songs By %s"
 msgstr ""
 
-#: ../../templates/show_artist.inc.php:72
-#: ../../templates/show_artist.inc.php:73
-#: ../../templates/show_album.inc.php:83 ../../templates/show_album.inc.php:84
+#: ../../templates/show_artist.inc.php:67
+#: ../../templates/show_artist.inc.php:68
+#: ../../templates/show_album.inc.php:78 ../../templates/show_album.inc.php:79
 msgid "Update from tags"
 msgstr ""
 
-#: ../../templates/show_live_stream.inc.php:35
+#: ../../templates/show_artist.inc.php:78
+msgid "Show Art"
+msgstr ""
+
+#: ../../templates/show_live_stream.inc.php:30
 msgid "Manage Radio Stations"
 msgstr ""
 
-#: ../../templates/show_live_stream.inc.php:39
-#: ../../templates/show_add_live_stream.inc.php:35
+#: ../../templates/show_live_stream.inc.php:34
+#: ../../templates/show_add_live_stream.inc.php:30
 msgid "Add Radio Station"
 msgstr ""
 
-#: ../../templates/show_get_albumart.inc.php:35
+#: ../../templates/show_get_albumart.inc.php:30
 msgid "Customize Search"
 msgstr ""
 
-#: ../../templates/show_get_albumart.inc.php:56
+#: ../../templates/show_get_albumart.inc.php:51
 msgid "Direct URL to Image"
 msgstr ""
 
-#: ../../templates/show_get_albumart.inc.php:64
+#: ../../templates/show_get_albumart.inc.php:59
 msgid "Local Image"
 msgstr ""
 
-#: ../../templates/show_get_albumart.inc.php:75
+#: ../../templates/show_get_albumart.inc.php:70
 msgid "Get Art"
 msgstr ""
 
-#: ../../templates/show_edit_album.inc.php:36
+#: ../../templates/show_edit_album.inc.php:31
 msgid "Edit Album"
 msgstr ""
 
-#: ../../templates/show_edit_album.inc.php:60
+#: ../../templates/show_edit_album.inc.php:55
 msgid "Update Album"
 msgstr ""
 
-#: ../../templates/show_album.inc.php:65
+#: ../../templates/show_album.inc.php:60
 msgid "Add Album"
 msgstr ""
 
-#: ../../templates/show_album.inc.php:69
+#: ../../templates/show_album.inc.php:64
 msgid "Add Random from Album"
 msgstr ""
 
-#: ../../templates/show_album.inc.php:73 ../../templates/show_album.inc.php:74
+#: ../../templates/show_album.inc.php:68 ../../templates/show_album.inc.php:69
 msgid "Reset Album Art"
 msgstr ""
 
-#: ../../templates/show_album.inc.php:78 ../../templates/show_album.inc.php:79
+#: ../../templates/show_album.inc.php:73 ../../templates/show_album.inc.php:74
 msgid "Find Album Art"
 msgstr ""
 
-#: ../../templates/show_duplicates.inc.php:35
+#: ../../templates/show_duplicates.inc.php:30
 msgid "Duplicate Songs"
 msgstr ""
 
-#: ../../templates/show_duplicates.inc.php:55
-#: ../../templates/show_duplicates.inc.php:94
+#: ../../templates/show_duplicates.inc.php:50
+#: ../../templates/show_duplicates.inc.php:89
 msgid "Size"
 msgstr ""
 
-#: ../../templates/show_live_streams.inc.php:50
-#: ../../templates/show_live_streams.inc.php:72
-#: ../../templates/show_add_live_stream.inc.php:66
-#: ../../templates/show_edit_live_stream_row.inc.php:42
+#: ../../templates/show_live_streams.inc.php:45
+#: ../../templates/show_live_streams.inc.php:67
+#: ../../templates/show_add_live_stream.inc.php:61
+#: ../../templates/show_edit_live_stream_row.inc.php:37
 msgid "Callsign"
 msgstr ""
 
-#: ../../templates/show_live_streams.inc.php:51
-#: ../../templates/show_live_streams.inc.php:73
-#: ../../templates/show_add_live_stream.inc.php:60
-#: ../../templates/show_edit_live_stream_row.inc.php:43
+#: ../../templates/show_live_streams.inc.php:46
+#: ../../templates/show_live_streams.inc.php:68
+#: ../../templates/show_add_live_stream.inc.php:55
+#: ../../templates/show_edit_live_stream_row.inc.php:38
 msgid "Frequency"
 msgstr ""
 
-#: ../../templates/show_users.inc.php:51 ../../templates/show_users.inc.php:73
+#: ../../templates/show_users.inc.php:46 ../../templates/show_users.inc.php:68
 msgid "Fullname"
 msgstr ""
 
-#: ../../templates/show_users.inc.php:53 ../../templates/show_users.inc.php:75
+#: ../../templates/show_users.inc.php:48 ../../templates/show_users.inc.php:70
 msgid "Registration Date"
 msgstr ""
 
-#: ../../templates/show_users.inc.php:56 ../../templates/show_users.inc.php:78
+#: ../../templates/show_users.inc.php:51 ../../templates/show_users.inc.php:73
 msgid "Last Ip"
 msgstr ""
 
-#: ../../templates/show_users.inc.php:59 ../../templates/show_users.inc.php:81
+#: ../../templates/show_users.inc.php:54 ../../templates/show_users.inc.php:76
 msgid "On-line"
 msgstr ""
 
-#: ../../templates/show_run_add_catalog.inc.php:36
-#: ../../templates/show_adds_catalog.inc.php:38
+#: ../../templates/show_run_add_catalog.inc.php:31
+#: ../../templates/show_adds_catalog.inc.php:33
 msgid "Found"
 msgstr ""
 
-#: ../../templates/show_edit_user.inc.php:35
+#: ../../templates/show_edit_user.inc.php:30
 msgid "Editing existing User"
 msgstr ""
 
-#: ../../templates/show_edit_user.inc.php:40
+#: ../../templates/show_edit_user.inc.php:35
 msgid "User Properties"
 msgstr ""
 
-#: ../../templates/show_edit_user.inc.php:59
-#: ../../templates/show_account.inc.php:46
-#: ../../templates/show_user_registration.inc.php:93
-#: ../../templates/show_add_user.inc.php:56
+#: ../../templates/show_edit_user.inc.php:54
+#: ../../templates/show_account.inc.php:41
+#: ../../templates/show_user_registration.inc.php:88
+#: ../../templates/show_add_user.inc.php:51
 msgid "E-mail"
 msgstr ""
 
-#: ../../templates/show_edit_user.inc.php:67
-#: ../../templates/show_login_form.inc.php:75
-#: ../../templates/show_install_account.inc.php:54
-#: ../../templates/show_user_registration.inc.php:99
-#: ../../templates/show_add_user.inc.php:64
-#: ../../modules/localplay/httpq.controller.php:241
-#: ../../modules/localplay/mpd.controller.php:259
-#: ../../modules/localplay/vlc.controller.php:241
+#: ../../templates/show_edit_user.inc.php:62
+#: ../../templates/show_login_form.inc.php:70
+#: ../../templates/show_install_account.inc.php:49
+#: ../../templates/show_user_registration.inc.php:94
+#: ../../templates/show_add_user.inc.php:59
+#: ../../modules/localplay/httpq.controller.php:234
+#: ../../modules/localplay/mpd.controller.php:252
+#: ../../modules/localplay/vlc.controller.php:234
 msgid "Password"
 msgstr ""
 
-#: ../../templates/show_edit_user.inc.php:76
-#: ../../templates/show_account.inc.php:59
-#: ../../templates/show_install_account.inc.php:58
-#: ../../templates/show_user_registration.inc.php:105
-#: ../../templates/show_add_user.inc.php:73
+#: ../../templates/show_edit_user.inc.php:71
+#: ../../templates/show_account.inc.php:54
+#: ../../templates/show_install_account.inc.php:53
+#: ../../templates/show_user_registration.inc.php:100
+#: ../../templates/show_add_user.inc.php:68
 msgid "Confirm Password"
 msgstr ""
 
-#: ../../templates/show_edit_user.inc.php:84
-#: ../../templates/show_add_user.inc.php:81
+#: ../../templates/show_edit_user.inc.php:79
+#: ../../templates/show_add_user.inc.php:76
 msgid "User Access Level"
 msgstr ""
 
-#: ../../templates/show_edit_user.inc.php:98
+#: ../../templates/show_edit_user.inc.php:93
 msgid "Other Options"
 msgstr ""
 
-#: ../../templates/show_edit_user.inc.php:101
+#: ../../templates/show_edit_user.inc.php:96
 msgid "Config Preset"
 msgstr ""
 
-#: ../../templates/show_edit_user.inc.php:107
+#: ../../templates/show_edit_user.inc.php:102
 msgid "Flash"
 msgstr ""
 
-#: ../../templates/show_edit_user.inc.php:113
+#: ../../templates/show_edit_user.inc.php:108
 msgid "Prevent Preset Override"
 msgstr ""
 
-#: ../../templates/show_edit_user.inc.php:115
+#: ../../templates/show_edit_user.inc.php:110
 msgid "This Affects all non-Admin accounts"
 msgstr ""
 
-#: ../../templates/show_edit_user.inc.php:119
-#: ../../templates/show_account.inc.php:65
-#: ../../templates/show_manage_catalogs.inc.php:46
+#: ../../templates/show_edit_user.inc.php:114
+#: ../../templates/show_account.inc.php:60
+#: ../../templates/show_manage_catalogs.inc.php:41
 msgid "Clear Stats"
 msgstr ""
 
-#: ../../templates/show_edit_user.inc.php:127
+#: ../../templates/show_edit_user.inc.php:122
 msgid "Update User"
 msgstr ""
 
-#: ../../templates/show_account.inc.php:52
+#: ../../templates/show_account.inc.php:47
 msgid "New Password"
 msgstr ""
 
-#: ../../templates/show_account.inc.php:75
+#: ../../templates/show_account.inc.php:70
 msgid "Update Account"
 msgstr ""
 
-#: ../../templates/show_add_live_stream.inc.php:46
-#: ../../templates/show_edit_live_stream_row.inc.php:41
+#: ../../templates/show_add_live_stream.inc.php:41
+#: ../../templates/show_edit_live_stream_row.inc.php:36
 msgid "Homepage"
 msgstr ""
 
-#: ../../templates/show_add_live_stream.inc.php:53
-#: ../../templates/show_edit_live_stream_row.inc.php:40
+#: ../../templates/show_add_live_stream.inc.php:48
+#: ../../templates/show_edit_live_stream_row.inc.php:35
 msgid "Stream URL"
 msgstr ""
 
-#: ../../templates/show_index.inc.php:44
+#: ../../templates/show_index.inc.php:39
 msgid "Loading..."
 msgstr ""
 
-#: ../../templates/show_playlists.inc.php:47
-#: ../../templates/show_playlists.inc.php:70
+#: ../../templates/show_playlists.inc.php:42
+#: ../../templates/show_playlists.inc.php:65
+#: ../../templates/show_smartplaylists.inc.php:36
+#: ../../templates/show_smartplaylists.inc.php:57
 msgid "Playlist Name"
 msgstr ""
 
-#: ../../templates/show_playlists.inc.php:49
-#: ../../templates/show_playlists.inc.php:72
+#: ../../templates/show_playlists.inc.php:44
+#: ../../templates/show_playlists.inc.php:67
 msgid "# Songs"
 msgstr ""
 
-#: ../../templates/show_playlists.inc.php:50
-#: ../../templates/show_playlists.inc.php:73
+#: ../../templates/show_playlists.inc.php:45
+#: ../../templates/show_playlists.inc.php:68
+#: ../../templates/show_smartplaylists.inc.php:38
+#: ../../templates/show_smartplaylists.inc.php:59
 msgid "Owner"
 msgstr ""
 
-#: ../../templates/show_login_form.inc.php:79
+#: ../../templates/show_login_form.inc.php:74
 msgid "Remember Me"
 msgstr ""
 
-#: ../../templates/show_login_form.inc.php:86
+#: ../../templates/show_login_form.inc.php:81
 msgid "Lost password"
 msgstr ""
 
-#: ../../templates/show_login_form.inc.php:87
+#: ../../templates/show_login_form.inc.php:82
 msgid "Login"
 msgstr ""
 
-#: ../../templates/show_login_form.inc.php:92
+#: ../../templates/show_login_form.inc.php:87
 msgid "Register"
 msgstr ""
 
-#: ../../templates/show_login_form.inc.php:104
+#: ../../templates/show_login_form.inc.php:99
 msgid "Message of the Day"
 msgstr ""
 
-#: ../../templates/list_header.inc.php:114
+#: ../../templates/list_header.inc.php:109
 msgid "Prev"
 msgstr ""
 
-#: ../../templates/list_header.inc.php:115
-#: ../../templates/show_localplay_control.inc.php:40
+#: ../../templates/list_header.inc.php:110
+#: ../../templates/show_localplay_control.inc.php:35
 msgid "Next"
 msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:40
+#: ../../templates/show_install_lang.inc.php:35
 msgid "Minimum requirements not met. Unable to install Ampache."
 msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:45
+#: ../../templates/show_install_lang.inc.php:40
 msgid "Choose Installation Language"
 msgstr ""
 
-#: ../../templates/show_install_lang.inc.php:66
+#: ../../templates/show_install_lang.inc.php:61
 msgid "Start configuration"
 msgstr ""
 
-#: ../../templates/show_user_stats.inc.php:43
+#: ../../templates/show_user_stats.inc.php:38
 msgid "Favorite Artists"
 msgstr ""
 
-#: ../../templates/show_user_stats.inc.php:56
+#: ../../templates/show_user_stats.inc.php:51
 msgid "Favorite Albums"
 msgstr ""
 
-#: ../../templates/show_user_stats.inc.php:69
+#: ../../templates/show_user_stats.inc.php:64
 msgid "Favorite Songs"
 msgstr ""
 
-#: ../../templates/show_access_list.inc.php:40
-#: ../../templates/sidebar_admin.inc.php:49
+#: ../../templates/show_access_list.inc.php:35
+#: ../../templates/sidebar_admin.inc.php:44
 msgid "Access Control"
 msgstr ""
 
-#: ../../templates/show_access_list.inc.php:48
-#: ../../templates/show_access_list.inc.php:49
-#: ../../templates/show_add_access_rpc.inc.php:35
+#: ../../templates/show_access_list.inc.php:43
+#: ../../templates/show_access_list.inc.php:44
+#: ../../templates/show_add_access_rpc.inc.php:30
 msgid "Add API / RPC Host"
 msgstr ""
 
-#: ../../templates/show_access_list.inc.php:52
-#: ../../templates/show_access_list.inc.php:53
-#: ../../templates/show_add_access_local.inc.php:35
+#: ../../templates/show_access_list.inc.php:47
+#: ../../templates/show_access_list.inc.php:48
+#: ../../templates/show_add_access_local.inc.php:30
 msgid "Add Local Network Definition"
 msgstr ""
 
-#: ../../templates/show_access_list.inc.php:62
+#: ../../templates/show_access_list.inc.php:57
 msgid "Access Control Entries"
 msgstr ""
 
-#: ../../templates/show_access_list.inc.php:68
+#: ../../templates/show_access_list.inc.php:63
 msgid "Start Address"
 msgstr ""
 
-#: ../../templates/show_access_list.inc.php:69
+#: ../../templates/show_access_list.inc.php:64
 msgid "End Address"
 msgstr ""
 
-#: ../../templates/show_access_list.inc.php:72
-#: ../../templates/show_add_playlist.inc.php:43
-#: ../../templates/show_add_access_rpc.inc.php:62
-#: ../../templates/show_add_access_local.inc.php:62
-#: ../../templates/show_random.inc.php:73
+#: ../../templates/show_access_list.inc.php:67
+#: ../../templates/show_add_playlist.inc.php:38
+#: ../../templates/show_add_access_rpc.inc.php:57
+#: ../../templates/show_add_access_local.inc.php:57
 msgid "Type"
 msgstr ""
 
-#: ../../templates/sidebar.inc.php:73
+#: ../../templates/sidebar.inc.php:68
 msgid "Logout"
 msgstr ""
 
-#: ../../templates/show_edit_access.inc.php:35
+#: ../../templates/show_edit_access.inc.php:30
 msgid "Edit Access Control List"
 msgstr ""
 
-#: ../../templates/show_manage_catalogs.inc.php:35
-#: ../../templates/sidebar_admin.inc.php:39
+#: ../../templates/show_manage_catalogs.inc.php:30
+#: ../../templates/sidebar_admin.inc.php:34
 msgid "Show Catalogs"
 msgstr ""
 
-#: ../../templates/show_manage_catalogs.inc.php:41
+#: ../../templates/show_manage_catalogs.inc.php:36
 msgid "Gather All Art"
 msgstr ""
 
 #. HINT: /data/myNewMusic
-#: ../../templates/show_manage_catalogs.inc.php:51
+#: ../../templates/show_manage_catalogs.inc.php:46
 #, php-format
 msgid "Add From %s"
 msgstr ""
 
 #. HINT: /data/myUpdatedMusic
-#: ../../templates/show_manage_catalogs.inc.php:53
+#: ../../templates/show_manage_catalogs.inc.php:48
 #, php-format
 msgid "Update From %s"
 msgstr ""
 
-#: ../../templates/show_add_playlist.inc.php:35
+#: ../../templates/show_add_playlist.inc.php:30
 msgid "Create a new playlist"
 msgstr ""
 
-#: ../../templates/show_info.inc.php:44
+#: ../../templates/show_info.inc.php:39
 msgid "Ampache Security Information"
 msgstr ""
 
-#: ../../templates/show_info.inc.php:45
+#: ../../templates/show_info.inc.php:40
 msgid "This page shows security information and ampache update information."
 msgstr ""
 
-#: ../../templates/show_info.inc.php:57
+#: ../../templates/show_info.inc.php:43 ../../templates/show_info.inc.php:91
+msgid "Close this window"
+msgstr ""
+
+#: ../../templates/show_info.inc.php:53
 msgid "Ampache Version"
 msgstr ""
 
-#: ../../templates/show_info.inc.php:60
+#: ../../templates/show_info.inc.php:56
 msgid ""
 "Compare that you are running a version of Ampache and currently a version of "
 "Ampache."
 msgstr ""
 
-#: ../../templates/show_info.inc.php:67
+#: ../../templates/show_info.inc.php:63
 msgid "This test checks for vulnerable PHP whether to use version."
 msgstr ""
 
-#: ../../templates/show_info.inc.php:71
-msgid "PHP Info"
+#: ../../templates/show_info.inc.php:67
+msgid "PHP recommendation settings"
 msgstr ""
 
 #: ../../templates/show_info.inc.php:74
+msgid "This test checks whether the recommended security settings."
+msgstr ""
+
+#: ../../templates/show_info.inc.php:77
+msgid "PHP Info"
+msgstr ""
+
+#: ../../templates/show_info.inc.php:80
 msgid "This is the phpinfo() to display information."
 msgstr ""
 
-#: ../../templates/show_search_bar.inc.php:42
+#: ../../templates/show_search_bar.inc.php:37
+msgid "Anywhere"
+msgstr ""
+
+#: ../../templates/show_search_bar.inc.php:44
 msgid "Advanced Search"
 msgstr ""
 
-#: ../../templates/show_album_art.inc.php:59
+#: ../../templates/show_album_art.inc.php:34
+msgid "Select New Album Art"
+msgstr ""
+
+#: ../../templates/show_album_art.inc.php:54
 msgid "Invalid"
 msgstr ""
 
-#: ../../templates/show_registration_confirmation.inc.php:48
+#: ../../templates/show_registration_confirmation.inc.php:43
 msgid "Registration Complete"
 msgstr ""
 
-#: ../../templates/show_registration_confirmation.inc.php:54
+#: ../../templates/show_registration_confirmation.inc.php:49
 msgid ""
 "Your account has been created. An activation key has been sent to the e-mail "
 "address you provided. Please check your e-mail for further information"
 msgstr ""
 
-#: ../../templates/show_registration_confirmation.inc.php:56
+#: ../../templates/show_registration_confirmation.inc.php:51
 msgid "Return to Login Page"
 msgstr ""
 
-#: ../../templates/show_update_items.inc.php:34
+#: ../../templates/show_update_items.inc.php:29
 msgid "Starting Update from Tags"
 msgstr ""
 
-#: ../../templates/show_update_items.inc.php:38
+#: ../../templates/show_update_items.inc.php:33
 msgid "Update from Tags Complete"
 msgstr ""
 
-#: ../../templates/show_plugins.inc.php:48
+#: ../../templates/show_plugins.inc.php:43
 msgid "Installed Version"
 msgstr ""
 
-#: ../../templates/show_plugins.inc.php:61
+#: ../../templates/show_plugins.inc.php:56
 msgid "Deactivate"
 msgstr ""
 
-#: ../../templates/show_plugins.inc.php:65
+#: ../../templates/show_plugins.inc.php:60
 msgid "Upgrade"
 msgstr ""
 
-#: ../../templates/show_lostpassword_form.inc.php:78
+#: ../../templates/show_lostpassword_form.inc.php:73
 msgid "Email"
 msgstr ""
 
-#: ../../templates/show_lostpassword_form.inc.php:82
+#: ../../templates/show_lostpassword_form.inc.php:77
 msgid "Submit"
 msgstr ""
 
-#: ../../templates/show_denied.inc.php:50
+#: ../../templates/show_denied.inc.php:45
 msgid ""
 "You've been redirected to this page because you do not have access to this "
 "function."
 msgstr ""
 
-#: ../../templates/show_denied.inc.php:51
+#: ../../templates/show_denied.inc.php:46
 msgid ""
 "If you believe this is an error please contact an Ampache administrator."
 msgstr ""
 
-#: ../../templates/show_denied.inc.php:52
+#: ../../templates/show_denied.inc.php:47
 msgid "This event has been logged"
 msgstr ""
 
-#: ../../templates/show_denied.inc.php:56
+#: ../../templates/show_denied.inc.php:51
 msgid ""
 "You've been redirected to this page because you've attempted to access a "
 "function that is disabled in the demo."
 msgstr ""
 
-#: ../../templates/show_denied.inc.php:57
+#: ../../templates/show_denied.inc.php:52
 msgid ""
 "Functions are disabled in the demo because previous users of the demo have "
 "used the functionality to post inappropriate materials"
 msgstr ""
 
-#: ../../templates/show_all_popular.inc.php:44
+#: ../../templates/show_all_popular.inc.php:39
 msgid "Most Popular Genres"
 msgstr ""
 
-#: ../../templates/show_all_popular.inc.php:50
-#: ../../templates/show_mail_users.inc.php:81
+#: ../../templates/show_all_popular.inc.php:45
+#: ../../templates/show_mail_users.inc.php:76
 msgid "Most Popular Songs"
 msgstr ""
 
-#: ../../templates/show_all_popular.inc.php:53
+#: ../../templates/show_all_popular.inc.php:48
 msgid "Most Popular Live Streams"
 msgstr ""
 
-#: ../../templates/show_all_popular.inc.php:56
+#: ../../templates/show_all_popular.inc.php:51
 msgid "Most Popular Tags"
 msgstr ""
 
-#: ../../templates/show_localplay_edit_instance.inc.php:35
+#: ../../templates/show_localplay_edit_instance.inc.php:30
 msgid "Edit Localplay Instance"
 msgstr ""
 
-#: ../../templates/show_localplay_edit_instance.inc.php:46
+#: ../../templates/show_localplay_edit_instance.inc.php:41
 msgid "Update Instance"
 msgstr ""
 
-#: ../../templates/show_videos.inc.php:52
-#: ../../templates/show_videos.inc.php:76
+#: ../../templates/show_videos.inc.php:46
+#: ../../templates/show_videos.inc.php:70
+msgid "Codec"
+msgstr ""
+
+#: ../../templates/show_videos.inc.php:47
+#: ../../templates/show_videos.inc.php:71
 msgid "Resolution"
 msgstr ""
 
+#: ../../templates/show_verify_catalog.inc.php:29
+msgid "Verify Catalog"
+msgstr ""
+
 #. HINT: Catalog Name
-#: ../../templates/show_verify_catalog.inc.php:36
+#: ../../templates/show_verify_catalog.inc.php:31
 #, php-format
 msgid "Updating the %s catalog"
 msgstr ""
 
-#: ../../templates/show_verify_catalog.inc.php:38
+#: ../../templates/show_verify_catalog.inc.php:33
 #, php-format
 msgid "%d item found checking tag information"
 msgid_plural "%d items found checking tag information"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../templates/show_verify_catalog.inc.php:40
-msgid "Verifed"
+#: ../../templates/show_verify_catalog.inc.php:35
+msgid "Verified"
 msgstr ""
 
 #. HINT: Democratic Name
-#: ../../templates/show_democratic.inc.php:35
+#: ../../templates/show_democratic.inc.php:30
 #, php-format
 msgid "%s Playlist"
 msgstr ""
 
-#: ../../templates/show_democratic.inc.php:42
-#: ../../templates/show_manage_democratic.inc.php:48
+#: ../../templates/show_democratic.inc.php:37
+#: ../../templates/show_manage_democratic.inc.php:43
 msgid "Cooldown"
 msgstr ""
 
-#: ../../templates/show_democratic.inc.php:53
+#: ../../templates/show_democratic.inc.php:48
 msgid "Play Democratic Playlist"
 msgstr ""
 
-#: ../../templates/show_localplay_control.inc.php:36
+#: ../../templates/show_localplay_control.inc.php:31
 msgid "Previous"
 msgstr ""
 
-#: ../../templates/show_localplay_control.inc.php:37
+#: ../../templates/show_localplay_control.inc.php:32
 msgid "Stop"
 msgstr ""
 
-#: ../../templates/show_localplay_control.inc.php:38
+#: ../../templates/show_localplay_control.inc.php:33
 msgid "Pause"
 msgstr ""
 
-#: ../../templates/show_now_playing_row.inc.php:58
+#: ../../templates/show_now_playing_row.inc.php:53
 msgid "Show Lyrics"
 msgstr ""
 
-#: ../../templates/show_now_playing_row.inc.php:120
+#: ../../templates/show_now_playing_row.inc.php:115
 msgid "Similar Songs"
 msgstr ""
 
-#: ../../templates/show_shoutbox.inc.php:35
+#: ../../templates/show_shoutbox.inc.php:30
 msgid "Shoutbox"
 msgstr ""
 
-#: ../../templates/show_localplay_instances.inc.php:35
+#: ../../templates/show_localplay_instances.inc.php:30
 msgid "Show Localplay Instances"
 msgstr ""
 
-#: ../../templates/show_localplay_instances.inc.php:51
+#: ../../templates/show_localplay_instances.inc.php:46
 msgid "Edit Instance"
 msgstr ""
 
 #. HINT: Username
-#: ../../templates/show_ip_history.inc.php:35
+#: ../../templates/show_ip_history.inc.php:30
 #, php-format
 msgid "%s IP History"
 msgstr ""
 
-#: ../../templates/show_ip_history.inc.php:41
+#: ../../templates/show_ip_history.inc.php:36
 msgid "Show Unique"
 msgstr ""
 
-#: ../../templates/show_ip_history.inc.php:44
-#: ../../templates/show_admin_info.inc.php:51
+#: ../../templates/show_ip_history.inc.php:39
+#: ../../templates/show_admin_info.inc.php:46
 msgid "Show All"
 msgstr ""
 
-#: ../../templates/show_ip_history.inc.php:57
-#: ../../templates/show_ip_history.inc.php:71
+#: ../../templates/show_ip_history.inc.php:52
+#: ../../templates/show_ip_history.inc.php:66
 msgid "Date"
 msgstr ""
 
-#: ../../templates/show_ip_history.inc.php:58
-#: ../../templates/show_ip_history.inc.php:72
+#: ../../templates/show_ip_history.inc.php:53
+#: ../../templates/show_ip_history.inc.php:67
 msgid "IP Address"
 msgstr ""
 
-#: ../../templates/show_install_account.inc.php:42
+#: ../../templates/show_install_account.inc.php:37
 msgid ""
 "This step creates your initial Ampache admin account. Once your admin "
 "account has been created you will be redirected to the login page."
 msgstr ""
 
-#: ../../templates/show_install_account.inc.php:46
+#: ../../templates/show_install_account.inc.php:41
 msgid "Create Admin Account"
 msgstr ""
 
-#: ../../templates/show_install_account.inc.php:63
+#: ../../templates/show_install_account.inc.php:58
 msgid "Create Account"
 msgstr ""
 
-#: ../../templates/show_preference_box.inc.php:55
-#: ../../templates/show_preference_box.inc.php:85
+#: ../../templates/show_preference_box.inc.php:50
+#: ../../templates/show_preference_box.inc.php:80
 msgid "Apply to All"
 msgstr ""
 
-#: ../../templates/show_preference_box.inc.php:56
-#: ../../templates/show_preference_box.inc.php:86
+#: ../../templates/show_preference_box.inc.php:51
+#: ../../templates/show_preference_box.inc.php:81
 msgid "Access Level"
 msgstr ""
 
-#: ../../templates/show_playlist.inc.php:51
-#: ../../templates/show_playlist.inc.php:52
+#: ../../templates/show_playlist.inc.php:46
+#: ../../templates/show_playlist.inc.php:47
 msgid "Normalize Tracks"
 msgstr ""
 
+#: ../../templates/show_playlist.inc.php:60
 #: ../../templates/show_playlist.inc.php:61
-#: ../../templates/show_playlist.inc.php:62
-msgid "Add All"
-msgstr ""
-
-#: ../../templates/show_playlist.inc.php:65
-#: ../../templates/show_playlist.inc.php:66
 msgid "Add Random"
 msgstr ""
 
-#: ../../templates/sidebar_preferences.inc.php:50
+#: ../../templates/sidebar_preferences.inc.php:45
 msgid "Account"
 msgstr ""
 
-#: ../../templates/install_header.inc.php:49
+#: ../../templates/install_header.inc.php:44
 msgid "Ampache Installation"
 msgstr ""
 
-#: ../../templates/install_header.inc.php:54
+#: ../../templates/install_header.inc.php:49
 msgid "Requirements"
 msgstr ""
 
-#: ../../templates/install_header.inc.php:56
+#: ../../templates/install_header.inc.php:51
 msgid ""
 "This page handles the installation of the Ampache database and the creation "
 "of the ampache.cfg.php file. Before you continue please make sure that you "
 "have the following prerequisites:"
 msgstr ""
 
-#: ../../templates/install_header.inc.php:59
+#: ../../templates/install_header.inc.php:54
 msgid ""
 "A MySQL server with a username and password that can create/modify databases"
 msgstr ""
 
-#: ../../templates/install_header.inc.php:60
+#: ../../templates/install_header.inc.php:55
 #, php-format
 msgid "Your webserver has read access to the files %s and %s"
 msgstr ""
 
-#: ../../templates/install_header.inc.php:63
+#: ../../templates/install_header.inc.php:58
 #, php-format
 msgid ""
 "Once you have ensured that the above requirements are met please fill out "
@@ -3649,292 +3791,575 @@ msgid ""
 "date simply edit %s"
 msgstr ""
 
-#: ../../templates/sidebar_admin.inc.php:43
+#: ../../templates/sidebar_admin.inc.php:38
 msgid "User Tools"
 msgstr ""
 
-#: ../../templates/sidebar_admin.inc.php:45
-#: ../../templates/show_add_user.inc.php:97
+#: ../../templates/sidebar_admin.inc.php:40
+#: ../../templates/show_add_user.inc.php:92
 msgid "Add User"
 msgstr ""
 
-#: ../../templates/sidebar_admin.inc.php:46
+#: ../../templates/sidebar_admin.inc.php:41
 msgid "Browse Users"
 msgstr ""
 
-#: ../../templates/sidebar_admin.inc.php:51
+#: ../../templates/sidebar_admin.inc.php:46
 msgid "Add ACL"
 msgstr ""
 
-#: ../../templates/sidebar_admin.inc.php:52
+#: ../../templates/sidebar_admin.inc.php:47
 msgid "Show ACL(s)"
 msgstr ""
 
-#: ../../templates/sidebar_admin.inc.php:59
-#: ../../templates/show_export.inc.php:39
+#: ../../templates/sidebar_admin.inc.php:53
+msgid "Security Check"
+msgstr ""
+
+#: ../../templates/sidebar_admin.inc.php:55
+#: ../../templates/show_export.inc.php:34
 msgid "Export Catalog"
 msgstr ""
 
-#: ../../templates/sidebar_admin.inc.php:61
+#: ../../templates/sidebar_admin.inc.php:57
 msgid "Manage Shoutbox"
 msgstr ""
 
-#: ../../templates/sidebar_admin.inc.php:66
+#: ../../templates/sidebar_admin.inc.php:62
 msgid "Server Config"
 msgstr ""
 
-#: ../../templates/show_admin_info.inc.php:43
+#: ../../templates/show_admin_info.inc.php:38
 msgid "Last Ten Flagged Records"
 msgstr ""
 
-#: ../../templates/show_admin_info.inc.php:47
-#: ../../templates/show_mail_users.inc.php:91
+#: ../../templates/show_admin_info.inc.php:42
+#: ../../templates/show_mail_users.inc.php:86
 msgid "Disabled Songs"
 msgstr ""
 
-#: ../../templates/show_duplicate.inc.php:39
+#: ../../templates/show_duplicate.inc.php:34
 msgid "Search Type"
 msgstr ""
 
-#: ../../templates/show_duplicate.inc.php:46
+#: ../../templates/show_duplicate.inc.php:41
 msgid "Artist and Title"
 msgstr ""
 
-#: ../../templates/show_duplicate.inc.php:47
+#: ../../templates/show_duplicate.inc.php:42
 msgid "Artist, Album and Title"
 msgstr ""
 
-#: ../../templates/show_duplicate.inc.php:49
+#: ../../templates/show_duplicate.inc.php:44
 msgid "Search Disabled Songs"
 msgstr ""
 
-#: ../../templates/show_localplay_status.inc.php:38
+#: ../../templates/show_localplay_status.inc.php:33
 msgid "Localplay Control"
 msgstr ""
 
-#: ../../templates/show_localplay_status.inc.php:43
+#: ../../templates/show_localplay_status.inc.php:38
 msgid "Mute"
 msgstr ""
 
-#: ../../templates/show_localplay_status.inc.php:44
+#: ../../templates/show_localplay_status.inc.php:39
 msgid "Decrease Volume"
 msgstr ""
 
-#: ../../templates/show_localplay_status.inc.php:45
+#: ../../templates/show_localplay_status.inc.php:40
 msgid "Increase Volume"
 msgstr ""
 
-#: ../../templates/show_localplay_status.inc.php:46
+#: ../../templates/show_localplay_status.inc.php:41
 msgid "Volume"
 msgstr ""
 
-#: ../../templates/show_localplay_status.inc.php:51
+#: ../../templates/show_localplay_status.inc.php:46
 msgid "Repeat"
 msgstr ""
 
-#: ../../templates/show_random.inc.php:35
+#: ../../templates/show_random.inc.php:30
 msgid "Play Random Selection"
 msgstr ""
 
-#: ../../templates/show_random.inc.php:39
+#: ../../templates/show_random.inc.php:42
 msgid "Item count"
 msgstr ""
 
-#: ../../templates/show_random.inc.php:62
-#: ../../templates/show_random.inc.php:63
+#: ../../templates/show_random.inc.php:72
+#: ../../templates/show_random.inc.php:73
 #, php-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../templates/show_random.inc.php:64
-#: ../../templates/show_random.inc.php:65
-#: ../../templates/show_random.inc.php:66
-#: ../../templates/show_random.inc.php:67
-#: ../../templates/show_random.inc.php:68
+#: ../../templates/show_random.inc.php:74
+#: ../../templates/show_random.inc.php:75
+#: ../../templates/show_random.inc.php:76
+#: ../../templates/show_random.inc.php:77
+#: ../../templates/show_random.inc.php:78
 #, php-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../templates/show_random.inc.php:77
-msgid "Standard"
-msgstr ""
-
-#: ../../templates/show_random.inc.php:78
-msgid "Less Played"
-msgstr ""
-
-#: ../../templates/show_random.inc.php:79
-msgid "Full Albums"
-msgstr ""
-
-#: ../../templates/show_random.inc.php:80
-msgid "Full Artist"
-msgstr ""
-
-#: ../../templates/show_random.inc.php:82
-msgid "Highest Rated"
-msgstr ""
-
-#: ../../templates/show_random.inc.php:88
-msgid "From catalog"
-msgstr ""
-
-#: ../../templates/show_random.inc.php:94
+#: ../../templates/show_random.inc.php:83
 msgid "Size Limit"
 msgstr ""
 
-#: ../../templates/show_random.inc.php:109
+#: ../../templates/show_random.inc.php:101
 msgid "Enqueue"
 msgstr ""
 
-#: ../../templates/show_object_rating_static.inc.php:57
+#: ../../templates/show_object_rating_static.inc.php:52
 msgid "out of"
 msgstr ""
 
-#: ../../templates/show_preference_admin.inc.php:35
+#: ../../templates/show_preference_admin.inc.php:30
 msgid "Preference Administration"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:67
+#: ../../templates/show_user_registration.inc.php:62
 msgid "User Agreement"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:74
+#: ../../templates/show_user_registration.inc.php:69
 msgid "I Accept"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:79
+#: ../../templates/show_user_registration.inc.php:74
 msgid "User Information"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:110
+#: ../../templates/show_user_registration.inc.php:105
 msgid "* Required fields"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:120
+#: ../../templates/show_user_registration.inc.php:115
 msgid "Register User"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:36
+#: ../../templates/show_mail_users.inc.php:31
 msgid "Send E-mail to Users"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:40
+#: ../../templates/show_mail_users.inc.php:35
 msgid "Mail to"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:46
+#: ../../templates/show_mail_users.inc.php:41
 msgid "Inactive Users"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:55
+#: ../../templates/show_mail_users.inc.php:50
 msgid "Catalog Statistics"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:66
+#: ../../templates/show_mail_users.inc.php:61
 msgid "Latest Artist Additions"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:77
+#: ../../templates/show_mail_users.inc.php:72
 msgid "Latest Album Additions"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:87
+#: ../../templates/show_mail_users.inc.php:82
 msgid "Flagged Songs"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:99
+#: ../../templates/show_mail_users.inc.php:94
 msgid "Most Popular Threshold in days"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:110
+#: ../../templates/show_mail_users.inc.php:105
 msgid "From"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:113
+#: ../../templates/show_mail_users.inc.php:108
 msgid "Yourself"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:114
+#: ../../templates/show_mail_users.inc.php:109
 msgid "Ampache"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:119
+#: ../../templates/show_mail_users.inc.php:114
 msgid "Subject"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:126
+#: ../../templates/show_mail_users.inc.php:121
 msgid "Message"
 msgstr ""
 
-#: ../../templates/show_mail_users.inc.php:134
+#: ../../templates/show_mail_users.inc.php:129
 msgid "Send Mail"
 msgstr ""
 
-#: ../../templates/show_export.inc.php:62
+#: ../../templates/show_export.inc.php:57
 msgid "Format"
 msgstr ""
 
-#: ../../templates/show_export.inc.php:72
+#: ../../templates/show_export.inc.php:67
 msgid "Export"
 msgstr ""
 
+#: ../../templates/show_adds_catalog.inc.php:29
+msgid "Starting New Song Search"
+msgstr ""
+
 #. HINT: Catalog Name
-#: ../../templates/show_adds_catalog.inc.php:36
+#: ../../templates/show_adds_catalog.inc.php:31
 #, php-format
 msgid "Starting New Song Search on %s catalog"
 msgstr ""
 
-#: ../../templates/show_add_user.inc.php:35
+#: ../../templates/show_add_user.inc.php:30
 msgid "Adding a New User"
 msgstr ""
 
-#: ../../templates/show_manage_democratic.inc.php:34
+#: ../../templates/show_manage_democratic.inc.php:29
 msgid "Manage Democratic Playlists"
 msgstr ""
 
-#: ../../templates/show_manage_democratic.inc.php:81
+#: ../../templates/show_manage_democratic.inc.php:76
 msgid "Create New Playlist"
 msgstr ""
 
-#: ../../templates/show_dynamic.inc.php:35
+#: ../../templates/show_dynamic.inc.php:30
 msgid "Advanced Random Rules"
 msgstr ""
 
-#: ../../templates/show_dynamic.inc.php:69
+#: ../../templates/show_dynamic.inc.php:39
+msgid "Field"
+msgstr ""
+
+#: ../../templates/show_dynamic.inc.php:40
+msgid "Operator"
+msgstr ""
+
+#: ../../templates/show_dynamic.inc.php:42
+msgid "Method"
+msgstr ""
+
+#: ../../templates/show_dynamic.inc.php:64
 msgid "Like"
 msgstr ""
 
-#: ../../templates/show_dynamic.inc.php:84
+#: ../../templates/show_dynamic.inc.php:73
+msgid "AND"
+msgstr ""
+
+#: ../../templates/show_dynamic.inc.php:79
 msgid "Add Rule"
 msgstr ""
 
-#: ../../templates/show_dynamic.inc.php:87
+#: ../../templates/show_dynamic.inc.php:82
 msgid "Save Rules As"
 msgstr ""
 
-#: ../../templates/show_dynamic.inc.php:90
+#: ../../templates/show_dynamic.inc.php:85
 msgid "Load Saved Rules"
 msgstr ""
 
-#: ../../search.php:50
-msgid "Error: No Keyword Entered"
-msgstr ""
-
-#: ../../search.php:66
+#: ../../sarg/trunk/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/v2.3/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/start/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-block-it.php:35
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-block-it.php:35
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-block-it.php:35
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-block-it.php:35
+#: ../../sarg/branches/v2.3/sarg-php/sarg-block-it.php:35
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-block-it.php:35
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-block-it.php:35
+#: ../../sarg/branches/serassio/sarg-php/sarg-block-it.php:35
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-block-it.php:35
+msgid "Could not open the filename"
+msgstr ""
+
+#: ../../sarg/trunk/sarg-php/sarg-block-it.php:43
+#: ../../sarg/trunk/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/v2.3/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/v2.3/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/start/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/start/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-block-it.php:43
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-block-it.php:43
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-block-it.php:43
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/branches/v2.3/sarg-php/sarg-block-it.php:43
+#: ../../sarg/branches/v2.3/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-block-it.php:43
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-block-it.php:43
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/branches/serassio/sarg-php/sarg-block-it.php:43
+#: ../../sarg/branches/serassio/sarg-php/sarg-squidguard-block2.php:49
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-block-it.php:43
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-squidguard-block2.php:49
+msgid "Write error"
+msgstr ""
+
+#: ../../sarg/trunk/sarg-php/sarg-block-it.php:46
+#: ../../sarg/trunk/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/v2.3/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/v2.3/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/start/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/start/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-block-it.php:46
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-block-it.php:46
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-block-it.php:46
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/branches/v2.3/sarg-php/sarg-block-it.php:46
+#: ../../sarg/branches/v2.3/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-block-it.php:46
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-block-it.php:46
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/branches/serassio/sarg-php/sarg-block-it.php:46
+#: ../../sarg/branches/serassio/sarg-php/sarg-squidguard-block2.php:52
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-block-it.php:46
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-squidguard-block2.php:52
+msgid "Done!"
+msgstr ""
+
+#: ../../sarg/trunk/sarg-php/sarg-block-it.php:49
+#: ../../sarg/trunk/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/v2.3/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/v2.3/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/start/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/start/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-block-it.php:49
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-block-it.php:49
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-block-it.php:49
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/branches/v2.3/sarg-php/sarg-block-it.php:49
+#: ../../sarg/branches/v2.3/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-block-it.php:49
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-block-it.php:49
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/branches/serassio/sarg-php/sarg-block-it.php:49
+#: ../../sarg/branches/serassio/sarg-php/sarg-squidguard-block2.php:55
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-block-it.php:49
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-squidguard-block2.php:55
+msgid "Return"
+msgstr ""
+
+#: ../../sarg/trunk/sarg-php/sarg-block-it.php:51
+#: ../../sarg/trunk/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/v2.3/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/v2.3/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/start/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/start/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-block-it.php:51
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-block-it.php:51
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-block-it.php:51
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/branches/v2.3/sarg-php/sarg-block-it.php:51
+#: ../../sarg/branches/v2.3/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-block-it.php:51
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-block-it.php:51
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/branches/serassio/sarg-php/sarg-block-it.php:51
+#: ../../sarg/branches/serassio/sarg-php/sarg-squidguard-block2.php:57
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-block-it.php:51
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-squidguard-block2.php:57
+msgid " to Sarg."
+msgstr ""
+
+#: ../../sarg/trunk/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/v2.3/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/start/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/branches/v2.3/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/branches/serassio/sarg-php/sarg-squidguard-block2.php:41
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-squidguard-block2.php:41
+msgid "Could not open the file"
+msgstr ""
+
+#: ../../sarg/trunk/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/v2.3/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/start/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/branches/v2.3/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/branches/serassio/sarg-php/sarg-squidguard-block.php:54
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-squidguard-block.php:54
+msgid "Sarg-SquidGuard - URL Blocking"
+msgstr ""
+
+#: ../../sarg/trunk/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/v2.3/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/start/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/branches/v2.3/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/branches/serassio/sarg-php/sarg-squidguard-block.php:57
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-squidguard-block.php:57
+msgid "Choose the rule set where"
+msgstr ""
+
+#: ../../sarg/trunk/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/Z-SARG_2_0_8_merge_HEAD/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/v2.3/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/v2.3-pre5/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/Z-SARG_2_0_9_merge_HEAD/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/Z-SARG_WIN_merge-old_HEAD/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/v2_2_7/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/v2_2_6/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/start/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/v2.3.1/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/Z-SARG_WIN_merge_HEAD/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/v2.3-pre2/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/tags/Z-SARG_WIN_merge-new_HEAD/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/branches/SARG_WIN/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/branches/v2_2_6_1/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/branches/v2.3/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/branches/v2_2_7/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/branches/SARG_2_0_9/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/branches/serassio/sarg-php/sarg-squidguard-block.php:59
+#: ../../sarg/branches/SARG_2_0_8/sarg-php/sarg-squidguard-block.php:59
+msgid "will by added"
+msgstr ""
+
+#: ../../search.php:49
 msgid "Search Saved"
 msgstr ""
 
-#: ../../search.php:66
+#: ../../search.php:49
 #, php-format
 msgid "Your Search has been saved as a track in %s"
 msgstr ""
 
-#: ../../radio.php:67
+#: ../../radio.php:62
 msgid "Radio Station Added"
 msgstr ""
 
@@ -3968,728 +4393,724 @@ msgid ""
 "There was a problem with the file upload: The %s was only partially uploaded."
 msgstr ""
 
-#: ../../modules/localplay/httpq.controller.php:238
-#: ../../modules/localplay/shoutcast.controller.php:259
-#: ../../modules/localplay/mpd.controller.php:256
-#: ../../modules/localplay/vlc.controller.php:238
+#: ../../modules/localplay/httpq.controller.php:231
+#: ../../modules/localplay/shoutcast.controller.php:252
+#: ../../modules/localplay/mpd.controller.php:249
+#: ../../modules/localplay/vlc.controller.php:231
 msgid "Instance Name"
 msgstr ""
 
-#: ../../modules/localplay/httpq.controller.php:239
-#: ../../modules/localplay/mpd.controller.php:257
-#: ../../modules/localplay/vlc.controller.php:239
+#: ../../modules/localplay/httpq.controller.php:232
+#: ../../modules/localplay/mpd.controller.php:250
+#: ../../modules/localplay/vlc.controller.php:232
 msgid "Hostname"
 msgstr ""
 
-#: ../../modules/localplay/httpq.controller.php:240
-#: ../../modules/localplay/mpd.controller.php:258
-#: ../../modules/localplay/vlc.controller.php:240
+#: ../../modules/localplay/httpq.controller.php:233
+#: ../../modules/localplay/mpd.controller.php:251
+#: ../../modules/localplay/vlc.controller.php:233
 msgid "Port"
 msgstr ""
 
-#: ../../modules/localplay/shoutcast.controller.php:260
+#: ../../modules/localplay/shoutcast.controller.php:253
 msgid "PID File"
 msgstr ""
 
-#: ../../modules/localplay/shoutcast.controller.php:261
+#: ../../modules/localplay/shoutcast.controller.php:254
 msgid "Playlist File"
 msgstr ""
 
-#: ../../modules/localplay/shoutcast.controller.php:262
+#: ../../modules/localplay/shoutcast.controller.php:255
 msgid "Local Path to Files"
 msgstr ""
 
-#: ../../albums.php:44
+#: ../../albums.php:39
 msgid "Album Art Cleared"
 msgstr ""
 
-#: ../../albums.php:44
+#: ../../albums.php:39
 msgid "Album Art information has been removed from the database"
 msgstr ""
 
-#: ../../albums.php:51 ../../albums.php:70 ../../albums.php:143
+#: ../../albums.php:46 ../../albums.php:65 ../../albums.php:138
 msgid "Album Art Not Located"
 msgstr ""
 
-#: ../../albums.php:51 ../../albums.php:70 ../../albums.php:143
+#: ../../albums.php:46 ../../albums.php:65 ../../albums.php:138
 msgid ""
 "Album Art could not be located at this time. This may be due to write access "
 "error, or the file is not received correctly."
 msgstr ""
 
-#: ../../albums.php:66 ../../albums.php:94
+#: ../../albums.php:61 ../../albums.php:89
 msgid "Album Art Inserted"
 msgstr ""
 
-#: ../../play/index.php:97
-msgid "Session Expired: please log in again at"
-msgstr ""
-
 #. HINT: Artist, Song Title
-#: ../../song.php:54 ../../song.php:72
+#: ../../song.php:49 ../../song.php:67
 #, php-format
 msgid "%1$s - %2$s Lyrics Detail"
 msgstr ""
 
-#: ../../democratic.php:68
+#: ../../democratic.php:63
 msgid "The Requested Playlist has been deleted."
 msgstr ""
 
-#: ../../artists.php:95
+#: ../../artists.php:90
 msgid "Renamed artist(s)"
 msgstr ""
 
-#: ../../artists.php:96
+#: ../../artists.php:91
 #, php-format
 msgid "%1$s artists have been merged with %2$s"
 msgstr ""
 
-#: ../../artists.php:175
+#: ../../artists.php:170
 msgid "Renamed artist"
 msgstr ""
 
-#: ../../artists.php:176
+#: ../../artists.php:171
 #, php-format
 msgid "%1$s is now known as %2$s"
 msgstr ""
 
-#: ../../artists.php:200
+#: ../../artists.php:195
 msgid "Show Artists starting with"
 msgstr ""
 
-#: ../../login.php:98
+#: ../../login.php:93
 msgid "Error Username or Password incorrect, please try again"
 msgstr ""
 
-#: ../../login.php:105
+#: ../../login.php:100
 msgid "User Disabled please contact Admin"
 msgstr ""
 
-#: ../../login.php:113
+#: ../../login.php:108
 msgid "User Already Logged in"
 msgstr ""
 
-#: ../../login.php:134
+#: ../../login.php:129
 msgid "Unable to create local account"
 msgstr ""
 
-#: ../../admin/flag.php:92
+#: ../../admin/flag.php:87
 msgid "Song Updated"
 msgstr ""
 
-#: ../../admin/flag.php:92
+#: ../../admin/flag.php:87
 msgid "The requested song has been updated"
 msgstr ""
 
-#: ../../admin/flag.php:134
+#: ../../admin/flag.php:129
 msgid "Album Updated"
 msgstr ""
 
-#: ../../admin/flag.php:176
+#: ../../admin/flag.php:171
 msgid "Artist Updated"
 msgstr ""
 
-#: ../../admin/flag.php:237
+#: ../../admin/flag.php:232
 msgid "Songs Updated"
 msgstr ""
 
-#: ../../admin/flag.php:245
+#: ../../admin/flag.php:240
 msgid "Flag Removed"
 msgstr ""
 
-#: ../../admin/flag.php:246
+#: ../../admin/flag.php:241
 msgid "Flag Removed from"
 msgstr ""
 
-#: ../../admin/flag.php:261
+#: ../../admin/flag.php:256
 msgid "Flags Updated"
 msgstr ""
 
-#: ../../admin/flag.php:280
+#: ../../admin/flag.php:275
 msgid "Songs Disabled"
 msgstr ""
 
-#: ../../admin/flag.php:280
+#: ../../admin/flag.php:275
 msgid "The requested song(s) have been disabled"
 msgstr ""
 
-#: ../../admin/flag.php:291
+#: ../../admin/flag.php:286
 msgid "Songs Enabled"
 msgstr ""
 
-#: ../../admin/flag.php:291
+#: ../../admin/flag.php:286
 msgid "The requested song(s) have been enabled"
 msgstr ""
 
-#: ../../admin/users.php:95
+#: ../../admin/users.php:90
 msgid "User Updated"
 msgstr ""
 
-#: ../../admin/users.php:95
+#: ../../admin/users.php:90
 msgid "updated"
 msgstr ""
 
 #. HINT: %1 Username, %2 Access num
-#: ../../admin/users.php:142
+#: ../../admin/users.php:137
 msgid "New User Added"
 msgstr ""
 
-#: ../../admin/users.php:142
+#: ../../admin/users.php:137
 #, php-format
 msgid "%1$s has been created with an access level of %2$s"
 msgstr ""
 
-#: ../../admin/users.php:147
+#: ../../admin/users.php:142
 msgid "User Enabled"
 msgstr ""
 
-#: ../../admin/users.php:152
+#: ../../admin/users.php:147
 msgid "User Disabled"
 msgstr ""
 
-#: ../../admin/users.php:155
+#: ../../admin/users.php:150
 msgid "Unable to Disabled last Administrator"
 msgstr ""
 
-#: ../../admin/users.php:171
+#: ../../admin/users.php:166
 msgid "User Deleted"
 msgstr ""
 
-#: ../../admin/users.php:171
+#: ../../admin/users.php:166
 #, php-format
 msgid "%s has been Deleted"
 msgstr ""
 
-#: ../../admin/users.php:174
+#: ../../admin/users.php:169
 msgid "Delete Error"
 msgstr ""
 
-#: ../../admin/users.php:174
+#: ../../admin/users.php:169
 msgid "Unable to delete last Admin User"
 msgstr ""
 
-#: ../../admin/users.php:180 ../../admin/access.php:56
+#: ../../admin/users.php:175 ../../admin/access.php:51
 msgid "Deletion Request"
 msgstr ""
 
-#: ../../admin/users.php:181
+#: ../../admin/users.php:176
 #, php-format
 msgid "Are you sure you want to permanently delete %s?"
 msgstr ""
 
-#: ../../admin/shout.php:48
+#: ../../admin/shout.php:43
 msgid "Shoutbox Post Updated"
 msgstr ""
 
-#: ../../admin/shout.php:60
+#: ../../admin/shout.php:55
 msgid "Shoutbox Post Deleted"
 msgstr ""
 
-#: ../../admin/catalog.php:65 ../../admin/catalog.php:85
-#: ../../admin/catalog.php:110 ../../admin/catalog.php:182
+#: ../../admin/catalog.php:60 ../../admin/catalog.php:80
+#: ../../admin/catalog.php:106 ../../admin/catalog.php:179
 msgid "Catalog Updated"
 msgstr ""
 
-#: ../../admin/catalog.php:127
+#: ../../admin/catalog.php:123
 msgid "Catalog Deleted"
 msgstr ""
 
-#: ../../admin/catalog.php:127
+#: ../../admin/catalog.php:123
 msgid "The Catalog and all associated records have been deleted"
 msgstr ""
 
-#: ../../admin/catalog.php:133
+#: ../../admin/catalog.php:129
 msgid "Catalog Delete"
 msgstr ""
 
-#: ../../admin/catalog.php:133
+#: ../../admin/catalog.php:129
 msgid "Confirm Deletion Request"
 msgstr ""
 
-#: ../../admin/catalog.php:142
+#: ../../admin/catalog.php:138
 msgid "Song Removed"
 msgid_plural "Songs Removed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../admin/catalog.php:145
+#: ../../admin/catalog.php:141
 msgid "No Songs Removed"
 msgstr ""
 
-#: ../../admin/catalog.php:148
+#: ../../admin/catalog.php:144
 msgid "Disabled Song Processed"
 msgid_plural "Disabled Songs Processed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../admin/catalog.php:169
+#: ../../admin/catalog.php:166
 msgid "Catalog Cleaned"
 msgstr ""
 
-#: ../../admin/catalog.php:213
+#: ../../admin/catalog.php:210
 msgid "Error: Name and path not specified"
 msgstr ""
 
-#: ../../admin/catalog.php:217
+#: ../../admin/catalog.php:214
 msgid "Error: Remote selected, but path is not a URL"
 msgstr ""
 
-#: ../../admin/catalog.php:221
+#: ../../admin/catalog.php:218
 msgid "Error: Remote Catalog specified, but no key provided"
 msgstr ""
 
-#: ../../admin/catalog.php:231
+#: ../../admin/catalog.php:228
 msgid "Error: Defined Path is inside an existing catalog"
 msgstr ""
 
-#: ../../admin/catalog.php:250
+#: ../../admin/catalog.php:246 ../../admin/catalog.php:247
 msgid "Catalog Created"
 msgstr ""
 
-#: ../../admin/catalog.php:267
+#: ../../admin/catalog.php:264
 msgid "Catalog statistics cleared"
 msgstr ""
 
-#: ../../admin/catalog.php:281
+#: ../../admin/catalog.php:278
 msgid "Now Playing Cleared"
 msgstr ""
 
-#: ../../admin/catalog.php:281
+#: ../../admin/catalog.php:278
 msgid "All now playing data has been cleared"
 msgstr ""
 
-#: ../../admin/catalog.php:292
+#: ../../admin/catalog.php:289
 msgid "No Disabled songs found"
 msgstr ""
 
-#: ../../admin/catalog.php:301
+#: ../../admin/catalog.php:298
 msgid "Delete Catalog"
 msgstr ""
 
-#: ../../admin/catalog.php:301
+#: ../../admin/catalog.php:298
 msgid "Do you really want to delete this catalog?"
 msgstr ""
 
-#: ../../admin/catalog.php:321
+#: ../../admin/catalog.php:318
 msgid "Album Art Search Finished"
 msgstr ""
 
-#: ../../admin/access.php:51
+#: ../../admin/access.php:46
 msgid "Deleted"
 msgstr ""
 
-#: ../../admin/access.php:51
+#: ../../admin/access.php:46
 msgid "Your Access List Entry has been removed"
 msgstr ""
 
-#: ../../admin/access.php:56
+#: ../../admin/access.php:51
 msgid "Are you sure you want to permanently delete"
 msgstr ""
 
-#: ../../admin/access.php:115
+#: ../../admin/access.php:110
 msgid "Your new Access Control List(s) have been created"
 msgstr ""
 
-#: ../../admin/access.php:135
+#: ../../admin/access.php:130
 msgid "Access List Entry updated"
 msgstr ""
 
-#: ../../admin/modules.php:49
+#: ../../admin/modules.php:44
 msgid "Install Failed, Controller Error"
 msgstr ""
 
-#: ../../admin/modules.php:67 ../../admin/modules.php:112
+#: ../../admin/modules.php:62 ../../admin/modules.php:107
 msgid "Are you sure you want to remove this plugin?"
 msgstr ""
 
-#: ../../admin/modules.php:79 ../../admin/modules.php:131
+#: ../../admin/modules.php:74 ../../admin/modules.php:126
 msgid "Plugin Deactivated"
 msgstr ""
 
-#: ../../admin/modules.php:94
+#: ../../admin/modules.php:89
 msgid "Unable to Install Plugin"
 msgstr ""
 
-#: ../../admin/modules.php:105
+#: ../../admin/modules.php:100
 msgid "Plugin Activated"
 msgstr ""
 
-#: ../../admin/modules.php:146
+#: ../../admin/modules.php:141
 msgid "Plugin Upgraded"
 msgstr ""
 
-#: ../../admin/modules.php:152
+#: ../../admin/modules.php:147
 msgid "Plugins"
 msgstr ""
 
-#: ../../admin/modules.php:158
+#: ../../admin/modules.php:153
 msgid "Localplay Controllers"
 msgstr ""
 
-#: ../../admin/system.php:61
+#: ../../admin/system.php:56
 msgid "Database Charset Updated"
 msgstr ""
 
-#: ../../admin/system.php:61
+#: ../../admin/system.php:56
 msgid ""
 "Your Database and associated tables have been updated to match your "
 "currently configured charset"
 msgstr ""
 
-#: ../../admin/mail.php:72
+#: ../../admin/mail.php:67
 msgid "E-mail Sent"
 msgstr ""
 
-#: ../../admin/mail.php:73
+#: ../../admin/mail.php:68
 msgid "Your E-mail was successfully sent."
 msgstr ""
 
-#: ../../admin/mail.php:76
+#: ../../admin/mail.php:71
 msgid "E-mail Not Sent"
 msgstr ""
 
-#: ../../admin/mail.php:77
+#: ../../admin/mail.php:72
 msgid "Your E-mail was not sent."
 msgstr ""
 
-#: ../../server/xml.server.php:54
+#: ../../server/xml.server.php:49
 msgid "Access Control not Enabled"
 msgstr ""
 
-#: ../../server/xml.server.php:65
+#: ../../server/xml.server.php:60
 msgid "Session Expired"
 msgstr ""
 
-#: ../../server/xml.server.php:76
+#: ../../server/xml.server.php:71
 msgid "Unauthorized access attempt to API - ACL Error"
 msgstr ""
 
-#: ../../bin/delete_disabled.inc:48
+#: ../../bin/delete_disabled.inc:43
 msgid "DEBUG ENABLED WILL NOT DELETE FILES!"
 msgstr ""
 
-#: ../../bin/delete_disabled.inc:56
+#: ../../bin/delete_disabled.inc:51
 #, php-format
 msgid "Would Delete: %s"
 msgstr ""
 
-#: ../../bin/delete_disabled.inc:60
+#: ../../bin/delete_disabled.inc:55
 #, php-format
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../../bin/write_playlists.inc:53
+#: ../../bin/write_playlists.inc:48
 #, php-format
 msgid "Error: Directory %s not writeable"
 msgstr ""
 
-#: ../../bin/write_playlists.inc:74
+#: ../../bin/write_playlists.inc:69
 msgid "This will dump a collection of m3u playlists based on type"
 msgstr ""
 
-#: ../../bin/write_playlists.inc:75
+#: ../../bin/write_playlists.inc:70
 msgid "Types:"
 msgstr ""
 
-#: ../../bin/write_playlists.inc:76
+#: ../../bin/write_playlists.inc:71
 msgid "Dumps all Albums as individual playlists"
 msgstr ""
 
-#: ../../bin/write_playlists.inc:77
+#: ../../bin/write_playlists.inc:72
 msgid "Dumps all of your Playlists as m3u's"
 msgstr ""
 
-#: ../../bin/write_playlists.inc:78
+#: ../../bin/write_playlists.inc:73
 msgid "Dumps all Artists as individual playlists"
 msgstr ""
 
-#: ../../bin/write_tags.inc:47
+#: ../../bin/write_tags.inc:42
 msgid ""
 "Writting of Tags to files is not currently supported by Getid3() use at your "
 "own risk."
 msgstr ""
 
-#: ../../bin/write_tags.inc:59
+#: ../../bin/write_tags.inc:54
 msgid "No Flagged Songs Found, exiting..."
 msgstr ""
 
-#: ../../bin/write_tags.inc:87
+#: ../../bin/write_tags.inc:82
 msgid "No Tag"
 msgstr ""
 
 #. HINT: %1$s: title, %2$s: artist_name
-#: ../../bin/write_tags.inc:96
+#: ../../bin/write_tags.inc:91
 #, php-format
 msgid "Updated song %1$s by %2$s"
 msgstr ""
 
-#: ../../bin/migrate_config.inc:61
+#: ../../bin/migrate_config.inc:56
 msgid "Parsing old config file..."
 msgstr ""
 
-#: ../../bin/migrate_config.inc:91
+#: ../../bin/migrate_config.inc:86
 msgid "Parse complete, writing"
 msgstr ""
 
-#: ../../bin/migrate_config.inc:99
+#: ../../bin/migrate_config.inc:94
 msgid "Write success, config migrated"
 msgstr ""
 
-#: ../../bin/migrate_config.inc:103
+#: ../../bin/migrate_config.inc:98
 msgid "Access Denied, config migration failed"
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:53
+#: ../../bin/fix_filenames.inc:48
 msgid "ERROR: Iconv required for this functionality, quiting"
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:62
+#: ../../bin/fix_filenames.inc:57
 #, php-format
 msgid "%s For the Love of Music"
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:63
+#: ../../bin/fix_filenames.inc:58
 msgid "Testing Basic Translation, the two strings below should look the same"
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:65
+#: ../../bin/fix_filenames.inc:60
 msgid "Original: For the Love of Music"
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:67
+#: ../../bin/fix_filenames.inc:62
 #, php-format
 msgid "Translated: %s"
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:70
+#: ../../bin/fix_filenames.inc:65
 #, php-format
 msgid "Input Charset (%s):"
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:74
+#: ../../bin/fix_filenames.inc:69
 #, php-format
 msgid "Using %s as source character set"
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:82
+#: ../../bin/fix_filenames.inc:77
 #, php-format
 msgid "Checking %s (%s)"
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:88
+#: ../../bin/fix_filenames.inc:83
 msgid "Finished checking filenames for valid chacters"
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:114
+#: ../../bin/fix_filenames.inc:109
 #, php-format
 msgid "ERROR: Unable to open %s"
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:120
+#: ../../bin/fix_filenames.inc:115
 #, php-format
 msgid "ERROR: Unable to chdir to %s"
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:143
+#: ../../bin/fix_filenames.inc:138
 msgid "Translation failure, stripping non-valid characters"
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:148
+#: ../../bin/fix_filenames.inc:143
 #, php-format
 msgid "Attempting to Transcode to %s"
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:151
+#: ../../bin/fix_filenames.inc:146
 #, php-format
 msgid "OLD: %s has invalid chars"
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:153
+#: ../../bin/fix_filenames.inc:148
 #, php-format
 msgid "NEW: %s"
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:157
+#: ../../bin/fix_filenames.inc:152
 msgid "Rename File (Y/N):"
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:160
+#: ../../bin/fix_filenames.inc:155
 msgid "Not Renaming..."
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:192
+#: ../../bin/fix_filenames.inc:187
 #, php-format
 msgid "Error: Unable to create %s move failed, stopping"
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:204
+#: ../../bin/fix_filenames.inc:199
 msgid "Error: Copy Failed, not deleteing old file"
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:213 ../../bin/sort_files.inc:300
+#: ../../bin/fix_filenames.inc:208 ../../bin/sort_files.inc:295
 #, php-format
 msgid "Error: Size Inconsistency, not deleting %s"
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:220 ../../bin/sort_files.inc:307
+#: ../../bin/fix_filenames.inc:215 ../../bin/sort_files.inc:302
 #, php-format
 msgid "Error: Unable to delete %s"
 msgstr ""
 
-#: ../../bin/fix_filenames.inc:222
+#: ../../bin/fix_filenames.inc:217
 msgid "File Moved..."
 msgstr ""
 
-#: ../../bin/sort_files.inc:72
+#: ../../bin/sort_files.inc:67
 #, php-format
 msgid "Starting Catalog: %s"
 msgstr ""
 
-#: ../../bin/sort_files.inc:87
+#: ../../bin/sort_files.inc:82
 msgid "Moving File..."
 msgstr ""
 
-#: ../../bin/sort_files.inc:89
+#: ../../bin/sort_files.inc:84
 #, php-format
 msgid "Source: %s"
 msgstr ""
 
-#: ../../bin/sort_files.inc:91
+#: ../../bin/sort_files.inc:86
 #, php-format
 msgid "Dest: %s"
 msgstr ""
 
-#: ../../bin/sort_files.inc:241
+#: ../../bin/sort_files.inc:236
 #, php-format
 msgid "Making %s Directory"
 msgstr ""
 
-#: ../../bin/sort_files.inc:248
+#: ../../bin/sort_files.inc:243
 #, php-format
 msgid "Error: Unable to create %s move failed"
 msgstr ""
 
 #. HINT: %1$s: file, %2$s: directory
-#: ../../bin/sort_files.inc:261
+#: ../../bin/sort_files.inc:256
 #, php-format
 msgid "Copying %1$s to %2$s"
 msgstr ""
 
-#: ../../bin/sort_files.inc:272
+#: ../../bin/sort_files.inc:267
 #, php-format
 msgid "Error: %s already exists"
 msgstr ""
 
-#: ../../bin/sort_files.inc:293
+#: ../../bin/sort_files.inc:288
 #, php-format
 msgid "Error: Unable to copy file to %s"
 msgstr ""
 
-#: ../../bin/catalog_update.inc:49
+#: ../../bin/catalog_update.inc:45
 msgid "- All Catalog Operations"
 msgstr ""
 
-#: ../../bin/catalog_update.inc:56
+#: ../../bin/catalog_update.inc:52
 msgid "- Catalog Clean"
 msgstr ""
 
-#: ../../bin/catalog_update.inc:60
+#: ../../bin/catalog_update.inc:56
 msgid "- Catalog Verify"
 msgstr ""
 
-#: ../../bin/catalog_update.inc:64
+#: ../../bin/catalog_update.inc:60
 msgid "- Catalog Add"
 msgstr ""
 
-#: ../../bin/catalog_update.inc:68
+#: ../../bin/catalog_update.inc:64
 msgid "- Catalog Art Gather"
 msgstr ""
 
-#: ../../bin/catalog_update.inc:72
+#: ../../bin/catalog_update.inc:68
 msgid "- Generate Thumbnails"
 msgstr ""
 
-#: ../../bin/catalog_update.inc:95
+#: ../../bin/catalog_update.inc:91
 msgid "Starting Catalog Operations..."
 msgstr ""
 
-#: ../../bin/catalog_update.inc:108 ../../bin/print_tags.inc:55
+#: ../../bin/catalog_update.inc:104 ../../bin/print_tags.inc:50
 #, php-format
 msgid "Reading: %s"
 msgstr ""
 
-#: ../../bin/catalog_update.inc:113
+#: ../../bin/catalog_update.inc:109
 msgid "- Starting Clean - "
 msgstr ""
 
-#: ../../bin/catalog_update.inc:121
+#: ../../bin/catalog_update.inc:117
 msgid "- Starting Verify - "
 msgstr ""
 
-#: ../../bin/catalog_update.inc:129
+#: ../../bin/catalog_update.inc:125
 msgid "- Starting Add - "
 msgstr ""
 
-#: ../../bin/catalog_update.inc:145
+#: ../../bin/catalog_update.inc:141
 msgid "Generating Thumbnails"
 msgstr ""
 
-#: ../../bin/catalog_update.inc:167
+#: ../../bin/catalog_update.inc:168
 msgid "- Catalog Update -"
 msgstr ""
 
-#: ../../bin/catalog_update.inc:169
+#: ../../bin/catalog_update.inc:170
 msgid "Usage: catalog_update.inc [CATALOG NAME] [-c|-v|-a|-g|-t]"
 msgstr ""
 
-#: ../../bin/catalog_update.inc:171
+#: ../../bin/catalog_update.inc:172
 msgid "Default behavior is to do all"
 msgstr ""
 
-#: ../../bin/catalog_update.inc:173
+#: ../../bin/catalog_update.inc:174
 msgid "Clean Catalogs"
 msgstr ""
 
-#: ../../bin/catalog_update.inc:175
+#: ../../bin/catalog_update.inc:176
 msgid "Verify Catalogs"
 msgstr ""
 
-#: ../../bin/catalog_update.inc:177
+#: ../../bin/catalog_update.inc:178
 msgid "Add to Catalogs"
 msgstr ""
 
-#: ../../bin/catalog_update.inc:181
+#: ../../bin/catalog_update.inc:182
 msgid "Generate Thumbnails"
 msgstr ""
 
-#: ../../bin/print_tags.inc:49
+#: ../../bin/print_tags.inc:44
 msgid "File not found."
 msgstr ""
 
-#: ../../bin/print_tags.inc:67
+#: ../../bin/print_tags.inc:62
 #, php-format
 msgid "Using: %s AND %s for file pattern matching"
 msgstr ""
 
-#: ../../bin/print_tags.inc:84
+#: ../../bin/print_tags.inc:79
 msgid "Results Seen by GetID3()"
 msgstr ""
 
-#: ../../bin/print_tags.inc:88
+#: ../../bin/print_tags.inc:83
 #, php-format
 msgid "Results Seen by Ampache using %s"
 msgstr ""
 
-#: ../../bin/print_tags.inc:95
+#: ../../bin/print_tags.inc:90
 #, php-format
 msgid "%s Version %s"
 msgstr ""
 
-#: ../../bin/print_tags.inc:97
+#: ../../bin/print_tags.inc:92
 msgid "Usage:"
 msgstr ""
 
-#: ../../bin/print_tags.inc:99
+#: ../../bin/print_tags.inc:94
 msgid "php print_tags.inc <Filename>"
 msgstr ""
 #: Database words