Merged: message

Updated: LANGLIST

2 files changed, 2739 insertions, 2739 deletions

diff --git a/locale/en_GB/LC_MESSAGES/messages.mo b/locale/en_GB/LC_MESSAGES/messages.mo
index afdfbac5..de26d562 100644
--- a/locale/en_GB/LC_MESSAGES/messages.mo
+++ b/locale/en_GB/LC_MESSAGES/messages.mo
diff --git a/locale/en_GB/LC_MESSAGES/messages.po b/locale/en_GB/LC_MESSAGES/messages.po
index 6199118b..31fe902f 100644
--- a/locale/en_GB/LC_MESSAGES/messages.po
+++ b/locale/en_GB/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ampache 2.5.0\n"
 "Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2008-11-25 17:34+0100\n"
+"POT-Creation-Date: 2008-11-26 08:21+0900\n"
 "PO-Revision-Date: 2005-07-17 21:58-0000\n"
 "Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: British English <en@li.org>\n"
@@ -16,1551 +16,1052 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../play/index.php:81
-msgid "Session Expired: please log in again at"
-msgstr "Session Expired: please log in again at"
-
-#: ../../lib/class/playlist.class.php:81
-#: ../../templates/show_playlist_edit.inc.php:40
-#: ../../templates/show_edit_playlist_row.inc.php:33
-#, fuzzy
-msgid "Private"
-msgstr "Your Private"
+#: ../../search.php:38
+msgid "Error: No Keyword Entered"
+msgstr ""
 
-#: ../../lib/class/stream.class.php:399
-#, fuzzy
-msgid "Ampache"
-msgstr "Ampache Debug"
+#: ../../templates/show_album_row.inc.php:23
+#: ../../templates/show_song_row.inc.php:23
+#: ../../templates/show_albums.inc.php:39
+#: ../../templates/show_albums.inc.php:69
+#: ../../templates/show_artists.inc.php:35
+#: ../../templates/show_artists.inc.php:62
+#: ../../templates/show_live_streams.inc.php:35
+#: ../../templates/show_live_streams.inc.php:57
+#: ../../templates/show_playlists.inc.php:34
+#: ../../templates/show_playlists.inc.php:57
+#: ../../templates/show_add_live_stream.inc.php:68
+#: ../../templates/show_catalog_row.inc.php:28
+#: ../../templates/show_artist_row.inc.php:23
+#: ../../templates/show_genres.inc.php:36
+#: ../../templates/show_genres.inc.php:72
+#: ../../templates/show_live_stream_row.inc.php:23
+#: ../../templates/show_shoutbox.inc.php:34
+#: ../../templates/show_songs.inc.php:39 ../../templates/show_songs.inc.php:68
+#: ../../templates/show_recently_played.inc.php:37
+#: ../../templates/show_recently_played.inc.php:80
+#: ../../templates/show_recently_played.inc.php:99
+#: ../../templates/show_artist.inc.php:38
+#: ../../templates/show_album.inc.php:51
+#: ../../templates/show_playlist_song_row.inc.php:22
+#: ../../templates/show_song.inc.php:28
+#: ../../templates/show_playlist_row.inc.php:23
+#: ../../templates/show_admin_tools.inc.php:45
+msgid "Add"
+msgstr "Add"
 
-#: ../../lib/class/stream.class.php:400
-#: ../../modules/localplay/mpd.controller.php:495
-#: ../../modules/localplay/httpq.controller.php:494
-#: ../../templates/show_localplay_status.inc.php:36
 #: ../../templates/show_album_row.inc.php:24
 #: ../../templates/sidebar_home.inc.php:102
-#: ../../templates/show_album.inc.php:55
 #: ../../templates/show_artist_row.inc.php:24
+#: ../../templates/show_localplay_status.inc.php:36
 #: ../../templates/show_artist.inc.php:41
+#: ../../templates/show_album.inc.php:55
 #: ../../templates/show_playlist_row.inc.php:24
+#: ../../lib/class/stream.class.php:400
+#: ../../modules/localplay/mpd.controller.php:495
+#: ../../modules/localplay/httpq.controller.php:494
 msgid "Random"
 msgstr "Random"
 
-#: ../../lib/class/album.class.php:244 ../../templates/show_album.inc.php:27
-msgid "Disk"
-msgstr ""
-
-#: ../../lib/class/album.class.php:256 ../../lib/class/browse.class.php:994
-#: ../../lib/ui.lib.php:412 ../../templates/show_genre.inc.php:35
-#: ../../templates/show_local_catalog_info.inc.php:30
-msgid "Artists"
-msgstr "Artists"
-
-#: ../../lib/class/album.class.php:256 ../../lib/class/album.class.php:257
-#: ../../templates/show_edit_album_row.inc.php:35
-msgid "Various"
-msgstr "Various"
-
-#: ../../lib/class/album.class.php:473 ../../lib/class/catalog.class.php:433
-#: ../../lib/class/catalog.class.php:774
-msgid "Error: Unable to open"
-msgstr "Error: Unable to open"
-
-#: ../../lib/class/access.class.php:325 ../../lib/class/access.class.php:350
-#: ../../lib/ui.lib.php:141 ../../lib/ui.lib.php:150 ../../lib/ui.lib.php:632
-#: ../../templates/show_random.inc.php:38
-#: ../../templates/show_admin_tools.inc.php:51
-#: ../../templates/show_edit_access.inc.php:76
-#: ../../templates/show_mail_users.inc.php:30
-#: ../../templates/show_export.inc.php:35
-#: ../../templates/show_add_access.inc.php:58
-msgid "All"
-msgstr "All"
-
-#: ../../lib/class/access.class.php:328
-#: ../../templates/show_edit_access.inc.php:73
-#: ../../templates/show_play_selected.inc.php:49
-#: ../../templates/show_add_access.inc.php:55
-msgid "View"
-msgstr "View"
-
-#: ../../lib/class/access.class.php:331
-#: ../../templates/show_edit_access.inc.php:74
-#: ../../templates/show_add_access.inc.php:56
-#, fuzzy
-msgid "Read"
-msgstr "Reason"
-
-#: ../../lib/class/access.class.php:334
-#: ../../templates/show_edit_access.inc.php:75
-#: ../../templates/show_add_access.inc.php:57
-msgid "Read/Write"
+#: ../../templates/show_album_row.inc.php:44
+#: ../../templates/show_song_row.inc.php:40
+msgid "Post Shout"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:152 ../../lib/class/catalog.class.php:153
-#: ../../lib/class/user.class.php:662 ../../lib/preferences.php:261
-#: ../../templates/show_user.inc.php:22 ../../templates/show_users.inc.php:53
-msgid "Never"
+#: ../../templates/show_album_row.inc.php:49
+#: ../../templates/show_playlist.inc.php:36
+#: ../../templates/rightbar.inc.php:49
+#: ../../templates/show_artist_row.inc.php:34
+#: ../../templates/show_search_options.inc.php:28
+#: ../../templates/show_playlist_row.inc.php:33
+msgid "Batch Download"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:211
-#, fuzzy
-msgid "day"
-msgid_plural "days"
-msgstr[0] "day"
-msgstr[1] "day"
+#: ../../templates/show_album_row.inc.php:53
+#: ../../templates/show_song_row.inc.php:49
+#: ../../templates/show_play_selected.inc.php:50
+#: ../../templates/show_artist_row.inc.php:38
+#: ../../templates/show_live_stream_row.inc.php:31
+#: ../../templates/show_playlist_song_row.inc.php:37
+#: ../../templates/show_playlist_row.inc.php:37
+msgid "Edit"
+msgstr "Edit"
 
-#: ../../lib/class/catalog.class.php:213
-#, fuzzy
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "hour"
-msgstr[1] "hour"
+#: ../../templates/show_user_preferences.inc.php:28
+#: ../../templates/show_preferences.inc.php:28
+#, fuzzy, php-format
+msgid "Editing %s preferences"
+msgstr "preferences"
 
-#: ../../lib/class/catalog.class.php:313
-msgid "Running Remote Sync"
-msgstr "Running Remote Sync"
+#: ../../templates/show_user_preferences.inc.php:36
+#: ../../templates/show_preference_box.inc.php:40
+#: ../../templates/show_preference_box.inc.php:70
+#: ../../templates/show_preference_admin.inc.php:30
+#: ../../templates/show_preference_admin.inc.php:49
+#: ../../templates/show_debug.inc.php:81
+msgid "Preference"
+msgstr "Preference"
 
-#: ../../lib/class/catalog.class.php:440 ../../lib/class/catalog.class.php:483
-msgid "Error: Unable to change to directory"
-msgstr "Error: Unable to change to directory"
+#: ../../templates/show_user_preferences.inc.php:37
+#: ../../templates/show_preference_box.inc.php:41
+#: ../../templates/show_preference_box.inc.php:71
+#: ../../templates/show_debug.inc.php:37 ../../templates/show_debug.inc.php:82
+msgid "Value"
+msgstr "Value"
 
-#: ../../lib/class/catalog.class.php:511
-#, fuzzy, php-format
-msgid "Error: Unable to get filesize for %s"
-msgstr "Error: Unable to get filesize for"
+#: ../../templates/show_user_preferences.inc.php:50
+#: ../../templates/show_preferences.inc.php:34
+msgid "Update Preferences"
+msgstr "Update Preferences"
 
-#: ../../lib/class/catalog.class.php:517
-#, fuzzy, php-format
-msgid "%s is not readable by ampache"
-msgstr "is not readable by ampache"
+#: ../../templates/show_song_row.inc.php:45
+#: ../../templates/show_artist.inc.php:51
+#: ../../templates/show_album.inc.php:77
+#: ../../templates/show_playlist_song_row.inc.php:33
+msgid "Download"
+msgstr "Download"
 
-#: ../../lib/class/catalog.class.php:525
-#, php-format
-msgid "%s does not match site charset"
+#: ../../templates/show_localplay_control.inc.php:25
+msgid "Previous"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1063 ../../admin/access.php:45
-#: ../../preferences.php:111
-msgid "Updated"
-msgstr "Updated"
-
-#: ../../lib/class/catalog.class.php:1070
-msgid "No Update Needed"
-msgstr "No Update Needed"
+#: ../../templates/show_localplay_control.inc.php:26
+msgid "Stop"
+msgstr ""
 
-#: ../../lib/class/catalog.class.php:1168
-msgid "Running Remote Update"
-msgstr "Running Remote Update"
+#: ../../templates/show_localplay_control.inc.php:27
+msgid "Pause"
+msgstr ""
 
-#: ../../lib/class/catalog.class.php:1195
-msgid "Added Playlist From"
-msgstr "Added Playlist From"
+#: ../../templates/show_localplay_control.inc.php:28
+#: ../../templates/show_manage_democratic.inc.php:57
+#: ../../templates/rightbar.inc.php:25
+msgid "Play"
+msgstr "Play"
 
-#: ../../lib/class/catalog.class.php:1224
-msgid "Catalog Update Finished"
-msgstr "Catalogue Update Finished"
+#: ../../templates/show_localplay_control.inc.php:29
+#: ../../templates/list_header.inc.php:101
+msgid "Next"
+msgstr "Next"
 
-#: ../../lib/class/catalog.class.php:1224
-msgid "Total Time"
-msgstr "Total Time"
+#: ../../templates/show_test.inc.php:32
+#: ../../templates/show_test_config.inc.php:40
+#: ../../templates/sidebar_admin.inc.php:45
+msgid "Ampache Debug"
+msgstr "Ampache Debug"
 
-#: ../../lib/class/catalog.class.php:1225
-msgid "Total Songs"
-msgstr "Total Songs"
+#: ../../templates/show_test.inc.php:33
+msgid ""
+"You've reached this page because a configuration error has occured. Debug "
+"Information below"
+msgstr ""
+"You've reached this page because a configuration error has occured. Debug "
+"Information below"
 
-#: ../../lib/class/catalog.class.php:1225
-msgid "Songs Per Seconds"
-msgstr "Songs Per Seconds"
+#: ../../templates/show_test.inc.php:38
+msgid "CHECK"
+msgstr "CHECK"
 
-#: ../../lib/class/catalog.class.php:1240 ../../admin/users.php:142
-msgid "Error"
-msgstr "Error"
+#: ../../templates/show_test.inc.php:40
+msgid "STATUS"
+msgstr "STATUS"
 
-#: ../../lib/class/catalog.class.php:1240
-msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
-msgstr "Unable to load XMLRPC library, make sure XML-RPC is enabled"
+#: ../../templates/show_test.inc.php:42
+msgid "DESCRIPTION"
+msgstr "DESCRIPTION"
 
-#: ../../lib/class/catalog.class.php:1270
-#: ../../lib/class/catalog.class.php:1338
-#: ../../lib/class/xmlrpcclient.class.php:64
-#: ../../lib/class/xmlrpcclient.class.php:97
-msgid "Error connecting to"
-msgstr "Error connecting to"
+#: ../../templates/show_test.inc.php:45
+#: ../../templates/show_install_lang.inc.php:54
+msgid "PHP Version"
+msgstr "PHP Version"
 
-#: ../../lib/class/catalog.class.php:1270
-#: ../../lib/class/catalog.class.php:1338
-#: ../../lib/class/xmlrpcclient.class.php:64
-#: ../../lib/class/xmlrpcclient.class.php:97
-msgid "Code"
-msgstr "Code"
+#: ../../templates/show_test.inc.php:60
+msgid ""
+"This tests to make sure that you are running a version of PHP that is known "
+"to work with Ampache."
+msgstr ""
+"This tests to make sure that you are running a version of PHP that is known "
+"to work with Ampache."
 
-#: ../../lib/class/catalog.class.php:1270
-#: ../../lib/class/catalog.class.php:1338
-#: ../../lib/class/xmlrpcclient.class.php:64
-msgid "Reason"
-msgstr "Reason"
+#: ../../templates/show_test.inc.php:64
+#: ../../templates/show_install_lang.inc.php:64
+msgid "Mysql for PHP"
+msgstr "Mysql for PHP"
 
-#: ../../lib/class/catalog.class.php:1299
-msgid "Completed updating remote catalog(s)"
-msgstr "Completed updating remote catalogue(s)"
+#: ../../templates/show_test.inc.php:79
+msgid ""
+"This test checks to see if you have the mysql extensions loaded for PHP. "
+"These are required for Ampache to work."
+msgstr ""
+"This test checks to see if you have the mysql extensions loaded for PHP. "
+"These are required for Ampache to work."
 
-#: ../../lib/class/catalog.class.php:1334 ../../admin/access.php:40
-msgid "Added"
-msgstr "Added"
+#: ../../templates/show_test.inc.php:83
+#: ../../templates/show_install_lang.inc.php:78
+msgid "PHP Session Support"
+msgstr "PHP Session Support"
 
-#: ../../lib/class/catalog.class.php:1406
-msgid "Catalog Root unreadable, stopping clean"
+#: ../../templates/show_test.inc.php:98
+msgid ""
+"This test checks to make sure that you have PHP session support enabled. "
+"Sessions are required for Ampache to work."
 msgstr ""
+"This test checks to make sure that you have PHP session support enabled. "
+"Sessions are required for Ampache to work."
 
-#: ../../lib/class/catalog.class.php:1463
-msgid "Catalog Clean Done"
-msgstr "Catalogue Clean Done"
-
-#: ../../lib/class/catalog.class.php:1463
-msgid "files removed"
-msgstr "files removed"
+#: ../../templates/show_test.inc.php:102
+#: ../../templates/show_install_lang.inc.php:88
+msgid "PHP ICONV Support"
+msgstr "PHP ICONV Support"
 
-#: ../../lib/class/catalog.class.php:1464
-msgid "Optimizing Tables"
+#: ../../templates/show_test.inc.php:116
+msgid ""
+"This test checks to make sure you have Iconv support installed. Iconv "
+"support is required for Ampache"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1764
+#: ../../templates/show_test.inc.php:120
+#: ../../templates/show_install_lang.inc.php:98
 #, fuzzy
-msgid "Update Finished."
-msgstr "Catalogue Update Finished"
+msgid "PHP PCRE Support"
+msgstr "PHP ICONV Support"
 
-#: ../../lib/class/catalog.class.php:1764
+#: ../../templates/show_test.inc.php:133
 #, fuzzy
-msgid "Checked"
-msgstr "Checking"
+msgid ""
+"This test makes sure you have PCRE support compiled into your version of "
+"PHP, this is required for Ampache."
+msgstr ""
+"This test checks to make sure that you have PHP session support enabled. "
+"Sessions are required for Ampache to work."
 
-#: ../../lib/class/catalog.class.php:1764
+#: ../../templates/show_test.inc.php:137
+#: ../../templates/show_install_lang.inc.php:108
 #, fuzzy
-msgid "songs updated."
-msgstr "Playlist updated."
+msgid "PHP PutENV Support"
+msgstr "PHP ICONV Support"
 
-#: ../../lib/class/catalog.class.php:1823
-#: ../../lib/class/catalog.class.php:1894
-#: ../../templates/show_album.inc.php:34
-msgid "Unknown (Orphaned)"
+#: ../../templates/show_test.inc.php:150
+msgid ""
+"This test makes sure that PHP isn't running in SafeMode and that we are able "
+"to modify the memory limits. While not required, without these abilities "
+"some features of ampache may not work correctly"
 msgstr ""
 
-#: ../../lib/class/flag.class.php:257
-msgid "Approved"
-msgstr ""
+#: ../../templates/show_test.inc.php:154
+#: ../../templates/show_install_config.inc.php:89
+msgid "Ampache.cfg.php Exists"
+msgstr "Ampache.cfg.php Exists"
 
-#: ../../lib/class/flag.class.php:258
-msgid "Pending"
+#: ../../templates/show_test.inc.php:167
+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 ""
+"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."
 
-#: ../../lib/class/flag.class.php:270 ../../templates/rightbar.inc.php:98
-#: ../../templates/show_admin_tools.inc.php:53
-#: ../../templates/show_flag.inc.php:56
-#: ../../templates/show_catalog_row.inc.php:33
-#: ../../templates/show_localplay_playlist.inc.php:48
-#: ../../templates/show_democratic_playlist.inc.php:78
-#: ../../templates/show_live_stream_row.inc.php:34
-#: ../../templates/show_playlist_row.inc.php:38
-#: ../../templates/show_playlist_song_row.inc.php:38
-#: ../../templates/show_localplay_instances.inc.php:40
-msgid "Delete"
-msgstr "Delete"
+#: ../../templates/show_test.inc.php:173
+#: ../../templates/show_install_config.inc.php:106
+msgid "Ampache.cfg.php Configured?"
+msgstr "Ampache.cfg.php Configured?"
 
-#: ../../lib/class/flag.class.php:273
-msgid "Re-Tag"
+#: ../../templates/show_test.inc.php:190
+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 ""
 
-#: ../../lib/class/flag.class.php:276 ../../templates/show_flag.inc.php:58
-msgid "Re-encode"
+#: ../../templates/show_test.inc.php:194
+msgid "DB Connection"
+msgstr "DB Connection"
+
+#: ../../templates/show_test.inc.php:210
+msgid ""
+"This attempts to connect to your database using the values from your ampache."
+"cfg.php"
 msgstr ""
+"This attempts to connect to your database using the values from your ampache."
+"cfg.php"
 
-#: ../../lib/class/flag.class.php:279 ../../templates/show_flag.inc.php:59
-#, fuzzy
-msgid "Other"
-msgstr "other"
+#: ../../templates/show_test.inc.php:214
+msgid "DB Inserted"
+msgstr ""
 
-#: ../../lib/class/flag.class.php:282 ../../lib/class/localplay.class.php:648
-#: ../../lib/class/user.class.php:666 ../../lib/general.lib.php:439
-#: ../../modules/localplay/mpd.controller.php:511
-#: ../../modules/localplay/httpq.controller.php:510
-#: ../../templates/show_user.inc.php:23 ../../templates/show_users.inc.php:54
-msgid "Unknown"
-msgstr "Unknown"
+#: ../../templates/show_test.inc.php:236
+#: ../../templates/show_install_config.inc.php:61
+msgid "Web Path"
+msgstr "Web Path"
 
-#: ../../lib/class/localplay.class.php:639
-#: ../../templates/show_now_playing.inc.php:33
-msgid "Now Playing"
-msgstr "Now Playing"
+#: ../../templates/show_albums.inc.php:41
+#: ../../templates/show_albums.inc.php:71
+msgid "Cover"
+msgstr "Cover"
 
-#: ../../lib/class/localplay.class.php:642
-#, fuzzy
-msgid "Stopped"
-msgstr "Stop"
+#: ../../templates/show_albums.inc.php:43
+#: ../../templates/show_albums.inc.php:73
+#: ../../templates/sidebar_home.inc.php:104
+#: ../../templates/show_edit_song.inc.php:37
+#: ../../templates/show_play_selected.inc.php:59
+#: ../../templates/show_search.inc.php:50
+#: ../../templates/show_songs.inc.php:42 ../../templates/show_songs.inc.php:71
+#: ../../templates/show_get_albumart.inc.php:36
+#: ../../templates/show_recently_played.inc.php:39
+#: ../../templates/show_recently_played.inc.php:102
+#: ../../templates/show_disabled_songs.inc.php:35
+#: ../../templates/show_disabled_songs.inc.php:58
+#: ../../templates/show_duplicates.inc.php:39
+#: ../../templates/show_duplicates.inc.php:77
+#: ../../templates/show_playlist_songs.inc.php:44
+#: ../../templates/show_playlist_songs.inc.php:65
+#: ../../templates/show_now_playing_row.inc.php:52
+msgid "Album"
+msgstr "Album"
 
-#: ../../lib/class/localplay.class.php:645
-#, fuzzy
-msgid "Paused"
-msgstr "Pause"
+#: ../../templates/show_albums.inc.php:44
+#: ../../templates/show_albums.inc.php:74
+#: ../../templates/show_artists.inc.php:36
+#: ../../templates/show_artists.inc.php:63
+#: ../../templates/sidebar_home.inc.php:34
+#: ../../templates/sidebar_home.inc.php:79
+#: ../../templates/sidebar_home.inc.php:105
+#: ../../templates/show_similar_artists.inc.php:33
+#: ../../templates/show_similar_artists.inc.php:86
+#: ../../templates/show_edit_song.inc.php:45
+#: ../../templates/show_play_selected.inc.php:60
+#: ../../templates/show_search.inc.php:44
+#: ../../templates/show_songs.inc.php:41 ../../templates/show_songs.inc.php:70
+#: ../../templates/show_get_albumart.inc.php:28
+#: ../../templates/show_recently_played.inc.php:40
+#: ../../templates/show_recently_played.inc.php:103
+#: ../../templates/show_disabled_songs.inc.php:36
+#: ../../templates/show_disabled_songs.inc.php:59
+#: ../../templates/show_duplicates.inc.php:38
+#: ../../templates/show_duplicates.inc.php:76
+#: ../../templates/show_playlist_songs.inc.php:43
+#: ../../templates/show_playlist_songs.inc.php:64
+#: ../../templates/show_now_playing_row.inc.php:59
+msgid "Artist"
+msgstr "Artist"
 
-#: ../../lib/class/browse.class.php:977
+#: ../../templates/show_albums.inc.php:45
+#: ../../templates/show_albums.inc.php:75
 #: ../../templates/show_artists.inc.php:37
 #: ../../templates/show_artists.inc.php:64
+#: ../../templates/show_manage_democratic.inc.php:39
+#: ../../templates/show_local_catalog_info.inc.php:31
 #: ../../templates/show_genre.inc.php:38
 #: ../../templates/show_genres.inc.php:38
-#: ../../templates/show_genres.inc.php:74
-#: ../../templates/show_local_catalog_info.inc.php:31
-#: ../../templates/show_manage_democratic.inc.php:39
-#: ../../templates/show_albums.inc.php:45
-#: ../../templates/show_albums.inc.php:75
+#: ../../templates/show_genres.inc.php:74 ../../lib/class/browse.class.php:977
 msgid "Songs"
 msgstr "Songs"
 
-#: ../../lib/class/browse.class.php:983 ../../lib/ui.lib.php:408
-#: ../../templates/show_artists.inc.php:38
-#: ../../templates/show_artists.inc.php:65
-#: ../../templates/show_genre.inc.php:32
-#: ../../templates/sidebar_home.inc.php:33
-#: ../../templates/sidebar_home.inc.php:76
-#: ../../templates/show_local_catalog_info.inc.php:29
-msgid "Albums"
-msgstr "Albums"
+#: ../../templates/show_albums.inc.php:46
+#: ../../templates/show_albums.inc.php:76
+#: ../../templates/show_edit_song.inc.php:67
+#: ../../templates/show_play_selected.inc.php:61
+#: ../../templates/show_edit_album.inc.php:33
+#: ../../templates/show_search.inc.php:60
+msgid "Year"
+msgstr "Year"
 
-#: ../../lib/class/browse.class.php:989
-msgid "Manage Users"
-msgstr "Manage Users"
+#: ../../templates/show_albums.inc.php:47
+#: ../../templates/show_albums.inc.php:77
+#: ../../templates/show_artists.inc.php:40
+#: ../../templates/show_artists.inc.php:67
+#: ../../templates/show_search.inc.php:91
+#: ../../templates/show_songs.inc.php:49 ../../templates/show_songs.inc.php:76
+#: ../../templates/show_now_playing_row.inc.php:36
+#, fuzzy
+msgid "Rating"
+msgstr "Editing"
 
-#: ../../lib/class/browse.class.php:1000
-#: ../../templates/sidebar_home.inc.php:37
-msgid "Radio Stations"
+#: ../../templates/show_albums.inc.php:48
+#: ../../templates/show_albums.inc.php:78
+#: ../../templates/show_catalogs.inc.php:36
+#: ../../templates/show_catalogs.inc.php:52
+#: ../../templates/show_playlists.inc.php:39
+#: ../../templates/show_playlists.inc.php:62
+#: ../../templates/show_album.inc.php:48
+#, fuzzy
+msgid "Actions"
+msgstr "Action"
+
+#: ../../templates/show_albums.inc.php:65
+#: ../../templates/show_artists.inc.php:58
+#: ../../templates/show_live_streams.inc.php:53
+#: ../../templates/show_playlists.inc.php:53
+#: ../../templates/show_manage_democratic.inc.php:63
+#: ../../templates/show_objects.inc.php:44
+#: ../../templates/rightbar.inc.php:101 ../../templates/show_genres.inc.php:68
+#: ../../templates/show_user_recommendations.inc.php:32
+#: ../../templates/show_user_recommendations.inc.php:43
+#: ../../templates/show_user_recommendations.inc.php:54
+#: ../../templates/show_user_stats.inc.php:34
+#: ../../templates/show_user_stats.inc.php:47
+#: ../../templates/show_user_stats.inc.php:60
+#: ../../templates/show_songs.inc.php:64
+#: ../../templates/show_recently_played.inc.php:95
+msgid "Not Enough Data"
 msgstr ""
 
-#: ../../lib/class/browse.class.php:1006
-msgid "Playlists"
-msgstr "Playlists"
+#: ../../templates/show_users.inc.php:39
+#: ../../templates/show_users.inc.php:104
+msgid "Fullname"
+msgstr "Fullname"
 
-#: ../../lib/class/browse.class.php:1011
-msgid "Playlist Songs"
-msgstr ""
+#: ../../templates/show_users.inc.php:39
+#: ../../templates/show_users.inc.php:104
+#: ../../templates/show_edit_user.inc.php:29
+#: ../../templates/show_add_user.inc.php:29
+#: ../../templates/show_install_account.inc.php:61
+#: ../../templates/show_recently_played.inc.php:41
+#: ../../templates/show_recently_played.inc.php:100
+#: ../../templates/show_login_form.inc.php:58
+#: ../../templates/show_user_registration.inc.php:73
+#: ../../templates/show_now_playing_row.inc.php:29
+msgid "Username"
+msgstr "Username"
 
-#: ../../lib/class/browse.class.php:1016
-#, fuzzy
-msgid "Current Playlist"
-msgstr "New Playlist"
+#: ../../templates/show_users.inc.php:40
+#: ../../templates/show_users.inc.php:105 ../../templates/show_user.inc.php:32
+msgid "Last Seen"
+msgstr "Last Seen"
 
-#: ../../lib/class/browse.class.php:1021
-#: ../../templates/show_admin_tools.inc.php:26
-#: ../../templates/sidebar_admin.inc.php:24
+#: ../../templates/show_users.inc.php:41
+#: ../../templates/show_users.inc.php:106
 #, fuzzy
-msgid "Catalogs"
-msgstr "Catalogue"
+msgid "Registration Date"
+msgstr "Register User"
 
-#: ../../lib/class/browse.class.php:1026
-msgid "Shoutbox Records"
+#: ../../templates/show_users.inc.php:42
+#: ../../templates/show_users.inc.php:107 ../../templates/show_user.inc.php:33
+msgid "Activity"
 msgstr ""
 
-#: ../../lib/class/browse.class.php:1031
+#: ../../templates/show_users.inc.php:44
+#: ../../templates/show_users.inc.php:109
 #, fuzzy
-msgid "Flagged Records"
-msgstr "Flagged by"
-
-#: ../../lib/class/browse.class.php:1037
-#: ../../templates/sidebar_home.inc.php:35
-msgid "Tag Cloud"
-msgstr ""
+msgid "Last Ip"
+msgstr "Last Seen"
 
-#: ../../lib/class/user.class.php:379 ../../admin/users.php:55
-#: ../../admin/users.php:105
-msgid "Error Username Required"
-msgstr "Error Username Required"
+#: ../../templates/show_users.inc.php:46
+#: ../../templates/show_users.inc.php:111
+#: ../../templates/show_localplay_controllers.inc.php:35
+#: ../../templates/show_localplay_controllers.inc.php:66
+#: ../../templates/show_artists.inc.php:41
+#: ../../templates/show_artists.inc.php:68
+#: ../../templates/show_live_streams.inc.php:40
+#: ../../templates/show_live_streams.inc.php:62
+#: ../../templates/show_manage_democratic.inc.php:40
+#: ../../templates/show_plugins.inc.php:35
+#: ../../templates/show_plugins.inc.php:64
+#: ../../templates/show_democratic_playlist.inc.php:51
+#: ../../templates/show_democratic_playlist.inc.php:86
+#: ../../templates/show_flagged.inc.php:39
+#: ../../templates/show_flagged.inc.php:58
+#: ../../templates/show_genres.inc.php:39
+#: ../../templates/show_genres.inc.php:75
+#: ../../templates/show_localplay_instances.inc.php:29
+#: ../../templates/show_localplay_playlist.inc.php:33
+#: ../../templates/show_localplay_playlist.inc.php:59
+#: ../../templates/show_songs.inc.php:51 ../../templates/show_songs.inc.php:78
+#: ../../templates/show_song.inc.php:26
+#: ../../templates/show_admin_tools.inc.php:34
+#: ../../templates/show_admin_tools.inc.php:74
+#: ../../templates/show_access_list.inc.php:52
+#: ../../templates/show_playlist_songs.inc.php:48
+#: ../../templates/show_playlist_songs.inc.php:69
+#: ../../templates/show_manage_shoutbox.inc.php:39
+#: ../../templates/show_manage_shoutbox.inc.php:63
+msgid "Action"
+msgstr "Action"
 
-#: ../../lib/class/user.class.php:383 ../../admin/users.php:58
-#: ../../admin/users.php:101
-msgid "Error Passwords don't match"
-msgstr "Error Passwords don't match"
+#: ../../templates/show_users.inc.php:47
+#: ../../templates/show_users.inc.php:112
+msgid "On-line"
+msgstr "On-line"
 
-#: ../../lib/class/random.class.php:423 ../../templates/rightbar.inc.php:66
-msgid "Related Album"
+#: ../../templates/show_users.inc.php:53 ../../templates/show_user.inc.php:22
+#: ../../lib/class/user.class.php:662 ../../lib/class/catalog.class.php:152
+#: ../../lib/class/catalog.class.php:153 ../../lib/preferences.php:261
+msgid "Never"
 msgstr ""
 
-#: ../../lib/class/random.class.php:426
-msgid "Related Genre"
-msgstr ""
+#: ../../templates/show_users.inc.php:54 ../../templates/show_user.inc.php:23
+#: ../../lib/class/flag.class.php:282 ../../lib/class/localplay.class.php:648
+#: ../../lib/class/user.class.php:666 ../../lib/general.lib.php:439
+#: ../../modules/localplay/mpd.controller.php:511
+#: ../../modules/localplay/httpq.controller.php:510
+msgid "Unknown"
+msgstr "Unknown"
 
-#: ../../lib/class/random.class.php:429 ../../templates/rightbar.inc.php:63
-msgid "Related Artist"
-msgstr ""
+#: ../../templates/show_edit_user.inc.php:23
+msgid "Editing existing User"
+msgstr "Editing existing User"
 
-#: ../../lib/class/random.class.php:432 ../../templates/rightbar.inc.php:60
-msgid "Pure Random"
-msgstr ""
+#: ../../templates/show_edit_user.inc.php:37
+#: ../../templates/show_user.inc.php:30
+#: ../../templates/show_add_user.inc.php:37
+#: ../../templates/show_user_registration.inc.php:83
+msgid "Full Name"
+msgstr "Full Name"
 
-#: ../../lib/class/rss.class.php:59
-msgid "RSS Feed"
-msgstr ""
+#: ../../templates/show_edit_user.inc.php:44
+#: ../../templates/show_add_user.inc.php:44
+#: ../../templates/show_account.inc.php:33
+#: ../../templates/show_user_registration.inc.php:92
+msgid "E-mail"
+msgstr "E-mail"
 
-#: ../../lib/class/democratic.class.php:97
-#: ../../templates/show_create_democratic.inc.php:35
-msgid "minutes"
-msgstr ""
+#: ../../templates/show_edit_user.inc.php:52
+#: ../../templates/show_add_user.inc.php:52
+#: ../../templates/show_install_account.inc.php:65
+#: ../../templates/show_login_form.inc.php:62
+#: ../../templates/show_user_registration.inc.php:101
+#: ../../modules/localplay/mpd.controller.php:235
+#: ../../modules/localplay/httpq.controller.php:219
+msgid "Password"
+msgstr "Password"
 
-#: ../../lib/class/democratic.class.php:98
-msgid "Primary"
-msgstr ""
+#: ../../templates/show_edit_user.inc.php:61
+#: ../../templates/show_add_user.inc.php:61
+#: ../../templates/show_account.inc.php:46
+#: ../../templates/show_install_account.inc.php:69
+#: ../../templates/show_user_registration.inc.php:110
+msgid "Confirm Password"
+msgstr "Confirm Password"
 
-#: ../../lib/class/democratic.class.php:102 ../../admin/users.php:125
+#: ../../templates/show_edit_user.inc.php:69
+#: ../../templates/show_add_user.inc.php:69
+msgid "User Access Level"
+msgstr "User Access Level"
+
+#: ../../templates/show_edit_user.inc.php:74
 #: ../../templates/show_preference_box.inc.php:58
 #: ../../templates/show_preference_admin.inc.php:41
-#: ../../templates/show_edit_user.inc.php:74
 #: ../../templates/show_add_user.inc.php:74
+#: ../../lib/class/democratic.class.php:102 ../../admin/users.php:125
 msgid "Guest"
 msgstr ""
 
-#: ../../lib/class/democratic.class.php:105 ../../lib/preferences.php:231
-#: ../../admin/users.php:126 ../../templates/show_preference_box.inc.php:59
+#: ../../templates/show_edit_user.inc.php:75
+#: ../../templates/show_preference_box.inc.php:59
 #: ../../templates/show_edit_access.inc.php:57
-#: ../../templates/show_mail_users.inc.php:31
 #: ../../templates/show_preference_admin.inc.php:42
-#: ../../templates/show_edit_user.inc.php:75
+#: ../../templates/show_add_access.inc.php:46
+#: ../../templates/show_add_user.inc.php:75
+#: ../../templates/show_create_democratic.inc.php:41
 #: ../../templates/show_flagged.inc.php:35
 #: ../../templates/show_flagged.inc.php:54
-#: ../../templates/show_add_user.inc.php:75
+#: ../../templates/show_mail_users.inc.php:31
 #: ../../templates/show_access_list.inc.php:49
-#: ../../templates/show_add_access.inc.php:46
-#: ../../templates/show_create_democratic.inc.php:41
 #: ../../templates/show_manage_shoutbox.inc.php:35
 #: ../../templates/show_manage_shoutbox.inc.php:59
+#: ../../lib/class/democratic.class.php:105 ../../lib/preferences.php:231
+#: ../../admin/users.php:126
 msgid "User"
 msgstr "User"
 
-#: ../../lib/class/democratic.class.php:108
-#: ../../templates/show_preference_box.inc.php:60
 #: ../../templates/show_edit_user.inc.php:76
+#: ../../templates/show_preference_box.inc.php:60
 #: ../../templates/show_add_user.inc.php:76
 #: ../../templates/show_create_democratic.inc.php:42
+#: ../../lib/class/democratic.class.php:108
 msgid "Content Manager"
 msgstr ""
 
-#: ../../lib/class/democratic.class.php:111
-#: ../../templates/show_preference_box.inc.php:61
 #: ../../templates/show_edit_user.inc.php:77
+#: ../../templates/show_preference_box.inc.php:61
 #: ../../templates/show_add_user.inc.php:77
 #: ../../templates/show_create_democratic.inc.php:43
+#: ../../lib/class/democratic.class.php:111
 msgid "Catalog Manager"
 msgstr ""
 
-#: ../../lib/class/democratic.class.php:114 ../../lib/preferences.php:233
-#: ../../admin/users.php:127 ../../templates/show_preference_box.inc.php:62
-#: ../../templates/sidebar.inc.php:31
-#: ../../templates/show_mail_users.inc.php:32
-#: ../../templates/show_preference_admin.inc.php:43
 #: ../../templates/show_edit_user.inc.php:78
+#: ../../templates/show_preference_box.inc.php:62
+#: ../../templates/show_preference_admin.inc.php:43
+#: ../../templates/sidebar.inc.php:31 ../../templates/show_add_user.inc.php:78
+#: ../../templates/show_create_democratic.inc.php:44
 #: ../../templates/show_democratic_playlist.inc.php:56
 #: ../../templates/show_democratic_playlist.inc.php:91
-#: ../../templates/show_add_user.inc.php:78
-#: ../../templates/show_create_democratic.inc.php:44
+#: ../../templates/show_mail_users.inc.php:32
+#: ../../lib/class/democratic.class.php:114 ../../lib/preferences.php:233
+#: ../../admin/users.php:127
 msgid "Admin"
 msgstr "Admin"
 
-#: ../../lib/class/registration.class.php:51
-#: ../../lib/class/registration.class.php:53
-#, fuzzy
-msgid "From: Ampache "
-msgstr "Search Ampache"
-
-#: ../../lib/class/registration.class.php:55
-#, fuzzy, php-format
-msgid "New User Registration at %s"
-msgstr "Ampache Installation"
-
-#: ../../lib/class/registration.class.php:68
-#, php-format
-msgid ""
-"Thank you for registering\n"
-"\n"
-"\n"
-"Please keep this e-mail for your records. Your account information is as "
-"follows:\n"
-"----------------------\n"
-"Username: %s\n"
-"Password: %s\n"
-"----------------------\n"
-"\n"
-"Your account is currently inactive. You cannot use it until you've visited "
-"the following link:\n"
-"\n"
-"%s \n"
-"\n"
-"Thank you for registering\n"
-msgstr ""
-
-#: ../../lib/class/registration.class.php:98
-#, php-format
-msgid ""
-"A new user has registered\n"
-"The following values were entered.\n"
-"\n"
-"Username: %s\n"
-"Fullname: %s\n"
-"E-mail: %s\n"
-"\n"
-msgstr ""
-
-#: ../../lib/class/vauth.class.php:478 ../../lib/class/vauth.class.php:502
-#: ../../lib/class/vauth.class.php:541
-msgid "Error Username or Password incorrect, please try again"
-msgstr ""
-
-#: ../../lib/rating.lib.php:51
-#, fuzzy
-msgid "Don't Play"
-msgstr "Local Play"
-
-#: ../../lib/rating.lib.php:54
-msgid "It's Pretty Bad"
-msgstr ""
+#: ../../templates/show_edit_user.inc.php:85
+msgid "Update User"
+msgstr "Update User"
 
-#: ../../lib/rating.lib.php:57
-msgid "It's Ok"
-msgstr ""
+#: ../../templates/show_catalogs.inc.php:32
+#: ../../templates/show_catalogs.inc.php:48
+#: ../../templates/show_localplay_controllers.inc.php:32
+#: ../../templates/show_localplay_controllers.inc.php:63
+#: ../../templates/show_edit_live_stream_row.inc.php:26
+#: ../../templates/show_live_streams.inc.php:36
+#: ../../templates/show_live_streams.inc.php:58
+#: ../../templates/show_edit_catalog.inc.php:26
+#: ../../templates/show_add_live_stream.inc.php:28
+#: ../../templates/show_edit_artist.inc.php:27
+#: ../../templates/show_edit_access.inc.php:26
+#: ../../templates/show_add_access.inc.php:26
+#: ../../templates/show_plugins.inc.php:32
+#: ../../templates/show_plugins.inc.php:61
+#: ../../templates/show_create_democratic.inc.php:26
+#: ../../templates/show_account.inc.php:27
+#: ../../templates/show_edit_album.inc.php:27
+#: ../../templates/show_localplay_playlist.inc.php:32
+#: ../../templates/show_localplay_playlist.inc.php:58
+#: ../../templates/show_add_playlist.inc.php:28
+#: ../../templates/show_admin_tools.inc.php:33
+#: ../../templates/show_admin_tools.inc.php:73
+#: ../../templates/show_access_list.inc.php:45
+#: ../../templates/show_playlist_edit.inc.php:30
+msgid "Name"
+msgstr "Name"
 
-#: ../../lib/rating.lib.php:60
-msgid "It's Pretty Good"
-msgstr ""
+#: ../../templates/show_catalogs.inc.php:33
+#: ../../templates/show_catalogs.inc.php:49
+#: ../../templates/show_add_catalog.inc.php:48
+msgid "Path"
+msgstr "Path"
 
-#: ../../lib/rating.lib.php:63
-msgid "I Love It!"
+#: ../../templates/show_catalogs.inc.php:34
+#: ../../templates/show_catalogs.inc.php:50
+msgid "Last Verify"
 msgstr ""
 
-#: ../../lib/rating.lib.php:66
-msgid "It's Insane"
+#: ../../templates/show_catalogs.inc.php:35
+#: ../../templates/show_catalogs.inc.php:51
+msgid "Last Add"
 msgstr ""
 
-#: ../../lib/rating.lib.php:70
-msgid "Off the Charts!"
+#: ../../templates/show_localplay_controllers.inc.php:33
+#: ../../templates/show_localplay_controllers.inc.php:64
+#: ../../templates/show_plugins.inc.php:33
+#: ../../templates/show_plugins.inc.php:62
+msgid "Description"
 msgstr ""
 
-#: ../../lib/preferences.php:164 ../../templates/show_flag_row.inc.php:33
-msgid "Enable"
-msgstr "Enable"
+#: ../../templates/show_localplay_controllers.inc.php:34
+#: ../../templates/show_localplay_controllers.inc.php:65
+#: ../../templates/show_plugins.inc.php:34
+#: ../../templates/show_plugins.inc.php:63
+#, fuzzy
+msgid "Version"
+msgstr "PHP Version"
 
-#: ../../lib/preferences.php:165 ../../templates/show_duplicates.inc.php:36
-#: ../../templates/show_duplicates.inc.php:74
 #: ../../templates/show_localplay_controllers.inc.php:44
+#: ../../templates/show_duplicates.inc.php:36
+#: ../../templates/show_duplicates.inc.php:74 ../../lib/preferences.php:165
 msgid "Disable"
 msgstr "Disable"
 
-#: ../../lib/preferences.php:174 ../../lib/preferences.php:216
-#: ../../lib/ui.lib.php:660 ../../templates/sidebar_localplay.inc.php:44
-#: ../../templates/show_adds_catalog.inc.php:25
-#: ../../templates/show_gather_art.inc.php:24
-#, fuzzy
-msgid "None"
-msgstr "No"
-
-#: ../../lib/preferences.php:176
-#: ../../templates/show_playtype_switch.inc.php:32
-msgid "Stream"
-msgstr "Stream"
-
-#: ../../lib/preferences.php:179
-#: ../../modules/localplay/mpd.controller.php:491
-#: ../../modules/localplay/httpq.controller.php:490
-#: ../../templates/show_playtype_switch.inc.php:36
-#: ../../templates/sidebar_home.inc.php:89
-#: ../../templates/sidebar_modules.inc.php:46
-msgid "Democratic"
+#: ../../templates/show_localplay_controllers.inc.php:48
+#: ../../templates/show_plugins.inc.php:42
+msgid "Activate"
 msgstr ""
 
-#: ../../lib/preferences.php:182 ../../templates/sidebar_localplay.inc.php:32
-#: ../../templates/show_playtype_switch.inc.php:34
-#: ../../templates/sidebar.inc.php:28 ../../templates/sidebar_home.inc.php:98
+#: ../../templates/show_localplay_controllers.inc.php:59
+#: ../../templates/show_plugins.inc.php:57
+#: ../../templates/show_flagged.inc.php:49
+#: ../../templates/show_localplay_playlist.inc.php:53
+#: ../../templates/show_disabled_songs.inc.php:52
+#: ../../templates/show_manage_shoutbox.inc.php:54
 #, fuzzy
-msgid "Localplay"
-msgstr "Local Play"
-
-#: ../../lib/preferences.php:184
-#: ../../templates/show_playtype_switch.inc.php:38
-msgid "Flash Player"
-msgstr ""
-
-#: ../../lib/preferences.php:191
-msgid "M3U"
-msgstr "M3U"
-
-#: ../../lib/preferences.php:192
-msgid "Simple M3U"
-msgstr "Simple M3U"
-
-#: ../../lib/preferences.php:193
-msgid "PLS"
-msgstr "PLS"
-
-#: ../../lib/preferences.php:194
-msgid "Asx"
-msgstr "Asx"
-
-#: ../../lib/preferences.php:195
-msgid "RAM"
-msgstr ""
-
-#: ../../lib/preferences.php:196
-msgid "XSPF"
-msgstr ""
+msgid "No Records Found"
+msgstr "No Results Found"
 
-#: ../../lib/preferences.php:230
+#: ../../templates/show_big_art.inc.php:29
+#: ../../templates/show_album_art.inc.php:41
 #, fuzzy
-msgid "Disabled"
-msgstr "Disable"
-
-#: ../../lib/preferences.php:232
-msgid "Manager"
-msgstr ""
-
-#: ../../lib/preferences.php:252
-msgid "Send on Add"
-msgstr ""
-
-#: ../../lib/preferences.php:253
-msgid "Send and Clear on Add"
-msgstr ""
-
-#: ../../lib/preferences.php:254
-msgid "Clear on Send"
-msgstr ""
-
-#: ../../lib/preferences.php:255 ../../lib/preferences.php:262
-#: ../../templates/show_manage_democratic.inc.php:38
-msgid "Default"
-msgstr ""
-
-#: ../../lib/preferences.php:263
-msgid "Always"
-msgstr ""
-
-#: ../../lib/general.lib.php:498
-msgid "On"
-msgstr "On"
-
-#: ../../lib/general.lib.php:501
-msgid "Off"
-msgstr "Off"
-
-#: ../../lib/install.php:257
-msgid "No Username/Password specified"
-msgstr ""
-
-#: ../../lib/install.php:262
-msgid "Passwords do not match"
-msgstr ""
-
-#: ../../lib/rss.php:180 ../../templates/show_recently_played.inc.php:23
-msgid "seconds ago"
-msgstr ""
+msgid "Album Art"
+msgstr "Find Album Art"
 
-#: ../../lib/rss.php:180 ../../templates/show_recently_played.inc.php:23
-msgid "minutes ago"
+#: ../../templates/show_big_art.inc.php:33
+msgid "Click to close window"
 msgstr ""
 
-#: ../../lib/rss.php:180 ../../templates/show_recently_played.inc.php:23
-#, fuzzy
-msgid "hours ago"
-msgstr "hours"
-
-#: ../../lib/rss.php:180 ../../templates/show_recently_played.inc.php:23
-#, fuzzy
-msgid "days ago"
-msgstr "days"
-
-#: ../../lib/rss.php:180 ../../templates/show_recently_played.inc.php:23
-msgid "weeks ago"
-msgstr ""
+#: ../../templates/show_preference_box.inc.php:43
+#: ../../templates/show_preference_box.inc.php:73
+msgid "Apply to All"
+msgstr "Apply to All"
 
-#: ../../lib/rss.php:180 ../../templates/show_recently_played.inc.php:23
-msgid "months ago"
+#: ../../templates/show_preference_box.inc.php:44
+#: ../../templates/show_preference_box.inc.php:74
+msgid "Access Level"
 msgstr ""
 
-#: ../../lib/rss.php:180 ../../templates/show_recently_played.inc.php:23
-#, fuzzy
-msgid "years ago"
-msgstr "year"
-
-#: ../../lib/ui.lib.php:355 ../../templates/sidebar.inc.php:27
-msgid "Home"
-msgstr "Home"
-
-#: ../../lib/ui.lib.php:358
-msgid "Upload"
-msgstr "Upload"
-
-#: ../../lib/ui.lib.php:361
-msgid "Local Play"
-msgstr "Local Play"
-
-#: ../../lib/ui.lib.php:364
-#, fuzzy
-msgid "Random Play"
-msgstr "Random"
-
-#: ../../lib/ui.lib.php:367 ../../templates/sidebar_home.inc.php:36
-#: ../../templates/sidebar_home.inc.php:85
-#: ../../templates/sidebar_home.inc.php:106
-#: ../../templates/show_manage_democratic.inc.php:34
-#: ../../templates/show_play_selected.inc.php:47
-msgid "Playlist"
-msgstr "Playlist"
-
-#: ../../lib/ui.lib.php:370 ../../templates/show_search.inc.php:131
-#: ../../templates/show_search_bar.inc.php:29
-msgid "Search"
-msgstr "Search"
-
-#: ../../lib/ui.lib.php:373 ../../templates/sidebar.inc.php:29
-#: ../../templates/sidebar_preferences.inc.php:9
-msgid "Preferences"
-msgstr "Preferences"
-
-#: ../../lib/ui.lib.php:376 ../../lib/ui.lib.php:380
-#, fuzzy
-msgid "Admin-Catalog"
-msgstr "Add Catalogue"
-
-#: ../../lib/ui.lib.php:384
-msgid "Admin-User Management"
+#: ../../templates/show_edit_song_row.inc.php:45
+#: ../../templates/show_edit_live_stream_row.inc.php:52
+#: ../../templates/show_edit_playlist_song_row.inc.php:38
+#: ../../templates/show_edit_playlist_row.inc.php:38
+#: ../../templates/show_edit_artist_row.inc.php:32
+#: ../../templates/show_edit_album_row.inc.php:48
+msgid "Save Changes"
 msgstr ""
 
-#: ../../lib/ui.lib.php:388
-#, fuzzy
-msgid "Admin-Mail Users"
-msgstr "Mail Users"
+#: ../../templates/show_artists.inc.php:38
+#: ../../templates/show_artists.inc.php:65
+#: ../../templates/sidebar_home.inc.php:33
+#: ../../templates/sidebar_home.inc.php:76
+#: ../../templates/show_local_catalog_info.inc.php:29
+#: ../../templates/show_genre.inc.php:32 ../../lib/ui.lib.php:408
+#: ../../lib/class/browse.class.php:983
+msgid "Albums"
+msgstr "Albums"
 
-#: ../../lib/ui.lib.php:392
-#, fuzzy
-msgid "Admin-Manage Access Lists"
-msgstr "Access Lists"
+#: ../../templates/show_artists.inc.php:39
+#: ../../templates/show_artists.inc.php:66
+#: ../../templates/show_democratic_playlist.inc.php:54
+#: ../../templates/show_democratic_playlist.inc.php:89
+#: ../../templates/show_songs.inc.php:45 ../../templates/show_songs.inc.php:74
+#: ../../templates/show_playlist_songs.inc.php:47
+#: ../../templates/show_playlist_songs.inc.php:68
+msgid "Time"
+msgstr "Time"
 
-#: ../../lib/ui.lib.php:396
-#, fuzzy
-msgid "Admin-Site Preferences"
-msgstr "Admin Preferences"
+#: ../../templates/show_duplicate.inc.php:23
+#: ../../templates/show_duplicate.inc.php:42
+#: ../../templates/sidebar_modules.inc.php:33
+msgid "Find Duplicates"
+msgstr "Find Duplicates"
 
-#: ../../lib/ui.lib.php:400
-msgid "Admin-Manage Modules"
-msgstr ""
+#: ../../templates/show_duplicate.inc.php:27
+msgid "Search Type"
+msgstr "Search Type"
 
-#: ../../lib/ui.lib.php:404
-#, fuzzy
-msgid "Browse Music"
-msgstr "Browse"
+#: ../../templates/show_duplicate.inc.php:33
+#: ../../templates/show_edit_song.inc.php:31
+#: ../../templates/show_search.inc.php:40
+#: ../../templates/show_disabled_songs.inc.php:34
+#: ../../templates/show_disabled_songs.inc.php:57
+msgid "Title"
+msgstr "Title"
 
-#: ../../lib/ui.lib.php:416 ../../templates/show_edit_song.inc.php:53
-#: ../../templates/show_genres.inc.php:37
-#: ../../templates/show_genres.inc.php:73
-#: ../../templates/show_play_selected.inc.php:58
-#: ../../templates/show_playlist_songs.inc.php:45
-#: ../../templates/show_playlist_songs.inc.php:66
-msgid "Genre"
-msgstr "Genre"
+#: ../../templates/show_duplicate.inc.php:34
+msgid "Artist and Title"
+msgstr "Artist and Title"
 
-#: ../../lib/ui.lib.php:420 ../../templates/show_stats.inc.php:22
-#: ../../templates/sidebar_modules.inc.php:41
-#, fuzzy
-msgid "Statistics"
-msgstr "Catalogue Statistics"
+#: ../../templates/show_duplicate.inc.php:35
+msgid "Artist, Album and Title"
+msgstr "Artist, Album and Title"
 
-#: ../../lib/ui.lib.php:511
-msgid "Add New"
+#: ../../templates/show_duplicate.inc.php:37
+msgid "Search Disabled Songs"
 msgstr ""
 
-#: ../../modules/localplay/shoutcast.controller.php:237
-#: ../../modules/localplay/mpd.controller.php:232
-#: ../../modules/localplay/httpq.controller.php:216
-msgid "Instance Name"
-msgstr ""
+#: ../../templates/show_import_playlist.inc.php:23
+msgid "Importing a Playlist from a File"
+msgstr "Importing a Playlist from a File"
 
-#: ../../modules/localplay/shoutcast.controller.php:238
-#, fuzzy
-msgid "PID File"
-msgstr "file"
+#: ../../templates/show_import_playlist.inc.php:28
+#: ../../templates/show_search.inc.php:66
+#: ../../templates/show_disabled_songs.inc.php:37
+#: ../../templates/show_disabled_songs.inc.php:60
+#: ../../templates/show_duplicates.inc.php:43
+#: ../../templates/show_duplicates.inc.php:81
+msgid "Filename"
+msgstr "Filename"
 
-#: ../../modules/localplay/shoutcast.controller.php:239
-#, fuzzy
-msgid "Playlist File"
+#: ../../templates/show_import_playlist.inc.php:35
+msgid "Playlist Type"
 msgstr "Playlist Type"
 
-#: ../../modules/localplay/shoutcast.controller.php:240
-#, fuzzy
-msgid "Local Path to Files"
-msgstr "Local Play Control"
-
-#: ../../modules/localplay/mpd.controller.php:233
-#: ../../modules/localplay/httpq.controller.php:217
-msgid "Hostname"
-msgstr ""
-
-#: ../../modules/localplay/mpd.controller.php:234
-#: ../../modules/localplay/httpq.controller.php:218
-msgid "Port"
-msgstr ""
-
-#: ../../modules/localplay/mpd.controller.php:235
-#: ../../modules/localplay/httpq.controller.php:219
-#: ../../templates/show_install_account.inc.php:65
-#: ../../templates/show_login_form.inc.php:62
-#: ../../templates/show_user_registration.inc.php:101
-#: ../../templates/show_edit_user.inc.php:52
-#: ../../templates/show_add_user.inc.php:52
-msgid "Password"
-msgstr "Password"
-
-#: ../../modules/horde/Browser.php:867
-msgid "file"
-msgstr "file"
-
-#: ../../modules/horde/Browser.php:871
-msgid "File uploads not supported."
-msgstr "File uploads not supported."
-
-#: ../../modules/horde/Browser.php:889
-msgid "No file uploaded"
-msgstr "No file uploaded"
-
-#: ../../modules/horde/Browser.php:896
-#, php-format
-msgid "There was a problem with the file upload: No %s was uploaded."
-msgstr "There was a problem with the file upload: No %s was uploaded."
-
-#: ../../modules/horde/Browser.php:901
-#, php-format
-msgid ""
-"There was a problem with the file upload: The %s was larger than the maximum "
-"allowed size (%d bytes)."
-msgstr ""
-"There was a problem with the file upload: The %s was larger than the maximum "
-"allowed size (%d bytes)."
-
-#: ../../modules/horde/Browser.php:903
-#, php-format
-msgid ""
-"There was a problem with the file upload: The %s was only partially uploaded."
-msgstr ""
-"There was a problem with the file upload: The %s was only partially uploaded."
-
-#: ../../admin/catalog.php:53 ../../admin/catalog.php:73
-#: ../../admin/catalog.php:98 ../../admin/catalog.php:170
-#, fuzzy
-msgid "Catalog Updated"
-msgstr "Catalogue Update Finished"
-
-#: ../../admin/catalog.php:115
-#, fuzzy
-msgid "Catalog Deleted"
-msgstr "Catalogue Clean Done"
-
-#: ../../admin/catalog.php:115
-msgid "The Catalog and all associated records have been deleted"
-msgstr ""
-
-#: ../../admin/catalog.php:121
-#, fuzzy
-msgid "Catalog Delete"
-msgstr "Catalogue Clean Done"
-
-#: ../../admin/catalog.php:121
-#, fuzzy
-msgid "Confirm Deletion Request"
-msgstr "Entry Deleted"
-
-#: ../../admin/catalog.php:130
-#, fuzzy
-msgid "Songs Removed"
-msgstr "files removed"
-
-#: ../../admin/catalog.php:133
-msgid "No Songs Removed"
-msgstr ""
-
-#: ../../admin/catalog.php:136
-#, fuzzy
-msgid "Disabled Songs Processed"
-msgstr "Show Disabled Songs"
-
-#: ../../admin/catalog.php:157
-#, fuzzy
-msgid "Catalog Cleaned"
-msgstr "Catalogue Clean Done"
-
-#: ../../admin/catalog.php:214
-msgid "Error: Defined Path is inside an existing catalog"
-msgstr ""
-
-#: ../../admin/catalog.php:233
-#, fuzzy
-msgid "Catalog Created"
-msgstr "Catalogue Name"
-
-#: ../../admin/catalog.php:250
-#, fuzzy
-msgid "Catalog statistics cleared"
-msgstr "Catalogue Statistics"
-
-#: ../../admin/catalog.php:263
-msgid "Now Playing Cleared"
-msgstr "Now Playing Cleared"
-
-#: ../../admin/catalog.php:263
-msgid "All now playing data has been cleared"
-msgstr "All now playing data has been cleared"
-
-#: ../../admin/catalog.php:273
-#, fuzzy
-msgid "No Disabled songs found"
-msgstr "Show Disabled Songs"
-
-#: ../../admin/catalog.php:282
-#, fuzzy
-msgid "Delete Catalog"
-msgstr "Update Catalogues"
-
-#: ../../admin/catalog.php:282
-msgid "Do you really want to delete this catalog?"
-msgstr "Do you really want to delete this catalogue?"
-
-#: ../../admin/catalog.php:302
-msgid "Album Art Search Finished"
-msgstr "Album Art Search Finished"
-
-#: ../../admin/flag.php:88
-#, fuzzy
-msgid "Song Updated"
-msgstr "Updated"
-
-#: ../../admin/flag.php:88
-#, fuzzy
-msgid "The requested song has been updated"
-msgstr "The requested song(s) have been disabled"
-
-#: ../../admin/flag.php:130
-#, fuzzy
-msgid "Album Updated"
-msgstr "Updated"
-
-#: ../../admin/flag.php:172
-#, fuzzy
-msgid "Artist Updated"
-msgstr "Fast Update"
-
-#: ../../admin/flag.php:237
-#, fuzzy
-msgid "Songs Updated"
-msgstr "Updated"
-
-#: ../../admin/flag.php:245
-#, fuzzy
-msgid "Flag Removed"
-msgstr "files removed"
-
-#: ../../admin/flag.php:246
-msgid "Flag Removed from"
-msgstr ""
-
-#: ../../admin/flag.php:261
-msgid "Flags Updated"
-msgstr ""
-
-#: ../../admin/flag.php:280
-msgid "Songs Disabled"
-msgstr "Songs Disabled"
-
-#: ../../admin/flag.php:280
-msgid "The requested song(s) have been disabled"
-msgstr "The requested song(s) have been disabled"
-
-#: ../../admin/flag.php:291
-msgid "Songs Enabled"
-msgstr "Songs Enabled"
-
-#: ../../admin/flag.php:291
-msgid "The requested song(s) have been enabled"
-msgstr "The requested song(s) have been enabled"
-
-#: ../../admin/users.php:83
-msgid "User Updated"
-msgstr ""
-
-#: ../../admin/users.php:83
-msgid "updated"
-msgstr ""
-
-#: ../../admin/users.php:110 ../../register.php:130
-#, fuzzy
-msgid "Error Username already exists"
-msgstr "Error Username Required"
+#: ../../templates/show_import_playlist.inc.php:47
+msgid "Import Playlist"
+msgstr "Import Playlist"
 
-#: ../../admin/users.php:129
-msgid "New User Added"
+#: ../../templates/show_edit_live_stream_row.inc.php:27
+#: ../../templates/show_add_live_stream.inc.php:42
+msgid "Stream URL"
 msgstr ""
 
-#: ../../admin/users.php:134
-msgid "User Enabled"
+#: ../../templates/show_edit_live_stream_row.inc.php:28
+#: ../../templates/show_add_live_stream.inc.php:35
+msgid "Homepage"
 msgstr ""
 
-#: ../../admin/users.php:139
-msgid "User Disabled"
+#: ../../templates/show_edit_live_stream_row.inc.php:29
+#: ../../templates/show_live_streams.inc.php:37
+#: ../../templates/show_live_streams.inc.php:59
+#: ../../templates/show_add_live_stream.inc.php:55
+msgid "Callsign"
 msgstr ""
 
-#: ../../admin/users.php:142
-msgid "Unable to Disabled last Administrator"
+#: ../../templates/show_edit_live_stream_row.inc.php:30
+#: ../../templates/show_live_streams.inc.php:38
+#: ../../templates/show_live_streams.inc.php:60
+#: ../../templates/show_add_live_stream.inc.php:49
+msgid "Frequency"
 msgstr ""
 
-#: ../../admin/users.php:164
-msgid "User Deleted"
-msgstr "User Deleted"
-
-#: ../../admin/users.php:167
-msgid "Delete Error"
-msgstr "Delete Error"
-
-#: ../../admin/users.php:167
-msgid "Unable to delete last Admin User"
-msgstr "Unable to delete last Admin User"
-
-#: ../../admin/users.php:173
-msgid "Deletion Request"
+#: ../../templates/show_live_streams.inc.php:39
+#: ../../templates/show_live_streams.inc.php:61
+#: ../../templates/show_search.inc.php:54
+msgid "Tag"
 msgstr ""
 
-#: ../../admin/users.php:174
-msgid "Are you sure you want to permanently delete"
-msgstr "Are you sure you want to permanently delete"
-
-#: ../../admin/modules.php:38
-msgid "Install Failed, Controller Error"
-msgstr ""
+#: ../../templates/sidebar_home.inc.php:24
+msgid "Browse"
+msgstr "Browse"
 
-#: ../../admin/modules.php:56 ../../admin/modules.php:101
+#: ../../templates/sidebar_home.inc.php:32
+#: ../../templates/sidebar_home.inc.php:73
+#: ../../templates/show_songs.inc.php:40 ../../templates/show_songs.inc.php:69
+#: ../../templates/show_playlist_songs.inc.php:42
+#: ../../templates/show_playlist_songs.inc.php:63
 #, fuzzy
-msgid "Are you sure you want to remove this plugin?"
-msgstr "Are you sure you want to permanently delete"
-
-#: ../../admin/modules.php:68 ../../admin/modules.php:120
-msgid "Plugin Deactivated"
-msgstr ""
-
-#: ../../admin/modules.php:83
-msgid "Unable to Install Plugin"
-msgstr ""
-
-#: ../../admin/modules.php:94
-msgid "Plugin Activated"
-msgstr ""
-
-#: ../../admin/modules.php:129
-msgid "Plugins"
-msgstr ""
+msgid "Song Title"
+msgstr "Song title"
 
-#: ../../admin/modules.php:135
-msgid "Localplay Controllers"
+#: ../../templates/sidebar_home.inc.php:35
+#: ../../lib/class/browse.class.php:1037
+msgid "Tag Cloud"
 msgstr ""
 
-#: ../../admin/access.php:35
-#, fuzzy
-msgid "Deleted"
-msgstr "Delete"
-
-#: ../../admin/access.php:35
-msgid "Your Access List Entry has been removed"
-msgstr "Your Access List Entry has been removed"
-
-#: ../../admin/access.php:40
-msgid "Your new Access List Entry has been created"
-msgstr "Your new Access List Entry has been created"
-
-#: ../../admin/access.php:45
-#, fuzzy
-msgid "Access List Entry updated"
-msgstr "Your Access List Entry has been removed"
-
-#: ../../admin/mail.php:90
-#, fuzzy
-msgid "E-mail Sent"
-msgstr "E-mail"
+#: ../../templates/sidebar_home.inc.php:36
+#: ../../templates/sidebar_home.inc.php:85
+#: ../../templates/sidebar_home.inc.php:106
+#: ../../templates/show_manage_democratic.inc.php:34
+#: ../../templates/show_play_selected.inc.php:47 ../../lib/ui.lib.php:367
+msgid "Playlist"
+msgstr "Playlist"
 
-#: ../../admin/mail.php:91
-msgid "Your E-mail was successfully sent."
+#: ../../templates/sidebar_home.inc.php:37
+#: ../../lib/class/browse.class.php:1000
+msgid "Radio Stations"
 msgstr ""
 
-#: ../../admin/system.php:49
-msgid "Database Charset Updated"
+#: ../../templates/sidebar_home.inc.php:41
+msgid "Filters"
 msgstr ""
 
-#: ../../admin/system.php:49
-msgid ""
-"Your Database and associated tables have been updated to match your "
-"currently configured charset"
+#: ../../templates/sidebar_home.inc.php:45
+msgid "Starts With"
 msgstr ""
 
-#: ../../admin/shout.php:35
-msgid "Shoutbox Post Updated"
+#: ../../templates/sidebar_home.inc.php:51
+msgid "Minimum Count"
 msgstr ""
 
-#: ../../admin/shout.php:47
-msgid "Shoutbox Post Deleted"
+#: ../../templates/sidebar_home.inc.php:55
+msgid "Rated"
 msgstr ""
 
-#: ../../templates/show_index.inc.php:38
-#: ../../templates/show_random_albums.inc.php:24
-msgid "Albums of the Moment"
+#: ../../templates/sidebar_home.inc.php:59
+msgid "Unplayed"
 msgstr ""
 
-#: ../../templates/show_index.inc.php:38
-msgid "Loading..."
+#: ../../templates/sidebar_home.inc.php:63
+#: ../../templates/show_artist.inc.php:55
+msgid "Show Art"
 msgstr ""
 
-#: ../../templates/rightbar.inc.php:25
-#: ../../templates/show_localplay_control.inc.php:28
-#: ../../templates/show_manage_democratic.inc.php:57
-msgid "Play"
-msgstr "Play"
-
-#: ../../templates/rightbar.inc.php:28
-msgid "Add to Playlist"
+#: ../../templates/sidebar_home.inc.php:68
+msgid "All Playlists"
 msgstr ""
 
-#: ../../templates/rightbar.inc.php:31
-msgid "Add to New Playlist"
+#: ../../templates/sidebar_home.inc.php:87
+msgid "Currently Playing"
 msgstr ""
 
-#: ../../templates/rightbar.inc.php:49
-#: ../../templates/show_album_row.inc.php:49
-#: ../../templates/show_playlist.inc.php:36
-#: ../../templates/show_artist_row.inc.php:34
-#: ../../templates/show_playlist_row.inc.php:33
-#: ../../templates/show_search_options.inc.php:28
-msgid "Batch Download"
+#: ../../templates/sidebar_home.inc.php:89
+#: ../../templates/show_playtype_switch.inc.php:36
+#: ../../templates/sidebar_modules.inc.php:46 ../../lib/preferences.php:179
+#: ../../modules/localplay/mpd.controller.php:491
+#: ../../modules/localplay/httpq.controller.php:490
+msgid "Democratic"
 msgstr ""
 
-#: ../../templates/rightbar.inc.php:54
-#: ../../templates/show_localplay_status.inc.php:39
+#: ../../templates/sidebar_home.inc.php:98
+#: ../../templates/sidebar_localplay.inc.php:32
+#: ../../templates/show_playtype_switch.inc.php:34
+#: ../../templates/sidebar.inc.php:28 ../../lib/preferences.php:182
 #, fuzzy
-msgid "Clear Playlist"
-msgstr "New Playlist"
+msgid "Localplay"
+msgstr "Local Play"
 
-#: ../../templates/rightbar.inc.php:57
-msgid "Add Dynamic Items"
+#: ../../templates/sidebar_home.inc.php:107
+msgid "Advanced"
 msgstr ""
 
-#: ../../templates/rightbar.inc.php:69
-msgid "Related Tag"
-msgstr ""
+#: ../../templates/show_confirmation.inc.php:27
+#: ../../templates/show_update_items.inc.php:27
+msgid "Continue"
+msgstr "Continue"
 
-#: ../../templates/rightbar.inc.php:101
-#: ../../templates/show_playlists.inc.php:53
-#: ../../templates/show_user_stats.inc.php:34
-#: ../../templates/show_user_stats.inc.php:47
-#: ../../templates/show_user_stats.inc.php:60
-#: ../../templates/show_artists.inc.php:58
-#: ../../templates/show_songs.inc.php:64
-#: ../../templates/show_recently_played.inc.php:95
-#: ../../templates/show_objects.inc.php:44
-#: ../../templates/show_user_recommendations.inc.php:32
-#: ../../templates/show_user_recommendations.inc.php:43
-#: ../../templates/show_user_recommendations.inc.php:54
-#: ../../templates/show_genres.inc.php:68
-#: ../../templates/show_manage_democratic.inc.php:63
-#: ../../templates/show_albums.inc.php:65
-#: ../../templates/show_live_streams.inc.php:53
-msgid "Not Enough Data"
-msgstr ""
+#: ../../templates/show_confirmation.inc.php:32
+#: ../../templates/show_similar_artists.inc.php:78
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../../templates/rightbar.inc.php:105
-msgid "More"
-msgstr ""
+#: ../../templates/show_flag_row.inc.php:31
+msgid "Reject"
+msgstr "Reject"
 
-#: ../../templates/show_install_account.inc.php:33
-#: ../../templates/show_install.inc.php:33
-#: ../../templates/show_install_lang.inc.php:34
-#: ../../templates/show_install_config.inc.php:33
-msgid "Ampache Installation"
-msgstr "Ampache Installation"
+#: ../../templates/show_flag_row.inc.php:33 ../../lib/preferences.php:164
+msgid "Enable"
+msgstr "Enable"
 
-#: ../../templates/show_install_account.inc.php:40
-#: ../../templates/show_install.inc.php:41
-#: ../../templates/show_install_lang.inc.php:41
-#: ../../templates/show_install_config.inc.php:39
+#: ../../templates/show_playlists.inc.php:35
+#: ../../templates/show_playlists.inc.php:58
 #, fuzzy
-msgid ""
-"This Page handles the installation of the Ampache database and the creation "
-"of the ampache.cfg.php file. Before you continue please make sure that you "
-"have the following pre-requisites"
-msgstr ""
-"This Page handles the installation of the ampache database and the creation "
-"of the ampache.cfg.php file. Before you continue please make sure that you "
-"have the following pre-requisites"
-
-#: ../../templates/show_install_account.inc.php:43
-#: ../../templates/show_install.inc.php:44
-#: ../../templates/show_install_lang.inc.php:44
-#: ../../templates/show_install_config.inc.php:42
-msgid ""
-"A MySQL Server with a username and password that can create/modify databases"
-msgstr ""
-"A MySQL Server with a username and password that can create/modify databases"
-
-#: ../../templates/show_install_account.inc.php:44
-msgid ""
-"Your webserver has read access to the /sql/ampache.sql file and the /config/"
-"ampache.cfg.dist.php file"
-msgstr ""
-"Your webserver has read access to the /sql/ampache.sql file and the /config/"
-"ampache.cfg.dist.php file"
-
-#: ../../templates/show_install_account.inc.php:46
-#: ../../templates/show_install.inc.php:48
-#: ../../templates/show_install_lang.inc.php:48
-#: ../../templates/show_install_config.inc.php:45
-msgid ""
-"Once you have ensured that you have the above requirements please fill out "
-"the information below. You will only be asked for the required config "
-"values. If you would like to make changes to your ampache install at a later "
-"date simply edit /config/ampache.cfg.php"
-msgstr ""
-"Once you have ensured that you have the above requirements please fill out "
-"the information below. You will only be asked for the required config "
-"values. If you would like to make changes to your ampache install at a later "
-"date simply edit /config/ampache.cfg.php"
-
-#: ../../templates/show_install_account.inc.php:49
-#: ../../templates/show_install.inc.php:53
-#: ../../templates/show_install_config.inc.php:49
-msgid "Step 1 - Creating and Inserting the Ampache Database"
-msgstr "Step 1 - Creating and Inserting the Ampache Database"
-
-#: ../../templates/show_install_account.inc.php:50
-msgid "Step 2 - Creating the ampache.cfg.php file"
-msgstr "Step 2 - Creating the ampache.cfg.php file"
-
-#: ../../templates/show_install_account.inc.php:51
-#: ../../templates/show_install.inc.php:58
-#: ../../templates/show_install_config.inc.php:54
-msgid "Step 3 - Setup Initial Account"
-msgstr "Step 3 - Setup Initial Account"
-
-#: ../../templates/show_install_account.inc.php:53
-msgid ""
-"This step creates your initial Ampache admin account. Once your admin "
-"account has been created you will be directed to the login page"
-msgstr ""
-"This step creates your initial Ampache admin account. Once your admin "
-"account has been created you will be directed to the login page"
+msgid "Playlist Name"
+msgstr "Playlist Type"
 
-#: ../../templates/show_install_account.inc.php:57
+#: ../../templates/show_playlists.inc.php:37
+#: ../../templates/show_playlists.inc.php:60
 #, fuzzy
-msgid "Create Admin Account"
-msgstr "Create Account"
-
-#: ../../templates/show_install_account.inc.php:61
-#: ../../templates/show_login_form.inc.php:58
-#: ../../templates/show_user_registration.inc.php:73
-#: ../../templates/show_recently_played.inc.php:41
-#: ../../templates/show_recently_played.inc.php:100
-#: ../../templates/show_now_playing_row.inc.php:29
-#: ../../templates/show_edit_user.inc.php:29
-#: ../../templates/show_add_user.inc.php:29
-#: ../../templates/show_users.inc.php:39
-#: ../../templates/show_users.inc.php:104
-msgid "Username"
-msgstr "Username"
-
-#: ../../templates/show_install_account.inc.php:69
-#: ../../templates/show_user_registration.inc.php:110
-#: ../../templates/show_edit_user.inc.php:61
-#: ../../templates/show_add_user.inc.php:61
-#: ../../templates/show_account.inc.php:46
-msgid "Confirm Password"
-msgstr "Confirm Password"
-
-#: ../../templates/show_install_account.inc.php:74
-msgid "Create Account"
-msgstr "Create Account"
-
-#: ../../templates/show_add_catalog.inc.php:26
-#: ../../templates/show_admin_tools.inc.php:82
-#: ../../templates/sidebar_admin.inc.php:26
-msgid "Add a Catalog"
-msgstr "Add a Catalogue"
+msgid "# Songs"
+msgstr "Songs"
 
-#: ../../templates/show_add_catalog.inc.php:27
-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)"
+#: ../../templates/show_playlists.inc.php:38
+#: ../../templates/show_playlists.inc.php:61
+msgid "Owner"
 msgstr ""
-"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)"
 
-#: ../../templates/show_add_catalog.inc.php:32
-msgid "Catalog Name"
-msgstr "Catalogue Name"
+#: ../../templates/show_edit_catalog.inc.php:22
+#, fuzzy, php-format
+msgid "Settings for %s"
+msgstr "Settings for catalogue in"
 
-#: ../../templates/show_add_catalog.inc.php:35
 #: ../../templates/show_edit_catalog.inc.php:29
+#: ../../templates/show_add_catalog.inc.php:35
 msgid "Auto-inserted Fields"
 msgstr "Auto-inserted Fields"
 
-#: ../../templates/show_add_catalog.inc.php:36
 #: ../../templates/show_edit_catalog.inc.php:30
+#: ../../templates/show_add_catalog.inc.php:36
 msgid "album name"
 msgstr "album name"
 
-#: ../../templates/show_add_catalog.inc.php:37
 #: ../../templates/show_edit_catalog.inc.php:31
+#: ../../templates/show_add_catalog.inc.php:37
 msgid "artist name"
 msgstr "artist name"
 
-#: ../../templates/show_add_catalog.inc.php:38
 #: ../../templates/show_edit_catalog.inc.php:32
+#: ../../templates/show_add_catalog.inc.php:38
 msgid "id3 comment"
 msgstr "id3 comment"
 
-#: ../../templates/show_add_catalog.inc.php:39
 #: ../../templates/show_edit_catalog.inc.php:33
+#: ../../templates/show_add_catalog.inc.php:39
 msgid "genre"
 msgstr "genre"
 
-#: ../../templates/show_add_catalog.inc.php:40
 #: ../../templates/show_edit_catalog.inc.php:34
+#: ../../templates/show_add_catalog.inc.php:40
 msgid "track number (padded with leading 0)"
 msgstr "track number (padded with leading 0)"
 
-#: ../../templates/show_add_catalog.inc.php:41
 #: ../../templates/show_edit_catalog.inc.php:35
+#: ../../templates/show_add_catalog.inc.php:41
 msgid "song title"
 msgstr "song title"
 
-#: ../../templates/show_add_catalog.inc.php:42
 #: ../../templates/show_edit_catalog.inc.php:36
+#: ../../templates/show_add_catalog.inc.php:42
 msgid "year"
 msgstr "year"
 
-#: ../../templates/show_add_catalog.inc.php:43
 #: ../../templates/show_edit_catalog.inc.php:37
+#: ../../templates/show_add_catalog.inc.php:43
 msgid "other"
 msgstr "other"
 
-#: ../../templates/show_add_catalog.inc.php:48
-#: ../../templates/show_catalogs.inc.php:33
-#: ../../templates/show_catalogs.inc.php:49
-msgid "Path"
-msgstr "Path"
-
-#: ../../templates/show_add_catalog.inc.php:52
 #: ../../templates/show_edit_catalog.inc.php:41
+#: ../../templates/show_add_catalog.inc.php:52
 msgid "Catalog Type"
 msgstr "Catalogue Type"
 
-#: ../../templates/show_add_catalog.inc.php:55
-msgid "Local"
-msgstr "Local"
-
-#: ../../templates/show_add_catalog.inc.php:56
-msgid "Remote"
-msgstr "Remote"
-
-#: ../../templates/show_add_catalog.inc.php:61
 #: ../../templates/show_edit_catalog.inc.php:45
+#: ../../templates/show_add_catalog.inc.php:61
 msgid "XML-RPC Key"
 msgstr ""
 
-#: ../../templates/show_add_catalog.inc.php:62
 #: ../../templates/show_edit_catalog.inc.php:47
+#: ../../templates/show_add_catalog.inc.php:62
 msgid "Required for Remote Catalogs"
 msgstr ""
 
-#: ../../templates/show_add_catalog.inc.php:65
-msgid "Filename Pattern"
-msgstr "Filename Pattern"
+#: ../../templates/show_edit_catalog.inc.php:51
+msgid "Filename pattern"
+msgstr "Filename pattern"
 
-#: ../../templates/show_add_catalog.inc.php:70
 #: ../../templates/show_edit_catalog.inc.php:58
+#: ../../templates/show_add_catalog.inc.php:70
 msgid "Folder Pattern"
 msgstr "Folder Pattern"
 
-#: ../../templates/show_add_catalog.inc.php:70
 #: ../../templates/show_edit_catalog.inc.php:58
+#: ../../templates/show_add_catalog.inc.php:70
 msgid "(no leading or ending '/')"
 msgstr "(no leading or ending '/')"
 
-#: ../../templates/show_add_catalog.inc.php:75
-#: ../../templates/show_admin_tools.inc.php:84
-msgid "Gather Album Art"
-msgstr "Gather Album Art"
-
-#: ../../templates/show_add_catalog.inc.php:79
-msgid "Build Playlists from m3u Files"
-msgstr "Build Playlists from m3u Files"
-
-#: ../../templates/show_add_catalog.inc.php:85
-msgid "Add Catalog"
-msgstr "Add Catalogue"
-
-#: ../../templates/show_localplay_status.inc.php:25
-msgid "Localplay Control"
-msgstr ""
-
-#: ../../templates/show_localplay_status.inc.php:28
-msgid "Mute"
-msgstr ""
-
-#: ../../templates/show_localplay_status.inc.php:29
-msgid "Decrease Volume"
-msgstr "Decrease Volume"
-
-#: ../../templates/show_localplay_status.inc.php:30
-msgid "Increase Volume"
-msgstr "Increase Volume"
-
-#: ../../templates/show_localplay_status.inc.php:31
-msgid "Volume"
-msgstr "Volume"
-
-#: ../../templates/show_localplay_status.inc.php:33
-#, fuzzy
-msgid "Repeat"
-msgstr "Reject"
-
-#: ../../templates/show_playlists.inc.php:34
-#: ../../templates/show_playlists.inc.php:57
-#: ../../templates/show_album_row.inc.php:23
-#: ../../templates/show_admin_tools.inc.php:45
-#: ../../templates/show_catalog_row.inc.php:28
-#: ../../templates/show_artists.inc.php:35
-#: ../../templates/show_artists.inc.php:62
-#: ../../templates/show_songs.inc.php:39 ../../templates/show_songs.inc.php:68
-#: ../../templates/show_recently_played.inc.php:37
-#: ../../templates/show_recently_played.inc.php:80
-#: ../../templates/show_recently_played.inc.php:99
-#: ../../templates/show_genres.inc.php:36
-#: ../../templates/show_genres.inc.php:72 ../../templates/show_song.inc.php:28
-#: ../../templates/show_albums.inc.php:39
-#: ../../templates/show_albums.inc.php:69
-#: ../../templates/show_album.inc.php:51
-#: ../../templates/show_song_row.inc.php:23
-#: ../../templates/show_artist_row.inc.php:23
-#: ../../templates/show_live_stream_row.inc.php:23
-#: ../../templates/show_artist.inc.php:38
-#: ../../templates/show_live_streams.inc.php:35
-#: ../../templates/show_live_streams.inc.php:57
-#: ../../templates/show_add_live_stream.inc.php:68
-#: ../../templates/show_playlist_row.inc.php:23
-#: ../../templates/show_playlist_song_row.inc.php:22
-#: ../../templates/show_shoutbox.inc.php:34
-msgid "Add"
-msgstr "Add"
-
-#: ../../templates/show_playlists.inc.php:35
-#: ../../templates/show_playlists.inc.php:58
-#, fuzzy
-msgid "Playlist Name"
-msgstr "Playlist Type"
-
-#: ../../templates/show_playlists.inc.php:37
-#: ../../templates/show_playlists.inc.php:60
-#, fuzzy
-msgid "# Songs"
-msgstr "Songs"
+#: ../../templates/show_edit_catalog.inc.php:68
+msgid "Save Catalog Settings"
+msgstr "Save Catalogue Settings"
 
-#: ../../templates/show_playlists.inc.php:38
-#: ../../templates/show_playlists.inc.php:61
-msgid "Owner"
+#: ../../templates/show_manage_democratic.inc.php:22
+msgid "Manage Democratic Playlists"
 msgstr ""
 
-#: ../../templates/show_playlists.inc.php:39
-#: ../../templates/show_playlists.inc.php:62
-#: ../../templates/show_albums.inc.php:48
-#: ../../templates/show_albums.inc.php:78
-#: ../../templates/show_album.inc.php:48
-#: ../../templates/show_catalogs.inc.php:36
-#: ../../templates/show_catalogs.inc.php:52
+#: ../../templates/show_manage_democratic.inc.php:35
+#: ../../templates/show_create_democratic.inc.php:30
 #, fuzzy
-msgid "Actions"
-msgstr "Action"
+msgid "Base Playlist"
+msgstr "New Playlist"
 
-#: ../../templates/show_album_row.inc.php:44
-#: ../../templates/show_song_row.inc.php:40
-msgid "Post Shout"
+#: ../../templates/show_manage_democratic.inc.php:36
+msgid "Cooldown"
 msgstr ""
 
-#: ../../templates/show_album_row.inc.php:53
-#: ../../templates/show_play_selected.inc.php:50
-#: ../../templates/show_song_row.inc.php:49
-#: ../../templates/show_artist_row.inc.php:38
-#: ../../templates/show_live_stream_row.inc.php:31
-#: ../../templates/show_playlist_row.inc.php:37
-#: ../../templates/show_playlist_song_row.inc.php:37
-msgid "Edit"
-msgstr "Edit"
-
-#: ../../templates/show_similar_artists.inc.php:23
-#, fuzzy
-msgid "Similar Artists"
-msgstr "Artists"
+#: ../../templates/show_manage_democratic.inc.php:37
+#: ../../templates/show_edit_access.inc.php:69
+#: ../../templates/show_preference_admin.inc.php:31
+#: ../../templates/show_preference_admin.inc.php:50
+#: ../../templates/show_add_access.inc.php:52
+#: ../../templates/show_create_democratic.inc.php:38
+#: ../../templates/show_access_list.inc.php:48
+msgid "Level"
+msgstr "Level"
 
-#: ../../templates/show_similar_artists.inc.php:25
-msgid "Please check the artists you want to merge with the current one"
+#: ../../templates/show_manage_democratic.inc.php:38
+#: ../../lib/preferences.php:255 ../../lib/preferences.php:262
+msgid "Default"
 msgstr ""
 
-#: ../../templates/show_similar_artists.inc.php:33
-#: ../../templates/show_similar_artists.inc.php:86
-#: ../../templates/show_artists.inc.php:36
-#: ../../templates/show_artists.inc.php:63
-#: ../../templates/show_songs.inc.php:41 ../../templates/show_songs.inc.php:70
-#: ../../templates/show_edit_song.inc.php:45
-#: ../../templates/show_recently_played.inc.php:40
-#: ../../templates/show_recently_played.inc.php:103
-#: ../../templates/sidebar_home.inc.php:34
-#: ../../templates/sidebar_home.inc.php:79
-#: ../../templates/sidebar_home.inc.php:105
-#: ../../templates/show_now_playing_row.inc.php:59
-#: ../../templates/show_duplicates.inc.php:38
-#: ../../templates/show_duplicates.inc.php:76
-#: ../../templates/show_get_albumart.inc.php:28
-#: ../../templates/show_play_selected.inc.php:60
-#: ../../templates/show_albums.inc.php:44
-#: ../../templates/show_albums.inc.php:74
-#: ../../templates/show_search.inc.php:44
-#: ../../templates/show_playlist_songs.inc.php:43
-#: ../../templates/show_playlist_songs.inc.php:64
-#: ../../templates/show_disabled_songs.inc.php:36
-#: ../../templates/show_disabled_songs.inc.php:59
-msgid "Artist"
-msgstr "Artist"
-
-#: ../../templates/show_similar_artists.inc.php:58
+#: ../../templates/show_manage_democratic.inc.php:69
 #, fuzzy
-msgid "No Similar Artists found"
-msgstr "Artists"
+msgid "Create New Playlist"
+msgstr "Create a new playlist"
 
-#: ../../templates/show_similar_artists.inc.php:66
-#, fuzzy
-msgid "Back"
-msgstr "Track"
+#: ../../templates/show_playlist.inc.php:26
+#, fuzzy, php-format
+msgid "%s %s Playlist"
+msgstr "New Playlist"
 
-#: ../../templates/show_similar_artists.inc.php:77
+#: ../../templates/show_playlist.inc.php:31
 #, fuzzy
-msgid "Rename selected"
-msgstr "Remove Selected Tracks"
-
-#: ../../templates/show_similar_artists.inc.php:78
-#: ../../templates/show_confirmation.inc.php:32
-msgid "Cancel"
-msgstr "Cancel"
+msgid "Normalize Tracks"
+msgstr "Total Tracks"
 
-#: ../../templates/show_similar_artists.inc.php:91
-msgid "Advanced Options"
+#: ../../templates/show_playlist.inc.php:40
+#: ../../templates/show_playlist.inc.php:41
+msgid "Add All"
 msgstr ""
 
-#: ../../templates/show_similar_artists.inc.php:152
-#, fuzzy
-msgid "Search Again"
-msgstr "Search Ampache"
+#: ../../templates/show_playlist.inc.php:44
+#: ../../templates/show_playlist.inc.php:45
+msgid "Add Random"
+msgstr ""
 
 #: ../../templates/sidebar_localplay.inc.php:35
 #: ../../templates/show_localplay_add_instance.inc.php:35
@@ -1580,6 +1081,14 @@ msgstr ""
 msgid "Active Instance"
 msgstr ""
 
+#: ../../templates/sidebar_localplay.inc.php:44
+#: ../../templates/show_gather_art.inc.php:24
+#: ../../templates/show_adds_catalog.inc.php:25 ../../lib/ui.lib.php:660
+#: ../../lib/preferences.php:174 ../../lib/preferences.php:216
+#, fuzzy
+msgid "None"
+msgstr "No"
+
 #: ../../templates/sidebar_localplay.inc.php:60
 msgid "Localplay Disabled"
 msgstr ""
@@ -1597,326 +1106,204 @@ msgstr ""
 msgid "Access Denied"
 msgstr ""
 
-#: ../../templates/show_user_stats.inc.php:30
-#, fuzzy
-msgid "Favorite Artists"
-msgstr "Artists"
-
-#: ../../templates/show_user_stats.inc.php:43
-#, fuzzy
-msgid "Favorite Albums"
-msgstr "Full Albums"
+#: ../../templates/footer.inc.php:25
+msgid "Using Old Password Encryption, Please Reset your Password"
+msgstr ""
 
-#: ../../templates/show_user_stats.inc.php:56
-#, fuzzy
-msgid "Favorite Songs"
-msgstr "Total Songs"
+#: ../../templates/footer.inc.php:32
+msgid "Queries:"
+msgstr ""
 
-#: ../../templates/show_random.inc.php:22
-msgid "Play Random Selection"
-msgstr "Play Random Selection"
+#: ../../templates/footer.inc.php:32
+msgid "Cache Hits:"
+msgstr ""
 
-#: ../../templates/show_random.inc.php:26
-msgid "Item count"
-msgstr "Item count"
+#: ../../templates/show_add_live_stream.inc.php:24
+#: ../../templates/sidebar_modules.inc.php:42
+msgid "Add Radio Station"
+msgstr ""
 
-#: ../../templates/show_random.inc.php:41
-#: ../../templates/show_songs.inc.php:43 ../../templates/show_songs.inc.php:72
-#, fuzzy
-msgid "Tags"
-msgstr "Track"
+#: ../../templates/show_add_live_stream.inc.php:61
+#: ../../templates/show_export.inc.php:32
+msgid "Catalog"
+msgstr "Catalogue"
 
-#: ../../templates/show_random.inc.php:46
-#: ../../templates/show_duplicates.inc.php:40
-#: ../../templates/show_duplicates.inc.php:78
-msgid "Length"
+#: ../../templates/show_index.inc.php:38
+#: ../../templates/show_random_albums.inc.php:24
+msgid "Albums of the Moment"
 msgstr ""
 
-#: ../../templates/show_random.inc.php:49
-#: ../../templates/show_random.inc.php:84
-#: ../../templates/show_search.inc.php:121
-msgid "Unlimited"
+#: ../../templates/show_index.inc.php:38
+msgid "Loading..."
 msgstr ""
 
-#: ../../templates/show_random.inc.php:50
-#: ../../templates/show_random.inc.php:51
-#, php-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../templates/show_random.inc.php:52
-#: ../../templates/show_random.inc.php:53
-#: ../../templates/show_random.inc.php:54
-#: ../../templates/show_random.inc.php:55
-#: ../../templates/show_random.inc.php:56
-#, fuzzy, php-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "hour"
-msgstr[1] "hour"
-
-#: ../../templates/show_random.inc.php:61
-#: ../../templates/show_playlist_edit.inc.php:36
-#: ../../templates/show_add_playlist.inc.php:32
-#: ../../templates/show_access_list.inc.php:51
-msgid "Type"
-msgstr "Type"
+#: ../../templates/show_edit_artist.inc.php:23
+#, fuzzy
+msgid "Edit Artist"
+msgstr "Artist"
 
-#: ../../templates/show_random.inc.php:64
-msgid "Standard"
+#: ../../templates/show_edit_artist.inc.php:35
+#: ../../templates/show_edit_song.inc.php:81
+#: ../../templates/show_edit_album.inc.php:41
+msgid "Flag for Retagging"
 msgstr ""
 
-#: ../../templates/show_random.inc.php:65
-msgid "Less Played"
+#: ../../templates/show_edit_artist.inc.php:41
+msgid "Update Artist"
 msgstr ""
 
-#: ../../templates/show_random.inc.php:66
-msgid "Full Albums"
-msgstr "Full Albums"
-
-#: ../../templates/show_random.inc.php:67
-msgid "Full Artist"
-msgstr "Full Artist"
-
-#: ../../templates/show_random.inc.php:69
-msgid "Highest Rated"
+#: ../../templates/show_edit_access.inc.php:22
+msgid "Edit ACL"
 msgstr ""
 
-#: ../../templates/show_random.inc.php:75
+#: ../../templates/show_edit_access.inc.php:30
+#: ../../templates/show_add_access.inc.php:63
 #, fuzzy
-msgid "From catalog"
-msgstr "from catalogue"
+msgid "ACL Type"
+msgstr "Type"
 
-#: ../../templates/show_random.inc.php:81
+#: ../../templates/show_edit_access.inc.php:34
+#: ../../templates/show_add_access.inc.php:66
 #, fuzzy
-msgid "Size Limit"
-msgstr "View Limit"
+msgid "Stream Access"
+msgstr "Stream"
 
-#: ../../templates/show_random.inc.php:95
-msgid "Enqueue"
+#: ../../templates/show_edit_access.inc.php:35
+#: ../../templates/show_add_access.inc.php:67
+msgid "Web Interface"
 msgstr ""
 
-#: ../../templates/show_adds_catalog.inc.php:23
-#, fuzzy, php-format
-msgid "Starting New Song Search on %s catalog"
-msgstr "Starting New Song Search on"
-
-#: ../../templates/show_adds_catalog.inc.php:25
-#: ../../templates/show_run_add_catalog.inc.php:24
-msgid "Found"
-msgstr "Found"
+#: ../../templates/show_edit_access.inc.php:36
+#: ../../templates/show_add_access.inc.php:68
+msgid "Local Network Definition"
+msgstr ""
 
-#: ../../templates/show_adds_catalog.inc.php:26
-#: ../../templates/show_verify_catalog.inc.php:26
-#: ../../templates/show_gather_art.inc.php:25
-#: ../../templates/show_run_add_catalog.inc.php:25
-#: ../../templates/show_clean_catalog.inc.php:26
-msgid "Reading"
+#: ../../templates/show_edit_access.inc.php:37
+#: ../../templates/show_add_access.inc.php:69
+msgid "RPC"
 msgstr ""
 
-#: ../../templates/show_playlist_edit.inc.php:26
+#: ../../templates/show_edit_access.inc.php:43
+#: ../../templates/show_add_access.inc.php:32
+msgid "Start IP Address"
+msgstr "Start IP Address"
+
+#: ../../templates/show_edit_access.inc.php:50
+#: ../../templates/show_add_access.inc.php:39
+msgid "End IP Address"
+msgstr "End IP Address"
+
+#: ../../templates/show_edit_access.inc.php:63
+#: ../../templates/show_add_access.inc.php:77
 #, fuzzy
-msgid "Editing Playlist"
-msgstr "Edit Playlist"
+msgid "Remote Key"
+msgstr "Remote"
 
-#: ../../templates/show_playlist_edit.inc.php:30
-#: ../../templates/show_admin_tools.inc.php:33
-#: ../../templates/show_admin_tools.inc.php:73
-#: ../../templates/show_localplay_playlist.inc.php:32
-#: ../../templates/show_localplay_playlist.inc.php:58
-#: ../../templates/show_edit_album.inc.php:27
-#: ../../templates/show_add_playlist.inc.php:28
-#: ../../templates/show_edit_catalog.inc.php:26
-#: ../../templates/show_edit_access.inc.php:26
-#: ../../templates/show_plugins.inc.php:32
-#: ../../templates/show_plugins.inc.php:61
-#: ../../templates/show_edit_artist.inc.php:27
-#: ../../templates/show_account.inc.php:27
-#: ../../templates/show_live_streams.inc.php:36
-#: ../../templates/show_live_streams.inc.php:58
-#: ../../templates/show_edit_live_stream_row.inc.php:26
-#: ../../templates/show_add_live_stream.inc.php:28
-#: ../../templates/show_localplay_controllers.inc.php:32
-#: ../../templates/show_localplay_controllers.inc.php:63
-#: ../../templates/show_catalogs.inc.php:32
-#: ../../templates/show_catalogs.inc.php:48
-#: ../../templates/show_access_list.inc.php:45
-#: ../../templates/show_add_access.inc.php:26
-#: ../../templates/show_create_democratic.inc.php:26
-msgid "Name"
-msgstr "Name"
+#: ../../templates/show_edit_access.inc.php:73
+#: ../../templates/show_add_access.inc.php:55
+#: ../../templates/show_play_selected.inc.php:49
+#: ../../lib/class/access.class.php:328
+msgid "View"
+msgstr "View"
 
-#: ../../templates/show_playlist_edit.inc.php:39
-#: ../../templates/show_edit_playlist_row.inc.php:32
-msgid "Public"
-msgstr "Public"
+#: ../../templates/show_edit_access.inc.php:74
+#: ../../templates/show_add_access.inc.php:56
+#: ../../lib/class/access.class.php:331
+#, fuzzy
+msgid "Read"
+msgstr "Reason"
+
+#: ../../templates/show_edit_access.inc.php:75
+#: ../../templates/show_add_access.inc.php:57
+#: ../../lib/class/access.class.php:334
+msgid "Read/Write"
+msgstr ""
+
+#: ../../templates/show_edit_access.inc.php:76
+#: ../../templates/show_add_access.inc.php:58
+#: ../../templates/show_export.inc.php:35
+#: ../../templates/show_mail_users.inc.php:30
+#: ../../templates/show_random.inc.php:38
+#: ../../templates/show_admin_tools.inc.php:51 ../../lib/ui.lib.php:141
+#: ../../lib/ui.lib.php:150 ../../lib/ui.lib.php:632
+#: ../../lib/class/access.class.php:325 ../../lib/class/access.class.php:350
+msgid "All"
+msgstr "All"
 
-#: ../../templates/show_playlist_edit.inc.php:47
-#: ../../templates/show_catalog_row.inc.php:31
 #: ../../templates/show_edit_access.inc.php:82
 #: ../../templates/show_preference_admin.inc.php:55
+#: ../../templates/show_catalog_row.inc.php:31
 #: ../../templates/show_play_selected.inc.php:64
 #: ../../templates/show_edit_shout.inc.php:41
 #: ../../templates/show_manage_catalogs.inc.php:42
+#: ../../templates/show_playlist_edit.inc.php:47
 #, fuzzy
 msgid "Update"
 msgstr "Updated"
 
-#: ../../templates/show_login_form.inc.php:66
-msgid "Remember Me"
-msgstr "Remember Me"
-
-#: ../../templates/show_login_form.inc.php:73
-msgid "Login"
-msgstr "Login"
-
-#: ../../templates/show_login_form.inc.php:78
-#, fuzzy
-msgid "Register"
-msgstr "Register User"
-
-#: ../../templates/show_login_form.inc.php:90
-msgid "Message of the Day"
-msgstr ""
-
-#: ../../templates/show_album_art.inc.php:41
-#: ../../templates/show_big_art.inc.php:29
+#: ../../templates/show_similar_artists.inc.php:23
 #, fuzzy
-msgid "Album Art"
-msgstr "Find Album Art"
-
-#: ../../templates/show_album_art.inc.php:47
-#: ../../templates/show_disabled_songs.inc.php:33
-#: ../../templates/show_disabled_songs.inc.php:56
-msgid "Select"
-msgstr "Select"
-
-#: ../../templates/show_admin_tools.inc.php:34
-#: ../../templates/show_admin_tools.inc.php:74
-#: ../../templates/show_artists.inc.php:41
-#: ../../templates/show_artists.inc.php:68
-#: ../../templates/show_songs.inc.php:51 ../../templates/show_songs.inc.php:78
-#: ../../templates/show_localplay_playlist.inc.php:33
-#: ../../templates/show_localplay_playlist.inc.php:59
-#: ../../templates/show_genres.inc.php:39
-#: ../../templates/show_genres.inc.php:75
-#: ../../templates/show_flagged.inc.php:39
-#: ../../templates/show_flagged.inc.php:58
-#: ../../templates/show_song.inc.php:26
-#: ../../templates/show_manage_democratic.inc.php:40
-#: ../../templates/show_plugins.inc.php:35
-#: ../../templates/show_plugins.inc.php:64
-#: ../../templates/show_democratic_playlist.inc.php:51
-#: ../../templates/show_democratic_playlist.inc.php:86
-#: ../../templates/show_users.inc.php:46
-#: ../../templates/show_users.inc.php:111
-#: ../../templates/show_live_streams.inc.php:40
-#: ../../templates/show_live_streams.inc.php:62
-#: ../../templates/show_playlist_songs.inc.php:48
-#: ../../templates/show_playlist_songs.inc.php:69
-#: ../../templates/show_localplay_controllers.inc.php:35
-#: ../../templates/show_localplay_controllers.inc.php:66
-#: ../../templates/show_access_list.inc.php:52
-#: ../../templates/show_localplay_instances.inc.php:29
-#: ../../templates/show_manage_shoutbox.inc.php:39
-#: ../../templates/show_manage_shoutbox.inc.php:63
-msgid "Action"
-msgstr "Action"
+msgid "Similar Artists"
+msgstr "Artists"
 
-#: ../../templates/show_admin_tools.inc.php:47
-#: ../../templates/show_catalog_row.inc.php:29
-msgid "Verify"
+#: ../../templates/show_similar_artists.inc.php:25
+msgid "Please check the artists you want to merge with the current one"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:49
-#: ../../templates/show_catalog_row.inc.php:30
+#: ../../templates/show_similar_artists.inc.php:58
 #, fuzzy
-msgid "Clean"
-msgstr "clear"
-
-#: ../../templates/show_admin_tools.inc.php:59
-msgid "Fast"
-msgstr ""
-
-#: ../../templates/show_admin_tools.inc.php:60
-#: ../../templates/show_catalog_row.inc.php:32
-msgid "Gather Art"
-msgstr ""
+msgid "No Similar Artists found"
+msgstr "Artists"
 
-#: ../../templates/show_admin_tools.inc.php:68
+#: ../../templates/show_similar_artists.inc.php:66
 #, fuzzy
-msgid "No Catalogs Found"
-msgstr "Not Found"
+msgid "Back"
+msgstr "Track"
 
-#: ../../templates/show_admin_tools.inc.php:78
-#: ../../templates/show_manage_catalogs.inc.php:31
+#: ../../templates/show_similar_artists.inc.php:77
 #, fuzzy
-msgid "Clean All"
-msgstr "Clean All Catalogues"
+msgid "Rename selected"
+msgstr "Remove Selected Tracks"
 
-#: ../../templates/show_admin_tools.inc.php:79
-#: ../../templates/show_manage_catalogs.inc.php:30
-#, fuzzy
-msgid "Verify All"
-msgstr "View All"
+#: ../../templates/show_similar_artists.inc.php:91
+msgid "Advanced Options"
+msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:80
-#: ../../templates/show_manage_catalogs.inc.php:29
+#: ../../templates/show_similar_artists.inc.php:152
 #, fuzzy
-msgid "Add to All"
-msgstr "Add to"
+msgid "Search Again"
+msgstr "Search Ampache"
 
-#: ../../templates/show_admin_tools.inc.php:81
-#: ../../templates/show_manage_catalogs.inc.php:32
-#, fuzzy
-msgid "Update All"
-msgstr "Updated"
+#: ../../templates/show_clean_catalog.inc.php:23
+#, fuzzy, php-format
+msgid "Cleaning the %s Catalog"
+msgstr "Updating the"
 
-#: ../../templates/show_admin_tools.inc.php:83
-msgid "Clear Catalog Stats"
-msgstr "Clear Catalogue Stats"
+#: ../../templates/show_clean_catalog.inc.php:25
+msgid "Checking"
+msgstr "Checking"
 
-#: ../../templates/show_admin_tools.inc.php:88
-#: ../../templates/sidebar_admin.inc.php:43
-#: ../../templates/sidebar_modules.inc.php:31
-msgid "Other Tools"
+#: ../../templates/show_clean_catalog.inc.php:26
+#: ../../templates/show_run_add_catalog.inc.php:25
+#: ../../templates/show_gather_art.inc.php:25
+#: ../../templates/show_adds_catalog.inc.php:26
+#: ../../templates/show_verify_catalog.inc.php:26
+msgid "Reading"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:90
-msgid "Show Duplicate Songs"
-msgstr "Show Duplicate Songs"
-
-#: ../../templates/show_admin_tools.inc.php:91
-#: ../../templates/sidebar_admin.inc.php:46
-msgid "Clear Now Playing"
-msgstr "Clear Now Playing"
-
-#: ../../templates/show_admin_tools.inc.php:92
-#: ../../templates/header.inc.php:84
-#, fuzzy
-msgid "Generate New Config"
-msgstr "Write Configuration"
-
-#: ../../templates/show_admin_tools.inc.php:93
-#, fuzzy
-msgid "Preferences Permissions"
+#: ../../templates/sidebar_preferences.inc.php:9
+#: ../../templates/sidebar.inc.php:29 ../../lib/ui.lib.php:373
+msgid "Preferences"
 msgstr "Preferences"
 
-#: ../../templates/show_admin_tools.inc.php:94
-msgid "Export To Itunes DB"
-msgstr ""
+#: ../../templates/sidebar_preferences.inc.php:18
+msgid "Account"
+msgstr "Account"
 
-#: ../../templates/show_admin_tools.inc.php:95
-msgid "Show Inactive Users"
+#: ../../templates/sidebar_preferences.inc.php:22
+msgid "Server Config"
 msgstr ""
 
-#: ../../templates/show_admin_tools.inc.php:96
-#, fuzzy
-msgid "Check for New Version"
-msgstr "Check for Configuration"
-
 #: ../../templates/show_flag.inc.php:41
 msgid "Flag Song"
 msgstr "Flag Song"
@@ -1936,10 +1323,32 @@ msgstr "Stream"
 msgid "Reason to flag"
 msgstr "Reason to flag"
 
+#: ../../templates/show_flag.inc.php:56 ../../templates/rightbar.inc.php:98
+#: ../../templates/show_catalog_row.inc.php:33
+#: ../../templates/show_democratic_playlist.inc.php:78
+#: ../../templates/show_live_stream_row.inc.php:34
+#: ../../templates/show_localplay_instances.inc.php:40
+#: ../../templates/show_localplay_playlist.inc.php:48
+#: ../../templates/show_playlist_song_row.inc.php:38
+#: ../../templates/show_playlist_row.inc.php:38
+#: ../../templates/show_admin_tools.inc.php:53
+#: ../../lib/class/flag.class.php:270
+msgid "Delete"
+msgstr "Delete"
+
 #: ../../templates/show_flag.inc.php:57
 msgid "Incorrect Tags"
 msgstr ""
 
+#: ../../templates/show_flag.inc.php:58 ../../lib/class/flag.class.php:276
+msgid "Re-encode"
+msgstr ""
+
+#: ../../templates/show_flag.inc.php:59 ../../lib/class/flag.class.php:279
+#, fuzzy
+msgid "Other"
+msgstr "other"
+
 #: ../../templates/show_flag.inc.php:64
 #: ../../templates/show_edit_song.inc.php:73
 #: ../../templates/show_flagged.inc.php:37
@@ -1956,70 +1365,136 @@ msgstr "Comment"
 msgid "Flag"
 msgstr "Flag"
 
-#: ../../templates/sidebar_admin.inc.php:27
-#: ../../templates/show_manage_catalogs.inc.php:22
-msgid "Show Catalogs"
-msgstr ""
+#: ../../templates/show_playtype_switch.inc.php:32
+#: ../../lib/preferences.php:176
+msgid "Stream"
+msgstr "Stream"
 
-#: ../../templates/sidebar_admin.inc.php:31
-msgid "User Tools"
+#: ../../templates/show_playtype_switch.inc.php:38
+#: ../../lib/preferences.php:184
+msgid "Flash Player"
 msgstr ""
 
-#: ../../templates/sidebar_admin.inc.php:33
-#: ../../templates/show_add_user.inc.php:85
-msgid "Add User"
-msgstr "Add User"
+#: ../../templates/show_preference_admin.inc.php:22
+#, fuzzy
+msgid "Preference Administration"
+msgstr "Preferences"
 
-#: ../../templates/sidebar_admin.inc.php:34
-msgid "Browse Users"
+#: ../../templates/show_install_config.inc.php:33
+#: ../../templates/show_install_lang.inc.php:34
+#: ../../templates/show_install.inc.php:33
+#: ../../templates/show_install_account.inc.php:33
+msgid "Ampache Installation"
+msgstr "Ampache Installation"
+
+#: ../../templates/show_install_config.inc.php:39
+#: ../../templates/show_install_lang.inc.php:41
+#: ../../templates/show_install.inc.php:41
+#: ../../templates/show_install_account.inc.php:40
+#, fuzzy
+msgid ""
+"This Page handles the installation of the Ampache database and the creation "
+"of the ampache.cfg.php file. Before you continue please make sure that you "
+"have the following pre-requisites"
 msgstr ""
+"This Page handles the installation of the ampache database and the creation "
+"of the ampache.cfg.php file. Before you continue please make sure that you "
+"have the following pre-requisites"
 
-#: ../../templates/sidebar_admin.inc.php:37
-msgid "Access Control"
+#: ../../templates/show_install_config.inc.php:42
+#: ../../templates/show_install_lang.inc.php:44
+#: ../../templates/show_install.inc.php:44
+#: ../../templates/show_install_account.inc.php:43
+msgid ""
+"A MySQL Server with a username and password that can create/modify databases"
 msgstr ""
+"A MySQL Server with a username and password that can create/modify databases"
 
-#: ../../templates/sidebar_admin.inc.php:39
-msgid "Add ACL"
+#: ../../templates/show_install_config.inc.php:43
+#: ../../templates/show_install_lang.inc.php:45
+#: ../../templates/show_install.inc.php:45
+msgid ""
+"Your webserver has read access to the /sql/ampache.sql file and the /config/"
+"ampache.cfg.php.dist file"
 msgstr ""
+"Your webserver has read access to the /sql/ampache.sql file and the /config/"
+"ampache.cfg.php.dist file"
 
-#: ../../templates/sidebar_admin.inc.php:40
-msgid "Show ACL(s)"
+#: ../../templates/show_install_config.inc.php:45
+#: ../../templates/show_install_lang.inc.php:48
+#: ../../templates/show_install.inc.php:48
+#: ../../templates/show_install_account.inc.php:46
+msgid ""
+"Once you have ensured that you have the above requirements please fill out "
+"the information below. You will only be asked for the required config "
+"values. If you would like to make changes to your ampache install at a later "
+"date simply edit /config/ampache.cfg.php"
 msgstr ""
+"Once you have ensured that you have the above requirements please fill out "
+"the information below. You will only be asked for the required config "
+"values. If you would like to make changes to your ampache install at a later "
+"date simply edit /config/ampache.cfg.php"
 
-#: ../../templates/sidebar_admin.inc.php:45
-#: ../../templates/show_test_config.inc.php:40
-#: ../../templates/show_test.inc.php:32
-msgid "Ampache Debug"
-msgstr "Ampache Debug"
+#: ../../templates/show_install_config.inc.php:49
+#: ../../templates/show_install.inc.php:53
+#: ../../templates/show_install_account.inc.php:49
+msgid "Step 1 - Creating and Inserting the Ampache Database"
+msgstr "Step 1 - Creating and Inserting the Ampache Database"
 
-#: ../../templates/sidebar_admin.inc.php:47
-#: ../../templates/show_export.inc.php:28
-msgid "Export Catalog"
-msgstr ""
+#: ../../templates/show_install_config.inc.php:50
+#: ../../templates/show_install.inc.php:57
+msgid "Step 2 - Creating the Ampache.cfg.php file"
+msgstr "Step 2 - Creating the Ampache.cfg.php file"
 
-#: ../../templates/sidebar_admin.inc.php:49
-msgid "Manage Shoutbox"
+#: ../../templates/show_install_config.inc.php:52
+msgid ""
+"This steps takes the basic config values and generates the config file. It "
+"will prompt you to download the config file. Please put the downloaded "
+"config file in /config"
 msgstr ""
 
-#: ../../templates/show_user.inc.php:30
-#: ../../templates/show_user_registration.inc.php:83
-#: ../../templates/show_edit_user.inc.php:37
-#: ../../templates/show_add_user.inc.php:37
-msgid "Full Name"
-msgstr "Full Name"
+#: ../../templates/show_install_config.inc.php:54
+#: ../../templates/show_install.inc.php:58
+#: ../../templates/show_install_account.inc.php:51
+msgid "Step 3 - Setup Initial Account"
+msgstr "Step 3 - Setup Initial Account"
 
-#: ../../templates/show_user.inc.php:31
-msgid "Create Date"
+#: ../../templates/show_install_config.inc.php:57
+msgid "Generate Config File"
 msgstr ""
 
-#: ../../templates/show_user.inc.php:32 ../../templates/show_users.inc.php:40
-#: ../../templates/show_users.inc.php:105
-msgid "Last Seen"
-msgstr "Last Seen"
+#: ../../templates/show_install_config.inc.php:65
+#: ../../templates/show_install.inc.php:66
+msgid "Desired Database Name"
+msgstr "Desired Database Name"
 
-#: ../../templates/show_user.inc.php:33 ../../templates/show_users.inc.php:42
-#: ../../templates/show_users.inc.php:107
-msgid "Activity"
+#: ../../templates/show_install_config.inc.php:69
+#: ../../templates/show_install.inc.php:70
+msgid "MySQL Hostname"
+msgstr "MySQL Hostname"
+
+#: ../../templates/show_install_config.inc.php:73
+msgid "MySQL Username"
+msgstr "MySQL Username"
+
+#: ../../templates/show_install_config.inc.php:77
+msgid "MySQL Password"
+msgstr "MySQL Password"
+
+#: ../../templates/show_install_config.inc.php:82
+msgid "Write Config"
+msgstr "Write Configuration"
+
+#: ../../templates/show_install_config.inc.php:127
+msgid "Check for Config"
+msgstr "Check for Configuration"
+
+#: ../../templates/show_install_config.inc.php:133
+msgid "Continue to Step 3"
+msgstr ""
+
+#: ../../templates/show_user.inc.php:31
+msgid "Create Date"
 msgstr ""
 
 #: ../../templates/show_user.inc.php:35
@@ -2039,304 +1514,138 @@ msgstr ""
 msgid "Recently Played"
 msgstr ""
 
-#: ../../templates/show_update_items.inc.php:22
-msgid "Starting Update from Tags"
-msgstr "Starting Update from Tags"
-
-#: ../../templates/show_update_items.inc.php:26
-#, fuzzy
-msgid "Update from Tags Complete"
-msgstr "Update From Tags Complete"
-
-#: ../../templates/show_update_items.inc.php:27
-#: ../../templates/show_confirmation.inc.php:27
-msgid "Continue"
-msgstr "Continue"
-
-#: ../../templates/show_artists.inc.php:39
-#: ../../templates/show_artists.inc.php:66
-#: ../../templates/show_songs.inc.php:45 ../../templates/show_songs.inc.php:74
-#: ../../templates/show_democratic_playlist.inc.php:54
-#: ../../templates/show_democratic_playlist.inc.php:89
-#: ../../templates/show_playlist_songs.inc.php:47
-#: ../../templates/show_playlist_songs.inc.php:68
-msgid "Time"
-msgstr "Time"
+#: ../../templates/show_add_access.inc.php:22
+msgid "Add Access for a Host"
+msgstr "Add Access for a Host"
 
-#: ../../templates/show_artists.inc.php:40
-#: ../../templates/show_artists.inc.php:67
-#: ../../templates/show_songs.inc.php:49 ../../templates/show_songs.inc.php:76
-#: ../../templates/show_now_playing_row.inc.php:36
-#: ../../templates/show_albums.inc.php:47
-#: ../../templates/show_albums.inc.php:77
-#: ../../templates/show_search.inc.php:91
-#, fuzzy
-msgid "Rating"
-msgstr "Editing"
+#: ../../templates/show_add_access.inc.php:74
+msgid "RPC Options"
+msgstr ""
 
-#: ../../templates/show_songs.inc.php:40 ../../templates/show_songs.inc.php:69
-#: ../../templates/sidebar_home.inc.php:32
-#: ../../templates/sidebar_home.inc.php:73
-#: ../../templates/show_playlist_songs.inc.php:42
-#: ../../templates/show_playlist_songs.inc.php:63
+#: ../../templates/show_add_access.inc.php:84
 #, fuzzy
-msgid "Song Title"
-msgstr "Song title"
-
-#: ../../templates/show_songs.inc.php:42 ../../templates/show_songs.inc.php:71
-#: ../../templates/show_edit_song.inc.php:37
-#: ../../templates/show_recently_played.inc.php:39
-#: ../../templates/show_recently_played.inc.php:102
-#: ../../templates/sidebar_home.inc.php:104
-#: ../../templates/show_now_playing_row.inc.php:52
-#: ../../templates/show_duplicates.inc.php:39
-#: ../../templates/show_duplicates.inc.php:77
-#: ../../templates/show_get_albumart.inc.php:36
-#: ../../templates/show_play_selected.inc.php:59
-#: ../../templates/show_albums.inc.php:43
-#: ../../templates/show_albums.inc.php:73
-#: ../../templates/show_search.inc.php:50
-#: ../../templates/show_playlist_songs.inc.php:44
-#: ../../templates/show_playlist_songs.inc.php:65
-#: ../../templates/show_disabled_songs.inc.php:35
-#: ../../templates/show_disabled_songs.inc.php:58
-msgid "Album"
-msgstr "Album"
-
-#: ../../templates/show_songs.inc.php:44 ../../templates/show_songs.inc.php:73
-#: ../../templates/show_localplay_playlist.inc.php:31
-#: ../../templates/show_localplay_playlist.inc.php:57
-#: ../../templates/show_edit_song.inc.php:61
-#: ../../templates/show_playlist_songs.inc.php:41
-#: ../../templates/show_playlist_songs.inc.php:46
-#: ../../templates/show_playlist_songs.inc.php:62
-#: ../../templates/show_playlist_songs.inc.php:67
-msgid "Track"
-msgstr "Track"
+msgid "Create ACL"
+msgstr "Create Account"
 
-#: ../../templates/show_localplay_playlist.inc.php:53
-#: ../../templates/show_flagged.inc.php:49
-#: ../../templates/show_plugins.inc.php:57
-#: ../../templates/show_localplay_controllers.inc.php:59
-#: ../../templates/show_disabled_songs.inc.php:52
-#: ../../templates/show_manage_shoutbox.inc.php:54
+#: ../../templates/sidebar_admin.inc.php:24
+#: ../../templates/show_admin_tools.inc.php:26
+#: ../../lib/class/browse.class.php:1021
 #, fuzzy
-msgid "No Records Found"
-msgstr "No Results Found"
-
-#: ../../templates/show_preference_box.inc.php:40
-#: ../../templates/show_preference_box.inc.php:70
-#: ../../templates/show_preference_admin.inc.php:30
-#: ../../templates/show_preference_admin.inc.php:49
-#: ../../templates/show_debug.inc.php:81
-#: ../../templates/show_user_preferences.inc.php:36
-msgid "Preference"
-msgstr "Preference"
+msgid "Catalogs"
+msgstr "Catalogue"
 
-#: ../../templates/show_preference_box.inc.php:41
-#: ../../templates/show_preference_box.inc.php:71
-#: ../../templates/show_debug.inc.php:37 ../../templates/show_debug.inc.php:82
-#: ../../templates/show_user_preferences.inc.php:37
-msgid "Value"
-msgstr "Value"
+#: ../../templates/sidebar_admin.inc.php:26
+#: ../../templates/show_admin_tools.inc.php:82
+#: ../../templates/show_add_catalog.inc.php:26
+msgid "Add a Catalog"
+msgstr "Add a Catalogue"
 
-#: ../../templates/show_preference_box.inc.php:43
-#: ../../templates/show_preference_box.inc.php:73
-msgid "Apply to All"
-msgstr "Apply to All"
+#: ../../templates/sidebar_admin.inc.php:27
+#: ../../templates/show_manage_catalogs.inc.php:22
+msgid "Show Catalogs"
+msgstr ""
 
-#: ../../templates/show_preference_box.inc.php:44
-#: ../../templates/show_preference_box.inc.php:74
-msgid "Access Level"
+#: ../../templates/sidebar_admin.inc.php:31
+msgid "User Tools"
 msgstr ""
 
-#: ../../templates/header.inc.php:36
-#, fuzzy
-msgid "Ampache Recently Played"
-msgstr "Ampache Installation"
+#: ../../templates/sidebar_admin.inc.php:33
+#: ../../templates/show_add_user.inc.php:85
+msgid "Add User"
+msgstr "Add User"
 
-#: ../../templates/header.inc.php:67
-msgid "Log out"
+#: ../../templates/sidebar_admin.inc.php:34
+msgid "Browse Users"
 msgstr ""
 
-#: ../../templates/header.inc.php:83
-msgid "Error Config File Out of Date"
+#: ../../templates/sidebar_admin.inc.php:37
+msgid "Access Control"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:29
-#: ../../templates/show_user_registration.inc.php:36
-#: ../../templates/show_user_activate.inc.php:29
-#: ../../templates/show_user_activate.inc.php:36
-#: ../../templates/show_registration_confirmation.inc.php:29
-msgid "Registration"
+#: ../../templates/sidebar_admin.inc.php:39
+msgid "Add ACL"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:54
-#, fuzzy
-msgid "User Agreement"
-msgstr "User Deleted"
-
-#: ../../templates/show_user_registration.inc.php:63
-#, fuzzy
-msgid "I Accept"
-msgstr "Accept"
-
-#: ../../templates/show_user_registration.inc.php:69
-msgid "User Information"
+#: ../../templates/sidebar_admin.inc.php:40
+msgid "Show ACL(s)"
 msgstr ""
 
-#: ../../templates/show_user_registration.inc.php:92
-#: ../../templates/show_edit_user.inc.php:44
-#: ../../templates/show_add_user.inc.php:44
-#: ../../templates/show_account.inc.php:33
-msgid "E-mail"
-msgstr "E-mail"
-
-#: ../../templates/show_user_registration.inc.php:131
-msgid "Register User"
-msgstr "Register User"
-
-#: ../../templates/show_edit_album.inc.php:23
-#, fuzzy
-msgid "Edit Album"
-msgstr "Album"
-
-#: ../../templates/show_edit_album.inc.php:33
-#: ../../templates/show_edit_song.inc.php:67
-#: ../../templates/show_play_selected.inc.php:61
-#: ../../templates/show_albums.inc.php:46
-#: ../../templates/show_albums.inc.php:76
-#: ../../templates/show_search.inc.php:60
-msgid "Year"
-msgstr "Year"
-
-#: ../../templates/show_edit_album.inc.php:41
-#: ../../templates/show_edit_song.inc.php:81
-#: ../../templates/show_edit_artist.inc.php:35
-msgid "Flag for Retagging"
+#: ../../templates/sidebar_admin.inc.php:43
+#: ../../templates/show_admin_tools.inc.php:88
+#: ../../templates/sidebar_modules.inc.php:31
+msgid "Other Tools"
 msgstr ""
 
-#: ../../templates/show_edit_album.inc.php:47
-#, fuzzy
-msgid "Update Album"
-msgstr "Gather Album Art"
+#: ../../templates/sidebar_admin.inc.php:46
+#: ../../templates/show_admin_tools.inc.php:91
+msgid "Clear Now Playing"
+msgstr "Clear Now Playing"
 
-#: ../../templates/show_install.inc.php:39
-#: ../../templates/show_install_lang.inc.php:39
-#: ../../templates/show_install_lang.inc.php:53
-msgid "Requirements"
+#: ../../templates/sidebar_admin.inc.php:47
+#: ../../templates/show_export.inc.php:28
+msgid "Export Catalog"
 msgstr ""
 
-#: ../../templates/show_install.inc.php:45
-#: ../../templates/show_install_lang.inc.php:45
-#: ../../templates/show_install_config.inc.php:43
-msgid ""
-"Your webserver has read access to the /sql/ampache.sql file and the /config/"
-"ampache.cfg.php.dist file"
+#: ../../templates/sidebar_admin.inc.php:49
+msgid "Manage Shoutbox"
 msgstr ""
-"Your webserver has read access to the /sql/ampache.sql file and the /config/"
-"ampache.cfg.php.dist file"
 
-#: ../../templates/show_install.inc.php:55
-msgid ""
-"This step creates and inserts the Ampache database, as such please provide a "
-"mysql account with database creation rights. This step may take a while "
-"depending upon the speed of your computer"
-msgstr ""
-"This step creates and inserts the Ampache database, as such please provide a "
-"mysql account with database creation rights. This step may take a while "
-"depending upon the speed of your computer"
+#: ../../templates/sidebar.inc.php:27 ../../lib/ui.lib.php:355
+msgid "Home"
+msgstr "Home"
 
-#: ../../templates/show_install.inc.php:57
-#: ../../templates/show_install_config.inc.php:50
-msgid "Step 2 - Creating the Ampache.cfg.php file"
-msgstr "Step 2 - Creating the Ampache.cfg.php file"
+#: ../../templates/sidebar.inc.php:30
+#: ../../templates/sidebar_modules.inc.php:25
+#, fuzzy
+msgid "Modules"
+msgstr "Mode"
 
-#: ../../templates/show_install.inc.php:62
-msgid "Insert Ampache Database"
-msgstr ""
+#: ../../templates/sidebar.inc.php:61
+msgid "Logout"
+msgstr "Logout"
 
-#: ../../templates/show_install.inc.php:66
-#: ../../templates/show_install_config.inc.php:65
-msgid "Desired Database Name"
-msgstr "Desired Database Name"
+#: ../../templates/show_local_catalog_info.inc.php:24
+#: ../../templates/show_mail_users.inc.php:42
+msgid "Catalog Statistics"
+msgstr "Catalogue Statistics"
 
-#: ../../templates/show_install.inc.php:70
-#: ../../templates/show_install_config.inc.php:69
-msgid "MySQL Hostname"
-msgstr "MySQL Hostname"
+#: ../../templates/show_local_catalog_info.inc.php:27
+msgid "Connected Users"
+msgstr "Connected Users"
 
-#: ../../templates/show_install.inc.php:74
-msgid "MySQL Administrative Username"
-msgstr "MySQL Administrative Username"
+#: ../../templates/show_local_catalog_info.inc.php:28
+msgid "Total Users"
+msgstr "Total Users"
 
-#: ../../templates/show_install.inc.php:78
-msgid "MySQL Administrative Password"
-msgstr "MySQL Administrative Password"
+#: ../../templates/show_local_catalog_info.inc.php:30
+#: ../../templates/show_genre.inc.php:35 ../../lib/ui.lib.php:412
+#: ../../lib/class/browse.class.php:994 ../../lib/class/album.class.php:256
+msgid "Artists"
+msgstr "Artists"
 
-#: ../../templates/show_install.inc.php:82
-msgid "Create Database User for New Database"
+#: ../../templates/show_local_catalog_info.inc.php:32
+msgid "Genres"
 msgstr ""
 
-#: ../../templates/show_install.inc.php:86
-#, fuzzy
-msgid "Ampache Database Username"
-msgstr "Desired Database Name"
+#: ../../templates/show_local_catalog_info.inc.php:33
+msgid "Catalog Size"
+msgstr "Catalogue Size"
 
-#: ../../templates/show_install.inc.php:90
-msgid "Ampache Database User Password"
-msgstr ""
+#: ../../templates/show_local_catalog_info.inc.php:34
+msgid "Catalog Time"
+msgstr "Catalogue Time"
 
-#: ../../templates/show_install.inc.php:94
-msgid "Overwrite Existing"
+#: ../../templates/show_install_lang.inc.php:39
+#: ../../templates/show_install_lang.inc.php:53
+#: ../../templates/show_install.inc.php:39
+msgid "Requirements"
 msgstr ""
 
-#: ../../templates/show_install.inc.php:98
-#, fuzzy
-msgid "Use Existing Database"
-msgstr "Insert Database"
-
-#: ../../templates/show_install.inc.php:103
-msgid "Insert Database"
-msgstr "Insert Database"
-
 #: ../../templates/show_install_lang.inc.php:52
 #, fuzzy
 msgid "System Checks"
 msgstr "Stream"
 
-#: ../../templates/show_install_lang.inc.php:54
-#: ../../templates/show_test.inc.php:45
-msgid "PHP Version"
-msgstr "PHP Version"
-
-#: ../../templates/show_install_lang.inc.php:64
-#: ../../templates/show_test.inc.php:64
-msgid "Mysql for PHP"
-msgstr "Mysql for PHP"
-
-#: ../../templates/show_install_lang.inc.php:78
-#: ../../templates/show_test.inc.php:83
-msgid "PHP Session Support"
-msgstr "PHP Session Support"
-
-#: ../../templates/show_install_lang.inc.php:88
-#: ../../templates/show_test.inc.php:102
-msgid "PHP ICONV Support"
-msgstr "PHP ICONV Support"
-
-#: ../../templates/show_install_lang.inc.php:98
-#: ../../templates/show_test.inc.php:120
-#, fuzzy
-msgid "PHP PCRE Support"
-msgstr "PHP ICONV Support"
-
-#: ../../templates/show_install_lang.inc.php:108
-#: ../../templates/show_test.inc.php:137
-#, fuzzy
-msgid "PHP PutENV Support"
-msgstr "PHP ICONV Support"
-
 #: ../../templates/show_install_lang.inc.php:119
 #, fuzzy
 msgid "Option"
@@ -2372,124 +1681,112 @@ msgstr ""
 msgid "Please contact your server administrator, and fix them."
 msgstr ""
 
-#: ../../templates/show_add_playlist.inc.php:24
-msgid "Create a new playlist"
-msgstr "Create a new playlist"
+#: ../../templates/rightbar.inc.php:28
+msgid "Add to Playlist"
+msgstr ""
 
-#: ../../templates/show_add_playlist.inc.php:42
-#: ../../templates/show_create_democratic.inc.php:53
-#: ../../templates/show_add_shout.inc.php:41
-#, fuzzy
-msgid "Create"
-msgstr "Bitrate"
+#: ../../templates/rightbar.inc.php:31
+msgid "Add to New Playlist"
+msgstr ""
 
-#: ../../templates/show_edit_song.inc.php:23
+#: ../../templates/rightbar.inc.php:54
+#: ../../templates/show_localplay_status.inc.php:39
 #, fuzzy
-msgid "Edit Song"
-msgstr "Editing"
-
-#: ../../templates/show_edit_song.inc.php:31
-#: ../../templates/show_duplicate.inc.php:33
-#: ../../templates/show_search.inc.php:40
-#: ../../templates/show_disabled_songs.inc.php:34
-#: ../../templates/show_disabled_songs.inc.php:57
-msgid "Title"
-msgstr "Title"
+msgid "Clear Playlist"
+msgstr "New Playlist"
 
-#: ../../templates/show_edit_song.inc.php:40
-#: ../../templates/show_edit_song.inc.php:48
-#: ../../templates/show_edit_song.inc.php:56
-#: ../../templates/show_rename_artist.inc.php:33
-#: ../../templates/show_search.inc.php:106
-msgid "OR"
+#: ../../templates/rightbar.inc.php:57
+msgid "Add Dynamic Items"
 msgstr ""
 
-#: ../../templates/show_edit_song.inc.php:88
-#, fuzzy
-msgid "Update Song"
-msgstr "Update Catalogues"
+#: ../../templates/rightbar.inc.php:60 ../../lib/class/random.class.php:432
+msgid "Pure Random"
+msgstr ""
 
-#: ../../templates/footer.inc.php:25
-msgid "Using Old Password Encryption, Please Reset your Password"
+#: ../../templates/rightbar.inc.php:63 ../../lib/class/random.class.php:429
+msgid "Related Artist"
 msgstr ""
 
-#: ../../templates/footer.inc.php:32
-msgid "Queries:"
+#: ../../templates/rightbar.inc.php:66 ../../lib/class/random.class.php:423
+msgid "Related Album"
 msgstr ""
 
-#: ../../templates/footer.inc.php:32
-msgid "Cache Hits:"
+#: ../../templates/rightbar.inc.php:69
+msgid "Related Tag"
 msgstr ""
 
-#: ../../templates/show_edit_catalog.inc.php:22
-#, fuzzy, php-format
-msgid "Settings for %s"
-msgstr "Settings for catalogue in"
+#: ../../templates/rightbar.inc.php:105
+msgid "More"
+msgstr ""
 
-#: ../../templates/show_edit_catalog.inc.php:51
-msgid "Filename pattern"
-msgstr "Filename pattern"
+#: ../../templates/header.inc.php:36
+#, fuzzy
+msgid "Ampache Recently Played"
+msgstr "Ampache Installation"
 
-#: ../../templates/show_edit_catalog.inc.php:68
-msgid "Save Catalog Settings"
-msgstr "Save Catalogue Settings"
+#: ../../templates/header.inc.php:67
+msgid "Log out"
+msgstr ""
 
-#: ../../templates/show_edit_access.inc.php:22
-msgid "Edit ACL"
+#: ../../templates/header.inc.php:83
+msgid "Error Config File Out of Date"
 msgstr ""
 
-#: ../../templates/show_edit_access.inc.php:30
-#: ../../templates/show_add_access.inc.php:63
+#: ../../templates/header.inc.php:84
+#: ../../templates/show_admin_tools.inc.php:92
 #, fuzzy
-msgid "ACL Type"
-msgstr "Type"
+msgid "Generate New Config"
+msgstr "Write Configuration"
 
-#: ../../templates/show_edit_access.inc.php:34
-#: ../../templates/show_add_access.inc.php:66
+#: ../../templates/show_edit_playlist_row.inc.php:32
+#: ../../templates/show_playlist_edit.inc.php:39
+msgid "Public"
+msgstr "Public"
+
+#: ../../templates/show_edit_playlist_row.inc.php:33
+#: ../../templates/show_playlist_edit.inc.php:40
+#: ../../lib/class/playlist.class.php:81
 #, fuzzy
-msgid "Stream Access"
-msgstr "Stream"
+msgid "Private"
+msgstr "Your Private"
 
-#: ../../templates/show_edit_access.inc.php:35
-#: ../../templates/show_add_access.inc.php:67
-msgid "Web Interface"
-msgstr ""
+#: ../../templates/show_add_user.inc.php:23
+msgid "Adding a New User"
+msgstr "Adding a New User"
 
-#: ../../templates/show_edit_access.inc.php:36
-#: ../../templates/show_add_access.inc.php:68
-msgid "Local Network Definition"
+#: ../../templates/show_genre.inc.php:29
+#, fuzzy, php-format
+msgid "Viewing %s Genre"
+msgstr "View"
+
+#: ../../templates/show_user_activate.inc.php:29
+#: ../../templates/show_user_activate.inc.php:36
+#: ../../templates/show_user_registration.inc.php:29
+#: ../../templates/show_user_registration.inc.php:36
+#: ../../templates/show_registration_confirmation.inc.php:29
+msgid "Registration"
 msgstr ""
 
-#: ../../templates/show_edit_access.inc.php:37
-#: ../../templates/show_add_access.inc.php:69
-msgid "RPC"
+#: ../../templates/show_user_activate.inc.php:48
+msgid "User Activated"
 msgstr ""
 
-#: ../../templates/show_edit_access.inc.php:43
-#: ../../templates/show_add_access.inc.php:32
-msgid "Start IP Address"
-msgstr "Start IP Address"
+#: ../../templates/show_user_activate.inc.php:51
+#, php-format
+msgid "This User ID is activated and can be used %sLogin%s"
+msgstr ""
 
-#: ../../templates/show_edit_access.inc.php:50
-#: ../../templates/show_add_access.inc.php:39
-msgid "End IP Address"
-msgstr "End IP Address"
+#: ../../templates/show_user_activate.inc.php:54
+msgid "Validation Failed"
+msgstr ""
 
-#: ../../templates/show_edit_access.inc.php:63
-#: ../../templates/show_add_access.inc.php:77
-#, fuzzy
-msgid "Remote Key"
-msgstr "Remote"
+#: ../../templates/show_user_activate.inc.php:55
+msgid "The validation key used isn't correct"
+msgstr ""
 
-#: ../../templates/show_edit_access.inc.php:69
-#: ../../templates/show_preference_admin.inc.php:31
-#: ../../templates/show_preference_admin.inc.php:50
-#: ../../templates/show_manage_democratic.inc.php:37
-#: ../../templates/show_access_list.inc.php:48
-#: ../../templates/show_add_access.inc.php:52
-#: ../../templates/show_create_democratic.inc.php:38
-msgid "Level"
-msgstr "Level"
+#: ../../templates/show_plugins.inc.php:46
+msgid "Deactivate"
+msgstr ""
 
 #: ../../templates/show_random_albums.inc.php:22
 msgid "Refresh"
@@ -2499,33 +1796,151 @@ msgstr ""
 msgid "Play Album"
 msgstr "Play Album"
 
+#: ../../templates/show_catalog_row.inc.php:29
+#: ../../templates/show_admin_tools.inc.php:47
+msgid "Verify"
+msgstr ""
+
+#: ../../templates/show_catalog_row.inc.php:30
+#: ../../templates/show_admin_tools.inc.php:49
+#, fuzzy
+msgid "Clean"
+msgstr "clear"
+
+#: ../../templates/show_catalog_row.inc.php:32
+#: ../../templates/show_admin_tools.inc.php:60
+msgid "Gather Art"
+msgstr ""
+
+#: ../../templates/show_create_democratic.inc.php:22
+msgid "Create Democratic Playlist"
+msgstr ""
+
+#: ../../templates/show_create_democratic.inc.php:34
+msgid "Cooldown Time"
+msgstr ""
+
+#: ../../templates/show_create_democratic.inc.php:35
+#: ../../lib/class/democratic.class.php:97
+msgid "minutes"
+msgstr ""
+
+#: ../../templates/show_create_democratic.inc.php:48
+msgid "Make Default"
+msgstr ""
+
+#: ../../templates/show_create_democratic.inc.php:53
+#: ../../templates/show_add_playlist.inc.php:42
+#: ../../templates/show_add_shout.inc.php:41
+#, fuzzy
+msgid "Create"
+msgstr "Bitrate"
+
+#: ../../templates/show_account.inc.php:39
+#, fuzzy
+msgid "New Password"
+msgstr "Password"
+
+#: ../../templates/show_account.inc.php:52
+#: ../../templates/show_manage_catalogs.inc.php:33
+msgid "Clear Stats"
+msgstr "Clear Stats"
+
+#: ../../templates/show_account.inc.php:62
+#, fuzzy
+msgid "Update Account"
+msgstr "Create Account"
+
+#: ../../templates/show_edit_song.inc.php:23
+#, fuzzy
+msgid "Edit Song"
+msgstr "Editing"
+
+#: ../../templates/show_edit_song.inc.php:40
+#: ../../templates/show_edit_song.inc.php:48
+#: ../../templates/show_edit_song.inc.php:56
+#: ../../templates/show_search.inc.php:106
+#: ../../templates/show_rename_artist.inc.php:33
+msgid "OR"
+msgstr ""
+
+#: ../../templates/show_edit_song.inc.php:53
+#: ../../templates/show_play_selected.inc.php:58
+#: ../../templates/show_genres.inc.php:37
+#: ../../templates/show_genres.inc.php:73
+#: ../../templates/show_playlist_songs.inc.php:45
+#: ../../templates/show_playlist_songs.inc.php:66 ../../lib/ui.lib.php:416
+msgid "Genre"
+msgstr "Genre"
+
+#: ../../templates/show_edit_song.inc.php:61
+#: ../../templates/show_localplay_playlist.inc.php:31
+#: ../../templates/show_localplay_playlist.inc.php:57
+#: ../../templates/show_songs.inc.php:44 ../../templates/show_songs.inc.php:73
+#: ../../templates/show_playlist_songs.inc.php:41
+#: ../../templates/show_playlist_songs.inc.php:46
+#: ../../templates/show_playlist_songs.inc.php:62
+#: ../../templates/show_playlist_songs.inc.php:67
+msgid "Track"
+msgstr "Track"
+
+#: ../../templates/show_edit_song.inc.php:88
+#, fuzzy
+msgid "Update Song"
+msgstr "Update Catalogues"
+
+#: ../../templates/show_democratic_playlist.inc.php:39
+#, fuzzy
+msgid "Playing from base Playlist"
+msgstr "Play Full Playlist"
+
+#: ../../templates/show_democratic_playlist.inc.php:52
+#: ../../templates/show_democratic_playlist.inc.php:87
+#, fuzzy
+msgid "Votes"
+msgstr "other"
+
+#: ../../templates/show_democratic_playlist.inc.php:53
+#: ../../templates/show_democratic_playlist.inc.php:88
 #: ../../templates/show_recently_played.inc.php:38
 #: ../../templates/show_recently_played.inc.php:101
-#: ../../templates/show_now_playing_row.inc.php:45
 #: ../../templates/show_duplicates.inc.php:37
 #: ../../templates/show_duplicates.inc.php:75
-#: ../../templates/show_democratic_playlist.inc.php:53
-#: ../../templates/show_democratic_playlist.inc.php:88
+#: ../../templates/show_now_playing_row.inc.php:45
 msgid "Song"
 msgstr "Song"
 
-#: ../../templates/show_recently_played.inc.php:42
-#: ../../templates/show_recently_played.inc.php:104
-msgid "Last Played"
+#: ../../templates/show_democratic_playlist.inc.php:68
+msgid "Remove Vote"
 msgstr ""
 
-#: ../../templates/show_user_recommendations.inc.php:29
-msgid "Recommended Artists"
+#: ../../templates/show_democratic_playlist.inc.php:70
+msgid "Add Vote"
 msgstr ""
 
-#: ../../templates/show_user_recommendations.inc.php:40
-msgid "Recommended Albums"
+#: ../../templates/show_localplay_edit_instance.inc.php:23
+msgid "Edit Localplay Instance"
 msgstr ""
 
-#: ../../templates/show_user_recommendations.inc.php:51
-msgid "Recommended Songs"
+#: ../../templates/show_localplay_edit_instance.inc.php:34
+msgid "Update Instance"
+msgstr ""
+
+#: ../../templates/show_search_bar.inc.php:29
+#: ../../templates/show_search.inc.php:131 ../../lib/ui.lib.php:370
+msgid "Search"
+msgstr "Search"
+
+#: ../../templates/show_search_bar.inc.php:30
+msgid "Advanced Search"
 msgstr ""
 
+#: ../../templates/show_stats.inc.php:22
+#: ../../templates/sidebar_modules.inc.php:41 ../../lib/ui.lib.php:420
+#, fuzzy
+msgid "Statistics"
+msgstr "Catalogue Statistics"
+
 #: ../../templates/show_ip_history.inc.php:23
 #, php-format
 msgid "%s IP History"
@@ -2552,604 +1967,583 @@ msgstr "Date"
 msgid "IP Address"
 msgstr "End IP Address"
 
-#: ../../templates/sidebar.inc.php:30
-#: ../../templates/sidebar_modules.inc.php:25
-#, fuzzy
-msgid "Modules"
-msgstr "Mode"
-
-#: ../../templates/sidebar.inc.php:61
-msgid "Logout"
-msgstr "Logout"
+#: ../../templates/show_embed_xspf.inc.php:54
+msgid "XSPF Player"
+msgstr ""
 
-#: ../../templates/show_import_playlist.inc.php:23
-msgid "Importing a Playlist from a File"
-msgstr "Importing a Playlist from a File"
+#: ../../templates/show_play_selected.inc.php:28
+msgid "Play Selected"
+msgstr "Play Selected"
 
-#: ../../templates/show_import_playlist.inc.php:28
-#: ../../templates/show_duplicates.inc.php:43
-#: ../../templates/show_duplicates.inc.php:81
-#: ../../templates/show_search.inc.php:66
-#: ../../templates/show_disabled_songs.inc.php:37
-#: ../../templates/show_disabled_songs.inc.php:60
-msgid "Filename"
-msgstr "Filename"
+#: ../../templates/show_play_selected.inc.php:31
+#, fuzzy
+msgid "Download Selected"
+msgstr "Play Selected"
 
-#: ../../templates/show_import_playlist.inc.php:35
-msgid "Playlist Type"
-msgstr "Playlist Type"
+#: ../../templates/show_play_selected.inc.php:40
+msgid "Set Track Numbers"
+msgstr "Set Track Numbers"
 
-#: ../../templates/show_import_playlist.inc.php:47
-msgid "Import Playlist"
-msgstr "Import Playlist"
+#: ../../templates/show_play_selected.inc.php:41
+msgid "Remove Selected Tracks"
+msgstr "Remove Selected Tracks"
 
-#: ../../templates/show_genre.inc.php:29
-#, fuzzy, php-format
-msgid "Viewing %s Genre"
-msgstr "View"
+#: ../../templates/show_play_selected.inc.php:47
+msgid "Add to"
+msgstr "Add to"
 
-#: ../../templates/show_mail_users.inc.php:23
+#: ../../templates/show_flagged.inc.php:34
+#: ../../templates/show_flagged.inc.php:53
+#: ../../templates/show_manage_shoutbox.inc.php:34
+#: ../../templates/show_manage_shoutbox.inc.php:58
 #, fuzzy
-msgid "Send E-mail to Users"
-msgstr "Mail Users"
-
-#: ../../templates/show_mail_users.inc.php:27
-msgid "Mail to"
-msgstr "Mail to"
-
-#: ../../templates/show_mail_users.inc.php:33
-msgid "Inactive Users"
-msgstr ""
+msgid "Object"
+msgstr "Subject"
 
-#: ../../templates/show_mail_users.inc.php:42
-#: ../../templates/show_local_catalog_info.inc.php:24
-msgid "Catalog Statistics"
-msgstr "Catalogue Statistics"
+#: ../../templates/show_flagged.inc.php:38
+#: ../../templates/show_flagged.inc.php:57
+#, fuzzy
+msgid "Status"
+msgstr "Stats"
 
+#: ../../templates/show_stats_popular.inc.php:25
 #: ../../templates/show_mail_users.inc.php:46
 #: ../../templates/show_all_popular.inc.php:29
-#: ../../templates/show_stats_popular.inc.php:25
 msgid "Most Popular Albums"
 msgstr "Most Popular Albums"
 
-#: ../../templates/show_mail_users.inc.php:53
-#, fuzzy
-msgid "Latest Artist Additions"
-msgstr "Newest Artist Additions"
-
+#: ../../templates/show_stats_popular.inc.php:31
 #: ../../templates/show_mail_users.inc.php:57
 #: ../../templates/show_all_popular.inc.php:26
-#: ../../templates/show_stats_popular.inc.php:31
 msgid "Most Popular Artists"
 msgstr "Most Popular Artists"
 
-#: ../../templates/show_mail_users.inc.php:64
-#, fuzzy
-msgid "Latest Album Additions"
-msgstr "Newest Album Additions"
-
-#: ../../templates/show_mail_users.inc.php:68
-#: ../../templates/show_all_popular.inc.php:38
-msgid "Most Popular Songs"
-msgstr "Most Popular Songs"
-
-#: ../../templates/show_mail_users.inc.php:74
-msgid "Flagged Songs"
-msgstr ""
-
-#: ../../templates/show_mail_users.inc.php:78
-#: ../../templates/show_admin_info.inc.php:34
-#, fuzzy
-msgid "Disabled Songs"
-msgstr "Show Disabled Songs"
-
-#: ../../templates/show_mail_users.inc.php:86
-#, fuzzy
-msgid "Most Popular Threshold in days"
-msgstr "Most Popular Songs"
-
-#: ../../templates/show_mail_users.inc.php:97
-msgid "Subject"
-msgstr "Subject"
-
-#: ../../templates/show_mail_users.inc.php:104
-msgid "Message"
-msgstr "Message"
-
-#: ../../templates/show_mail_users.inc.php:112
-msgid "Send Mail"
-msgstr "Send Mail"
-
-#: ../../templates/sidebar_home.inc.php:24
-msgid "Browse"
-msgstr "Browse"
-
-#: ../../templates/sidebar_home.inc.php:41
-msgid "Filters"
-msgstr ""
-
-#: ../../templates/sidebar_home.inc.php:45
-msgid "Starts With"
-msgstr ""
-
-#: ../../templates/sidebar_home.inc.php:51
-msgid "Minimum Count"
-msgstr ""
-
-#: ../../templates/sidebar_home.inc.php:55
-msgid "Rated"
+#: ../../templates/show_user_recommendations.inc.php:29
+msgid "Recommended Artists"
 msgstr ""
 
-#: ../../templates/sidebar_home.inc.php:59
-msgid "Unplayed"
+#: ../../templates/show_user_recommendations.inc.php:40
+msgid "Recommended Albums"
 msgstr ""
 
-#: ../../templates/sidebar_home.inc.php:63
-#: ../../templates/show_artist.inc.php:55
-msgid "Show Art"
+#: ../../templates/show_user_recommendations.inc.php:51
+msgid "Recommended Songs"
 msgstr ""
 
-#: ../../templates/sidebar_home.inc.php:68
-msgid "All Playlists"
+#: ../../templates/show_edit_shout.inc.php:23
+msgid "Edit existing Shoutbox Post"
 msgstr ""
 
-#: ../../templates/sidebar_home.inc.php:87
-msgid "Currently Playing"
+#: ../../templates/show_edit_shout.inc.php:28
+#, php-format
+msgid "Created by: %s for %s"
 msgstr ""
 
-#: ../../templates/sidebar_home.inc.php:107
-msgid "Advanced"
-msgstr ""
+#: ../../templates/show_edit_shout.inc.php:31
+#: ../../templates/show_add_shout.inc.php:27
+#, fuzzy
+msgid "Comment:"
+msgstr "Comment"
 
-#: ../../templates/show_admin_info.inc.php:30
-msgid "Last Ten Flagged Records"
+#: ../../templates/show_edit_shout.inc.php:37
+#: ../../templates/show_add_shout.inc.php:34
+msgid "Make Sticky"
 msgstr ""
 
-#: ../../templates/show_object_rating.inc.php:34
 #: ../../templates/show_object_rating_static.inc.php:34
+#: ../../templates/show_object_rating.inc.php:34
 #, fuzzy
 msgid "Current rating: "
 msgstr "New Playlist"
 
-#: ../../templates/show_object_rating.inc.php:36
 #: ../../templates/show_object_rating_static.inc.php:36
+#: ../../templates/show_object_rating.inc.php:36
 msgid "not rated yet"
 msgstr ""
 
-#: ../../templates/show_object_rating.inc.php:38
 #: ../../templates/show_object_rating_static.inc.php:38
+#: ../../templates/show_object_rating.inc.php:38
 #, php-format
 msgid "%s of 5"
 msgstr ""
 
-#: ../../templates/show_democratic.inc.php:22
-#, fuzzy, php-format
-msgid "%s Playlist"
-msgstr "New Playlist"
-
-#: ../../templates/show_preference_admin.inc.php:22
-#, fuzzy
-msgid "Preference Administration"
-msgstr "Preferences"
+#: ../../templates/show_object_rating_static.inc.php:44
+msgid "out of"
+msgstr ""
 
-#: ../../templates/show_edit_user.inc.php:23
-msgid "Editing existing User"
-msgstr "Editing existing User"
+#: ../../templates/show_export.inc.php:51
+msgid "Format"
+msgstr ""
 
-#: ../../templates/show_edit_user.inc.php:69
-#: ../../templates/show_add_user.inc.php:69
-msgid "User Access Level"
-msgstr "User Access Level"
+#: ../../templates/show_export.inc.php:61
+msgid "Export"
+msgstr ""
 
-#: ../../templates/show_edit_user.inc.php:85
-msgid "Update User"
-msgstr "Update User"
+#: ../../templates/show_edit_album.inc.php:23
+#, fuzzy
+msgid "Edit Album"
+msgstr "Album"
 
-#: ../../templates/show_local_catalog_info.inc.php:27
-msgid "Connected Users"
-msgstr "Connected Users"
+#: ../../templates/show_edit_album.inc.php:47
+#, fuzzy
+msgid "Update Album"
+msgstr "Gather Album Art"
 
-#: ../../templates/show_local_catalog_info.inc.php:28
-msgid "Total Users"
-msgstr "Total Users"
+#: ../../templates/show_album_art.inc.php:47
+#: ../../templates/show_disabled_songs.inc.php:33
+#: ../../templates/show_disabled_songs.inc.php:56
+msgid "Select"
+msgstr "Select"
 
-#: ../../templates/show_local_catalog_info.inc.php:32
-msgid "Genres"
+#: ../../templates/show_localplay_status.inc.php:25
+msgid "Localplay Control"
 msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:33
-msgid "Catalog Size"
-msgstr "Catalogue Size"
-
-#: ../../templates/show_local_catalog_info.inc.php:34
-msgid "Catalog Time"
-msgstr "Catalogue Time"
+#: ../../templates/show_localplay_status.inc.php:28
+msgid "Mute"
+msgstr ""
 
-#: ../../templates/show_duplicates.inc.php:22
-#, fuzzy
-msgid "Duplicate Songs"
-msgstr "Show Duplicate Songs"
+#: ../../templates/show_localplay_status.inc.php:29
+msgid "Decrease Volume"
+msgstr "Decrease Volume"
 
-#: ../../templates/show_duplicates.inc.php:41
-#: ../../templates/show_duplicates.inc.php:79
-msgid "Bitrate"
-msgstr "Bitrate"
+#: ../../templates/show_localplay_status.inc.php:30
+msgid "Increase Volume"
+msgstr "Increase Volume"
 
-#: ../../templates/show_duplicates.inc.php:42
-#: ../../templates/show_duplicates.inc.php:80
-msgid "Size"
-msgstr "Size"
+#: ../../templates/show_localplay_status.inc.php:31
+msgid "Volume"
+msgstr "Volume"
 
-#: ../../templates/show_flagged.inc.php:34
-#: ../../templates/show_flagged.inc.php:53
-#: ../../templates/show_manage_shoutbox.inc.php:34
-#: ../../templates/show_manage_shoutbox.inc.php:58
+#: ../../templates/show_localplay_status.inc.php:33
 #, fuzzy
-msgid "Object"
-msgstr "Subject"
+msgid "Repeat"
+msgstr "Reject"
 
-#: ../../templates/show_flagged.inc.php:38
-#: ../../templates/show_flagged.inc.php:57
+#: ../../templates/show_admin_info.inc.php:30
+msgid "Last Ten Flagged Records"
+msgstr ""
+
+#: ../../templates/show_admin_info.inc.php:34
+#: ../../templates/show_mail_users.inc.php:78
 #, fuzzy
-msgid "Status"
-msgstr "Stats"
+msgid "Disabled Songs"
+msgstr "Show Disabled Songs"
 
-#: ../../templates/show_song.inc.php:24
-msgid "Details"
+#: ../../templates/show_localplay_instances.inc.php:23
+msgid "Show Localplay Instances"
 msgstr ""
 
-#: ../../templates/show_rename_artist.inc.php:29
-#, fuzzy, php-format
-msgid "Rename %s"
-msgstr "Username"
-
-#: ../../templates/show_rename_artist.inc.php:35
-msgid "Insert current"
+#: ../../templates/show_localplay_instances.inc.php:39
+msgid "Edit Instance"
 msgstr ""
 
-#: ../../templates/show_rename_artist.inc.php:37
+#: ../../templates/show_update_items.inc.php:22
+msgid "Starting Update from Tags"
+msgstr "Starting Update from Tags"
+
+#: ../../templates/show_update_items.inc.php:26
 #, fuzzy
-msgid "Update id3 tags"
-msgstr "Update from tags"
+msgid "Update from Tags Complete"
+msgstr "Update From Tags Complete"
 
-#: ../../templates/show_rename_artist.inc.php:38
+#: ../../templates/show_user_stats.inc.php:30
 #, fuzzy
-msgid "Rename"
-msgstr "Username"
+msgid "Favorite Artists"
+msgstr "Artists"
 
-#: ../../templates/show_duplicate.inc.php:23
-#: ../../templates/show_duplicate.inc.php:42
-#: ../../templates/sidebar_modules.inc.php:33
-msgid "Find Duplicates"
-msgstr "Find Duplicates"
+#: ../../templates/show_user_stats.inc.php:43
+#, fuzzy
+msgid "Favorite Albums"
+msgstr "Full Albums"
 
-#: ../../templates/show_duplicate.inc.php:27
-msgid "Search Type"
-msgstr "Search Type"
+#: ../../templates/show_user_stats.inc.php:56
+#, fuzzy
+msgid "Favorite Songs"
+msgstr "Total Songs"
 
-#: ../../templates/show_duplicate.inc.php:34
-msgid "Artist and Title"
-msgstr "Artist and Title"
+#: ../../templates/show_shoutbox.inc.php:22
+msgid "Shoutbox"
+msgstr ""
 
-#: ../../templates/show_duplicate.inc.php:35
-msgid "Artist, Album and Title"
-msgstr "Artist, Album and Title"
+#: ../../templates/show_search.inc.php:26
+msgid "Search Ampache"
+msgstr "Search Ampache"
 
-#: ../../templates/show_duplicate.inc.php:37
-msgid "Search Disabled Songs"
+#: ../../templates/show_search.inc.php:30
+msgid "Keywords"
 msgstr ""
 
-#: ../../templates/show_playlist.inc.php:26
-#, fuzzy, php-format
-msgid "%s %s Playlist"
-msgstr "New Playlist"
+#: ../../templates/show_search.inc.php:72
+#, fuzzy
+msgid "Played"
+msgstr "Play"
 
-#: ../../templates/show_playlist.inc.php:31
+#: ../../templates/show_search.inc.php:76
+msgid "Yes"
+msgstr "Yes"
+
+#: ../../templates/show_search.inc.php:77
+msgid "No"
+msgstr "No"
+
+#: ../../templates/show_search.inc.php:80
 #, fuzzy
-msgid "Normalize Tracks"
-msgstr "Total Tracks"
+msgid "Min Bitrate"
+msgstr "Bitrate"
 
-#: ../../templates/show_playlist.inc.php:40
-#: ../../templates/show_playlist.inc.php:41
-msgid "Add All"
+#: ../../templates/show_search.inc.php:95
+msgid "One Star"
 msgstr ""
 
-#: ../../templates/show_playlist.inc.php:44
-#: ../../templates/show_playlist.inc.php:45
-msgid "Add Random"
-msgstr ""
+#: ../../templates/show_search.inc.php:96
+#, fuzzy
+msgid "Two Stars"
+msgstr "Total Users"
 
-#: ../../templates/show_debug.inc.php:23
-msgid "Debug Tools"
+#: ../../templates/show_search.inc.php:97
+msgid "Three Stars"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:25
-msgid "Generate Configuration"
+#: ../../templates/show_search.inc.php:98
+msgid "Four Stars"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:26
-msgid "Set Database Charset"
+#: ../../templates/show_search.inc.php:99
+msgid "Five Stars"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:29
-msgid "PHP Settings"
+#: ../../templates/show_search.inc.php:102
+msgid "Operator"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:36
-msgid "Setting"
+#: ../../templates/show_search.inc.php:105
+msgid "AND"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:40
-msgid "Memory Limit"
-msgstr ""
+#: ../../templates/show_search.inc.php:111
+#, fuzzy
+msgid "Method"
+msgstr "Mode"
 
-#: ../../templates/show_debug.inc.php:44
-msgid "Maximum Execution Time"
+#: ../../templates/show_search.inc.php:114
+msgid "Fuzzy"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:48
-msgid "Safe Mode"
+#: ../../templates/show_search.inc.php:115
+msgid "Exact"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:56
-msgid "Zlib Support"
+#: ../../templates/show_search.inc.php:118
+msgid "Maximum Results"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:60
-msgid "GD Support"
+#: ../../templates/show_search.inc.php:121
+#: ../../templates/show_random.inc.php:49
+#: ../../templates/show_random.inc.php:84
+msgid "Unlimited"
 msgstr ""
 
-#: ../../templates/show_debug.inc.php:64
-msgid "Iconv Support"
-msgstr ""
+#: ../../templates/show_add_playlist.inc.php:24
+msgid "Create a new playlist"
+msgstr "Create a new playlist"
 
-#: ../../templates/show_debug.inc.php:74
-msgid "Current Configuration"
-msgstr ""
+#: ../../templates/show_add_playlist.inc.php:32
+#: ../../templates/show_random.inc.php:61
+#: ../../templates/show_access_list.inc.php:51
+#: ../../templates/show_playlist_edit.inc.php:36
+msgid "Type"
+msgstr "Type"
 
-#: ../../templates/show_localplay_control.inc.php:25
-msgid "Previous"
-msgstr ""
+#: ../../templates/show_run_add_catalog.inc.php:24
+#: ../../templates/show_adds_catalog.inc.php:25
+msgid "Found"
+msgstr "Found"
 
-#: ../../templates/show_localplay_control.inc.php:26
-msgid "Stop"
+#: ../../templates/show_install.inc.php:55
+msgid ""
+"This step creates and inserts the Ampache database, as such please provide a "
+"mysql account with database creation rights. This step may take a while "
+"depending upon the speed of your computer"
 msgstr ""
+"This step creates and inserts the Ampache database, as such please provide a "
+"mysql account with database creation rights. This step may take a while "
+"depending upon the speed of your computer"
 
-#: ../../templates/show_localplay_control.inc.php:27
-msgid "Pause"
+#: ../../templates/show_install.inc.php:62
+msgid "Insert Ampache Database"
 msgstr ""
 
-#: ../../templates/show_localplay_control.inc.php:29
-#: ../../templates/list_header.inc.php:101
-msgid "Next"
-msgstr "Next"
+#: ../../templates/show_install.inc.php:74
+msgid "MySQL Administrative Username"
+msgstr "MySQL Administrative Username"
 
-#: ../../templates/show_manage_democratic.inc.php:22
-msgid "Manage Democratic Playlists"
+#: ../../templates/show_install.inc.php:78
+msgid "MySQL Administrative Password"
+msgstr "MySQL Administrative Password"
+
+#: ../../templates/show_install.inc.php:82
+msgid "Create Database User for New Database"
 msgstr ""
 
-#: ../../templates/show_manage_democratic.inc.php:35
-#: ../../templates/show_create_democratic.inc.php:30
+#: ../../templates/show_install.inc.php:86
 #, fuzzy
-msgid "Base Playlist"
-msgstr "New Playlist"
+msgid "Ampache Database Username"
+msgstr "Desired Database Name"
 
-#: ../../templates/show_manage_democratic.inc.php:36
-msgid "Cooldown"
+#: ../../templates/show_install.inc.php:90
+msgid "Ampache Database User Password"
 msgstr ""
 
-#: ../../templates/show_manage_democratic.inc.php:69
+#: ../../templates/show_install.inc.php:94
+msgid "Overwrite Existing"
+msgstr ""
+
+#: ../../templates/show_install.inc.php:98
 #, fuzzy
-msgid "Create New Playlist"
-msgstr "Create a new playlist"
+msgid "Use Existing Database"
+msgstr "Insert Database"
 
-#: ../../templates/show_get_albumart.inc.php:23
-msgid "Customize Search"
+#: ../../templates/show_install.inc.php:103
+msgid "Insert Database"
+msgstr "Insert Database"
+
+#: ../../templates/show_install_account.inc.php:44
+msgid ""
+"Your webserver has read access to the /sql/ampache.sql file and the /config/"
+"ampache.cfg.dist.php file"
 msgstr ""
+"Your webserver has read access to the /sql/ampache.sql file and the /config/"
+"ampache.cfg.dist.php file"
 
-#: ../../templates/show_get_albumart.inc.php:44
-msgid "Direct URL to Image"
+#: ../../templates/show_install_account.inc.php:50
+msgid "Step 2 - Creating the ampache.cfg.php file"
+msgstr "Step 2 - Creating the ampache.cfg.php file"
+
+#: ../../templates/show_install_account.inc.php:53
+msgid ""
+"This step creates your initial Ampache admin account. Once your admin "
+"account has been created you will be directed to the login page"
 msgstr ""
+"This step creates your initial Ampache admin account. Once your admin "
+"account has been created you will be directed to the login page"
 
-#: ../../templates/show_get_albumart.inc.php:52
+#: ../../templates/show_install_account.inc.php:57
 #, fuzzy
-msgid "Local Image"
-msgstr "Local Play"
+msgid "Create Admin Account"
+msgstr "Create Account"
 
-#: ../../templates/show_get_albumart.inc.php:63
-msgid "Get Art"
-msgstr "Get Art"
+#: ../../templates/show_install_account.inc.php:74
+msgid "Create Account"
+msgstr "Create Account"
 
-#: ../../templates/show_plugins.inc.php:33
-#: ../../templates/show_plugins.inc.php:62
-#: ../../templates/show_localplay_controllers.inc.php:33
-#: ../../templates/show_localplay_controllers.inc.php:64
-msgid "Description"
-msgstr ""
+#: ../../templates/show_gather_art.inc.php:23
+msgid "Starting Album Art Search"
+msgstr "Starting Album Art Search"
 
-#: ../../templates/show_plugins.inc.php:34
-#: ../../templates/show_plugins.inc.php:63
-#: ../../templates/show_localplay_controllers.inc.php:34
-#: ../../templates/show_localplay_controllers.inc.php:65
-#, fuzzy
-msgid "Version"
-msgstr "PHP Version"
+#: ../../templates/show_gather_art.inc.php:24
+msgid "Searched"
+msgstr "Searched"
 
-#: ../../templates/show_plugins.inc.php:42
-#: ../../templates/show_localplay_controllers.inc.php:48
-msgid "Activate"
+#: ../../templates/show_add_shout.inc.php:23
+msgid "Post to Shoutbox"
 msgstr ""
 
-#: ../../templates/show_plugins.inc.php:46
-msgid "Deactivate"
+#: ../../templates/show_stats_newest.inc.php:22
+msgid "Newest Albums"
 msgstr ""
 
-#: ../../templates/show_democratic_playlist.inc.php:39
+#: ../../templates/show_stats_newest.inc.php:26
+msgid "Newest Artists"
+msgstr ""
+
+#: ../../templates/show_songs.inc.php:43 ../../templates/show_songs.inc.php:72
+#: ../../templates/show_random.inc.php:41
 #, fuzzy
-msgid "Playing from base Playlist"
-msgstr "Play Full Playlist"
+msgid "Tags"
+msgstr "Track"
 
-#: ../../templates/show_democratic_playlist.inc.php:52
-#: ../../templates/show_democratic_playlist.inc.php:87
+#: ../../templates/show_mail_users.inc.php:23
 #, fuzzy
-msgid "Votes"
-msgstr "other"
+msgid "Send E-mail to Users"
+msgstr "Mail Users"
 
-#: ../../templates/show_democratic_playlist.inc.php:68
-msgid "Remove Vote"
-msgstr ""
+#: ../../templates/show_mail_users.inc.php:27
+msgid "Mail to"
+msgstr "Mail to"
 
-#: ../../templates/show_democratic_playlist.inc.php:70
-msgid "Add Vote"
+#: ../../templates/show_mail_users.inc.php:33
+msgid "Inactive Users"
 msgstr ""
 
-#: ../../templates/show_all_popular.inc.php:32
+#: ../../templates/show_mail_users.inc.php:53
 #, fuzzy
-msgid "Most Popular Genres"
-msgstr "Most Popular Songs"
+msgid "Latest Artist Additions"
+msgstr "Newest Artist Additions"
 
-#: ../../templates/show_all_popular.inc.php:41
-msgid "Most Popular Live Streams"
-msgstr ""
+#: ../../templates/show_mail_users.inc.php:64
+#, fuzzy
+msgid "Latest Album Additions"
+msgstr "Newest Album Additions"
 
-#: ../../templates/show_all_popular.inc.php:44
-msgid "Most Popular Tags"
+#: ../../templates/show_mail_users.inc.php:68
+#: ../../templates/show_all_popular.inc.php:38
+msgid "Most Popular Songs"
+msgstr "Most Popular Songs"
+
+#: ../../templates/show_mail_users.inc.php:74
+msgid "Flagged Songs"
 msgstr ""
 
-#: ../../templates/show_edit_artist.inc.php:23
+#: ../../templates/show_mail_users.inc.php:86
 #, fuzzy
-msgid "Edit Artist"
-msgstr "Artist"
+msgid "Most Popular Threshold in days"
+msgstr "Most Popular Songs"
 
-#: ../../templates/show_edit_artist.inc.php:41
-msgid "Update Artist"
-msgstr ""
+#: ../../templates/show_mail_users.inc.php:97
+msgid "Subject"
+msgstr "Subject"
 
-#: ../../templates/show_play_selected.inc.php:28
-msgid "Play Selected"
-msgstr "Play Selected"
+#: ../../templates/show_mail_users.inc.php:104
+msgid "Message"
+msgstr "Message"
 
-#: ../../templates/show_play_selected.inc.php:31
-#, fuzzy
-msgid "Download Selected"
-msgstr "Play Selected"
+#: ../../templates/show_mail_users.inc.php:112
+msgid "Send Mail"
+msgstr "Send Mail"
 
-#: ../../templates/show_play_selected.inc.php:40
-msgid "Set Track Numbers"
-msgstr "Set Track Numbers"
+#: ../../templates/show_random.inc.php:22
+msgid "Play Random Selection"
+msgstr "Play Random Selection"
 
-#: ../../templates/show_play_selected.inc.php:41
-msgid "Remove Selected Tracks"
-msgstr "Remove Selected Tracks"
+#: ../../templates/show_random.inc.php:26
+msgid "Item count"
+msgstr "Item count"
 
-#: ../../templates/show_play_selected.inc.php:47
-msgid "Add to"
-msgstr "Add to"
+#: ../../templates/show_random.inc.php:46
+#: ../../templates/show_duplicates.inc.php:40
+#: ../../templates/show_duplicates.inc.php:78
+msgid "Length"
+msgstr ""
 
-#: ../../templates/show_add_user.inc.php:23
-msgid "Adding a New User"
-msgstr "Adding a New User"
+#: ../../templates/show_random.inc.php:50
+#: ../../templates/show_random.inc.php:51
+#, php-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../templates/show_export.inc.php:32
-#: ../../templates/show_add_live_stream.inc.php:61
-msgid "Catalog"
-msgstr "Catalogue"
+#: ../../templates/show_random.inc.php:52
+#: ../../templates/show_random.inc.php:53
+#: ../../templates/show_random.inc.php:54
+#: ../../templates/show_random.inc.php:55
+#: ../../templates/show_random.inc.php:56
+#, fuzzy, php-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "hour"
+msgstr[1] "hour"
 
-#: ../../templates/show_export.inc.php:51
-msgid "Format"
+#: ../../templates/show_random.inc.php:64
+msgid "Standard"
 msgstr ""
 
-#: ../../templates/show_export.inc.php:61
-msgid "Export"
+#: ../../templates/show_random.inc.php:65
+msgid "Less Played"
 msgstr ""
 
-#: ../../templates/show_embed_xspf.inc.php:54
-msgid "XSPF Player"
-msgstr ""
+#: ../../templates/show_random.inc.php:66
+msgid "Full Albums"
+msgstr "Full Albums"
 
-#: ../../templates/show_albums.inc.php:41
-#: ../../templates/show_albums.inc.php:71
-msgid "Cover"
-msgstr "Cover"
+#: ../../templates/show_random.inc.php:67
+msgid "Full Artist"
+msgstr "Full Artist"
 
-#: ../../templates/show_album.inc.php:52
-msgid "Add Album"
+#: ../../templates/show_random.inc.php:69
+msgid "Highest Rated"
 msgstr ""
 
-#: ../../templates/show_album.inc.php:56
-msgid "Add Random from Album"
-msgstr ""
+#: ../../templates/show_random.inc.php:75
+#, fuzzy
+msgid "From catalog"
+msgstr "from catalogue"
 
-#: ../../templates/show_album.inc.php:61
-msgid "Reset Album Art"
-msgstr "Reset Album Art"
+#: ../../templates/show_random.inc.php:81
+#, fuzzy
+msgid "Size Limit"
+msgstr "View Limit"
 
-#: ../../templates/show_album.inc.php:66
-msgid "Find Album Art"
-msgstr "Find Album Art"
+#: ../../templates/show_random.inc.php:95
+msgid "Enqueue"
+msgstr ""
 
-#: ../../templates/show_album.inc.php:71
-#: ../../templates/show_artist.inc.php:45
-msgid "Update from tags"
-msgstr "Update from tags"
+#: ../../templates/show_search_options.inc.php:23
+#, fuzzy
+msgid "Options"
+msgstr "Action"
 
-#: ../../templates/show_album.inc.php:77
-#: ../../templates/show_song_row.inc.php:45
-#: ../../templates/show_artist.inc.php:51
-#: ../../templates/show_playlist_song_row.inc.php:33
-msgid "Download"
-msgstr "Download"
+#: ../../templates/show_search_options.inc.php:26
+msgid "Add Search Results"
+msgstr ""
 
-#: ../../templates/show_users.inc.php:39
-#: ../../templates/show_users.inc.php:104
-msgid "Fullname"
-msgstr "Fullname"
+#: ../../templates/show_get_albumart.inc.php:23
+msgid "Customize Search"
+msgstr ""
 
-#: ../../templates/show_users.inc.php:41
-#: ../../templates/show_users.inc.php:106
-#, fuzzy
-msgid "Registration Date"
-msgstr "Register User"
+#: ../../templates/show_get_albumart.inc.php:44
+msgid "Direct URL to Image"
+msgstr ""
 
-#: ../../templates/show_users.inc.php:44
-#: ../../templates/show_users.inc.php:109
+#: ../../templates/show_get_albumart.inc.php:52
 #, fuzzy
-msgid "Last Ip"
-msgstr "Last Seen"
+msgid "Local Image"
+msgstr "Local Play"
 
-#: ../../templates/show_users.inc.php:47
-#: ../../templates/show_users.inc.php:112
-msgid "On-line"
-msgstr "On-line"
+#: ../../templates/show_get_albumart.inc.php:63
+msgid "Get Art"
+msgstr "Get Art"
 
-#: ../../templates/show_object_rating_static.inc.php:44
-msgid "out of"
+#: ../../templates/show_adds_catalog.inc.php:23
+#, fuzzy, php-format
+msgid "Starting New Song Search on %s catalog"
+msgstr "Starting New Song Search on"
+
+#: ../../templates/show_recently_played.inc.php:23 ../../lib/rss.php:180
+msgid "seconds ago"
 msgstr ""
 
-#: ../../templates/show_verify_catalog.inc.php:23
-#, fuzzy, php-format
-msgid "Updating the %s catalog"
-msgstr "Updating the"
+#: ../../templates/show_recently_played.inc.php:23 ../../lib/rss.php:180
+msgid "minutes ago"
+msgstr ""
 
-#: ../../templates/show_verify_catalog.inc.php:24
-msgid "songs found checking tag information."
-msgstr "songs found checking tag information."
+#: ../../templates/show_recently_played.inc.php:23 ../../lib/rss.php:180
+#, fuzzy
+msgid "hours ago"
+msgstr "hours"
 
-#: ../../templates/show_verify_catalog.inc.php:25
-msgid "Verifed"
+#: ../../templates/show_recently_played.inc.php:23 ../../lib/rss.php:180
+#, fuzzy
+msgid "days ago"
+msgstr "days"
+
+#: ../../templates/show_recently_played.inc.php:23 ../../lib/rss.php:180
+msgid "weeks ago"
 msgstr ""
 
-#: ../../templates/show_edit_artist_row.inc.php:32
-#: ../../templates/show_edit_live_stream_row.inc.php:52
-#: ../../templates/show_edit_album_row.inc.php:48
-#: ../../templates/show_edit_song_row.inc.php:45
-#: ../../templates/show_edit_playlist_row.inc.php:38
-#: ../../templates/show_edit_playlist_song_row.inc.php:38
-msgid "Save Changes"
+#: ../../templates/show_recently_played.inc.php:23 ../../lib/rss.php:180
+msgid "months ago"
 msgstr ""
 
-#: ../../templates/show_big_art.inc.php:33
-msgid "Click to close window"
+#: ../../templates/show_recently_played.inc.php:23 ../../lib/rss.php:180
+#, fuzzy
+msgid "years ago"
+msgstr "year"
+
+#: ../../templates/show_recently_played.inc.php:42
+#: ../../templates/show_recently_played.inc.php:104
+msgid "Last Played"
 msgstr ""
 
 #: ../../templates/show_artist.inc.php:22
@@ -3177,28 +2571,27 @@ msgstr "Show All Songs By"
 msgid "Add Random Songs By %s"
 msgstr "Play Random Songs By"
 
-#: ../../templates/list_header.inc.php:100
-msgid "Prev"
-msgstr "Prev"
+#: ../../templates/show_artist.inc.php:45
+#: ../../templates/show_album.inc.php:71
+msgid "Update from tags"
+msgstr "Update from tags"
 
-#: ../../templates/show_edit_shout.inc.php:23
-msgid "Edit existing Shoutbox Post"
-msgstr ""
+#: ../../templates/show_democratic.inc.php:22
+#, fuzzy, php-format
+msgid "%s Playlist"
+msgstr "New Playlist"
 
-#: ../../templates/show_edit_shout.inc.php:28
-#, php-format
-msgid "Created by: %s for %s"
-msgstr ""
+#: ../../templates/show_verify_catalog.inc.php:23
+#, fuzzy, php-format
+msgid "Updating the %s catalog"
+msgstr "Updating the"
 
-#: ../../templates/show_edit_shout.inc.php:31
-#: ../../templates/show_add_shout.inc.php:27
-#, fuzzy
-msgid "Comment:"
-msgstr "Comment"
+#: ../../templates/show_verify_catalog.inc.php:24
+msgid "songs found checking tag information."
+msgstr "songs found checking tag information."
 
-#: ../../templates/show_edit_shout.inc.php:37
-#: ../../templates/show_add_shout.inc.php:34
-msgid "Make Sticky"
+#: ../../templates/show_verify_catalog.inc.php:25
+msgid "Verifed"
 msgstr ""
 
 #: ../../templates/show_denied.inc.php:38
@@ -3228,276 +2621,363 @@ msgid ""
 "used the functionality to post inappropriate materials"
 msgstr ""
 
-#: ../../templates/sidebar_preferences.inc.php:18
-msgid "Account"
-msgstr "Account"
+#: ../../templates/show_album.inc.php:27 ../../lib/class/album.class.php:244
+msgid "Disk"
+msgstr ""
 
-#: ../../templates/sidebar_preferences.inc.php:22
-msgid "Server Config"
+#: ../../templates/show_album.inc.php:34
+#: ../../lib/class/catalog.class.php:1823
+#: ../../lib/class/catalog.class.php:1894
+msgid "Unknown (Orphaned)"
 msgstr ""
 
-#: ../../templates/show_account.inc.php:39
-#, fuzzy
-msgid "New Password"
-msgstr "Password"
+#: ../../templates/show_album.inc.php:52
+msgid "Add Album"
+msgstr ""
 
-#: ../../templates/show_account.inc.php:52
-#: ../../templates/show_manage_catalogs.inc.php:33
-msgid "Clear Stats"
-msgstr "Clear Stats"
+#: ../../templates/show_album.inc.php:56
+msgid "Add Random from Album"
+msgstr ""
 
-#: ../../templates/show_account.inc.php:62
+#: ../../templates/show_album.inc.php:61
+msgid "Reset Album Art"
+msgstr "Reset Album Art"
+
+#: ../../templates/show_album.inc.php:66
+msgid "Find Album Art"
+msgstr "Find Album Art"
+
+#: ../../templates/show_localplay_add_instance.inc.php:24
+msgid "Add Localplay Instance"
+msgstr ""
+
+#: ../../templates/show_login_form.inc.php:66
+msgid "Remember Me"
+msgstr "Remember Me"
+
+#: ../../templates/show_login_form.inc.php:73
+msgid "Login"
+msgstr "Login"
+
+#: ../../templates/show_login_form.inc.php:78
 #, fuzzy
-msgid "Update Account"
-msgstr "Create Account"
+msgid "Register"
+msgstr "Register User"
 
-#: ../../templates/show_live_streams.inc.php:37
-#: ../../templates/show_live_streams.inc.php:59
-#: ../../templates/show_edit_live_stream_row.inc.php:29
-#: ../../templates/show_add_live_stream.inc.php:55
-msgid "Callsign"
+#: ../../templates/show_login_form.inc.php:90
+msgid "Message of the Day"
 msgstr ""
 
-#: ../../templates/show_live_streams.inc.php:38
-#: ../../templates/show_live_streams.inc.php:60
-#: ../../templates/show_edit_live_stream_row.inc.php:30
-#: ../../templates/show_add_live_stream.inc.php:49
-msgid "Frequency"
+#: ../../templates/show_all_popular.inc.php:32
+#, fuzzy
+msgid "Most Popular Genres"
+msgstr "Most Popular Songs"
+
+#: ../../templates/show_all_popular.inc.php:41
+msgid "Most Popular Live Streams"
 msgstr ""
 
-#: ../../templates/show_live_streams.inc.php:39
-#: ../../templates/show_live_streams.inc.php:61
-#: ../../templates/show_search.inc.php:54
-msgid "Tag"
+#: ../../templates/show_all_popular.inc.php:44
+msgid "Most Popular Tags"
 msgstr ""
 
-#: ../../templates/show_search.inc.php:26
-msgid "Search Ampache"
-msgstr "Search Ampache"
+#: ../../templates/show_song.inc.php:24
+msgid "Details"
+msgstr ""
 
-#: ../../templates/show_search.inc.php:30
-msgid "Keywords"
+#: ../../templates/show_disabled_songs.inc.php:38
+#: ../../templates/show_disabled_songs.inc.php:61
+msgid "Addition Time"
 msgstr ""
 
-#: ../../templates/show_search.inc.php:72
+#: ../../templates/show_disabled_songs.inc.php:65
 #, fuzzy
-msgid "Played"
-msgstr "Play"
+msgid "Remove"
+msgstr "Remote"
 
-#: ../../templates/show_search.inc.php:76
-msgid "Yes"
-msgstr "Yes"
+#: ../../templates/show_edit_album_row.inc.php:35
+#: ../../lib/class/album.class.php:256 ../../lib/class/album.class.php:257
+msgid "Various"
+msgstr "Various"
 
-#: ../../templates/show_search.inc.php:77
-msgid "No"
-msgstr "No"
+#: ../../templates/list_header.inc.php:100
+msgid "Prev"
+msgstr "Prev"
 
-#: ../../templates/show_search.inc.php:80
+#: ../../templates/show_duplicates.inc.php:22
 #, fuzzy
-msgid "Min Bitrate"
+msgid "Duplicate Songs"
+msgstr "Show Duplicate Songs"
+
+#: ../../templates/show_duplicates.inc.php:41
+#: ../../templates/show_duplicates.inc.php:79
+msgid "Bitrate"
 msgstr "Bitrate"
 
-#: ../../templates/show_search.inc.php:95
-msgid "One Star"
+#: ../../templates/show_duplicates.inc.php:42
+#: ../../templates/show_duplicates.inc.php:80
+msgid "Size"
+msgstr "Size"
+
+#: ../../templates/show_manage_catalogs.inc.php:28
+msgid "Gather All Art"
 msgstr ""
 
-#: ../../templates/show_search.inc.php:96
+#: ../../templates/show_manage_catalogs.inc.php:29
+#: ../../templates/show_admin_tools.inc.php:80
 #, fuzzy
-msgid "Two Stars"
-msgstr "Total Users"
+msgid "Add to All"
+msgstr "Add to"
 
-#: ../../templates/show_search.inc.php:97
-msgid "Three Stars"
-msgstr ""
+#: ../../templates/show_manage_catalogs.inc.php:30
+#: ../../templates/show_admin_tools.inc.php:79
+#, fuzzy
+msgid "Verify All"
+msgstr "View All"
 
-#: ../../templates/show_search.inc.php:98
-msgid "Four Stars"
-msgstr ""
+#: ../../templates/show_manage_catalogs.inc.php:31
+#: ../../templates/show_admin_tools.inc.php:78
+#, fuzzy
+msgid "Clean All"
+msgstr "Clean All Catalogues"
 
-#: ../../templates/show_search.inc.php:99
-msgid "Five Stars"
+#: ../../templates/show_manage_catalogs.inc.php:32
+#: ../../templates/show_admin_tools.inc.php:81
+#, fuzzy
+msgid "Update All"
+msgstr "Updated"
+
+#: ../../templates/show_manage_catalogs.inc.php:38
+#, fuzzy
+msgid "Add From"
+msgstr "Add to"
+
+#: ../../templates/show_manage_catalogs.inc.php:40
+#, fuzzy
+msgid "Update From"
+msgstr "Update from tags"
+
+#: ../../templates/show_admin_tools.inc.php:59
+msgid "Fast"
 msgstr ""
 
-#: ../../templates/show_search.inc.php:102
-msgid "Operator"
+#: ../../templates/show_admin_tools.inc.php:68
+#, fuzzy
+msgid "No Catalogs Found"
+msgstr "Not Found"
+
+#: ../../templates/show_admin_tools.inc.php:83
+msgid "Clear Catalog Stats"
+msgstr "Clear Catalogue Stats"
+
+#: ../../templates/show_admin_tools.inc.php:84
+#: ../../templates/show_add_catalog.inc.php:75
+msgid "Gather Album Art"
+msgstr "Gather Album Art"
+
+#: ../../templates/show_admin_tools.inc.php:90
+msgid "Show Duplicate Songs"
+msgstr "Show Duplicate Songs"
+
+#: ../../templates/show_admin_tools.inc.php:93
+#, fuzzy
+msgid "Preferences Permissions"
+msgstr "Preferences"
+
+#: ../../templates/show_admin_tools.inc.php:94
+msgid "Export To Itunes DB"
 msgstr ""
 
-#: ../../templates/show_search.inc.php:105
-msgid "AND"
+#: ../../templates/show_admin_tools.inc.php:95
+msgid "Show Inactive Users"
 msgstr ""
 
-#: ../../templates/show_search.inc.php:111
+#: ../../templates/show_admin_tools.inc.php:96
 #, fuzzy
-msgid "Method"
-msgstr "Mode"
+msgid "Check for New Version"
+msgstr "Check for Configuration"
 
-#: ../../templates/show_search.inc.php:114
-msgid "Fuzzy"
+#: ../../templates/show_access_list.inc.php:29
+msgid "Ampache Access Control"
 msgstr ""
 
-#: ../../templates/show_search.inc.php:115
-msgid "Exact"
+#: ../../templates/show_access_list.inc.php:32
+msgid ""
+"Since your catalog can be accessed remotely you may want to limit the access "
+"from remote sources so you are not in violation of copyright laws."
 msgstr ""
 
-#: ../../templates/show_search.inc.php:118
-msgid "Maximum Results"
+#: ../../templates/show_access_list.inc.php:33
+msgid ""
+"By default your server will allow anyone with an account to stream music."
 msgstr ""
 
-#: ../../templates/show_preferences.inc.php:28
-#: ../../templates/show_user_preferences.inc.php:28
-#, fuzzy, php-format
-msgid "Editing %s preferences"
-msgstr "preferences"
+#: ../../templates/show_access_list.inc.php:34
+msgid ""
+"It will not allow any other Ampache servers to connect to it to share "
+"catalog information."
+msgstr ""
 
-#: ../../templates/show_preferences.inc.php:34
-#: ../../templates/show_user_preferences.inc.php:50
-msgid "Update Preferences"
-msgstr "Update Preferences"
+#: ../../templates/show_access_list.inc.php:35
+#, fuzzy
+msgid ""
+"Use tool below to add any server's IP address that you want to access your "
+"Ampache catalog or be able to stream from this server."
+msgstr ""
+"Use the form below to add a host that you want to have access to your "
+"Ampache catalog."
 
-#: ../../templates/show_edit_live_stream_row.inc.php:27
-#: ../../templates/show_add_live_stream.inc.php:42
-msgid "Stream URL"
+#: ../../templates/show_access_list.inc.php:40
+msgid "Add Entry"
+msgstr "Add Entry"
+
+#: ../../templates/show_access_list.inc.php:46
+msgid "Start Address"
+msgstr "Start Address"
+
+#: ../../templates/show_access_list.inc.php:47
+msgid "End Address"
+msgstr "End Address"
+
+#: ../../templates/show_access_list.inc.php:50
+msgid "Key"
 msgstr ""
 
-#: ../../templates/show_edit_live_stream_row.inc.php:28
-#: ../../templates/show_add_live_stream.inc.php:35
-msgid "Homepage"
+#: ../../templates/show_rename_artist.inc.php:29
+#, fuzzy, php-format
+msgid "Rename %s"
+msgstr "Username"
+
+#: ../../templates/show_rename_artist.inc.php:35
+msgid "Insert current"
 msgstr ""
 
-#: ../../templates/show_gather_art.inc.php:23
-msgid "Starting Album Art Search"
-msgstr "Starting Album Art Search"
+#: ../../templates/show_rename_artist.inc.php:37
+#, fuzzy
+msgid "Update id3 tags"
+msgstr "Update from tags"
 
-#: ../../templates/show_gather_art.inc.php:24
-msgid "Searched"
-msgstr "Searched"
+#: ../../templates/show_rename_artist.inc.php:38
+#, fuzzy
+msgid "Rename"
+msgstr "Username"
 
-#: ../../templates/show_add_live_stream.inc.php:24
-#: ../../templates/sidebar_modules.inc.php:42
-msgid "Add Radio Station"
+#: ../../templates/show_user_registration.inc.php:54
+#, fuzzy
+msgid "User Agreement"
+msgstr "User Deleted"
+
+#: ../../templates/show_user_registration.inc.php:63
+#, fuzzy
+msgid "I Accept"
+msgstr "Accept"
+
+#: ../../templates/show_user_registration.inc.php:69
+msgid "User Information"
 msgstr ""
 
-#: ../../templates/show_test.inc.php:33
+#: ../../templates/show_user_registration.inc.php:131
+msgid "Register User"
+msgstr "Register User"
+
+#: ../../templates/show_playlist_edit.inc.php:26
+#, fuzzy
+msgid "Editing Playlist"
+msgstr "Edit Playlist"
+
+#: ../../templates/show_add_catalog.inc.php:27
 msgid ""
-"You've reached this page because a configuration error has occured. Debug "
-"Information below"
+"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 ""
-"You've reached this page because a configuration error has occured. Debug "
-"Information below"
+"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)"
 
-#: ../../templates/show_test.inc.php:38
-msgid "CHECK"
-msgstr "CHECK"
+#: ../../templates/show_add_catalog.inc.php:32
+msgid "Catalog Name"
+msgstr "Catalogue Name"
 
-#: ../../templates/show_test.inc.php:40
-msgid "STATUS"
-msgstr "STATUS"
+#: ../../templates/show_add_catalog.inc.php:55
+msgid "Local"
+msgstr "Local"
 
-#: ../../templates/show_test.inc.php:42
-msgid "DESCRIPTION"
-msgstr "DESCRIPTION"
+#: ../../templates/show_add_catalog.inc.php:56
+msgid "Remote"
+msgstr "Remote"
 
-#: ../../templates/show_test.inc.php:60
-msgid ""
-"This tests to make sure that you are running a version of PHP that is known "
-"to work with Ampache."
-msgstr ""
-"This tests to make sure that you are running a version of PHP that is known "
-"to work with Ampache."
+#: ../../templates/show_add_catalog.inc.php:65
+msgid "Filename Pattern"
+msgstr "Filename Pattern"
 
-#: ../../templates/show_test.inc.php:79
-msgid ""
-"This test checks to see if you have the mysql extensions loaded for PHP. "
-"These are required for Ampache to work."
+#: ../../templates/show_add_catalog.inc.php:79
+msgid "Build Playlists from m3u Files"
+msgstr "Build Playlists from m3u Files"
+
+#: ../../templates/show_add_catalog.inc.php:85
+msgid "Add Catalog"
+msgstr "Add Catalogue"
+
+#: ../../templates/show_registration_confirmation.inc.php:36
+msgid "Registration Complete"
 msgstr ""
-"This test checks to see if you have the mysql extensions loaded for PHP. "
-"These are required for Ampache to work."
 
-#: ../../templates/show_test.inc.php:98
+#: ../../templates/show_registration_confirmation.inc.php:42
 msgid ""
-"This test checks to make sure that you have PHP session support enabled. "
-"Sessions are required for Ampache to work."
+"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 ""
-"This test checks to make sure that you have PHP session support enabled. "
-"Sessions are required for Ampache to work."
 
-#: ../../templates/show_test.inc.php:116
-msgid ""
-"This test checks to make sure you have Iconv support installed. Iconv "
-"support is required for Ampache"
+#: ../../templates/show_registration_confirmation.inc.php:44
+msgid "Return to Login Page"
 msgstr ""
 
-#: ../../templates/show_test.inc.php:133
-#, fuzzy
-msgid ""
-"This test makes sure you have PCRE support compiled into your version of "
-"PHP, this is required for Ampache."
+#: ../../templates/show_debug.inc.php:23
+msgid "Debug Tools"
 msgstr ""
-"This test checks to make sure that you have PHP session support enabled. "
-"Sessions are required for Ampache to work."
 
-#: ../../templates/show_test.inc.php:150
-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"
+#: ../../templates/show_debug.inc.php:25
+msgid "Generate Configuration"
 msgstr ""
 
-#: ../../templates/show_test.inc.php:154
-#: ../../templates/show_install_config.inc.php:89
-msgid "Ampache.cfg.php Exists"
-msgstr "Ampache.cfg.php Exists"
+#: ../../templates/show_debug.inc.php:26
+msgid "Set Database Charset"
+msgstr ""
 
-#: ../../templates/show_test.inc.php:167
-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."
+#: ../../templates/show_debug.inc.php:29
+msgid "PHP Settings"
 msgstr ""
-"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."
 
-#: ../../templates/show_test.inc.php:173
-#: ../../templates/show_install_config.inc.php:106
-msgid "Ampache.cfg.php Configured?"
-msgstr "Ampache.cfg.php Configured?"
+#: ../../templates/show_debug.inc.php:36
+msgid "Setting"
+msgstr ""
 
-#: ../../templates/show_test.inc.php:190
-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"
+#: ../../templates/show_debug.inc.php:40
+msgid "Memory Limit"
 msgstr ""
 
-#: ../../templates/show_test.inc.php:194
-msgid "DB Connection"
-msgstr "DB Connection"
+#: ../../templates/show_debug.inc.php:44
+msgid "Maximum Execution Time"
+msgstr ""
 
-#: ../../templates/show_test.inc.php:210
-msgid ""
-"This attempts to connect to your database using the values from your ampache."
-"cfg.php"
+#: ../../templates/show_debug.inc.php:48
+msgid "Safe Mode"
 msgstr ""
-"This attempts to connect to your database using the values from your ampache."
-"cfg.php"
 
-#: ../../templates/show_test.inc.php:214
-msgid "DB Inserted"
+#: ../../templates/show_debug.inc.php:56
+msgid "Zlib Support"
 msgstr ""
 
-#: ../../templates/show_test.inc.php:236
-#: ../../templates/show_install_config.inc.php:61
-msgid "Web Path"
-msgstr "Web Path"
+#: ../../templates/show_debug.inc.php:60
+msgid "GD Support"
+msgstr ""
 
-#: ../../templates/show_clean_catalog.inc.php:23
-#, fuzzy, php-format
-msgid "Cleaning the %s Catalog"
-msgstr "Updating the"
+#: ../../templates/show_debug.inc.php:64
+msgid "Iconv Support"
+msgstr ""
 
-#: ../../templates/show_clean_catalog.inc.php:25
-msgid "Checking"
-msgstr "Checking"
+#: ../../templates/show_debug.inc.php:74
+msgid "Current Configuration"
+msgstr ""
 
 #: ../../templates/sidebar_modules.inc.php:27
 #, fuzzy
@@ -3529,260 +3009,511 @@ msgstr ""
 msgid "Manage Playlist"
 msgstr ""
 
-#: ../../templates/show_search_bar.inc.php:30
-msgid "Advanced Search"
+#: ../../templates/show_manage_shoutbox.inc.php:36
+#: ../../templates/show_manage_shoutbox.inc.php:60
+msgid "Sticky"
 msgstr ""
 
-#: ../../templates/show_manage_catalogs.inc.php:28
-msgid "Gather All Art"
+#: ../../templates/show_manage_shoutbox.inc.php:38
+#: ../../templates/show_manage_shoutbox.inc.php:62
+msgid "Date Added"
 msgstr ""
 
-#: ../../templates/show_manage_catalogs.inc.php:38
+#: ../../templates/show_now_playing.inc.php:33
+#: ../../lib/class/localplay.class.php:639
+msgid "Now Playing"
+msgstr "Now Playing"
+
+#: ../../artists.php:181
 #, fuzzy
-msgid "Add From"
-msgstr "Add to"
+msgid "Show Artists starting with"
+msgstr "<u>S</u>how artists starting with"
 
-#: ../../templates/show_manage_catalogs.inc.php:40
+#: ../../flag.php:45
 #, fuzzy
-msgid "Update From"
-msgstr "Update from tags"
+msgid "Item Flagged"
+msgstr "Flagged by"
 
-#: ../../templates/show_catalogs.inc.php:34
-#: ../../templates/show_catalogs.inc.php:50
-msgid "Last Verify"
+#: ../../flag.php:45
+msgid "The specified item has been flagged"
 msgstr ""
 
-#: ../../templates/show_catalogs.inc.php:35
-#: ../../templates/show_catalogs.inc.php:51
-msgid "Last Add"
-msgstr ""
+#: ../../register.php:73
+#, fuzzy
+msgid "Error Captcha Required"
+msgstr "Error Username Required"
 
-#: ../../templates/show_localplay_add_instance.inc.php:24
-msgid "Add Localplay Instance"
+#: ../../register.php:80
+msgid "Error Captcha Failed"
 msgstr ""
 
-#: ../../templates/show_access_list.inc.php:29
-msgid "Ampache Access Control"
+#: ../../register.php:87
+msgid "You <U>must</U> accept the user agreement"
 msgstr ""
 
-#: ../../templates/show_access_list.inc.php:32
-msgid ""
-"Since your catalog can be accessed remotely you may want to limit the access "
-"from remote sources so you are not in violation of copyright laws."
+#: ../../register.php:92
+msgid "You did not enter a username"
 msgstr ""
 
-#: ../../templates/show_access_list.inc.php:33
-msgid ""
-"By default your server will allow anyone with an account to stream music."
+#: ../../register.php:96
+msgid "Please fill in your full name (Firstname Lastname)"
 msgstr ""
 
-#: ../../templates/show_access_list.inc.php:34
-msgid ""
-"It will not allow any other Ampache servers to connect to it to share "
-"catalog information."
-msgstr ""
+#: ../../register.php:122
+#, fuzzy
+msgid "You must enter a password"
+msgstr "Enter password"
 
-#: ../../templates/show_access_list.inc.php:35
+#: ../../register.php:126
 #, fuzzy
-msgid ""
-"Use tool below to add any server's IP address that you want to access your "
-"Ampache catalog or be able to stream from this server."
-msgstr ""
-"Use the form below to add a host that you want to have access to your "
-"Ampache catalog."
+msgid "Your passwords do not match"
+msgstr "Error Passwords don't match"
 
-#: ../../templates/show_access_list.inc.php:40
-msgid "Add Entry"
-msgstr "Add Entry"
+#: ../../register.php:130 ../../admin/users.php:110
+#, fuzzy
+msgid "Error Username already exists"
+msgstr "Error Username Required"
 
-#: ../../templates/show_access_list.inc.php:46
-msgid "Start Address"
-msgstr "Start Address"
+#: ../../register.php:158
+#, fuzzy
+msgid "Error: Insert Failed"
+msgstr "Error: Insufficient Rights"
 
-#: ../../templates/show_access_list.inc.php:47
-msgid "End Address"
-msgstr "End Address"
+#: ../../login.php:73
+msgid "User Disabled please contact Admin"
+msgstr ""
 
-#: ../../templates/show_access_list.inc.php:50
-msgid "Key"
+#: ../../login.php:89
+msgid "Unable to create new account"
 msgstr ""
 
-#: ../../templates/show_add_access.inc.php:22
-msgid "Add Access for a Host"
-msgstr "Add Access for a Host"
+#: ../../login.php:98
+msgid "No local account found"
+msgstr ""
 
-#: ../../templates/show_add_access.inc.php:74
-msgid "RPC Options"
+#: ../../login.php:115
+msgid "User Already Logged in"
 msgstr ""
 
-#: ../../templates/show_add_access.inc.php:84
+#: ../../democratic.php:52
+msgid "The Requested Playlist has been deleted."
+msgstr ""
+
+#: ../../lib/rating.lib.php:51
 #, fuzzy
-msgid "Create ACL"
-msgstr "Create Account"
+msgid "Don't Play"
+msgstr "Local Play"
 
-#: ../../templates/show_localplay_instances.inc.php:23
-msgid "Show Localplay Instances"
+#: ../../lib/rating.lib.php:54
+msgid "It's Pretty Bad"
 msgstr ""
 
-#: ../../templates/show_localplay_instances.inc.php:39
-msgid "Edit Instance"
+#: ../../lib/rating.lib.php:57
+msgid "It's Ok"
 msgstr ""
 
-#: ../../templates/show_disabled_songs.inc.php:38
-#: ../../templates/show_disabled_songs.inc.php:61
-msgid "Addition Time"
+#: ../../lib/rating.lib.php:60
+msgid "It's Pretty Good"
 msgstr ""
 
-#: ../../templates/show_disabled_songs.inc.php:65
-#, fuzzy
-msgid "Remove"
-msgstr "Remote"
+#: ../../lib/rating.lib.php:63
+msgid "I Love It!"
+msgstr ""
 
-#: ../../templates/show_install_config.inc.php:52
-msgid ""
-"This steps takes the basic config values and generates the config file. It "
-"will prompt you to download the config file. Please put the downloaded "
-"config file in /config"
+#: ../../lib/rating.lib.php:66
+msgid "It's Insane"
 msgstr ""
 
-#: ../../templates/show_install_config.inc.php:57
-msgid "Generate Config File"
+#: ../../lib/rating.lib.php:70
+msgid "Off the Charts!"
 msgstr ""
 
-#: ../../templates/show_install_config.inc.php:73
-msgid "MySQL Username"
-msgstr "MySQL Username"
+#: ../../lib/ui.lib.php:358
+msgid "Upload"
+msgstr "Upload"
 
-#: ../../templates/show_install_config.inc.php:77
-msgid "MySQL Password"
-msgstr "MySQL Password"
+#: ../../lib/ui.lib.php:361
+msgid "Local Play"
+msgstr "Local Play"
 
-#: ../../templates/show_install_config.inc.php:82
-msgid "Write Config"
-msgstr "Write Configuration"
+#: ../../lib/ui.lib.php:364
+#, fuzzy
+msgid "Random Play"
+msgstr "Random"
 
-#: ../../templates/show_install_config.inc.php:127
-msgid "Check for Config"
-msgstr "Check for Configuration"
+#: ../../lib/ui.lib.php:376 ../../lib/ui.lib.php:380
+#, fuzzy
+msgid "Admin-Catalog"
+msgstr "Add Catalogue"
 
-#: ../../templates/show_install_config.inc.php:133
-msgid "Continue to Step 3"
+#: ../../lib/ui.lib.php:384
+msgid "Admin-User Management"
 msgstr ""
 
-#: ../../templates/show_user_activate.inc.php:48
-msgid "User Activated"
+#: ../../lib/ui.lib.php:388
+#, fuzzy
+msgid "Admin-Mail Users"
+msgstr "Mail Users"
+
+#: ../../lib/ui.lib.php:392
+#, fuzzy
+msgid "Admin-Manage Access Lists"
+msgstr "Access Lists"
+
+#: ../../lib/ui.lib.php:396
+#, fuzzy
+msgid "Admin-Site Preferences"
+msgstr "Admin Preferences"
+
+#: ../../lib/ui.lib.php:400
+msgid "Admin-Manage Modules"
 msgstr ""
 
-#: ../../templates/show_user_activate.inc.php:51
-#, php-format
-msgid "This User ID is activated and can be used %sLogin%s"
+#: ../../lib/ui.lib.php:404
+#, fuzzy
+msgid "Browse Music"
+msgstr "Browse"
+
+#: ../../lib/ui.lib.php:511
+msgid "Add New"
 msgstr ""
 
-#: ../../templates/show_user_activate.inc.php:54
-msgid "Validation Failed"
+#: ../../lib/class/browse.class.php:989
+msgid "Manage Users"
+msgstr "Manage Users"
+
+#: ../../lib/class/browse.class.php:1006
+msgid "Playlists"
+msgstr "Playlists"
+
+#: ../../lib/class/browse.class.php:1011
+msgid "Playlist Songs"
 msgstr ""
 
-#: ../../templates/show_user_activate.inc.php:55
-msgid "The validation key used isn't correct"
+#: ../../lib/class/browse.class.php:1016
+#, fuzzy
+msgid "Current Playlist"
+msgstr "New Playlist"
+
+#: ../../lib/class/browse.class.php:1026
+msgid "Shoutbox Records"
 msgstr ""
 
-#: ../../templates/show_create_democratic.inc.php:22
-msgid "Create Democratic Playlist"
+#: ../../lib/class/browse.class.php:1031
+#, fuzzy
+msgid "Flagged Records"
+msgstr "Flagged by"
+
+#: ../../lib/class/rss.class.php:59
+msgid "RSS Feed"
 msgstr ""
 
-#: ../../templates/show_create_democratic.inc.php:34
-msgid "Cooldown Time"
+#: ../../lib/class/flag.class.php:257
+msgid "Approved"
 msgstr ""
 
-#: ../../templates/show_create_democratic.inc.php:48
-msgid "Make Default"
+#: ../../lib/class/flag.class.php:258
+msgid "Pending"
 msgstr ""
 
-#: ../../templates/show_stats_newest.inc.php:22
-msgid "Newest Albums"
+#: ../../lib/class/flag.class.php:273
+msgid "Re-Tag"
 msgstr ""
 
-#: ../../templates/show_stats_newest.inc.php:26
-msgid "Newest Artists"
+#: ../../lib/class/localplay.class.php:642
+#, fuzzy
+msgid "Stopped"
+msgstr "Stop"
+
+#: ../../lib/class/localplay.class.php:645
+#, fuzzy
+msgid "Paused"
+msgstr "Pause"
+
+#: ../../lib/class/democratic.class.php:98
+msgid "Primary"
 msgstr ""
 
-#: ../../templates/show_add_shout.inc.php:23
-msgid "Post to Shoutbox"
+#: ../../lib/class/user.class.php:379 ../../admin/users.php:55
+#: ../../admin/users.php:105
+msgid "Error Username Required"
+msgstr "Error Username Required"
+
+#: ../../lib/class/user.class.php:383 ../../admin/users.php:58
+#: ../../admin/users.php:101
+msgid "Error Passwords don't match"
+msgstr "Error Passwords don't match"
+
+#: ../../lib/class/album.class.php:473 ../../lib/class/catalog.class.php:433
+#: ../../lib/class/catalog.class.php:774
+msgid "Error: Unable to open"
+msgstr "Error: Unable to open"
+
+#: ../../lib/class/catalog.class.php:211
+#, fuzzy
+msgid "day"
+msgid_plural "days"
+msgstr[0] "day"
+msgstr[1] "day"
+
+#: ../../lib/class/catalog.class.php:213
+#, fuzzy
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "hour"
+msgstr[1] "hour"
+
+#: ../../lib/class/catalog.class.php:313
+msgid "Running Remote Sync"
+msgstr "Running Remote Sync"
+
+#: ../../lib/class/catalog.class.php:440 ../../lib/class/catalog.class.php:483
+msgid "Error: Unable to change to directory"
+msgstr "Error: Unable to change to directory"
+
+#: ../../lib/class/catalog.class.php:511
+#, fuzzy, php-format
+msgid "Error: Unable to get filesize for %s"
+msgstr "Error: Unable to get filesize for"
+
+#: ../../lib/class/catalog.class.php:517
+#, fuzzy, php-format
+msgid "%s is not readable by ampache"
+msgstr "is not readable by ampache"
+
+#: ../../lib/class/catalog.class.php:525
+#, php-format
+msgid "%s does not match site charset"
 msgstr ""
 
-#: ../../templates/show_shoutbox.inc.php:22
-msgid "Shoutbox"
+#: ../../lib/class/catalog.class.php:1063 ../../preferences.php:111
+#: ../../admin/access.php:45
+msgid "Updated"
+msgstr "Updated"
+
+#: ../../lib/class/catalog.class.php:1070
+msgid "No Update Needed"
+msgstr "No Update Needed"
+
+#: ../../lib/class/catalog.class.php:1168
+msgid "Running Remote Update"
+msgstr "Running Remote Update"
+
+#: ../../lib/class/catalog.class.php:1195
+msgid "Added Playlist From"
+msgstr "Added Playlist From"
+
+#: ../../lib/class/catalog.class.php:1224
+msgid "Catalog Update Finished"
+msgstr "Catalogue Update Finished"
+
+#: ../../lib/class/catalog.class.php:1224
+msgid "Total Time"
+msgstr "Total Time"
+
+#: ../../lib/class/catalog.class.php:1225
+msgid "Total Songs"
+msgstr "Total Songs"
+
+#: ../../lib/class/catalog.class.php:1225
+msgid "Songs Per Seconds"
+msgstr "Songs Per Seconds"
+
+#: ../../lib/class/catalog.class.php:1240 ../../admin/users.php:142
+msgid "Error"
+msgstr "Error"
+
+#: ../../lib/class/catalog.class.php:1240
+msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
+msgstr "Unable to load XMLRPC library, make sure XML-RPC is enabled"
+
+#: ../../lib/class/catalog.class.php:1270
+#: ../../lib/class/catalog.class.php:1338
+#: ../../lib/class/xmlrpcclient.class.php:64
+#: ../../lib/class/xmlrpcclient.class.php:97
+msgid "Error connecting to"
+msgstr "Error connecting to"
+
+#: ../../lib/class/catalog.class.php:1270
+#: ../../lib/class/catalog.class.php:1338
+#: ../../lib/class/xmlrpcclient.class.php:64
+#: ../../lib/class/xmlrpcclient.class.php:97
+msgid "Code"
+msgstr "Code"
+
+#: ../../lib/class/catalog.class.php:1270
+#: ../../lib/class/catalog.class.php:1338
+#: ../../lib/class/xmlrpcclient.class.php:64
+msgid "Reason"
+msgstr "Reason"
+
+#: ../../lib/class/catalog.class.php:1299
+msgid "Completed updating remote catalog(s)"
+msgstr "Completed updating remote catalogue(s)"
+
+#: ../../lib/class/catalog.class.php:1334 ../../admin/access.php:40
+msgid "Added"
+msgstr "Added"
+
+#: ../../lib/class/catalog.class.php:1406
+msgid "Catalog Root unreadable, stopping clean"
 msgstr ""
 
-#: ../../templates/show_flag_row.inc.php:31
-msgid "Reject"
-msgstr "Reject"
+#: ../../lib/class/catalog.class.php:1463
+msgid "Catalog Clean Done"
+msgstr "Catalogue Clean Done"
 
-#: ../../templates/show_localplay_edit_instance.inc.php:23
-msgid "Edit Localplay Instance"
+#: ../../lib/class/catalog.class.php:1463
+msgid "files removed"
+msgstr "files removed"
+
+#: ../../lib/class/catalog.class.php:1464
+msgid "Optimizing Tables"
 msgstr ""
 
-#: ../../templates/show_localplay_edit_instance.inc.php:34
-msgid "Update Instance"
+#: ../../lib/class/catalog.class.php:1764
+#, fuzzy
+msgid "Update Finished."
+msgstr "Catalogue Update Finished"
+
+#: ../../lib/class/catalog.class.php:1764
+#, fuzzy
+msgid "Checked"
+msgstr "Checking"
+
+#: ../../lib/class/catalog.class.php:1764
+#, fuzzy
+msgid "songs updated."
+msgstr "Playlist updated."
+
+#: ../../lib/class/random.class.php:426
+msgid "Related Genre"
 msgstr ""
 
-#: ../../templates/show_registration_confirmation.inc.php:36
-msgid "Registration Complete"
+#: ../../lib/class/stream.class.php:399
+#, fuzzy
+msgid "Ampache"
+msgstr "Ampache Debug"
+
+#: ../../lib/class/vauth.class.php:478 ../../lib/class/vauth.class.php:502
+#: ../../lib/class/vauth.class.php:541
+msgid "Error Username or Password incorrect, please try again"
 msgstr ""
 
-#: ../../templates/show_registration_confirmation.inc.php:42
+#: ../../lib/class/registration.class.php:51
+#: ../../lib/class/registration.class.php:53
+#, fuzzy
+msgid "From: Ampache "
+msgstr "Search Ampache"
+
+#: ../../lib/class/registration.class.php:55
+#, fuzzy, php-format
+msgid "New User Registration at %s"
+msgstr "Ampache Installation"
+
+#: ../../lib/class/registration.class.php:68
+#, php-format
 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"
+"Thank you for registering\n"
+"\n"
+"\n"
+"Please keep this e-mail for your records. Your account information is as "
+"follows:\n"
+"----------------------\n"
+"Username: %s\n"
+"Password: %s\n"
+"----------------------\n"
+"\n"
+"Your account is currently inactive. You cannot use it until you've visited "
+"the following link:\n"
+"\n"
+"%s \n"
+"\n"
+"Thank you for registering\n"
 msgstr ""
 
-#: ../../templates/show_registration_confirmation.inc.php:44
-msgid "Return to Login Page"
+#: ../../lib/class/registration.class.php:98
+#, php-format
+msgid ""
+"A new user has registered\n"
+"The following values were entered.\n"
+"\n"
+"Username: %s\n"
+"Fullname: %s\n"
+"E-mail: %s\n"
+"\n"
 msgstr ""
 
-#: ../../templates/show_manage_shoutbox.inc.php:36
-#: ../../templates/show_manage_shoutbox.inc.php:60
-msgid "Sticky"
+#: ../../lib/general.lib.php:498
+msgid "On"
+msgstr "On"
+
+#: ../../lib/general.lib.php:501
+msgid "Off"
+msgstr "Off"
+
+#: ../../lib/preferences.php:191
+msgid "M3U"
+msgstr "M3U"
+
+#: ../../lib/preferences.php:192
+msgid "Simple M3U"
+msgstr "Simple M3U"
+
+#: ../../lib/preferences.php:193
+msgid "PLS"
+msgstr "PLS"
+
+#: ../../lib/preferences.php:194
+msgid "Asx"
+msgstr "Asx"
+
+#: ../../lib/preferences.php:195
+msgid "RAM"
 msgstr ""
 
-#: ../../templates/show_manage_shoutbox.inc.php:38
-#: ../../templates/show_manage_shoutbox.inc.php:62
-msgid "Date Added"
+#: ../../lib/preferences.php:196
+msgid "XSPF"
 msgstr ""
 
-#: ../../templates/show_search_options.inc.php:23
+#: ../../lib/preferences.php:230
 #, fuzzy
-msgid "Options"
-msgstr "Action"
+msgid "Disabled"
+msgstr "Disable"
 
-#: ../../templates/show_search_options.inc.php:26
-msgid "Add Search Results"
+#: ../../lib/preferences.php:232
+msgid "Manager"
 msgstr ""
 
-#: ../../search.php:38
-msgid "Error: No Keyword Entered"
+#: ../../lib/preferences.php:252
+msgid "Send on Add"
 msgstr ""
 
-#: ../../install.php:168
-msgid "Error: Config file not found or Unreadable"
+#: ../../lib/preferences.php:253
+msgid "Send and Clear on Add"
 msgstr ""
 
-#: ../../login.php:73
-msgid "User Disabled please contact Admin"
+#: ../../lib/preferences.php:254
+msgid "Clear on Send"
 msgstr ""
 
-#: ../../login.php:89
-msgid "Unable to create new account"
+#: ../../lib/preferences.php:263
+msgid "Always"
 msgstr ""
 
-#: ../../login.php:98
-msgid "No local account found"
+#: ../../lib/install.php:257
+msgid "No Username/Password specified"
 msgstr ""
 
-#: ../../login.php:115
-msgid "User Already Logged in"
+#: ../../lib/install.php:262
+msgid "Passwords do not match"
 msgstr ""
 
+#: ../../shout.php:41
+#, fuzzy
+msgid "Invalid Object Selected"
+msgstr "Edit Selected"
+
 #: ../../preferences.php:40 ../../preferences.php:75
 msgid "Server"
 msgstr ""
@@ -3795,6 +3526,18 @@ msgstr ""
 msgid "Your Account has been updated"
 msgstr ""
 
+#: ../../play/index.php:81
+msgid "Session Expired: please log in again at"
+msgstr "Session Expired: please log in again at"
+
+#: ../../radio.php:50
+msgid "Radio Station Added"
+msgstr ""
+
+#: ../../install.php:168
+msgid "Error: Config file not found or Unreadable"
+msgstr ""
+
 #: ../../update.php:47 ../../update.php:51
 #, fuzzy
 msgid "Ampache Update"
@@ -3805,15 +3548,32 @@ msgstr "Ampache Debug"
 msgid "Update Now!"
 msgstr "Update Catalogues"
 
-#: ../../artists.php:181
+#: ../../albums.php:32
+msgid "Album Art Cleared"
+msgstr "Album Art Cleared"
+
+#: ../../albums.php:32
 #, fuzzy
-msgid "Show Artists starting with"
-msgstr "<u>S</u>how artists starting with"
+msgid "Album Art information has been removed from the database"
+msgstr "Album Art information has been removed from the database"
 
-#: ../../shout.php:41
+#: ../../albums.php:39 ../../albums.php:56 ../../albums.php:129
+msgid "Album Art Not Located"
+msgstr "Album Art Not Located"
+
+#: ../../albums.php:39 ../../albums.php:56 ../../albums.php:129
 #, fuzzy
-msgid "Invalid Object Selected"
-msgstr "Edit Selected"
+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 ""
+"Album Art could not be located at this time. This may be due to Amazon being "
+"busy, or the album not being present in their collection."
+
+#: ../../albums.php:52 ../../albums.php:80
+#, fuzzy
+msgid "Album Art Inserted"
+msgstr "Album Art Cleared"
 
 #: ../../playlist.php:57
 #, fuzzy
@@ -3834,86 +3594,326 @@ msgstr "Playlist updated."
 msgid "Empty Playlists Deleted"
 msgstr "Import Playlist"
 
-#: ../../register.php:73
+#: ../../modules/horde/Browser.php:867
+msgid "file"
+msgstr "file"
+
+#: ../../modules/horde/Browser.php:871
+msgid "File uploads not supported."
+msgstr "File uploads not supported."
+
+#: ../../modules/horde/Browser.php:889
+msgid "No file uploaded"
+msgstr "No file uploaded"
+
+#: ../../modules/horde/Browser.php:896
+#, php-format
+msgid "There was a problem with the file upload: No %s was uploaded."
+msgstr "There was a problem with the file upload: No %s was uploaded."
+
+#: ../../modules/horde/Browser.php:901
+#, php-format
+msgid ""
+"There was a problem with the file upload: The %s was larger than the maximum "
+"allowed size (%d bytes)."
+msgstr ""
+"There was a problem with the file upload: The %s was larger than the maximum "
+"allowed size (%d bytes)."
+
+#: ../../modules/horde/Browser.php:903
+#, php-format
+msgid ""
+"There was a problem with the file upload: The %s was only partially uploaded."
+msgstr ""
+"There was a problem with the file upload: The %s was only partially uploaded."
+
+#: ../../modules/localplay/mpd.controller.php:232
+#: ../../modules/localplay/shoutcast.controller.php:237
+#: ../../modules/localplay/httpq.controller.php:216
+msgid "Instance Name"
+msgstr ""
+
+#: ../../modules/localplay/mpd.controller.php:233
+#: ../../modules/localplay/httpq.controller.php:217
+msgid "Hostname"
+msgstr ""
+
+#: ../../modules/localplay/mpd.controller.php:234
+#: ../../modules/localplay/httpq.controller.php:218
+msgid "Port"
+msgstr ""
+
+#: ../../modules/localplay/shoutcast.controller.php:238
 #, fuzzy
-msgid "Error Captcha Required"
-msgstr "Error Username Required"
+msgid "PID File"
+msgstr "file"
 
-#: ../../register.php:80
-msgid "Error Captcha Failed"
+#: ../../modules/localplay/shoutcast.controller.php:239
+#, fuzzy
+msgid "Playlist File"
+msgstr "Playlist Type"
+
+#: ../../modules/localplay/shoutcast.controller.php:240
+#, fuzzy
+msgid "Local Path to Files"
+msgstr "Local Play Control"
+
+#: ../../admin/mail.php:90
+#, fuzzy
+msgid "E-mail Sent"
+msgstr "E-mail"
+
+#: ../../admin/mail.php:91
+msgid "Your E-mail was successfully sent."
 msgstr ""
 
-#: ../../register.php:87
-msgid "You <U>must</U> accept the user agreement"
+#: ../../admin/modules.php:38
+msgid "Install Failed, Controller Error"
 msgstr ""
 
-#: ../../register.php:92
-msgid "You did not enter a username"
+#: ../../admin/modules.php:56 ../../admin/modules.php:101
+#, fuzzy
+msgid "Are you sure you want to remove this plugin?"
+msgstr "Are you sure you want to permanently delete"
+
+#: ../../admin/modules.php:68 ../../admin/modules.php:120
+msgid "Plugin Deactivated"
 msgstr ""
 
-#: ../../register.php:96
-msgid "Please fill in your full name (Firstname Lastname)"
+#: ../../admin/modules.php:83
+msgid "Unable to Install Plugin"
 msgstr ""
 
-#: ../../register.php:122
+#: ../../admin/modules.php:94
+msgid "Plugin Activated"
+msgstr ""
+
+#: ../../admin/modules.php:129
+msgid "Plugins"
+msgstr ""
+
+#: ../../admin/modules.php:135
+msgid "Localplay Controllers"
+msgstr ""
+
+#: ../../admin/flag.php:88
 #, fuzzy
-msgid "You must enter a password"
-msgstr "Enter password"
+msgid "Song Updated"
+msgstr "Updated"
 
-#: ../../register.php:126
+#: ../../admin/flag.php:88
 #, fuzzy
-msgid "Your passwords do not match"
-msgstr "Error Passwords don't match"
+msgid "The requested song has been updated"
+msgstr "The requested song(s) have been disabled"
 
-#: ../../register.php:158
+#: ../../admin/flag.php:130
 #, fuzzy
-msgid "Error: Insert Failed"
-msgstr "Error: Insufficient Rights"
+msgid "Album Updated"
+msgstr "Updated"
 
-#: ../../flag.php:45
+#: ../../admin/flag.php:172
 #, fuzzy
-msgid "Item Flagged"
-msgstr "Flagged by"
+msgid "Artist Updated"
+msgstr "Fast Update"
 
-#: ../../flag.php:45
-msgid "The specified item has been flagged"
+#: ../../admin/flag.php:237
+#, fuzzy
+msgid "Songs Updated"
+msgstr "Updated"
+
+#: ../../admin/flag.php:245
+#, fuzzy
+msgid "Flag Removed"
+msgstr "files removed"
+
+#: ../../admin/flag.php:246
+msgid "Flag Removed from"
 msgstr ""
 
-#: ../../albums.php:32
-msgid "Album Art Cleared"
-msgstr "Album Art Cleared"
+#: ../../admin/flag.php:261
+msgid "Flags Updated"
+msgstr ""
 
-#: ../../albums.php:32
+#: ../../admin/flag.php:280
+msgid "Songs Disabled"
+msgstr "Songs Disabled"
+
+#: ../../admin/flag.php:280
+msgid "The requested song(s) have been disabled"
+msgstr "The requested song(s) have been disabled"
+
+#: ../../admin/flag.php:291
+msgid "Songs Enabled"
+msgstr "Songs Enabled"
+
+#: ../../admin/flag.php:291
+msgid "The requested song(s) have been enabled"
+msgstr "The requested song(s) have been enabled"
+
+#: ../../admin/shout.php:35
+msgid "Shoutbox Post Updated"
+msgstr ""
+
+#: ../../admin/shout.php:47
+msgid "Shoutbox Post Deleted"
+msgstr ""
+
+#: ../../admin/access.php:35
 #, fuzzy
-msgid "Album Art information has been removed from the database"
-msgstr "Album Art information has been removed from the database"
+msgid "Deleted"
+msgstr "Delete"
 
-#: ../../albums.php:39 ../../albums.php:56 ../../albums.php:129
-msgid "Album Art Not Located"
-msgstr "Album Art Not Located"
+#: ../../admin/access.php:35
+msgid "Your Access List Entry has been removed"
+msgstr "Your Access List Entry has been removed"
 
-#: ../../albums.php:39 ../../albums.php:56 ../../albums.php:129
+#: ../../admin/access.php:40
+msgid "Your new Access List Entry has been created"
+msgstr "Your new Access List Entry has been created"
+
+#: ../../admin/access.php:45
 #, fuzzy
+msgid "Access List Entry updated"
+msgstr "Your Access List Entry has been removed"
+
+#: ../../admin/users.php:83
+msgid "User Updated"
+msgstr ""
+
+#: ../../admin/users.php:83
+msgid "updated"
+msgstr ""
+
+#: ../../admin/users.php:129
+msgid "New User Added"
+msgstr ""
+
+#: ../../admin/users.php:134
+msgid "User Enabled"
+msgstr ""
+
+#: ../../admin/users.php:139
+msgid "User Disabled"
+msgstr ""
+
+#: ../../admin/users.php:142
+msgid "Unable to Disabled last Administrator"
+msgstr ""
+
+#: ../../admin/users.php:164
+msgid "User Deleted"
+msgstr "User Deleted"
+
+#: ../../admin/users.php:167
+msgid "Delete Error"
+msgstr "Delete Error"
+
+#: ../../admin/users.php:167
+msgid "Unable to delete last Admin User"
+msgstr "Unable to delete last Admin User"
+
+#: ../../admin/users.php:173
+msgid "Deletion Request"
+msgstr ""
+
+#: ../../admin/users.php:174
+msgid "Are you sure you want to permanently delete"
+msgstr "Are you sure you want to permanently delete"
+
+#: ../../admin/system.php:49
+msgid "Database Charset Updated"
+msgstr ""
+
+#: ../../admin/system.php:49
 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."
+"Your Database and associated tables have been updated to match your "
+"currently configured charset"
 msgstr ""
-"Album Art could not be located at this time. This may be due to Amazon being "
-"busy, or the album not being present in their collection."
 
-#: ../../albums.php:52 ../../albums.php:80
+#: ../../admin/catalog.php:53 ../../admin/catalog.php:73
+#: ../../admin/catalog.php:98 ../../admin/catalog.php:170
 #, fuzzy
-msgid "Album Art Inserted"
-msgstr "Album Art Cleared"
+msgid "Catalog Updated"
+msgstr "Catalogue Update Finished"
 
-#: ../../radio.php:50
-msgid "Radio Station Added"
+#: ../../admin/catalog.php:115
+#, fuzzy
+msgid "Catalog Deleted"
+msgstr "Catalogue Clean Done"
+
+#: ../../admin/catalog.php:115
+msgid "The Catalog and all associated records have been deleted"
 msgstr ""
 
-#: ../../democratic.php:52
-msgid "The Requested Playlist has been deleted."
+#: ../../admin/catalog.php:121
+#, fuzzy
+msgid "Catalog Delete"
+msgstr "Catalogue Clean Done"
+
+#: ../../admin/catalog.php:121
+#, fuzzy
+msgid "Confirm Deletion Request"
+msgstr "Entry Deleted"
+
+#: ../../admin/catalog.php:130
+#, fuzzy
+msgid "Songs Removed"
+msgstr "files removed"
+
+#: ../../admin/catalog.php:133
+msgid "No Songs Removed"
 msgstr ""
 
+#: ../../admin/catalog.php:136
+#, fuzzy
+msgid "Disabled Songs Processed"
+msgstr "Show Disabled Songs"
+
+#: ../../admin/catalog.php:157
+#, fuzzy
+msgid "Catalog Cleaned"
+msgstr "Catalogue Clean Done"
+
+#: ../../admin/catalog.php:214
+msgid "Error: Defined Path is inside an existing catalog"
+msgstr ""
+
+#: ../../admin/catalog.php:233
+#, fuzzy
+msgid "Catalog Created"
+msgstr "Catalogue Name"
+
+#: ../../admin/catalog.php:250
+#, fuzzy
+msgid "Catalog statistics cleared"
+msgstr "Catalogue Statistics"
+
+#: ../../admin/catalog.php:263
+msgid "Now Playing Cleared"
+msgstr "Now Playing Cleared"
+
+#: ../../admin/catalog.php:263
+msgid "All now playing data has been cleared"
+msgstr "All now playing data has been cleared"
+
+#: ../../admin/catalog.php:273
+#, fuzzy
+msgid "No Disabled songs found"
+msgstr "Show Disabled Songs"
+
+#: ../../admin/catalog.php:282
+#, fuzzy
+msgid "Delete Catalog"
+msgstr "Update Catalogues"
+
+#: ../../admin/catalog.php:282
+msgid "Do you really want to delete this catalog?"
+msgstr "Do you really want to delete this catalogue?"
+
+#: ../../admin/catalog.php:302
+msgid "Album Art Search Finished"
+msgstr "Album Art Search Finished"
+
 #: ../../bin/print_tags.inc:66
 msgid ""
 "[print_tags.php.inc]\n"