Updated translations...

2 files changed, 3103 insertions, 3054 deletions

diff --git a/locale/en_GB/LC_MESSAGES/messages.mo b/locale/en_GB/LC_MESSAGES/messages.mo
index b3cd4430..49084144 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 7da42025..b8072b1e 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 SVN $Rev$\n"
 "Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2009-06-24 10:57+0900\n"
+"POT-Creation-Date: 2009-09-08 19:27-0300\n"
 "PO-Revision-Date: 2009-05-06 22:00+0900\n"
 "Last-Translator: momo-i <webmaster@momo-i.org>\n"
 "Language-Team: English (British)\n"
@@ -16,1288 +16,539 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../search.php:38
-msgid "Error: No Keyword Entered"
-msgstr "Error: No Keyword Entered"
-
-#. HINT: Artist, Song Title
-#: ../../song.php:42 ../../song.php:60
-#, php-format
-msgid "%1$s - %2$s Lyrics Detail"
-msgstr "%1$s - %2$s Lyrics Detail"
-
-#. HINT: Artist Fullname
-#: ../../templates/show_album_row.inc.php:23
-#: ../../templates/show_song_row.inc.php:23
-#: ../../templates/show_albums.inc.php:40
-#: ../../templates/show_albums.inc.php:71
-#: ../../templates/show_artists.inc.php:36
-#: ../../templates/show_artists.inc.php:64
-#: ../../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_videos.inc.php:36
-#: ../../templates/show_videos.inc.php:60
-#: ../../templates/show_add_live_stream.inc.php:68
-#: ../../templates/show_catalog_row.inc.php:29
-#: ../../templates/show_video_row.inc.php:23
-#: ../../templates/show_artist_row.inc.php:23
-#: ../../templates/show_genres.inc.php:36
-#: ../../templates/show_genres.inc.php:49
-#: ../../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:43
-#: ../../templates/show_album.inc.php:51
-#: ../../templates/show_playlist_song_row.inc.php:22
-#: ../../templates/show_song.inc.php:29
-#: ../../templates/show_playlist_row.inc.php:23
-#: ../../templates/show_live_stream.inc.php:26
-#: ../../templates/show_admin_tools.inc.php:45
-msgid "Add"
-msgstr "Add"
-
-#. HINT: Artist Fullname
-#: ../../templates/show_album_row.inc.php:24
-#: ../../templates/sidebar_home.inc.php:105
-#: ../../templates/show_artist_row.inc.php:24
-#: ../../templates/show_genres.inc.php:52
-#: ../../templates/show_localplay_status.inc.php:44
-#: ../../templates/show_artist.inc.php:48
-#: ../../templates/show_album.inc.php:55
-#: ../../templates/show_playlist_row.inc.php:24
-#: ../../modules/localplay/mpd.controller.php:495
-#: ../../modules/localplay/httpq.controller.php:492
-msgid "Random"
-msgstr "Random"
+#: ../../register.php:73
+msgid "Error Captcha Required"
+msgstr "Error Captcha Required"
 
-#: ../../templates/show_album_row.inc.php:45
-#: ../../templates/show_song_row.inc.php:38
-msgid "Post Shout"
-msgstr "Post Shout"
+#: ../../register.php:80
+msgid "Error Captcha Failed"
+msgstr "Error Captcha Failed"
 
-#: ../../templates/show_album_row.inc.php:50
-#: ../../templates/show_playlist.inc.php:35
-#: ../../templates/show_playlist.inc.php:36
-#: ../../templates/rightbar.inc.php:49
-#: ../../templates/show_artist_row.inc.php:35
-#: ../../templates/show_genres.inc.php:60
-#: ../../templates/show_search_options.inc.php:32
-#: ../../templates/show_search_options.inc.php:33
-#: ../../templates/show_playlist_row.inc.php:33
-msgid "Batch Download"
-msgstr "Batch Download"
+#: ../../register.php:87
+msgid "You <U>must</U> accept the user agreement"
+msgstr "You <U>must</U> accept the user agreement"
 
-#: ../../templates/show_album_row.inc.php:54
-#: ../../templates/show_song_row.inc.php:47
-#: ../../templates/show_user_row.inc.php:38
-#: ../../templates/show_play_selected.inc.php:50
-#: ../../templates/show_artist_row.inc.php:39
-#: ../../templates/show_shout_row.inc.php:32
-#: ../../templates/show_live_stream_row.inc.php:31
-#: ../../templates/show_playlist_song_row.inc.php:37
-#: ../../templates/show_playlist_row.inc.php:37
-#: ../../templates/show_access_list.inc.php:79
-msgid "Edit"
-msgstr "Edit"
+#: ../../register.php:92
+msgid "You did not enter a username"
+msgstr "You did not enter a username"
 
-#. HINT: Editing Username preferences
-#. HINT: Username
-#: ../../templates/show_user_preferences.inc.php:28
-#: ../../templates/show_preferences.inc.php:28
-#, php-format
-msgid "Editing %s preferences"
-msgstr "Editing %s preferences"
+#: ../../register.php:96
+msgid "Please fill in your full name (Firstname Lastname)"
+msgstr "Please fill in your full name (Firstname Lastname)"
 
-#: ../../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:93
-msgid "Preference"
-msgstr "Preference"
+#: ../../register.php:117
+msgid "Error Email address not confirmed"
+msgstr "Error Email address not confirmed"
 
-#: ../../templates/show_user_preferences.inc.php:37
-#: ../../templates/show_preference_box.inc.php:41
-#: ../../templates/show_preference_box.inc.php:71
-#: ../../templates/show_random_rules.inc.php:34
-#: ../../templates/show_dynamic.inc.php:33
-#: ../../templates/show_debug.inc.php:45 ../../templates/show_debug.inc.php:94
-msgid "Value"
-msgstr "Value"
+#: ../../register.php:123
+msgid "You must enter a password"
+msgstr "You must enter a password"
 
-#: ../../templates/show_user_preferences.inc.php:50
-#: ../../templates/show_preferences.inc.php:34
-msgid "Update Preferences"
-msgstr "Update Preferences"
+#: ../../register.php:127
+msgid "Your passwords do not match"
+msgstr "Your passwords do not match"
 
-#: ../../templates/show_song_row.inc.php:35
-msgid "Song Information"
-msgstr "Song Information"
+#: ../../register.php:131 ../../admin/users.php:110
+msgid "Error Username already exists"
+msgstr "Error Username already exists"
 
-#: ../../templates/show_song_row.inc.php:43
-#: ../../templates/show_video_row.inc.php:32
-#: ../../templates/show_artist.inc.php:59
-#: ../../templates/show_artist.inc.php:60
-#: ../../templates/show_album.inc.php:76 ../../templates/show_album.inc.php:77
-#: ../../templates/show_playlist_song_row.inc.php:33
-#: ../../templates/show_song.inc.php:32
-msgid "Download"
-msgstr "Download"
+#: ../../register.php:159 ../../admin/users.php:117
+msgid "Error: Insert Failed"
+msgstr "Error: Insert Failed"
 
-#: ../../templates/show_localplay_control.inc.php:25
-msgid "Previous"
-msgstr "Previous"
+#: ../../update.php:47 ../../update.php:51
+msgid "Ampache Update"
+msgstr "Ampache Update"
 
-#: ../../templates/show_localplay_control.inc.php:26
-msgid "Stop"
-msgstr "Stop"
+#: ../../update.php:56
+#, php-format
+msgid ""
+"This page handles all database updates to Ampache starting with "
+"<strong>3.3.3.5</strong>. According to your database your current version "
+"is: <strong>%s</strong>."
+msgstr ""
+"This page handles all database updates to Ampache starting with "
+"<strong>3.3.3.5</strong>. According to your database your current version "
+"is: <strong>%s</strong>."
 
-#: ../../templates/show_localplay_control.inc.php:27
-msgid "Pause"
-msgstr "Pause"
+#: ../../update.php:57
+msgid "the following updates need to be performed"
+msgstr "the following updates need to be performed"
 
-#: ../../templates/show_localplay_control.inc.php:28
-#: ../../templates/show_manage_democratic.inc.php:57
-#: ../../templates/rightbar.inc.php:25
-#: ../../templates/show_democratic.inc.php:39
-msgid "Play"
-msgstr "Play"
+#: ../../update.php:64
+msgid "Update Now!"
+msgstr "Update Now!"
 
-#: ../../templates/show_localplay_control.inc.php:29
-#: ../../templates/list_header.inc.php:101
-msgid "Next"
-msgstr "Next"
+#: ../../update.php:68
+msgid "Ampache Installation."
+msgstr "Ampache Installation."
 
-#: ../../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"
+#: ../../play/index.php:84
+msgid "Session Expired: please log in again at"
+msgstr "Session Expired: please log in again at"
 
-#: ../../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"
+#. HINT: Artist, Song Title
+#: ../../song.php:42 ../../song.php:60
+#, php-format
+msgid "%1$s - %2$s Lyrics Detail"
+msgstr "%1$s - %2$s Lyrics Detail"
 
-#: ../../templates/show_test.inc.php:38
-msgid "CHECK"
-msgstr "CHECK"
+#: ../../radio.php:50
+msgid "Radio Station Added"
+msgstr "Radio Station Added"
 
-#: ../../templates/show_test.inc.php:40
-msgid "STATUS"
-msgstr "STATUS"
+#: ../../admin/flag.php:88
+msgid "Song Updated"
+msgstr "Song Updated"
 
-#: ../../templates/show_test.inc.php:42
-msgid "DESCRIPTION"
-msgstr "DESCRIPTION"
+#: ../../admin/flag.php:88
+msgid "The requested song has been updated"
+msgstr "The requested song has been updated"
 
-#: ../../templates/show_test.inc.php:45
-#: ../../templates/show_install_check.inc.php:26
-#: ../../templates/show_install_check.inc.php:39
-msgid "PHP Version"
-msgstr "PHP Version"
+#: ../../admin/flag.php:130
+msgid "Album Updated"
+msgstr "Album Updated"
 
-#: ../../templates/show_test.inc.php:51
-#: ../../templates/show_install_check.inc.php:37
-msgid "Hash Function Exists"
-msgstr "Hash Function Exists"
+#: ../../admin/flag.php:172
+msgid "Artist Updated"
+msgstr "Artist Updated"
 
-#: ../../templates/show_test.inc.php:51
-#: ../../templates/show_install_check.inc.php:37
-msgid "SHA256 Support"
-msgstr "SHA256 Support"
+#: ../../admin/flag.php:237
+msgid "Songs Updated"
+msgstr "Songs Updated"
 
-#: ../../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."
+#: ../../admin/flag.php:245
+msgid "Flag Removed"
+msgstr "Flag Removed"
 
-#: ../../templates/show_test.inc.php:65
-#: ../../templates/show_install_check.inc.php:47
-#: ../../templates/show_install_check.inc.php:52
-msgid "Mysql for PHP"
-msgstr "Mysql for PHP"
+#: ../../admin/flag.php:246
+msgid "Flag Removed from"
+msgstr "Flag Removed from"
 
-#: ../../templates/show_test.inc.php:78
-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."
+#: ../../admin/flag.php:261
+msgid "Flags Updated"
+msgstr "Flags Updated"
 
-#: ../../templates/show_test.inc.php:82
-#: ../../templates/show_install_check.inc.php:60
-#: ../../templates/show_install_check.inc.php:65
-msgid "PHP Session Support"
-msgstr "PHP Session Support"
+#: ../../admin/flag.php:280
+msgid "Songs Disabled"
+msgstr "Songs Disabled"
 
-#: ../../templates/show_test.inc.php:95
-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."
+#: ../../admin/flag.php:280
+msgid "The requested song(s) have been disabled"
+msgstr "The requested song(s) have been disabled"
 
-#: ../../templates/show_test.inc.php:99
-#: ../../templates/show_install_check.inc.php:73
-#: ../../templates/show_install_check.inc.php:78
-msgid "PHP ICONV Support"
-msgstr "PHP ICONV Support"
+#: ../../admin/flag.php:291
+msgid "Songs Enabled"
+msgstr "Songs Enabled"
 
-#: ../../templates/show_test.inc.php:111
-msgid ""
-"This test checks to make sure you have Iconv support installed. Iconv "
-"support is required for Ampache"
-msgstr ""
-"This test checks to make sure you have Iconv support installed. Iconv "
-"support is required for Ampache"
+#: ../../admin/flag.php:291
+msgid "The requested song(s) have been enabled"
+msgstr "The requested song(s) have been enabled"
 
-#: ../../templates/show_test.inc.php:115
-#: ../../templates/show_install_check.inc.php:86
-#: ../../templates/show_install_check.inc.php:91
-msgid "PHP PCRE Support"
-msgstr "PHP PCRE Support"
+#: ../../admin/catalog.php:54 ../../admin/catalog.php:74
+#: ../../admin/catalog.php:99 ../../admin/catalog.php:171
+msgid "Catalog Updated"
+msgstr "Catalog Updated"
 
-#: ../../templates/show_test.inc.php:127
-msgid ""
-"This test makes sure you have PCRE support compiled into your version of "
-"PHP, this is required for Ampache."
-msgstr ""
-"This test makes sure you have PCRE support compiled into your version of "
-"PHP, this is required for Ampache."
+#: ../../admin/catalog.php:116
+msgid "Catalog Deleted"
+msgstr "Catalog Deleted"
 
-#: ../../templates/show_test.inc.php:131
-#: ../../templates/show_install_check.inc.php:99
-#: ../../templates/show_install_check.inc.php:104
-msgid "PHP PutENV Support"
-msgstr "PHP PutENV Support"
+#: ../../admin/catalog.php:116
+msgid "The Catalog and all associated records have been deleted"
+msgstr "The Catalog and all associated records have been deleted"
 
-#: ../../templates/show_test.inc.php:143
-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 ""
-"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"
+#: ../../admin/catalog.php:122
+msgid "Catalog Delete"
+msgstr "Catalog Delete"
 
-#: ../../templates/show_test.inc.php:147
-#: ../../templates/show_install_config.inc.php:93
-msgid "Ampache.cfg.php Exists"
-msgstr "Ampache.cfg.php Exists"
+#: ../../admin/catalog.php:122
+msgid "Confirm Deletion Request"
+msgstr "Confirm Deletion Request"
 
-#: ../../templates/show_test.inc.php:160
-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."
+#: ../../admin/catalog.php:131
+msgid "Song Removed"
+msgid_plural "Songs Removed"
+msgstr[0] "Song Removed"
+msgstr[1] "Songs Removed"
 
-#: ../../templates/show_test.inc.php:166
-#: ../../templates/show_install_config.inc.php:108
-msgid "Ampache.cfg.php Configured?"
-msgstr "Ampache.cfg.php Configured?"
+#: ../../admin/catalog.php:134
+msgid "No Songs Removed"
+msgstr "No Songs Removed"
 
-#: ../../templates/show_test.inc.php:182
-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 ""
-"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"
+#: ../../admin/catalog.php:137
+msgid "Disabled Song Processed"
+msgid_plural "Disabled Songs Processed"
+msgstr[0] "Disabled Song Processed"
+msgstr[1] "Disabled Songs Processed"
 
-#: ../../templates/show_test.inc.php:186
-msgid "DB Connection"
-msgstr "DB Connection"
+#: ../../admin/catalog.php:158
+msgid "Catalog Cleaned"
+msgstr "Catalog Cleaned"
 
-#: ../../templates/show_test.inc.php:200
-msgid ""
-"This attempts to connect to your database using the values from your ampache."
-"cfg.php"
+#: ../../admin/catalog.php:202
+msgid "Error: Name and path not specified"
 msgstr ""
-"This attempts to connect to your database using the values from your ampache."
-"cfg.php"
-
-#: ../../templates/show_test.inc.php:204
-msgid "DB Inserted"
-msgstr "DB Inserted"
 
-#: ../../templates/show_test.inc.php:218
-msgid ""
-"This checks a few key tables to make sure that you have successfully "
-"inserted the ampache database and that the user has access to the database"
+#: ../../admin/catalog.php:206
+msgid "Error: Remote selected, but path is not a URL"
 msgstr ""
-"This checks a few key tables to make sure that you have successfully "
-"inserted the ampache database and that the user has access to the database"
 
-#: ../../templates/show_test.inc.php:223
-#: ../../templates/show_install_config.inc.php:65
-msgid "Web Path"
-msgstr "Web Path"
-
-#: ../../templates/show_test.inc.php:247
-msgid ""
-"This test makes sure that your web_path variable is set correctly and that "
-"we are able to get to the index page. If you do not see a check mark here "
-"then your web_path is not set correctly."
+#: ../../admin/catalog.php:210
+msgid "Error: Remote Catalog specified, but no key provided"
 msgstr ""
-"This test makes sure that your web_path variable is set correctly and that "
-"we are able to get to the index page. If you do not see a check mark here "
-"then your web_path is not set correctly."
-
-#: ../../templates/show_albums.inc.php:42
-#: ../../templates/show_albums.inc.php:73
-msgid "Cover"
-msgstr "Cover"
-
-#: ../../templates/show_albums.inc.php:44
-#: ../../templates/show_albums.inc.php:75
-#: ../../templates/sidebar_home.inc.php:107
-#: ../../templates/show_edit_song.inc.php:37
-#: ../../templates/show_democratic_playlist.inc.php:57
-#: ../../templates/show_democratic_playlist.inc.php:97
-#: ../../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_song.inc.php:43
-#: ../../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:78
-#: ../../templates/show_lyrics_song.inc.php:49
-#: ../../templates/show_playlist_songs.inc.php:44
-#: ../../templates/show_playlist_songs.inc.php:65
-#: ../../templates/show_now_playing_row.inc.php:61
-msgid "Album"
-msgstr "Album"
-
-#: ../../templates/show_albums.inc.php:45
-#: ../../templates/show_albums.inc.php:76
-#: ../../templates/show_artists.inc.php:37
-#: ../../templates/show_artists.inc.php:65
-#: ../../templates/sidebar_home.inc.php:81
-#: ../../templates/sidebar_home.inc.php:108
-#: ../../templates/show_similar_artists.inc.php:33
-#: ../../templates/show_similar_artists.inc.php:86
-#: ../../templates/show_edit_song.inc.php:45
-#: ../../templates/show_democratic_playlist.inc.php:58
-#: ../../templates/show_democratic_playlist.inc.php:98
-#: ../../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_song.inc.php:42
-#: ../../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:77
-#: ../../templates/show_lyrics_song.inc.php:56
-#: ../../templates/show_playlist_songs.inc.php:43
-#: ../../templates/show_playlist_songs.inc.php:64
-#: ../../templates/show_now_playing_row.inc.php:68
-msgid "Artist"
-msgstr "Artist"
-
-#: ../../templates/show_albums.inc.php:46
-#: ../../templates/show_albums.inc.php:77
-#: ../../templates/show_artists.inc.php:38
-#: ../../templates/show_artists.inc.php:66
-#: ../../templates/show_manage_democratic.inc.php:39
-#: ../../templates/show_popular.inc.php:23
-#: ../../templates/show_genre.inc.php:39 ../../templates/show_stats.inc.php:32
-#: ../../templates/show_stats.inc.php:68
-#: ../../templates/show_genres.inc.php:38
-#: ../../templates/show_genres.inc.php:74 ../../lib/class/browse.class.php:142
-msgid "Songs"
-msgstr "Songs"
-
-#: ../../templates/show_albums.inc.php:47
-#: ../../templates/show_albums.inc.php:78
-#: ../../templates/show_edit_song.inc.php:59
-#: ../../templates/show_play_selected.inc.php:61
-#: ../../templates/show_edit_album.inc.php:33
-#: ../../templates/show_search.inc.php:60
-msgid "Year"
-msgstr "Year"
-
-#: ../../templates/show_albums.inc.php:48
-#: ../../templates/show_albums.inc.php:79
-#: ../../templates/show_artists.inc.php:41
-#: ../../templates/show_artists.inc.php:69
-#: ../../templates/show_videos.inc.php:41
-#: ../../templates/show_videos.inc.php:65
-#: ../../templates/show_stats.inc.php:34 ../../templates/show_songs.inc.php:43
-#: ../../templates/show_songs.inc.php:72
-msgid "Tags"
-msgstr "Tags"
-
-#: ../../templates/show_albums.inc.php:49
-#: ../../templates/show_albums.inc.php:80
-#: ../../templates/show_artists.inc.php:42
-#: ../../templates/show_artists.inc.php:70
-#: ../../templates/show_search.inc.php:104
-#: ../../templates/show_songs.inc.php:49 ../../templates/show_songs.inc.php:76
-#: ../../templates/show_now_playing_row.inc.php:36
-msgid "Rating"
-msgstr "Rating"
-
-#: ../../templates/show_albums.inc.php:50
-#: ../../templates/show_albums.inc.php:81
-#: ../../templates/show_catalogs.inc.php:38
-#: ../../templates/show_catalogs.inc.php:55
-#: ../../templates/show_playlists.inc.php:39
-#: ../../templates/show_playlists.inc.php:62
-#: ../../templates/show_album.inc.php:48
-msgid "Actions"
-msgstr "Actions"
-
-#: ../../templates/show_albums.inc.php:67
-#: ../../templates/show_artists.inc.php:60
-#: ../../templates/show_live_streams.inc.php:53
-#: ../../templates/show_playlists.inc.php:53
-#: ../../templates/show_manage_democratic.inc.php:63
-#: ../../templates/show_videos.inc.php:56
-#: ../../templates/show_objects.inc.php:44
-#: ../../templates/rightbar.inc.php:108 ../../templates/show_genres.inc.php:68
-#: ../../templates/show_user_recommendations.inc.php:32
-#: ../../templates/show_user_recommendations.inc.php:43
-#: ../../templates/show_user_recommendations.inc.php:54
-#: ../../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 "Not Enough Data"
-
-#: ../../templates/show_users.inc.php:39 ../../templates/show_users.inc.php:61
-msgid "Fullname"
-msgstr "Fullname"
-
-#: ../../templates/show_users.inc.php:39 ../../templates/show_users.inc.php:61
-#: ../../templates/show_edit_user.inc.php:32
-#: ../../templates/show_add_user.inc.php:29
-#: ../../templates/show_install_account.inc.php:62
-#: ../../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"
-
-#: ../../templates/show_users.inc.php:40 ../../templates/show_users.inc.php:62
-#: ../../templates/show_user.inc.php:32
-msgid "Last Seen"
-msgstr "Last Seen"
-
-#: ../../templates/show_users.inc.php:41 ../../templates/show_users.inc.php:63
-msgid "Registration Date"
-msgstr "Registration Date"
 
-#: ../../templates/show_users.inc.php:42 ../../templates/show_users.inc.php:64
-#: ../../templates/show_user.inc.php:33
-msgid "Activity"
-msgstr "Activity"
+#: ../../admin/catalog.php:215
+msgid "Error: Defined Path is inside an existing catalog"
+msgstr "Error: Defined Path is inside an existing catalog"
 
-#: ../../templates/show_users.inc.php:44 ../../templates/show_users.inc.php:66
-msgid "Last Ip"
-msgstr "Last Ip"
+#: ../../admin/catalog.php:234
+msgid "Catalog Created"
+msgstr "Catalog Created"
 
-#: ../../templates/show_users.inc.php:46 ../../templates/show_users.inc.php:68
-#: ../../templates/show_localplay_controllers.inc.php:35
-#: ../../templates/show_localplay_controllers.inc.php:66
-#: ../../templates/show_artists.inc.php:43
-#: ../../templates/show_artists.inc.php:71
-#: ../../templates/show_live_streams.inc.php:40
-#: ../../templates/show_live_streams.inc.php:62
-#: ../../templates/show_manage_democratic.inc.php:40
-#: ../../templates/show_videos.inc.php:42
-#: ../../templates/show_videos.inc.php:66
-#: ../../templates/show_plugins.inc.php:35
-#: ../../templates/show_plugins.inc.php:64
-#: ../../templates/show_democratic_playlist.inc.php:54
-#: ../../templates/show_democratic_playlist.inc.php:94
-#: ../../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_random_rules.inc.php:36
-#: ../../templates/show_localplay_playlist.inc.php:35
-#: ../../templates/show_localplay_playlist.inc.php:61
-#: ../../templates/show_songs.inc.php:51 ../../templates/show_songs.inc.php:78
-#: ../../templates/show_song.inc.php:27
-#: ../../templates/show_admin_tools.inc.php:34
-#: ../../templates/show_admin_tools.inc.php:74
-#: ../../templates/show_access_list.inc.php:62
-#: ../../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"
+#: ../../admin/catalog.php:251
+msgid "Catalog statistics cleared"
+msgstr "Catalog statistics cleared"
 
-#: ../../templates/show_users.inc.php:47 ../../templates/show_users.inc.php:69
-msgid "On-line"
-msgstr "On-line"
+#: ../../admin/catalog.php:264
+msgid "Now Playing Cleared"
+msgstr "Now Playing Cleared"
 
-#: ../../templates/show_users.inc.php:53 ../../templates/show_user.inc.php:22
-#: ../../lib/class/user.class.php:671 ../../lib/class/catalog.class.php:146
-#: ../../lib/class/catalog.class.php:147 ../../lib/class/catalog.class.php:148
-#: ../../lib/preferences.php:263
-msgid "Never"
-msgstr "Never"
+#: ../../admin/catalog.php:264
+msgid "All now playing data has been cleared"
+msgstr "All now playing data has been cleared"
 
-#: ../../templates/show_users.inc.php:54 ../../templates/show_user.inc.php:23
-#: ../../lib/class/flag.class.php:337 ../../lib/class/localplay.class.php:648
-#: ../../lib/class/user.class.php:675 ../../lib/general.lib.php:339
-#: ../../modules/localplay/mpd.controller.php:525
-msgid "Unknown"
-msgstr "Unknown"
+#: ../../admin/catalog.php:275
+msgid "No Disabled songs found"
+msgstr "No Disabled songs found"
 
-#: ../../templates/show_edit_user.inc.php:23
-msgid "Editing existing User"
-msgstr "Editing existing User"
+#: ../../admin/catalog.php:284
+msgid "Delete Catalog"
+msgstr "Delete Catalog"
 
-#: ../../templates/show_edit_user.inc.php:28
-msgid "User Properties"
-msgstr "User Properties"
+#: ../../admin/catalog.php:284
+msgid "Do you really want to delete this catalog?"
+msgstr "Do you really want to delete this catalog?"
 
-#: ../../templates/show_edit_user.inc.php:40
-#: ../../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"
+#: ../../admin/catalog.php:304
+msgid "Album Art Search Finished"
+msgstr "Album Art Search Finished"
 
-#: ../../templates/show_edit_user.inc.php:47
-#: ../../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"
+#: ../../admin/users.php:55 ../../admin/users.php:105
+#: ../../lib/class/user.class.php:379
+msgid "Error Username Required"
+msgstr "Error Username Required"
 
-#: ../../templates/show_edit_user.inc.php:55
-#: ../../templates/show_add_user.inc.php:52
-#: ../../templates/show_install_account.inc.php:66
-#: ../../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"
+#: ../../admin/users.php:58 ../../admin/users.php:101
+#: ../../lib/class/user.class.php:383
+msgid "Error Passwords don't match"
+msgstr "Error Passwords don't match"
 
-#: ../../templates/show_edit_user.inc.php:64
-#: ../../templates/show_add_user.inc.php:61
-#: ../../templates/show_account.inc.php:46
-#: ../../templates/show_install_account.inc.php:70
-#: ../../templates/show_user_registration.inc.php:110
-msgid "Confirm Password"
-msgstr "Confirm Password"
+#: ../../admin/users.php:83
+msgid "User Updated"
+msgstr "User Updated"
 
-#: ../../templates/show_edit_user.inc.php:72
-#: ../../templates/show_add_user.inc.php:69
-msgid "User Access Level"
-msgstr "User Access Level"
+#: ../../admin/users.php:83
+msgid "updated"
+msgstr "updated"
 
-#: ../../templates/show_edit_user.inc.php:77
-#: ../../templates/show_preference_box.inc.php:58
+#: ../../admin/users.php:125 ../../templates/show_edit_user.inc.php:77
 #: ../../templates/show_preference_admin.inc.php:41
 #: ../../templates/show_add_user.inc.php:74
-#: ../../lib/class/democratic.class.php:145 ../../admin/users.php:125
+#: ../../templates/show_preference_box.inc.php:58
+#: ../../lib/class/democratic.class.php:145
 msgid "Guest"
 msgstr "Guest"
 
-#: ../../templates/show_edit_user.inc.php:78
-#: ../../templates/show_preference_box.inc.php:59
-#: ../../templates/show_add_access_local.inc.php:41
-#: ../../templates/show_add_access_rpc.inc.php:41
-#: ../../templates/show_edit_access.inc.php:60
-#: ../../templates/show_preference_admin.inc.php:42
-#: ../../templates/show_add_access.inc.php:41
-#: ../../templates/show_add_user.inc.php:75
-#: ../../templates/show_create_democratic.inc.php:42
+#: ../../admin/users.php:126 ../../templates/show_add_access_local.inc.php:41
 #: ../../templates/show_flagged.inc.php:35
 #: ../../templates/show_flagged.inc.php:54
+#: ../../templates/show_access_list.inc.php:59
+#: ../../templates/show_edit_user.inc.php:78
+#: ../../templates/show_create_democratic.inc.php:42
 #: ../../templates/show_add_access_current.inc.php:44
+#: ../../templates/show_preference_admin.inc.php:42
+#: ../../templates/show_edit_access.inc.php:60
 #: ../../templates/show_mail_users.inc.php:31
-#: ../../templates/show_access_list.inc.php:59
+#: ../../templates/show_add_user.inc.php:75
+#: ../../templates/show_add_access.inc.php:41
+#: ../../templates/show_preference_box.inc.php:59
 #: ../../templates/show_manage_shoutbox.inc.php:35
 #: ../../templates/show_manage_shoutbox.inc.php:59
+#: ../../templates/show_add_access_rpc.inc.php:41
 #: ../../lib/class/democratic.class.php:148 ../../lib/preferences.php:232
-#: ../../admin/users.php:126
 msgid "User"
 msgstr "User"
 
-#: ../../templates/show_edit_user.inc.php:79
-#: ../../templates/show_preference_box.inc.php:60
-#: ../../templates/show_add_user.inc.php:76
-#: ../../templates/show_create_democratic.inc.php:43
-#: ../../lib/class/democratic.class.php:151
-msgid "Content Manager"
-msgstr "Content Manager"
-
-#: ../../templates/show_edit_user.inc.php:80
-#: ../../templates/show_preference_box.inc.php:61
-#: ../../templates/show_add_user.inc.php:77
-#: ../../templates/show_create_democratic.inc.php:44
-#: ../../lib/class/democratic.class.php:154
-msgid "Catalog Manager"
-msgstr "Catalog Manager"
-
-#: ../../templates/show_edit_user.inc.php:81
-#: ../../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
+#: ../../admin/users.php:127 ../../templates/show_edit_user.inc.php:81
 #: ../../templates/show_create_democratic.inc.php:45
+#: ../../templates/sidebar.inc.php:31
+#: ../../templates/show_preference_admin.inc.php:43
+#: ../../templates/show_mail_users.inc.php:32
+#: ../../templates/show_add_user.inc.php:78
+#: ../../templates/show_preference_box.inc.php:62
 #: ../../templates/show_democratic_playlist.inc.php:61
 #: ../../templates/show_democratic_playlist.inc.php:101
-#: ../../templates/show_mail_users.inc.php:32
 #: ../../lib/class/democratic.class.php:157 ../../lib/preferences.php:234
-#: ../../admin/users.php:127
 msgid "Admin"
 msgstr "Admin"
 
-#: ../../templates/show_edit_user.inc.php:86
-msgid "Other Options"
-msgstr "Other Options"
-
-#: ../../templates/show_edit_user.inc.php:89
-msgid "Config Preset"
-msgstr "Config Preset"
-
-#: ../../templates/show_edit_user.inc.php:93
-#: ../../templates/sidebar_home.inc.php:91
-#: ../../templates/show_playtype_switch.inc.php:36
-#: ../../templates/sidebar_modules.inc.php:41 ../../lib/preferences.php:180
-#: ../../modules/localplay/mpd.controller.php:491
-#: ../../modules/localplay/httpq.controller.php:488
-msgid "Democratic"
-msgstr "Democratic"
-
-#: ../../templates/show_edit_user.inc.php:94
-#: ../../templates/sidebar_home.inc.php:100
-#: ../../templates/sidebar_localplay.inc.php:32
-#: ../../templates/show_playtype_switch.inc.php:34
-#: ../../templates/sidebar.inc.php:28 ../../lib/preferences.php:183
-msgid "Localplay"
-msgstr "Localplay"
-
-#: ../../templates/show_edit_user.inc.php:95
-msgid "Flash"
-msgstr "Flash"
-
-#: ../../templates/show_edit_user.inc.php:96
-#: ../../templates/show_playtype_switch.inc.php:32
-#: ../../lib/preferences.php:177
-msgid "Stream"
-msgstr "Stream"
-
-#: ../../templates/show_edit_user.inc.php:101
-msgid "Prevent Preset Override"
-msgstr "Prevent Preset Override"
-
-#: ../../templates/show_edit_user.inc.php:103
-msgid "This Affects all non-Admin accounts"
-msgstr "This Affects all non-Admin accounts"
-
-#: ../../templates/show_edit_user.inc.php:107
-#: ../../templates/show_account.inc.php:52
-#: ../../templates/show_manage_catalogs.inc.php:33
-msgid "Clear Stats"
-msgstr "Clear Stats"
-
-#: ../../templates/show_edit_user.inc.php:115
-msgid "Update User"
-msgstr "Update User"
-
-#: ../../templates/show_catalogs.inc.php:33
-#: ../../templates/show_catalogs.inc.php:50
-#: ../../templates/show_localplay_controllers.inc.php:32
-#: ../../templates/show_localplay_controllers.inc.php:63
-#: ../../templates/show_edit_live_stream_row.inc.php:26
-#: ../../templates/show_live_streams.inc.php:36
-#: ../../templates/show_live_streams.inc.php:58
-#: ../../templates/show_edit_catalog.inc.php:26
-#: ../../templates/show_add_access_local.inc.php:26
-#: ../../templates/show_add_access_rpc.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_stats.inc.php:63
-#: ../../templates/show_edit_album.inc.php:27
-#: ../../templates/show_add_access_current.inc.php:26
-#: ../../templates/show_localplay_playlist.inc.php:34
-#: ../../templates/show_localplay_playlist.inc.php:60
-#: ../../templates/show_add_playlist.inc.php:28
-#: ../../templates/show_admin_tools.inc.php:33
-#: ../../templates/show_admin_tools.inc.php:73
-#: ../../templates/show_access_list.inc.php:55
-#: ../../templates/show_playlist_edit.inc.php:30
-msgid "Name"
-msgstr "Name"
-
-#: ../../templates/show_catalogs.inc.php:34
-#: ../../templates/show_catalogs.inc.php:51
-#: ../../templates/show_stats.inc.php:64
-#: ../../templates/show_add_catalog.inc.php:47
-msgid "Path"
-msgstr "Path"
-
-#: ../../templates/show_catalogs.inc.php:35
-#: ../../templates/show_catalogs.inc.php:52
-#: ../../templates/show_stats.inc.php:65
-msgid "Last Verify"
-msgstr "Last Verify"
-
-#: ../../templates/show_catalogs.inc.php:36
-#: ../../templates/show_catalogs.inc.php:53
-#: ../../templates/show_stats.inc.php:66
-msgid "Last Add"
-msgstr "Last Add"
-
-#: ../../templates/show_catalogs.inc.php:37
-#: ../../templates/show_catalogs.inc.php:54
-#: ../../templates/show_stats.inc.php:67
-msgid "Last Clean"
-msgstr "Last Clean"
-
-#: ../../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 "Description"
-
-#: ../../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
-msgid "Version"
-msgstr "Version"
-
-#: ../../templates/show_localplay_controllers.inc.php:44
-#: ../../templates/show_user_row.inc.php:46
-#: ../../templates/show_duplicates.inc.php:36
-#: ../../templates/show_duplicates.inc.php:75 ../../lib/preferences.php:166
-#: ../../lib/preferences.php:273
-msgid "Disable"
-msgstr "Disable"
-
-#: ../../templates/show_localplay_controllers.inc.php:48
-#: ../../templates/show_plugins.inc.php:42
-msgid "Activate"
-msgstr "Activate"
-
-#: ../../templates/show_localplay_controllers.inc.php:59
-#: ../../templates/show_plugins.inc.php:57
-#: ../../templates/show_flagged.inc.php:49
-#: ../../templates/show_localplay_playlist.inc.php:55
-#: ../../templates/show_disabled_songs.inc.php:52
-#: ../../templates/show_manage_shoutbox.inc.php:54
-msgid "No Records Found"
-msgstr "No Records Found"
-
-#: ../../templates/show_big_art.inc.php:29
-#: ../../templates/show_album_art.inc.php:41
-msgid "Album Art"
-msgstr "Album Art"
-
-#: ../../templates/show_big_art.inc.php:33
-msgid "Click to close window"
-msgstr "Click to close window"
-
-#: ../../templates/show_preference_box.inc.php:43
-#: ../../templates/show_preference_box.inc.php:73
-msgid "Apply to All"
-msgstr "Apply to All"
-
-#: ../../templates/show_preference_box.inc.php:44
-#: ../../templates/show_preference_box.inc.php:74
-msgid "Access Level"
-msgstr "Access Level"
-
-#: ../../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 "Save Changes"
-
-#: ../../templates/show_artists.inc.php:39
-#: ../../templates/show_artists.inc.php:67
-#: ../../templates/sidebar_home.inc.php:33
-#: ../../templates/sidebar_home.inc.php:78
-#: ../../templates/show_popular.inc.php:26
-#: ../../templates/show_genre.inc.php:33 ../../templates/show_stats.inc.php:30
-#: ../../lib/ui.lib.php:362 ../../lib/class/browse.class.php:148
-msgid "Albums"
-msgstr "Albums"
-
-#: ../../templates/show_artists.inc.php:40
-#: ../../templates/show_artists.inc.php:68
-#: ../../templates/show_videos.inc.php:40
-#: ../../templates/show_videos.inc.php:64
-#: ../../templates/show_democratic_playlist.inc.php:59
-#: ../../templates/show_democratic_playlist.inc.php:99
-#: ../../templates/show_search.inc.php:72
-#: ../../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"
-
-#: ../../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_duplicate.inc.php:27
-msgid "Search Type"
-msgstr "Search Type"
-
-#: ../../templates/show_duplicate.inc.php:33
-#: ../../templates/show_videos.inc.php:37
-#: ../../templates/show_videos.inc.php:61
-#: ../../templates/show_edit_song.inc.php:31
-#: ../../templates/show_democratic_playlist.inc.php:56
-#: ../../templates/show_democratic_playlist.inc.php:96
-#: ../../templates/show_search.inc.php:40 ../../templates/show_song.inc.php:41
-#: ../../templates/show_disabled_songs.inc.php:34
-#: ../../templates/show_disabled_songs.inc.php:57
-msgid "Title"
-msgstr "Title"
-
-#: ../../templates/show_duplicate.inc.php:34
-msgid "Artist and Title"
-msgstr "Artist and Title"
-
-#: ../../templates/show_duplicate.inc.php:35
-msgid "Artist, Album and Title"
-msgstr "Artist, Album and Title"
-
-#: ../../templates/show_duplicate.inc.php:37
-msgid "Search Disabled Songs"
-msgstr "Search Disabled Songs"
-
-#: ../../templates/show_import_playlist.inc.php:23
-msgid "Importing a Playlist from a File"
-msgstr "Importing a Playlist from a File"
-
-#: ../../templates/show_import_playlist.inc.php:28
-#: ../../templates/show_search.inc.php:66 ../../templates/show_song.inc.php:52
-#: ../../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:82
-msgid "Filename"
-msgstr "Filename"
-
-#: ../../templates/show_import_playlist.inc.php:34
-msgid "Playlist Type"
-msgstr "Playlist Type"
-
-#: ../../templates/show_import_playlist.inc.php:46
-msgid "Import Playlist"
-msgstr "Import Playlist"
-
-#: ../../templates/show_edit_live_stream_row.inc.php:27
-#: ../../templates/show_add_live_stream.inc.php:42
-msgid "Stream URL"
-msgstr "Stream URL"
-
-#: ../../templates/show_edit_live_stream_row.inc.php:28
-#: ../../templates/show_add_live_stream.inc.php:35
-msgid "Homepage"
-msgstr "Homepage"
-
-#: ../../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 "Callsign"
-
-#: ../../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 "Frequency"
-
-#: ../../templates/show_live_streams.inc.php:39
-#: ../../templates/show_live_streams.inc.php:61
-#: ../../templates/show_search.inc.php:54
-msgid "Tag"
-msgstr "Tag"
-
-#: ../../templates/sidebar_home.inc.php:24
-msgid "Browse"
-msgstr "Browse"
-
-#: ../../templates/sidebar_home.inc.php:32
-msgid "Song Titles"
-msgstr "Song Titles"
-
-#: ../../templates/sidebar_home.inc.php:34
-#: ../../templates/show_popular.inc.php:29
-#: ../../templates/show_genre.inc.php:36 ../../templates/show_stats.inc.php:31
-#: ../../lib/ui.lib.php:366 ../../lib/class/browse.class.php:159
-#: ../../lib/class/album.class.php:257
-msgid "Artists"
-msgstr "Artists"
-
-#: ../../templates/sidebar_home.inc.php:35
-#: ../../lib/class/browse.class.php:203 ../../browse.php:68
-msgid "Tag Cloud"
-msgstr "Tag Cloud"
-
-#: ../../templates/sidebar_home.inc.php:36
-#: ../../lib/class/browse.class.php:172
-msgid "Playlists"
-msgstr "Playlists"
-
-#: ../../templates/sidebar_home.inc.php:37
-#: ../../lib/class/browse.class.php:166
-msgid "Radio Stations"
-msgstr "Radio Stations"
-
-#: ../../templates/sidebar_home.inc.php:38
-#: ../../lib/class/browse.class.php:209
-msgid "Videos"
-msgstr "Videos"
-
-#: ../../templates/sidebar_home.inc.php:42
-msgid "Filters"
-msgstr "Filters"
-
-#: ../../templates/sidebar_home.inc.php:46
-msgid "Starts With"
-msgstr "Starts With"
-
-#: ../../templates/sidebar_home.inc.php:52
-msgid "Minimum Count"
-msgstr "Minimum Count"
-
-#: ../../templates/sidebar_home.inc.php:56
-msgid "Rated"
-msgstr "Rated"
-
-#: ../../templates/sidebar_home.inc.php:60
-msgid "Unplayed"
-msgstr "Unplayed"
+#. HINT: %1 Username, %2 Access num
+#: ../../admin/users.php:130
+msgid "New User Added"
+msgstr "New User Added"
 
-#: ../../templates/sidebar_home.inc.php:64
-#: ../../templates/show_artist.inc.php:64
-msgid "Show Art"
-msgstr "Show Art"
+#: ../../admin/users.php:130
+#, php-format
+msgid "%1$s has been created with an access level of %2$s"
+msgstr ""
 
-#: ../../templates/sidebar_home.inc.php:69
-msgid "All Playlists"
-msgstr "All Playlists"
+#: ../../admin/users.php:135
+msgid "User Enabled"
+msgstr "User Enabled"
 
-#: ../../templates/sidebar_home.inc.php:75
-#: ../../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
-msgid "Song Title"
-msgstr "Song Title"
+#: ../../admin/users.php:140
+msgid "User Disabled"
+msgstr "User Disabled"
 
-#: ../../templates/sidebar_home.inc.php:87
-#: ../../templates/sidebar_home.inc.php:109
-#: ../../templates/show_manage_democratic.inc.php:34
-#: ../../templates/show_play_selected.inc.php:47 ../../lib/ui.lib.php:321
-msgid "Playlist"
-msgstr "Playlist"
+#: ../../admin/users.php:143 ../../lib/class/artist.class.php:354
+#: ../../lib/class/catalog.class.php:1240
+msgid "Error"
+msgstr "Error"
 
-#: ../../templates/sidebar_home.inc.php:89
-msgid "Currently Playing"
-msgstr "Currently Playing"
+#: ../../admin/users.php:143
+msgid "Unable to Disabled last Administrator"
+msgstr "Unable to Disabled last Administrator"
 
-#: ../../templates/sidebar_home.inc.php:102
-#: ../../templates/show_live_stream.inc.php:29
-msgid "Import"
-msgstr "Import"
+#: ../../admin/users.php:155
+msgid "User Deleted"
+msgstr "User Deleted"
 
-#: ../../templates/sidebar_home.inc.php:110
-msgid "Advanced"
-msgstr "Advanced"
+#: ../../admin/users.php:155
+#, fuzzy, php-format
+msgid "%s has been Deleted"
+msgstr " has been created"
 
-#: ../../templates/sidebar_home.inc.php:113
-#: ../../templates/show_popular.inc.php:22
-#: ../../templates/show_newest.inc.php:22
-msgid "Information"
-msgstr "Information"
+#: ../../admin/users.php:158
+msgid "Delete Error"
+msgstr "Delete Error"
 
-#: ../../templates/sidebar_home.inc.php:115
-#: ../../templates/show_stats.inc.php:24 ../../lib/ui.lib.php:374
-msgid "Statistics"
-msgstr "Statistics"
+#: ../../admin/users.php:158
+msgid "Unable to delete last Admin User"
+msgstr "Unable to delete last Admin User"
 
-#: ../../templates/sidebar_home.inc.php:116
-msgid "Newest"
-msgstr "Newest"
+#: ../../admin/users.php:164
+msgid "Deletion Request"
+msgstr "Deletion Request"
 
-#: ../../templates/sidebar_home.inc.php:117
-msgid "Popular"
-msgstr "Popular"
+#: ../../admin/users.php:165
+#, fuzzy, php-format
+msgid "Are you sure you want to permanently delete %s?"
+msgstr "Are you sure you want to permanently delete"
 
-#: ../../templates/show_confirmation.inc.php:27
-#: ../../templates/show_update_items.inc.php:27
-msgid "Continue"
-msgstr "Continue"
+#: ../../admin/modules.php:38
+msgid "Install Failed, Controller Error"
+msgstr "Install Failed, Controller Error"
 
-#: ../../templates/show_confirmation.inc.php:32
-#: ../../templates/show_similar_artists.inc.php:78
-msgid "Cancel"
-msgstr "Cancel"
+#: ../../admin/modules.php:56 ../../admin/modules.php:101
+msgid "Are you sure you want to remove this plugin?"
+msgstr "Are you sure you want to remove this plugin?"
 
-#: ../../templates/show_flag_row.inc.php:31
-msgid "Reject"
-msgstr "Reject"
+#: ../../admin/modules.php:68 ../../admin/modules.php:120
+msgid "Plugin Deactivated"
+msgstr "Plugin Deactivated"
 
-#: ../../templates/show_flag_row.inc.php:33
-#: ../../templates/show_user_row.inc.php:43 ../../lib/preferences.php:165
-#: ../../lib/preferences.php:272
-msgid "Enable"
-msgstr "Enable"
+#: ../../admin/modules.php:83
+msgid "Unable to Install Plugin"
+msgstr "Unable to Install Plugin"
 
-#: ../../templates/show_playlists.inc.php:35
-#: ../../templates/show_playlists.inc.php:58
-msgid "Playlist Name"
-msgstr "Playlist Name"
+#: ../../admin/modules.php:94
+msgid "Plugin Activated"
+msgstr "Plugin Activated"
 
-#: ../../templates/show_playlists.inc.php:37
-#: ../../templates/show_playlists.inc.php:60
-msgid "# Songs"
-msgstr "# Songs"
+#: ../../admin/modules.php:129
+msgid "Plugins"
+msgstr "Plugins"
 
-#: ../../templates/show_playlists.inc.php:38
-#: ../../templates/show_playlists.inc.php:61
-msgid "Owner"
-msgstr "Owner"
+#: ../../admin/modules.php:135
+msgid "Localplay Controllers"
+msgstr "Localplay Controllers"
 
-#. HINT: Catalog Name
-#: ../../templates/show_edit_catalog.inc.php:22
-#, php-format
-msgid "Settings for %s"
-msgstr "Settings for %s"
+#: ../../admin/shout.php:35
+msgid "Shoutbox Post Updated"
+msgstr "Shoutbox Post Updated"
 
-#: ../../templates/show_edit_catalog.inc.php:29
-#: ../../templates/show_add_catalog.inc.php:35
-msgid "Auto-inserted Fields"
-msgstr "Auto-inserted Fields"
+#: ../../admin/shout.php:47
+msgid "Shoutbox Post Deleted"
+msgstr "Shoutbox Post Deleted"
 
-#: ../../templates/show_edit_catalog.inc.php:30
-#: ../../templates/show_add_catalog.inc.php:36
-msgid "album name"
-msgstr "album name"
+#: ../../admin/access.php:35
+msgid "Deleted"
+msgstr "Deleted"
 
-#: ../../templates/show_edit_catalog.inc.php:31
-#: ../../templates/show_add_catalog.inc.php:37
-msgid "artist name"
-msgstr "artist name"
+#: ../../admin/access.php:35
+msgid "Your Access List Entry has been removed"
+msgstr "Your Access List Entry has been removed"
 
-#: ../../templates/show_edit_catalog.inc.php:32
-#: ../../templates/show_add_catalog.inc.php:38
-msgid "id3 comment"
-msgstr "id3 comment"
+#: ../../admin/access.php:93 ../../templates/show_song.inc.php:60
+#: ../../lib/class/catalog.class.php:1348
+msgid "Added"
+msgstr "Added"
 
-#: ../../templates/show_edit_catalog.inc.php:33
-#: ../../templates/show_add_catalog.inc.php:39
-msgid "track number (padded with leading 0)"
-msgstr "track number (padded with leading 0)"
+#: ../../admin/access.php:93
+msgid "Your new Access Control List(s) have been created"
+msgstr "Your new Access Control List(s) have been created"
 
-#: ../../templates/show_edit_catalog.inc.php:34
-#: ../../templates/show_add_catalog.inc.php:40
-msgid "song title"
-msgstr "song title"
+#: ../../admin/access.php:109 ../../preferences.php:111
+#: ../../lib/class/catalog.class.php:1032
+#: ../../lib/class/catalog.class.php:1936
+msgid "Updated"
+msgstr "Updated"
 
-#: ../../templates/show_edit_catalog.inc.php:35
-#: ../../templates/show_add_catalog.inc.php:41
-msgid "year"
-msgstr "year"
+#: ../../admin/access.php:109
+msgid "Access List Entry updated"
+msgstr "Access List Entry updated"
 
-#: ../../templates/show_edit_catalog.inc.php:36
-#: ../../templates/show_add_catalog.inc.php:42
-msgid "other"
-msgstr "other"
+#: ../../admin/system.php:49
+msgid "Database Charset Updated"
+msgstr "Database Charset Updated"
 
-#: ../../templates/show_edit_catalog.inc.php:40
-#: ../../templates/show_add_catalog.inc.php:51
-msgid "Catalog Type"
-msgstr "Catalog Type"
+#: ../../admin/system.php:49
+msgid ""
+"Your Database and associated tables have been updated to match your "
+"currently configured charset"
+msgstr ""
+"Your Database and associated tables have been updated to match your "
+"currently configured charset"
 
-#: ../../templates/show_edit_catalog.inc.php:44
-#: ../../templates/show_add_catalog.inc.php:60
-msgid "XML-RPC Key"
-msgstr "XML-RPC Key"
+#: ../../admin/mail.php:79
+msgid "E-mail Sent"
+msgstr "E-mail Sent"
 
-#: ../../templates/show_edit_catalog.inc.php:46
-#: ../../templates/show_add_catalog.inc.php:61
-msgid "Required for Remote Catalogs"
-msgstr "Required for Remote Catalogs"
+#: ../../admin/mail.php:80
+msgid "Your E-mail was successfully sent."
+msgstr "Your E-mail was successfully sent."
 
-#: ../../templates/show_edit_catalog.inc.php:50
-msgid "Filename pattern"
-msgstr "Filename pattern"
+#: ../../preferences.php:40 ../../preferences.php:75
+msgid "Server"
+msgstr "Server"
 
-#: ../../templates/show_edit_catalog.inc.php:57
-#: ../../templates/show_add_catalog.inc.php:69
-msgid "Folder Pattern"
-msgstr "Folder Pattern"
+#: ../../preferences.php:107
+msgid "Error Update Failed"
+msgstr "Error Update Failed"
 
-#: ../../templates/show_edit_catalog.inc.php:57
-#: ../../templates/show_add_catalog.inc.php:69
-msgid "(no leading or ending '/')"
-msgstr "(no leading or ending '/')"
+#: ../../preferences.php:112
+msgid "Your Account has been updated"
+msgstr "Your Account has been updated"
 
-#: ../../templates/show_edit_catalog.inc.php:67
-msgid "Save Catalog Settings"
-msgstr "Save Catalog Settings"
+#: ../../flag.php:45
+msgid "Item Flagged"
+msgstr "Item Flagged"
 
-#: ../../templates/show_manage_democratic.inc.php:22
-msgid "Manage Democratic Playlists"
-msgstr "Manage Democratic Playlists"
+#: ../../flag.php:45
+msgid "The specified item has been flagged"
+msgstr "The specified item has been flagged"
 
-#: ../../templates/show_manage_democratic.inc.php:35
-#: ../../templates/show_create_democratic.inc.php:30
-msgid "Base Playlist"
-msgstr "Base Playlist"
+#: ../../templates/show_add_access_local.inc.php:22
+#: ../../templates/show_access_list.inc.php:40
+#: ../../templates/show_access_list.inc.php:41
+msgid "Add Local Network Definition"
+msgstr "Add Local Network Definition"
 
-#: ../../templates/show_manage_democratic.inc.php:36
-#: ../../templates/show_democratic.inc.php:29
-msgid "Cooldown"
-msgstr "Cooldown"
+#: ../../templates/show_add_access_local.inc.php:26
+#: ../../templates/show_admin_tools.inc.php:33
+#: ../../templates/show_admin_tools.inc.php:73
+#: ../../templates/show_catalogs.inc.php:33
+#: ../../templates/show_catalogs.inc.php:57
+#: ../../templates/show_access_list.inc.php:55
+#: ../../templates/show_create_democratic.inc.php:26
+#: ../../templates/show_localplay_controllers.inc.php:32
+#: ../../templates/show_localplay_controllers.inc.php:63
+#: ../../templates/show_add_playlist.inc.php:28
+#: ../../templates/show_add_access_current.inc.php:26
+#: ../../templates/show_localplay_playlist.inc.php:34
+#: ../../templates/show_localplay_playlist.inc.php:60
+#: ../../templates/show_stats.inc.php:63
+#: ../../templates/show_add_live_stream.inc.php:28
+#: ../../templates/show_edit_access.inc.php:26
+#: ../../templates/show_add_access.inc.php:26
+#: ../../templates/show_playlist_edit.inc.php:30
+#: ../../templates/show_edit_catalog.inc.php:26
+#: ../../templates/show_edit_artist.inc.php:27
+#: ../../templates/show_edit_album.inc.php:27
+#: ../../templates/show_plugins.inc.php:32
+#: ../../templates/show_plugins.inc.php:61
+#: ../../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_account.inc.php:27
+#: ../../templates/show_add_access_rpc.inc.php:26
+msgid "Name"
+msgstr "Name"
 
-#: ../../templates/show_manage_democratic.inc.php:37
 #: ../../templates/show_add_access_local.inc.php:32
-#: ../../templates/show_add_access_rpc.inc.php:32
-#: ../../templates/show_edit_access.inc.php:72
+#: ../../templates/show_access_list.inc.php:58
+#: ../../templates/show_manage_democratic.inc.php:37
+#: ../../templates/show_create_democratic.inc.php:39
+#: ../../templates/show_add_access_current.inc.php:35
 #: ../../templates/show_preference_admin.inc.php:31
 #: ../../templates/show_preference_admin.inc.php:50
+#: ../../templates/show_edit_access.inc.php:72
 #: ../../templates/show_add_access.inc.php:32
-#: ../../templates/show_create_democratic.inc.php:39
-#: ../../templates/show_add_access_current.inc.php:35
-#: ../../templates/show_access_list.inc.php:58
+#: ../../templates/show_add_access_rpc.inc.php:32
 msgid "Level"
 msgstr "Level"
 
-#: ../../templates/show_manage_democratic.inc.php:38
-#: ../../lib/preferences.php:257 ../../lib/preferences.php:264
-msgid "Default"
-msgstr "Default"
-
-#: ../../templates/show_manage_democratic.inc.php:58
-#: ../../templates/show_flag.inc.php:56
-#: ../../templates/show_user_row.inc.php:49
-#: ../../templates/rightbar.inc.php:105
-#: ../../templates/show_catalog_row.inc.php:34
-#: ../../templates/show_democratic_playlist.inc.php:86
-#: ../../templates/show_shout_row.inc.php:36
-#: ../../templates/show_live_stream_row.inc.php:34
-#: ../../templates/show_localplay_instances.inc.php:40
-#: ../../templates/show_localplay_playlist.inc.php:50
-#: ../../templates/show_playlist_song_row.inc.php:38
-#: ../../templates/show_playlist_row.inc.php:38
-#: ../../templates/show_admin_tools.inc.php:53
-#: ../../templates/show_access_list.inc.php:80
-#: ../../lib/class/flag.class.php:325
-msgid "Delete"
-msgstr "Delete"
-
-#: ../../templates/show_manage_democratic.inc.php:69
-msgid "Create New Playlist"
-msgstr "Create New Playlist"
-
-#: ../../templates/show_add_access_local.inc.php:22
-#: ../../templates/show_access_list.inc.php:40
-#: ../../templates/show_access_list.inc.php:41
-msgid "Add Local Network Definition"
-msgstr "Add Local Network Definition"
-
 #: ../../templates/show_add_access_local.inc.php:34
-#: ../../templates/show_add_access_rpc.inc.php:34
+#: ../../templates/show_add_access_current.inc.php:37
 #: ../../templates/show_edit_access.inc.php:75
 #: ../../templates/show_add_access.inc.php:34
 #: ../../templates/show_play_selected.inc.php:49
-#: ../../templates/show_add_access_current.inc.php:37
+#: ../../templates/show_add_access_rpc.inc.php:34
 #: ../../lib/class/access.class.php:411
 msgid "View"
 msgstr "View"
 
 #: ../../templates/show_add_access_local.inc.php:35
-#: ../../templates/show_add_access_rpc.inc.php:35
+#: ../../templates/show_add_access_current.inc.php:38
 #: ../../templates/show_edit_access.inc.php:76
 #: ../../templates/show_add_access.inc.php:35
-#: ../../templates/show_add_access_current.inc.php:38
+#: ../../templates/show_add_access_rpc.inc.php:35
 #: ../../lib/class/access.class.php:414
 msgid "Read"
 msgstr "Read"
 
 #: ../../templates/show_add_access_local.inc.php:36
-#: ../../templates/show_add_access_rpc.inc.php:36
+#: ../../templates/show_add_access_current.inc.php:39
 #: ../../templates/show_edit_access.inc.php:77
 #: ../../templates/show_add_access.inc.php:36
-#: ../../templates/show_add_access_current.inc.php:39
+#: ../../templates/show_add_access_rpc.inc.php:36
 #: ../../lib/class/access.class.php:417
 msgid "Read/Write"
 msgstr "Read/Write"
 
 #: ../../templates/show_add_access_local.inc.php:37
 #: ../../templates/show_add_access_local.inc.php:52
-#: ../../templates/show_add_access_rpc.inc.php:37
-#: ../../templates/show_add_access_rpc.inc.php:52
-#: ../../templates/show_edit_access.inc.php:78
-#: ../../templates/show_add_access.inc.php:37
-#: ../../templates/show_export.inc.php:35
+#: ../../templates/show_admin_tools.inc.php:51
 #: ../../templates/show_add_access_current.inc.php:40
+#: ../../templates/show_edit_access.inc.php:78
 #: ../../templates/show_mail_users.inc.php:30
+#: ../../templates/show_add_access.inc.php:37
 #: ../../templates/show_random.inc.php:38
-#: ../../templates/show_admin_tools.inc.php:51 ../../lib/ui.lib.php:543
+#: ../../templates/show_export.inc.php:35
+#: ../../templates/show_add_access_rpc.inc.php:37
+#: ../../templates/show_add_access_rpc.inc.php:52
 #: ../../lib/class/access.class.php:408 ../../lib/class/access.class.php:428
+#: ../../lib/ui.lib.php:543
 msgid "All"
 msgstr "All"
 
 #: ../../templates/show_add_access_local.inc.php:48
-#: ../../templates/show_add_access_rpc.inc.php:48
-#: ../../templates/show_add_playlist.inc.php:32
-#: ../../templates/show_random.inc.php:58
 #: ../../templates/show_access_list.inc.php:61
+#: ../../templates/show_add_playlist.inc.php:32
 #: ../../templates/show_playlist_edit.inc.php:36
+#: ../../templates/show_random.inc.php:58
+#: ../../templates/show_add_access_rpc.inc.php:48
 msgid "Type"
 msgstr "Type"
 
@@ -1311,9 +562,9 @@ msgid "Local Network Definition"
 msgstr "Local Network Definition"
 
 #: ../../templates/show_add_access_local.inc.php:51
-#: ../../templates/show_add_access_rpc.inc.php:51
 #: ../../templates/show_edit_access.inc.php:34
 #: ../../templates/show_add_access.inc.php:51
+#: ../../templates/show_add_access_rpc.inc.php:51
 #: ../../lib/class/access.class.php:454
 msgid "Stream Access"
 msgstr "Stream Access"
@@ -1326,324 +577,285 @@ msgid "Web Interface"
 msgstr "Web Interface"
 
 #: ../../templates/show_add_access_local.inc.php:56
-#: ../../templates/show_add_access_rpc.inc.php:56
-#: ../../templates/show_add_access.inc.php:59
 #: ../../templates/show_add_access_current.inc.php:50
+#: ../../templates/show_add_access.inc.php:59
+#: ../../templates/show_add_access_rpc.inc.php:56
 msgid "RPC Options"
 msgstr "RPC Options"
 
 #: ../../templates/show_add_access_local.inc.php:59
-#: ../../templates/show_add_access_rpc.inc.php:59
+#: ../../templates/show_add_access_current.inc.php:53
 #: ../../templates/show_edit_access.inc.php:66
 #: ../../templates/show_add_access.inc.php:62
-#: ../../templates/show_add_access_current.inc.php:53
+#: ../../templates/show_add_access_rpc.inc.php:59
 msgid "Remote Key"
 msgstr "Remote Key"
 
 #: ../../templates/show_add_access_local.inc.php:66
-#: ../../templates/show_add_access_rpc.inc.php:66
+#: ../../templates/show_add_access_current.inc.php:32
 #: ../../templates/show_edit_access.inc.php:43
 #: ../../templates/show_add_access.inc.php:69
-#: ../../templates/show_add_access_current.inc.php:32
+#: ../../templates/show_add_access_rpc.inc.php:66
 msgid "IPv4 or IPv6 Addresses"
 msgstr "IPv4 or IPv6 Addresses"
 
 #: ../../templates/show_add_access_local.inc.php:71
-#: ../../templates/show_add_access_rpc.inc.php:71
 #: ../../templates/show_edit_access.inc.php:48
 #: ../../templates/show_add_access.inc.php:74
+#: ../../templates/show_add_access_rpc.inc.php:71
 msgid "Start"
 msgstr "Start"
 
 #: ../../templates/show_add_access_local.inc.php:76
-#: ../../templates/show_add_access_rpc.inc.php:76
 #: ../../templates/show_edit_access.inc.php:53
 #: ../../templates/show_add_access.inc.php:79
+#: ../../templates/show_add_access_rpc.inc.php:76
 msgid "End"
 msgstr "End"
 
 #: ../../templates/show_add_access_local.inc.php:85
-#: ../../templates/show_add_access_rpc.inc.php:85
-#: ../../templates/show_add_access.inc.php:88
 #: ../../templates/show_add_access_current.inc.php:61
+#: ../../templates/show_add_access.inc.php:88
+#: ../../templates/show_add_access_rpc.inc.php:85
 msgid "Create ACL"
 msgstr "Create ACL"
 
-#. HINT: Playlist Type, Playlist Name
-#: ../../templates/show_playlist.inc.php:26
-#, php-format
-msgid "%s %s Playlist"
-msgstr "%s %s Playlist"
-
-#: ../../templates/show_playlist.inc.php:30
-#: ../../templates/show_playlist.inc.php:31
-msgid "Normalize Tracks"
-msgstr "Normalize Tracks"
-
-#: ../../templates/show_playlist.inc.php:40
-#: ../../templates/show_playlist.inc.php:41
-msgid "Add All"
-msgstr "Add All"
-
-#: ../../templates/show_playlist.inc.php:44
-#: ../../templates/show_playlist.inc.php:45
-msgid "Add Random"
-msgstr "Add Random"
-
-#: ../../templates/sidebar_localplay.inc.php:35
-#: ../../templates/show_localplay_add_instance.inc.php:35
-msgid "Add Instance"
-msgstr "Add Instance"
-
-#: ../../templates/sidebar_localplay.inc.php:36
-msgid "Show instances"
-msgstr "Show instances"
-
-#: ../../templates/sidebar_localplay.inc.php:38
-msgid "Show Playlist"
-msgstr "Show Playlist"
-
-#: ../../templates/sidebar_localplay.inc.php:42
-msgid "Active Instance"
-msgstr "Active Instance"
-
-#: ../../templates/sidebar_localplay.inc.php:44
-#: ../../templates/show_gather_art.inc.php:24
-#: ../../templates/show_adds_catalog.inc.php:26 ../../lib/ui.lib.php:571
-#: ../../lib/preferences.php:175 ../../lib/preferences.php:217
-msgid "None"
-msgstr "None"
-
-#: ../../templates/sidebar_localplay.inc.php:60
-msgid "Localplay Disabled"
-msgstr "Localplay Disabled"
-
-#: ../../templates/sidebar_localplay.inc.php:62
-msgid "Allow Localplay set to False"
-msgstr "Allow Localplay set to False"
-
-#: ../../templates/sidebar_localplay.inc.php:64
-msgid "Localplay Controller Not Defined"
-msgstr "Localplay Controller Not Defined"
-
-#: ../../templates/sidebar_localplay.inc.php:66
-#: ../../templates/show_denied.inc.php:32
-msgid "Access Denied"
-msgstr "Access Denied"
-
-#: ../../templates/footer.inc.php:25
-msgid "Using Old Password Encryption, Please Reset your Password"
-msgstr "Using Old Password Encryption, Please Reset your Password"
-
-#: ../../templates/footer.inc.php:32
-#: ../../templates/show_login_form.inc.php:99
-msgid "Queries:"
-msgstr "Queries:"
-
-#: ../../templates/footer.inc.php:32
-#: ../../templates/show_login_form.inc.php:99
-msgid "Cache Hits:"
-msgstr "Cache Hits:"
-
-#: ../../templates/show_videos.inc.php:38
-#: ../../templates/show_videos.inc.php:62
-#: ../../templates/show_search.inc.php:79
-msgid "Codec"
-msgstr "Codec"
-
-#: ../../templates/show_videos.inc.php:39
-#: ../../templates/show_videos.inc.php:63
-msgid "Resolution"
-msgstr "Resolution"
-
-#: ../../templates/show_add_access_rpc.inc.php:22
-#: ../../templates/show_access_list.inc.php:36
-#: ../../templates/show_access_list.inc.php:37
-msgid "Add API / RPC Host"
-msgstr "Add API / RPC Host"
+#: ../../templates/show_admin_tools.inc.php:26
+#: ../../templates/show_stats.inc.php:25
+#: ../../templates/sidebar_admin.inc.php:24
+#: ../../lib/class/browse.class.php:187
+msgid "Catalogs"
+msgstr "Catalogs"
 
-#: ../../templates/show_add_access_rpc.inc.php:50
-#: ../../templates/show_add_access_rpc.inc.php:51
-#: ../../templates/show_add_access_rpc.inc.php:52
-#: ../../templates/show_edit_access.inc.php:37
-#: ../../templates/show_add_access.inc.php:54
-msgid "RPC"
-msgstr "RPC"
+#: ../../templates/show_admin_tools.inc.php:34
+#: ../../templates/show_admin_tools.inc.php:74
+#: ../../templates/show_flagged.inc.php:39
+#: ../../templates/show_flagged.inc.php:58
+#: ../../templates/show_song.inc.php:30 ../../templates/show_songs.inc.php:51
+#: ../../templates/show_songs.inc.php:78
+#: ../../templates/show_random_rules.inc.php:36
+#: ../../templates/show_access_list.inc.php:62
+#: ../../templates/show_users.inc.php:46 ../../templates/show_users.inc.php:68
+#: ../../templates/show_manage_democratic.inc.php:40
+#: ../../templates/show_genres.inc.php:39
+#: ../../templates/show_genres.inc.php:75
+#: ../../templates/show_localplay_controllers.inc.php:35
+#: ../../templates/show_localplay_controllers.inc.php:66
+#: ../../templates/show_localplay_playlist.inc.php:35
+#: ../../templates/show_localplay_playlist.inc.php:61
+#: ../../templates/show_localplay_instances.inc.php:29
+#: ../../templates/show_artists.inc.php:43
+#: ../../templates/show_artists.inc.php:71
+#: ../../templates/show_democratic_playlist.inc.php:54
+#: ../../templates/show_democratic_playlist.inc.php:94
+#: ../../templates/show_plugins.inc.php:35
+#: ../../templates/show_plugins.inc.php:64
+#: ../../templates/show_videos.inc.php:42
+#: ../../templates/show_videos.inc.php:66
+#: ../../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
+#: ../../templates/show_live_streams.inc.php:40
+#: ../../templates/show_live_streams.inc.php:62
+msgid "Action"
+msgstr "Action"
 
-#: ../../templates/show_add_live_stream.inc.php:24
+#. HINT: Artist Fullname
+#: ../../templates/show_admin_tools.inc.php:45
+#: ../../templates/show_video_row.inc.php:23
+#: ../../templates/show_song.inc.php:32 ../../templates/show_songs.inc.php:39
+#: ../../templates/show_songs.inc.php:68
+#: ../../templates/show_song_row.inc.php:23
+#: ../../templates/show_shoutbox.inc.php:34
+#: ../../templates/show_genres.inc.php:36
+#: ../../templates/show_genres.inc.php:49
+#: ../../templates/show_genres.inc.php:72
+#: ../../templates/show_albums.inc.php:40
+#: ../../templates/show_albums.inc.php:71
+#: ../../templates/show_playlist_song_row.inc.php:22
+#: ../../templates/show_recently_played.inc.php:37
+#: ../../templates/show_recently_played.inc.php:80
+#: ../../templates/show_recently_played.inc.php:99
+#: ../../templates/show_add_live_stream.inc.php:68
+#: ../../templates/show_artist.inc.php:43
+#: ../../templates/show_artists.inc.php:36
+#: ../../templates/show_artists.inc.php:64
+#: ../../templates/show_live_stream_row.inc.php:23
+#: ../../templates/show_videos.inc.php:36
+#: ../../templates/show_videos.inc.php:60
 #: ../../templates/show_live_stream.inc.php:26
-msgid "Add Radio Station"
-msgstr "Add Radio Station"
-
-#: ../../templates/show_add_live_stream.inc.php:61
-#: ../../templates/show_export.inc.php:32
-msgid "Catalog"
-msgstr "Catalog"
-
-#: ../../templates/show_index.inc.php:38
-#: ../../templates/show_random_albums.inc.php:24
-msgid "Albums of the Moment"
-msgstr "Albums of the Moment"
-
-#: ../../templates/show_index.inc.php:38
-msgid "Loading..."
-msgstr "Loading..."
-
-#: ../../templates/show_edit_artist.inc.php:23
-msgid "Edit Artist"
-msgstr "Edit Artist"
-
-#: ../../templates/show_edit_artist.inc.php:35
-#: ../../templates/show_edit_song.inc.php:73
-#: ../../templates/show_edit_album.inc.php:41
-msgid "Flag for Retagging"
-msgstr "Flag for Retagging"
+#: ../../templates/show_artist_row.inc.php:23
+#: ../../templates/show_live_streams.inc.php:35
+#: ../../templates/show_live_streams.inc.php:57
+#: ../../templates/show_album_row.inc.php:23
+#: ../../templates/show_catalog_row.inc.php:29
+#: ../../templates/show_playlist_row.inc.php:23
+#: ../../templates/show_album.inc.php:51
+#: ../../templates/show_playlists.inc.php:34
+#: ../../templates/show_playlists.inc.php:57
+msgid "Add"
+msgstr "Add"
 
-#: ../../templates/show_edit_artist.inc.php:41
-msgid "Update Artist"
-msgstr "Update Artist"
+#: ../../templates/show_admin_tools.inc.php:47
+#: ../../templates/show_catalog_row.inc.php:30
+msgid "Verify"
+msgstr "Verify"
 
-#: ../../templates/show_edit_access.inc.php:22
-msgid "Edit Access Control List"
-msgstr "Edit Access Control List"
+#: ../../templates/show_admin_tools.inc.php:49
+#: ../../templates/show_catalog_row.inc.php:31
+msgid "Clean"
+msgstr "Clean"
 
-#: ../../templates/show_edit_access.inc.php:30
-#: ../../templates/show_add_access.inc.php:48
-msgid "ACL Type"
-msgstr "ACL Type"
+#: ../../templates/show_admin_tools.inc.php:53
+#: ../../templates/show_flag.inc.php:56
+#: ../../templates/show_access_list.inc.php:80
+#: ../../templates/show_manage_democratic.inc.php:58
+#: ../../templates/show_playlist_song_row.inc.php:38
+#: ../../templates/show_localplay_playlist.inc.php:50
+#: ../../templates/show_localplay_instances.inc.php:40
+#: ../../templates/show_shout_row.inc.php:36
+#: ../../templates/show_live_stream_row.inc.php:34
+#: ../../templates/show_democratic_playlist.inc.php:86
+#: ../../templates/show_catalog_row.inc.php:34
+#: ../../templates/show_playlist_row.inc.php:38
+#: ../../templates/show_user_row.inc.php:49
+#: ../../templates/rightbar.inc.php:105 ../../lib/class/flag.class.php:325
+msgid "Delete"
+msgstr "Delete"
 
-#: ../../templates/show_edit_access.inc.php:84
-#: ../../templates/show_preference_admin.inc.php:55
-#: ../../templates/show_catalog_row.inc.php:32
-#: ../../templates/show_create_democratic.inc.php:59
-#: ../../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
-msgid "Update"
-msgstr "Update"
+#: ../../templates/show_admin_tools.inc.php:59
+msgid "Fast"
+msgstr "Fast"
 
-#: ../../templates/show_similar_artists.inc.php:23
-msgid "Similar Artists"
-msgstr "Similar Artists"
+#: ../../templates/show_admin_tools.inc.php:60
+#: ../../templates/show_catalog_row.inc.php:33
+msgid "Gather Art"
+msgstr "Gather Art"
 
-#: ../../templates/show_similar_artists.inc.php:25
-msgid "Please check the artists you want to merge with the current one"
-msgstr "Please check the artists you want to merge with the current one"
+#: ../../templates/show_admin_tools.inc.php:68
+msgid "No Catalogs Found"
+msgstr "No Catalogs Found"
 
-#: ../../templates/show_similar_artists.inc.php:58
-msgid "No Similar Artists found"
-msgstr "No Similar Artists found"
+#: ../../templates/show_admin_tools.inc.php:78
+#: ../../templates/show_manage_catalogs.inc.php:31
+msgid "Clean All"
+msgstr "Clean All"
 
-#: ../../templates/show_similar_artists.inc.php:66
-msgid "Back"
-msgstr "Back"
+#: ../../templates/show_admin_tools.inc.php:79
+#: ../../templates/show_manage_catalogs.inc.php:30
+msgid "Verify All"
+msgstr "Verify All"
 
-#: ../../templates/show_similar_artists.inc.php:77
-msgid "Rename selected"
-msgstr "Rename selected"
+#: ../../templates/show_admin_tools.inc.php:80
+#: ../../templates/show_manage_catalogs.inc.php:29
+msgid "Add to All"
+msgstr "Add to All"
 
-#: ../../templates/show_similar_artists.inc.php:91
-msgid "Advanced Options"
-msgstr "Advanced Options"
+#: ../../templates/show_admin_tools.inc.php:81
+#: ../../templates/show_manage_catalogs.inc.php:32
+msgid "Update All"
+msgstr "Update All"
 
-#: ../../templates/show_similar_artists.inc.php:152
-msgid "Search Again"
-msgstr "Search Again"
+#: ../../templates/show_admin_tools.inc.php:82
+#: ../../templates/show_add_catalog.inc.php:26
+#: ../../templates/sidebar_admin.inc.php:26
+msgid "Add a Catalog"
+msgstr "Add a Catalog"
 
-#. HINT: Catalog Name
-#: ../../templates/show_clean_catalog.inc.php:24
-#, php-format
-msgid "Cleaning the %s Catalog"
-msgstr "Cleaning the %s Catalog"
+#: ../../templates/show_admin_tools.inc.php:83
+msgid "Clear Catalog Stats"
+msgstr "Clear Catalog Stats"
 
-#: ../../templates/show_clean_catalog.inc.php:26
-msgid "Checking"
-msgstr "Checking"
+#: ../../templates/show_admin_tools.inc.php:84
+#: ../../templates/show_add_catalog.inc.php:74
+msgid "Gather Album Art"
+msgstr "Gather Album Art"
 
-#: ../../templates/show_clean_catalog.inc.php:27
-#: ../../templates/show_run_add_catalog.inc.php:25
-#: ../../templates/show_gather_art.inc.php:25
-#: ../../templates/show_adds_catalog.inc.php:27
-#: ../../templates/show_verify_catalog.inc.php:29
-msgid "Reading"
-msgstr "Reading"
+#: ../../templates/show_admin_tools.inc.php:88
+#: ../../templates/sidebar_modules.inc.php:31
+#: ../../templates/sidebar_admin.inc.php:43
+msgid "Other Tools"
+msgstr "Other Tools"
 
-#: ../../templates/sidebar_preferences.inc.php:9
-#: ../../templates/sidebar.inc.php:29 ../../templates/show_user_row.inc.php:39
-#: ../../lib/ui.lib.php:327
-msgid "Preferences"
-msgstr "Preferences"
+#: ../../templates/show_admin_tools.inc.php:90
+msgid "Show Duplicate Songs"
+msgstr "Show Duplicate Songs"
 
-#: ../../templates/sidebar_preferences.inc.php:18
-msgid "Account"
-msgstr "Account"
+#: ../../templates/show_admin_tools.inc.php:91
+#: ../../templates/sidebar_admin.inc.php:46
+msgid "Clear Now Playing"
+msgstr "Clear Now Playing"
 
-#: ../../templates/show_flag.inc.php:41
-msgid "Flag Song"
-msgstr "Flag Song"
+#: ../../templates/show_admin_tools.inc.php:92
+#: ../../templates/header.inc.php:79
+msgid "Generate New Config"
+msgstr "Generate New Config"
 
-#: ../../templates/show_flag.inc.php:45
-#: ../../templates/show_edit_song.inc.php:27
-msgid "File"
-msgstr "File"
+#: ../../templates/show_admin_tools.inc.php:93
+msgid "Preferences Permissions"
+msgstr "Preferences Permissions"
 
-#: ../../templates/show_flag.inc.php:49
-msgid "Item"
-msgstr "Item"
+#: ../../templates/show_admin_tools.inc.php:94
+msgid "Export To Itunes DB"
+msgstr "Export To Itunes DB"
 
-#: ../../templates/show_flag.inc.php:53
-msgid "Reason to flag"
-msgstr "Reason to flag"
+#: ../../templates/show_admin_tools.inc.php:95
+msgid "Show Inactive Users"
+msgstr "Show Inactive Users"
 
-#: ../../templates/show_flag.inc.php:57
-msgid "Incorrect Tags"
-msgstr "Incorrect Tags"
+#: ../../templates/show_admin_tools.inc.php:96
+msgid "Check for New Version"
+msgstr "Check for New Version"
 
-#: ../../templates/show_flag.inc.php:58 ../../lib/class/flag.class.php:331
-msgid "Re-encode"
-msgstr "Re-encode"
+#: ../../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
+msgid "Object"
+msgstr "Object"
 
-#: ../../templates/show_flag.inc.php:59 ../../lib/class/flag.class.php:334
-msgid "Other"
-msgstr "Other"
+#: ../../templates/show_flagged.inc.php:36
+#: ../../templates/show_flagged.inc.php:55
+#: ../../templates/show_flag.inc.php:69
+msgid "Flag"
+msgstr "Flag"
 
-#: ../../templates/show_flag.inc.php:64
-#: ../../templates/show_edit_song.inc.php:65
 #: ../../templates/show_flagged.inc.php:37
 #: ../../templates/show_flagged.inc.php:56
-#: ../../templates/show_search.inc.php:34 ../../templates/show_song.inc.php:46
+#: ../../templates/show_song.inc.php:49 ../../templates/show_flag.inc.php:64
+#: ../../templates/show_search.inc.php:34
+#: ../../templates/show_edit_song.inc.php:65
 #: ../../templates/show_manage_shoutbox.inc.php:37
 #: ../../templates/show_manage_shoutbox.inc.php:61
 msgid "Comment"
 msgstr "Comment"
 
-#: ../../templates/show_flag.inc.php:69
-#: ../../templates/show_flagged.inc.php:36
-#: ../../templates/show_flagged.inc.php:55
-msgid "Flag"
-msgstr "Flag"
-
-#: ../../templates/show_playtype_switch.inc.php:38
-#: ../../lib/preferences.php:185
-msgid "Flash Player"
-msgstr "Flash Player"
+#: ../../templates/show_flagged.inc.php:38
+#: ../../templates/show_flagged.inc.php:57
+msgid "Status"
+msgstr "Status"
 
-#: ../../templates/show_preference_admin.inc.php:22
-msgid "Preference Administration"
-msgstr "Preference Administration"
+#: ../../templates/show_flagged.inc.php:49
+#: ../../templates/show_disabled_songs.inc.php:52
+#: ../../templates/show_localplay_controllers.inc.php:59
+#: ../../templates/show_localplay_playlist.inc.php:55
+#: ../../templates/show_plugins.inc.php:57
+#: ../../templates/show_manage_shoutbox.inc.php:54
+msgid "No Records Found"
+msgstr "No Records Found"
 
-#: ../../templates/show_install_config.inc.php:34
+#: ../../templates/show_install_account.inc.php:34
 #: ../../templates/show_install_lang.inc.php:35
+#: ../../templates/show_install_config.inc.php:34
 #: ../../templates/show_install.inc.php:35
-#: ../../templates/show_install_account.inc.php:34
 msgid "Ampache Installation"
 msgstr "Ampache Installation"
 
-#: ../../templates/show_install_config.inc.php:40
+#: ../../templates/show_install_account.inc.php:41
 #: ../../templates/show_install_lang.inc.php:42
+#: ../../templates/show_install_config.inc.php:40
 #: ../../templates/show_install.inc.php:43
-#: ../../templates/show_install_account.inc.php:41
 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 "
@@ -1653,28 +865,25 @@ msgstr ""
 "of the ampache.cfg.php file. Before you continue please make sure that you "
 "have the following pre-requisites"
 
-#: ../../templates/show_install_config.inc.php:43
+#: ../../templates/show_install_account.inc.php:44
 #: ../../templates/show_install_lang.inc.php:45
+#: ../../templates/show_install_config.inc.php:43
 #: ../../templates/show_install.inc.php:46
-#: ../../templates/show_install_account.inc.php:44
 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_config.inc.php:44
+#: ../../templates/show_install_account.inc.php:45
 #: ../../templates/show_install_lang.inc.php:46
+#: ../../templates/show_install_config.inc.php:44
 #: ../../templates/show_install.inc.php:47
-#: ../../templates/show_install_account.inc.php:45
 #, fuzzy, php-format
 msgid "Your webserver has read access to the %s file and the %s file"
 msgstr ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
 "ampache.cfg.php.dist file"
 
-#: ../../templates/show_install_config.inc.php:47
-#: ../../templates/show_install_lang.inc.php:49
-#: ../../templates/show_install.inc.php:50
 #: ../../templates/show_install_account.inc.php:47
 msgid ""
 "Once you have ensured that you have the above requirements please fill out "
@@ -1687,71 +896,375 @@ msgstr ""
 "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:50
 #: ../../templates/show_install_config.inc.php:51
 #: ../../templates/show_install.inc.php:55
-#: ../../templates/show_install_account.inc.php:50
 msgid "Step 1 - Creating and Inserting the Ampache Database"
 msgstr "Step 1 - Creating and Inserting the Ampache Database"
 
-#: ../../templates/show_install_config.inc.php:52
-#: ../../templates/show_install.inc.php:59
-msgid "Step 2 - Creating the Ampache.cfg.php file"
-msgstr "Step 2 - Creating the Ampache.cfg.php file"
-
-#: ../../templates/show_install_config.inc.php:54
-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 ""
-"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"
+#: ../../templates/show_install_account.inc.php:51
+msgid "Step 2 - Creating the ampache.cfg.php file"
+msgstr "Step 2 - Creating the ampache.cfg.php file"
 
+#: ../../templates/show_install_account.inc.php:52
 #: ../../templates/show_install_config.inc.php:56
 #: ../../templates/show_install.inc.php:60
-#: ../../templates/show_install_account.inc.php:52
 msgid "Step 3 - Setup Initial Account"
 msgstr "Step 3 - Setup Initial Account"
 
-#: ../../templates/show_install_config.inc.php:60
-msgid "Generate Config File"
-msgstr "Generate Config File"
+#: ../../templates/show_install_account.inc.php:54
+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_install_config.inc.php:69
-#: ../../templates/show_install.inc.php:68
-msgid "Desired Database Name"
-msgstr "Desired Database Name"
+#: ../../templates/show_install_account.inc.php:58
+msgid "Create Admin Account"
+msgstr "Create Admin Account"
 
-#: ../../templates/show_install_config.inc.php:73
-#: ../../templates/show_install.inc.php:72
-msgid "MySQL Hostname"
-msgstr "MySQL Hostname"
+#: ../../templates/show_install_account.inc.php:62
+#: ../../templates/show_users.inc.php:39 ../../templates/show_users.inc.php:61
+#: ../../templates/show_now_playing_row.inc.php:29
+#: ../../templates/show_edit_user.inc.php:32
+#: ../../templates/show_recently_played.inc.php:41
+#: ../../templates/show_recently_played.inc.php:100
+#: ../../templates/show_user_registration.inc.php:73
+#: ../../templates/show_login_form.inc.php:58
+#: ../../templates/show_add_user.inc.php:29
+msgid "Username"
+msgstr "Username"
 
-#: ../../templates/show_install_config.inc.php:77
-msgid "MySQL Username"
-msgstr "MySQL Username"
+#: ../../templates/show_install_account.inc.php:66
+#: ../../templates/show_edit_user.inc.php:55
+#: ../../templates/show_user_registration.inc.php:101
+#: ../../templates/show_login_form.inc.php:62
+#: ../../templates/show_add_user.inc.php:52
+#: ../../modules/localplay/httpq.controller.php:219
+#: ../../modules/localplay/mpd.controller.php:235
+msgid "Password"
+msgstr "Password"
 
-#: ../../templates/show_install_config.inc.php:81
-msgid "MySQL Password"
-msgstr "MySQL Password"
+#: ../../templates/show_install_account.inc.php:70
+#: ../../templates/show_edit_user.inc.php:64
+#: ../../templates/show_user_registration.inc.php:110
+#: ../../templates/show_add_user.inc.php:61
+#: ../../templates/show_account.inc.php:46
+msgid "Confirm Password"
+msgstr "Confirm Password"
 
-#: ../../templates/show_install_config.inc.php:86
-msgid "Write Config"
-msgstr "Write Config"
+#: ../../templates/show_install_account.inc.php:75
+msgid "Create Account"
+msgstr "Create Account"
 
-#: ../../templates/show_install_config.inc.php:127
-msgid "Check for Config"
-msgstr "Check for Config"
+#: ../../templates/show_catalogs.inc.php:34
+#: ../../templates/show_catalogs.inc.php:58
+#: ../../templates/show_stats.inc.php:64
+#: ../../templates/show_add_catalog.inc.php:47
+msgid "Path"
+msgstr "Path"
 
-#: ../../templates/show_install_config.inc.php:133
-msgid "Continue to Step 3"
-msgstr "Continue to Step 3"
+#: ../../templates/show_catalogs.inc.php:35
+#: ../../templates/show_catalogs.inc.php:59
+#: ../../templates/show_stats.inc.php:65
+msgid "Last Verify"
+msgstr "Last Verify"
+
+#: ../../templates/show_catalogs.inc.php:36
+#: ../../templates/show_catalogs.inc.php:60
+#: ../../templates/show_stats.inc.php:66
+msgid "Last Add"
+msgstr "Last Add"
+
+#: ../../templates/show_catalogs.inc.php:37
+#: ../../templates/show_catalogs.inc.php:61
+#: ../../templates/show_stats.inc.php:67
+msgid "Last Clean"
+msgstr "Last Clean"
+
+#: ../../templates/show_catalogs.inc.php:38
+#: ../../templates/show_catalogs.inc.php:62
+#: ../../templates/show_albums.inc.php:50
+#: ../../templates/show_albums.inc.php:81
+#: ../../templates/show_album.inc.php:48
+#: ../../templates/show_playlists.inc.php:39
+#: ../../templates/show_playlists.inc.php:62
+msgid "Actions"
+msgstr "Actions"
+
+#: ../../templates/show_catalogs.inc.php:52
+#: ../../templates/show_songs.inc.php:64
+#: ../../templates/show_objects.inc.php:44
+#: ../../templates/show_manage_democratic.inc.php:63
+#: ../../templates/show_tagcloud.inc.php:33
+#: ../../templates/show_genres.inc.php:68
+#: ../../templates/show_albums.inc.php:67
+#: ../../templates/show_recently_played.inc.php:95
+#: ../../templates/show_artists.inc.php:60
+#: ../../templates/show_videos.inc.php:56
+#: ../../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_live_streams.inc.php:53
+#: ../../templates/rightbar.inc.php:108
+#: ../../templates/show_playlists.inc.php:53
+msgid "Not Enough Data"
+msgstr "Not Enough Data"
+
+#: ../../templates/show_embed_xspf.inc.php:54
+msgid "XSPF Player"
+msgstr "XSPF Player"
+
+#: ../../templates/show_video_row.inc.php:32
+#: ../../templates/show_song.inc.php:35
+#: ../../templates/show_song_row.inc.php:43
+#: ../../templates/show_playlist_song_row.inc.php:33
+#: ../../templates/show_artist.inc.php:59
+#: ../../templates/show_artist.inc.php:60
+#: ../../templates/show_album.inc.php:76 ../../templates/show_album.inc.php:77
+msgid "Download"
+msgstr "Download"
+
+#: ../../templates/show_flag_row.inc.php:31
+msgid "Reject"
+msgstr "Reject"
+
+#: ../../templates/show_flag_row.inc.php:33
+#: ../../templates/show_user_row.inc.php:43 ../../lib/preferences.php:165
+#: ../../lib/preferences.php:272
+msgid "Enable"
+msgstr "Enable"
+
+#: ../../templates/show_song.inc.php:24
+msgid "Details"
+msgstr "Details"
+
+#: ../../templates/show_song.inc.php:27 ../../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:49
+#: ../../templates/show_albums.inc.php:80
+#: ../../templates/show_search.inc.php:104
+#: ../../templates/show_artists.inc.php:42
+#: ../../templates/show_artists.inc.php:70
+msgid "Rating"
+msgstr "Rating"
+
+#: ../../templates/show_song.inc.php:34
+msgid "Link"
+msgstr "Link"
+
+#: ../../templates/show_song.inc.php:44
+#: ../../templates/show_disabled_songs.inc.php:34
+#: ../../templates/show_disabled_songs.inc.php:57
+#: ../../templates/show_search.inc.php:40
+#: ../../templates/show_edit_song.inc.php:31
+#: ../../templates/show_duplicate.inc.php:33
+#: ../../templates/show_democratic_playlist.inc.php:56
+#: ../../templates/show_democratic_playlist.inc.php:96
+#: ../../templates/show_videos.inc.php:37
+#: ../../templates/show_videos.inc.php:61
+msgid "Title"
+msgstr "Title"
+
+#: ../../templates/show_song.inc.php:45 ../../templates/show_songs.inc.php:41
+#: ../../templates/show_songs.inc.php:70
+#: ../../templates/show_disabled_songs.inc.php:36
+#: ../../templates/show_disabled_songs.inc.php:59
+#: ../../templates/show_lyrics_song.inc.php:56
+#: ../../templates/show_now_playing_row.inc.php:68
+#: ../../templates/show_similar_artists.inc.php:33
+#: ../../templates/show_similar_artists.inc.php:86
+#: ../../templates/show_albums.inc.php:45
+#: ../../templates/show_albums.inc.php:76
+#: ../../templates/show_recently_played.inc.php:40
+#: ../../templates/show_recently_played.inc.php:103
+#: ../../templates/show_search.inc.php:44
+#: ../../templates/show_edit_song.inc.php:45
+#: ../../templates/show_duplicates.inc.php:38
+#: ../../templates/show_duplicates.inc.php:77
+#: ../../templates/show_artists.inc.php:37
+#: ../../templates/show_artists.inc.php:65
+#: ../../templates/show_get_albumart.inc.php:28
+#: ../../templates/show_democratic_playlist.inc.php:58
+#: ../../templates/show_democratic_playlist.inc.php:98
+#: ../../templates/show_play_selected.inc.php:60
+#: ../../templates/show_playlist_songs.inc.php:43
+#: ../../templates/show_playlist_songs.inc.php:64
+#: ../../templates/sidebar_home.inc.php:81
+#: ../../templates/sidebar_home.inc.php:108
+msgid "Artist"
+msgstr "Artist"
+
+#: ../../templates/show_song.inc.php:46 ../../templates/show_songs.inc.php:42
+#: ../../templates/show_songs.inc.php:71
+#: ../../templates/show_disabled_songs.inc.php:35
+#: ../../templates/show_disabled_songs.inc.php:58
+#: ../../templates/show_lyrics_song.inc.php:49
+#: ../../templates/show_now_playing_row.inc.php:61
+#: ../../templates/show_albums.inc.php:44
+#: ../../templates/show_albums.inc.php:75
+#: ../../templates/show_recently_played.inc.php:39
+#: ../../templates/show_recently_played.inc.php:102
+#: ../../templates/show_search.inc.php:50
+#: ../../templates/show_edit_song.inc.php:37
+#: ../../templates/show_duplicates.inc.php:39
+#: ../../templates/show_duplicates.inc.php:78
+#: ../../templates/show_get_albumart.inc.php:36
+#: ../../templates/show_democratic_playlist.inc.php:57
+#: ../../templates/show_democratic_playlist.inc.php:97
+#: ../../templates/show_play_selected.inc.php:59
+#: ../../templates/show_playlist_songs.inc.php:44
+#: ../../templates/show_playlist_songs.inc.php:65
+#: ../../templates/sidebar_home.inc.php:107
+msgid "Album"
+msgstr "Album"
+
+#: ../../templates/show_song.inc.php:47 ../../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 ../../lib/ui.lib.php:370
+msgid "Genre"
+msgstr "Genre"
+
+#: ../../templates/show_song.inc.php:48
+#: ../../templates/show_duplicates.inc.php:40
+#: ../../templates/show_duplicates.inc.php:79
+#: ../../templates/show_random.inc.php:43
+msgid "Length"
+msgstr "Length"
+
+#: ../../templates/show_song.inc.php:50
+msgid "Label"
+msgstr "Label"
+
+#: ../../templates/show_song.inc.php:51
+msgid "Song Language"
+msgstr "Song Language"
+
+#: ../../templates/show_song.inc.php:52
+msgid "Catalog Number"
+msgstr "Catalog Number"
+
+#: ../../templates/show_song.inc.php:53
+#: ../../templates/show_duplicates.inc.php:41
+#: ../../templates/show_duplicates.inc.php:80
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: ../../templates/show_song.inc.php:55
+#: ../../templates/show_disabled_songs.inc.php:37
+#: ../../templates/show_disabled_songs.inc.php:60
+#: ../../templates/show_search.inc.php:66
+#: ../../templates/show_duplicates.inc.php:43
+#: ../../templates/show_duplicates.inc.php:82
+#: ../../templates/show_import_playlist.inc.php:28
+msgid "Filename"
+msgstr "Filename"
+
+#: ../../templates/show_song.inc.php:58
+msgid "Last Updated"
+msgstr "Last Updated"
+
+#: ../../templates/show_dynamic.inc.php:22
+msgid "Advanced Random Rules"
+msgstr "Advanced Random Rules"
+
+#: ../../templates/show_dynamic.inc.php:31
+#: ../../templates/show_random_rules.inc.php:32
+msgid "Field"
+msgstr "Field"
+
+#: ../../templates/show_dynamic.inc.php:32
+#: ../../templates/show_random_rules.inc.php:33
+#: ../../templates/show_search.inc.php:115
+msgid "Operator"
+msgstr "Operator"
+
+#: ../../templates/show_dynamic.inc.php:33
+#: ../../templates/show_random_rules.inc.php:34
+#: ../../templates/show_debug.inc.php:45 ../../templates/show_debug.inc.php:94
+#: ../../templates/show_preference_box.inc.php:41
+#: ../../templates/show_preference_box.inc.php:71
+#: ../../templates/show_user_preferences.inc.php:37
+msgid "Value"
+msgstr "Value"
+
+#: ../../templates/show_dynamic.inc.php:34
+#: ../../templates/show_random_rules.inc.php:35
+#: ../../templates/show_search.inc.php:124
+msgid "Method"
+msgstr "Method"
+
+#: ../../templates/show_dynamic.inc.php:56
+msgid "Like"
+msgstr "Like"
+
+#: ../../templates/show_dynamic.inc.php:64
+#: ../../templates/show_rename_artist.inc.php:33
+#: ../../templates/show_search.inc.php:119
+#: ../../templates/show_edit_song.inc.php:40
+#: ../../templates/show_edit_song.inc.php:48
+msgid "OR"
+msgstr "OR"
+
+#: ../../templates/show_dynamic.inc.php:65
+#: ../../templates/show_search.inc.php:118
+msgid "AND"
+msgstr "AND"
+
+#: ../../templates/show_dynamic.inc.php:71
+msgid "Add Rule"
+msgstr "Add Rule"
+
+#: ../../templates/show_dynamic.inc.php:74
+msgid "Save Rules As"
+msgstr "Save Rules As"
+
+#: ../../templates/show_dynamic.inc.php:77
+msgid "Load Saved Rules"
+msgstr "Load Saved Rules"
+
+#: ../../templates/show_user.inc.php:22 ../../templates/show_users.inc.php:53
+#: ../../lib/class/user.class.php:671 ../../lib/class/catalog.class.php:146
+#: ../../lib/class/catalog.class.php:147 ../../lib/class/catalog.class.php:148
+#: ../../lib/preferences.php:263
+msgid "Never"
+msgstr "Never"
+
+#: ../../templates/show_user.inc.php:23 ../../templates/show_users.inc.php:54
+#: ../../lib/class/flag.class.php:337 ../../lib/class/user.class.php:675
+#: ../../lib/class/localplay.class.php:648 ../../lib/general.lib.php:339
+#: ../../modules/localplay/mpd.controller.php:529
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../../templates/show_user.inc.php:30
+#: ../../templates/show_edit_user.inc.php:40
+#: ../../templates/show_user_registration.inc.php:83
+#: ../../templates/show_add_user.inc.php:37
+msgid "Full Name"
+msgstr "Full Name"
 
 #: ../../templates/show_user.inc.php:31
 msgid "Create Date"
 msgstr "Create Date"
 
+#: ../../templates/show_user.inc.php:32 ../../templates/show_users.inc.php:40
+#: ../../templates/show_users.inc.php:62
+msgid "Last Seen"
+msgstr "Last Seen"
+
+#: ../../templates/show_user.inc.php:33 ../../templates/show_users.inc.php:42
+#: ../../templates/show_users.inc.php:64
+msgid "Activity"
+msgstr "Activity"
+
 #: ../../templates/show_user.inc.php:35
 msgid "User is Online Now"
 msgstr "User is Online Now"
@@ -1764,130 +1277,214 @@ msgstr "User is Offline Now"
 msgid "Active Playlist"
 msgstr "Active Playlist"
 
-#: ../../templates/show_user.inc.php:68 ../../templates/header.inc.php:37
-#: ../../templates/show_recently_played.inc.php:25
-#: ../../lib/class/ampacherss.class.php:71
-msgid "Recently Played"
-msgstr "Recently Played"
-
-#: ../../templates/show_add_access.inc.php:22
-#: ../../templates/show_access_list.inc.php:43
-#: ../../templates/show_access_list.inc.php:44
-msgid "Advanced Add"
-msgstr "Advanced Add"
-
-#: ../../templates/sidebar_admin.inc.php:24
-#: ../../templates/show_stats.inc.php:25
-#: ../../templates/show_admin_tools.inc.php:26
-#: ../../lib/class/browse.class.php:187
-msgid "Catalogs"
-msgstr "Catalogs"
-
-#: ../../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 Catalog"
+#: ../../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
+#: ../../templates/sidebar_home.inc.php:75
+msgid "Song Title"
+msgstr "Song Title"
 
-#: ../../templates/sidebar_admin.inc.php:27
-#: ../../templates/show_manage_catalogs.inc.php:22
-msgid "Show Catalogs"
-msgstr "Show Catalogs"
+#: ../../templates/show_songs.inc.php:43 ../../templates/show_songs.inc.php:72
+#: ../../templates/show_albums.inc.php:48
+#: ../../templates/show_albums.inc.php:79
+#: ../../templates/show_stats.inc.php:34
+#: ../../templates/show_artists.inc.php:41
+#: ../../templates/show_artists.inc.php:69
+#: ../../templates/show_videos.inc.php:41
+#: ../../templates/show_videos.inc.php:65
+msgid "Tags"
+msgstr "Tags"
 
-#: ../../templates/sidebar_admin.inc.php:31
-msgid "User Tools"
-msgstr "User Tools"
+#: ../../templates/show_songs.inc.php:44 ../../templates/show_songs.inc.php:73
+#: ../../templates/show_localplay_playlist.inc.php:33
+#: ../../templates/show_localplay_playlist.inc.php:59
+#: ../../templates/show_edit_song.inc.php:53
+#: ../../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/sidebar_admin.inc.php:33
-#: ../../templates/show_add_user.inc.php:85
-msgid "Add User"
-msgstr "Add User"
+#: ../../templates/show_songs.inc.php:45 ../../templates/show_songs.inc.php:74
+#: ../../templates/show_search.inc.php:72
+#: ../../templates/show_artists.inc.php:40
+#: ../../templates/show_artists.inc.php:68
+#: ../../templates/show_democratic_playlist.inc.php:59
+#: ../../templates/show_democratic_playlist.inc.php:99
+#: ../../templates/show_videos.inc.php:40
+#: ../../templates/show_videos.inc.php:64
+#: ../../templates/show_playlist_songs.inc.php:47
+#: ../../templates/show_playlist_songs.inc.php:68
+msgid "Time"
+msgstr "Time"
 
-#: ../../templates/sidebar_admin.inc.php:34
-msgid "Browse Users"
-msgstr "Browse Users"
+#: ../../templates/show_big_art.inc.php:29
+#: ../../templates/show_album_art.inc.php:41
+msgid "Album Art"
+msgstr "Album Art"
 
-#: ../../templates/sidebar_admin.inc.php:37
-#: ../../templates/show_access_list.inc.php:28
-msgid "Access Control"
-msgstr "Access Control"
+#: ../../templates/show_big_art.inc.php:33
+msgid "Click to close window"
+msgstr "Click to close window"
 
-#: ../../templates/sidebar_admin.inc.php:39
-msgid "Add ACL"
-msgstr "Add ACL"
+#: ../../templates/show_song_row.inc.php:35
+msgid "Song Information"
+msgstr "Song Information"
 
-#: ../../templates/sidebar_admin.inc.php:40
-msgid "Show ACL(s)"
-msgstr "Show ACL(s)"
+#: ../../templates/show_song_row.inc.php:38
+#: ../../templates/show_album_row.inc.php:45
+msgid "Post Shout"
+msgstr "Post Shout"
 
-#: ../../templates/sidebar_admin.inc.php:43
-#: ../../templates/show_admin_tools.inc.php:88
-#: ../../templates/sidebar_modules.inc.php:31
-msgid "Other Tools"
-msgstr "Other Tools"
+#: ../../templates/show_song_row.inc.php:47
+#: ../../templates/show_access_list.inc.php:79
+#: ../../templates/show_playlist_song_row.inc.php:37
+#: ../../templates/show_shout_row.inc.php:32
+#: ../../templates/show_live_stream_row.inc.php:31
+#: ../../templates/show_play_selected.inc.php:50
+#: ../../templates/show_artist_row.inc.php:39
+#: ../../templates/show_album_row.inc.php:54
+#: ../../templates/show_playlist_row.inc.php:37
+#: ../../templates/show_user_row.inc.php:38
+msgid "Edit"
+msgstr "Edit"
 
-#: ../../templates/sidebar_admin.inc.php:46
-#: ../../templates/show_admin_tools.inc.php:91
-msgid "Clear Now Playing"
-msgstr "Clear Now Playing"
+#: ../../templates/show_flag.inc.php:41
+msgid "Flag Song"
+msgstr "Flag Song"
 
-#: ../../templates/sidebar_admin.inc.php:47
-#: ../../templates/show_export.inc.php:28
-msgid "Export Catalog"
-msgstr "Export Catalog"
+#: ../../templates/show_flag.inc.php:45
+#: ../../templates/show_edit_song.inc.php:27
+msgid "File"
+msgstr "File"
 
-#: ../../templates/sidebar_admin.inc.php:49
-msgid "Manage Shoutbox"
-msgstr "Manage Shoutbox"
+#: ../../templates/show_flag.inc.php:49
+msgid "Item"
+msgstr "Item"
 
-#: ../../templates/sidebar_admin.inc.php:54
-msgid "Server Config"
-msgstr "Server Config"
+#: ../../templates/show_flag.inc.php:53
+msgid "Reason to flag"
+msgstr "Reason to flag"
 
-#: ../../templates/show_install_check.inc.php:23
-msgid "Required"
-msgstr "Required"
+#: ../../templates/show_flag.inc.php:57
+msgid "Incorrect Tags"
+msgstr "Incorrect Tags"
 
-#: ../../templates/show_install_check.inc.php:112
-msgid "Optional"
-msgstr "Optional"
+#: ../../templates/show_flag.inc.php:58 ../../lib/class/flag.class.php:331
+msgid "Re-encode"
+msgstr "Re-encode"
 
-#: ../../templates/show_install_check.inc.php:114
-#: ../../templates/show_debug.inc.php:80
-msgid "Gettext Support"
-msgstr "Gettext Support"
+#: ../../templates/show_flag.inc.php:59 ../../lib/class/flag.class.php:334
+msgid "Other"
+msgstr "Other"
 
-#: ../../templates/show_install_check.inc.php:118
-msgid "Gettext Emulator will be used"
-msgstr "Gettext Emulator will be used"
+#: ../../templates/show_object_rating_static.inc.php:34
+#: ../../templates/show_object_rating.inc.php:34
+msgid "Current rating: "
+msgstr "Current rating: "
 
-#: ../../templates/show_install_check.inc.php:126
-msgid "Mbstring Support"
-msgstr "Mbstring Support"
+#: ../../templates/show_object_rating_static.inc.php:36
+#: ../../templates/show_object_rating.inc.php:36
+msgid "not rated yet"
+msgstr "not rated yet"
 
-#: ../../templates/show_install_check.inc.php:130
-#, fuzzy
-msgid "Multibyte Character may not detect correct"
-msgstr "Multibyte Chracter may not detect correct"
+#: ../../templates/show_object_rating_static.inc.php:38
+#: ../../templates/show_object_rating.inc.php:38
+#, php-format
+msgid "%s of 5"
+msgstr "%s of 5"
 
-#: ../../templates/sidebar.inc.php:27 ../../lib/ui.lib.php:309
-msgid "Home"
-msgstr "Home"
+#: ../../templates/show_object_rating_static.inc.php:44
+msgid "out of"
+msgstr "out of"
 
-#: ../../templates/sidebar.inc.php:30
 #: ../../templates/sidebar_modules.inc.php:25
+#: ../../templates/sidebar.inc.php:30
 msgid "Modules"
 msgstr "Modules"
 
-#: ../../templates/sidebar.inc.php:61
-msgid "Logout"
-msgstr "Logout"
+#: ../../templates/sidebar_modules.inc.php:27
+msgid "Localplay Modules"
+msgstr "Localplay Modules"
+
+#: ../../templates/sidebar_modules.inc.php:28
+msgid "Available Plugins"
+msgstr "Available Plugins"
+
+#: ../../templates/sidebar_modules.inc.php:33
+#: ../../templates/show_duplicate.inc.php:23
+#: ../../templates/show_duplicate.inc.php:42
+msgid "Find Duplicates"
+msgstr "Find Duplicates"
+
+#: ../../templates/sidebar_modules.inc.php:34
+msgid "Mail Users"
+msgstr "Mail Users"
+
+#: ../../templates/sidebar_modules.inc.php:35
+msgid "Manage Flagged"
+msgstr "Manage Flagged"
+
+#: ../../templates/sidebar_modules.inc.php:36
+msgid "Show Disabled"
+msgstr "Show Disabled"
+
+#: ../../templates/sidebar_modules.inc.php:41
+#: ../../templates/show_edit_user.inc.php:93
+#: ../../templates/show_playtype_switch.inc.php:36
+#: ../../templates/sidebar_home.inc.php:91 ../../lib/preferences.php:180
+#: ../../modules/localplay/httpq.controller.php:488
+#: ../../modules/localplay/mpd.controller.php:495
+msgid "Democratic"
+msgstr "Democratic"
+
+#: ../../templates/sidebar_modules.inc.php:43
+msgid "Manage Playlist"
+msgstr "Manage Playlist"
+
+#: ../../templates/show_run_add_catalog.inc.php:24
+#: ../../templates/show_adds_catalog.inc.php:26
+msgid "Found"
+msgstr "Found"
+
+#: ../../templates/show_run_add_catalog.inc.php:25
+#: ../../templates/show_verify_catalog.inc.php:29
+#: ../../templates/show_gather_art.inc.php:25
+#: ../../templates/show_clean_catalog.inc.php:27
+#: ../../templates/show_adds_catalog.inc.php:27
+msgid "Reading"
+msgstr "Reading"
+
+#: ../../templates/show_edit_artist_row.inc.php:32
+#: ../../templates/show_edit_album_row.inc.php:48
+#: ../../templates/show_edit_playlist_row.inc.php:38
+#: ../../templates/show_edit_playlist_song_row.inc.php:38
+#: ../../templates/show_edit_song_row.inc.php:45
+#: ../../templates/show_edit_live_stream_row.inc.php:52
+msgid "Save Changes"
+msgstr "Save Changes"
 
 #: ../../templates/show_install_lang.inc.php:40
 #: ../../templates/show_install.inc.php:41
 msgid "Requirements"
 msgstr "Requirements"
 
+#: ../../templates/show_install_lang.inc.php:49
+#: ../../templates/show_install_config.inc.php:47
+#: ../../templates/show_install.inc.php:50
+#, fuzzy, php-format
+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 %s"
+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_lang.inc.php:55
 msgid "Minimum Requirements not met. Unable to Install Ampache."
 msgstr "Minimum Requirements not met. Unable to Install Ampache."
@@ -1900,139 +1497,460 @@ msgstr "Choose installation language."
 msgid "Start configuration"
 msgstr "Start configuration"
 
-#: ../../templates/rightbar.inc.php:28
-msgid "Add to Playlist"
-msgstr "Add to Playlist"
+#: ../../templates/show_random_albums.inc.php:22
+msgid "Refresh"
+msgstr "Refresh"
 
-#: ../../templates/rightbar.inc.php:31
-msgid "Add to New Playlist"
-msgstr "Add to New Playlist"
+#: ../../templates/show_random_albums.inc.php:24
+#: ../../templates/show_index.inc.php:38
+msgid "Albums of the Moment"
+msgstr "Albums of the Moment"
+
+#: ../../templates/show_random_albums.inc.php:48
+msgid "Play Album"
+msgstr "Play Album"
+
+#: ../../templates/show_localplay_status.inc.php:26
+msgid "Localplay Control"
+msgstr "Localplay Control"
+
+#: ../../templates/show_localplay_status.inc.php:27
+#: ../../templates/header.inc.php:36
+#: ../../templates/show_now_playing.inc.php:33
+#: ../../lib/class/ampacherss.class.php:70
+#: ../../lib/class/localplay.class.php:639
+msgid "Now Playing"
+msgstr "Now Playing"
+
+#: ../../templates/show_localplay_status.inc.php:31
+msgid "Mute"
+msgstr "Mute"
+
+#: ../../templates/show_localplay_status.inc.php:32
+msgid "Decrease Volume"
+msgstr "Decrease Volume"
+
+#: ../../templates/show_localplay_status.inc.php:33
+msgid "Increase Volume"
+msgstr "Increase Volume"
+
+#: ../../templates/show_localplay_status.inc.php:34
+msgid "Volume"
+msgstr "Volume"
+
+#: ../../templates/show_localplay_status.inc.php:39
+msgid "Repeat"
+msgstr "Repeat"
+
+#. HINT: Artist Fullname
+#: ../../templates/show_localplay_status.inc.php:44
+#: ../../templates/show_genres.inc.php:52
+#: ../../templates/show_artist.inc.php:48
+#: ../../templates/show_artist_row.inc.php:24
+#: ../../templates/sidebar_home.inc.php:105
+#: ../../templates/show_album_row.inc.php:24
+#: ../../templates/show_playlist_row.inc.php:24
+#: ../../templates/show_album.inc.php:55
+#: ../../modules/localplay/httpq.controller.php:492
+#: ../../modules/localplay/mpd.controller.php:499
+msgid "Random"
+msgstr "Random"
 
-#: ../../templates/rightbar.inc.php:54
 #: ../../templates/show_localplay_status.inc.php:47
 #: ../../templates/show_democratic.inc.php:43
 #: ../../templates/show_democratic.inc.php:44
+#: ../../templates/rightbar.inc.php:54
 msgid "Clear Playlist"
 msgstr "Clear Playlist"
 
-#: ../../templates/rightbar.inc.php:57
-msgid "Add Dynamic Items"
-msgstr "Add Dynamic Items"
+#: ../../templates/show_random_rules.inc.php:22
+msgid "Rules"
+msgstr "Rules"
 
-#: ../../templates/rightbar.inc.php:60 ../../lib/class/random.class.php:421
-msgid "Pure Random"
-msgstr "Pure Random"
+#: ../../templates/show_disabled_songs.inc.php:33
+#: ../../templates/show_disabled_songs.inc.php:56
+#: ../../templates/show_album_art.inc.php:49
+msgid "Select"
+msgstr "Select"
 
-#: ../../templates/rightbar.inc.php:63 ../../lib/class/random.class.php:418
-msgid "Related Artist"
-msgstr "Related Artist"
+#: ../../templates/show_disabled_songs.inc.php:38
+#: ../../templates/show_disabled_songs.inc.php:61
+msgid "Addition Time"
+msgstr "Addition Time"
 
-#: ../../templates/rightbar.inc.php:66 ../../lib/class/random.class.php:412
-msgid "Related Album"
-msgstr "Related Album"
+#: ../../templates/show_disabled_songs.inc.php:65
+msgid "Remove"
+msgstr "Remove"
 
-#: ../../templates/rightbar.inc.php:69
-msgid "Related Tag"
-msgstr "Related Tag"
+#: ../../templates/show_access_list.inc.php:28
+#: ../../templates/sidebar_admin.inc.php:37
+msgid "Access Control"
+msgstr "Access Control"
 
-#: ../../templates/rightbar.inc.php:112
-msgid "More"
-msgstr "More"
+#: ../../templates/show_access_list.inc.php:32
+#: ../../templates/show_access_list.inc.php:33
+#: ../../templates/show_add_access_current.inc.php:22
+msgid "Add Current Host"
+msgstr "Add Current Host"
 
-#: ../../templates/header.inc.php:36
-#: ../../templates/show_localplay_status.inc.php:27
-#: ../../templates/show_now_playing.inc.php:33
-#: ../../lib/class/localplay.class.php:639
-#: ../../lib/class/ampacherss.class.php:70
-msgid "Now Playing"
-msgstr "Now Playing"
+#: ../../templates/show_access_list.inc.php:36
+#: ../../templates/show_access_list.inc.php:37
+#: ../../templates/show_add_access_rpc.inc.php:22
+msgid "Add API / RPC Host"
+msgstr "Add API / RPC Host"
 
-#: ../../templates/header.inc.php:62
-msgid "Log out"
-msgstr "Log out"
+#: ../../templates/show_access_list.inc.php:43
+#: ../../templates/show_access_list.inc.php:44
+#: ../../templates/show_add_access.inc.php:22
+msgid "Advanced Add"
+msgstr "Advanced Add"
 
-#: ../../templates/header.inc.php:78
-msgid "Error Config File Out of Date"
-msgstr "Error Config File Out of Date"
+#: ../../templates/show_access_list.inc.php:50
+msgid "Access Control Entries"
+msgstr "Access Control Entries"
 
-#: ../../templates/header.inc.php:79
-#: ../../templates/show_admin_tools.inc.php:92
-msgid "Generate New Config"
-msgstr "Generate New Config"
+#: ../../templates/show_access_list.inc.php:56
+msgid "Start Address"
+msgstr "Start Address"
 
-#: ../../templates/show_edit_playlist_row.inc.php:32
-#: ../../templates/show_playlist_edit.inc.php:39
-msgid "Public"
-msgstr "Public"
+#: ../../templates/show_access_list.inc.php:57
+msgid "End Address"
+msgstr "End Address"
 
-#: ../../templates/show_edit_playlist_row.inc.php:33
-#: ../../templates/show_playlist_edit.inc.php:40
-#: ../../lib/class/playlist.class.php:83
-msgid "Private"
-msgstr "Private"
+#: ../../templates/show_access_list.inc.php:60
+msgid "Key"
+msgstr "Key"
 
-#: ../../templates/show_add_user.inc.php:23
-msgid "Adding a New User"
-msgstr "Adding a New User"
+#: ../../templates/show_lyrics_song.inc.php:42
+#: ../../templates/show_now_playing_row.inc.php:54
+#: ../../templates/show_recently_played.inc.php:38
+#: ../../templates/show_recently_played.inc.php:101
+#: ../../templates/show_duplicates.inc.php:37
+#: ../../templates/show_duplicates.inc.php:76
+msgid "Song"
+msgstr "Song"
 
-#. HINT: Genre Name
-#: ../../templates/show_genre.inc.php:30
-#, php-format
-msgid "Viewing %s Genre"
-msgstr "Viewing %s Genre"
+#: ../../templates/show_users.inc.php:39 ../../templates/show_users.inc.php:61
+msgid "Fullname"
+msgstr "Fullname"
 
-#: ../../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 "Registration"
+#: ../../templates/show_users.inc.php:41 ../../templates/show_users.inc.php:63
+msgid "Registration Date"
+msgstr "Registration Date"
 
-#: ../../templates/show_user_activate.inc.php:48
-msgid "User Activated"
-msgstr "User Activated"
+#: ../../templates/show_users.inc.php:44 ../../templates/show_users.inc.php:66
+msgid "Last Ip"
+msgstr "Last Ip"
 
-#. HINT: Start A tag, End A tag
-#: ../../templates/show_user_activate.inc.php:52
-#, php-format
-msgid "This User ID is activated and can be used %sLogin%s"
-msgstr "This User ID is activated and can be used %sLogin%s"
+#: ../../templates/show_users.inc.php:47 ../../templates/show_users.inc.php:69
+msgid "On-line"
+msgstr "On-line"
 
-#: ../../templates/show_user_activate.inc.php:55
-msgid "Validation Failed"
-msgstr "Validation Failed"
+#: ../../templates/show_manage_democratic.inc.php:22
+msgid "Manage Democratic Playlists"
+msgstr "Manage Democratic Playlists"
 
-#: ../../templates/show_user_activate.inc.php:56
-msgid "The validation key used isn't correct"
-msgstr "The validation key used isn't correct"
+#: ../../templates/show_manage_democratic.inc.php:34
+#: ../../templates/show_play_selected.inc.php:47
+#: ../../templates/sidebar_home.inc.php:87
+#: ../../templates/sidebar_home.inc.php:109 ../../lib/ui.lib.php:321
+msgid "Playlist"
+msgstr "Playlist"
 
-#: ../../templates/show_plugins.inc.php:46
-msgid "Deactivate"
-msgstr "Deactivate"
+#: ../../templates/show_manage_democratic.inc.php:35
+#: ../../templates/show_create_democratic.inc.php:30
+msgid "Base Playlist"
+msgstr "Base Playlist"
 
-#: ../../templates/show_random_albums.inc.php:22
-msgid "Refresh"
-msgstr "Refresh"
+#: ../../templates/show_manage_democratic.inc.php:36
+#: ../../templates/show_democratic.inc.php:29
+msgid "Cooldown"
+msgstr "Cooldown"
 
-#: ../../templates/show_random_albums.inc.php:48
-msgid "Play Album"
-msgstr "Play Album"
+#: ../../templates/show_manage_democratic.inc.php:38
+#: ../../lib/preferences.php:257 ../../lib/preferences.php:264
+msgid "Default"
+msgstr "Default"
 
-#: ../../templates/show_catalog_row.inc.php:30
-#: ../../templates/show_admin_tools.inc.php:47
-msgid "Verify"
-msgstr "Verify"
+#: ../../templates/show_manage_democratic.inc.php:39
+#: ../../templates/show_genres.inc.php:38
+#: ../../templates/show_genres.inc.php:74
+#: ../../templates/show_albums.inc.php:46
+#: ../../templates/show_albums.inc.php:77
+#: ../../templates/show_stats.inc.php:32 ../../templates/show_stats.inc.php:68
+#: ../../templates/show_artists.inc.php:38
+#: ../../templates/show_artists.inc.php:66
+#: ../../templates/show_genre.inc.php:39
+#: ../../templates/show_popular.inc.php:23
+#: ../../lib/class/browse.class.php:142
+msgid "Songs"
+msgstr "Songs"
 
-#: ../../templates/show_catalog_row.inc.php:31
-#: ../../templates/show_admin_tools.inc.php:49
-msgid "Clean"
-msgstr "Clean"
+#: ../../templates/show_manage_democratic.inc.php:57
+#: ../../templates/show_democratic.inc.php:39
+#: ../../templates/show_localplay_control.inc.php:28
+#: ../../templates/rightbar.inc.php:25
+msgid "Play"
+msgstr "Play"
 
-#: ../../templates/show_catalog_row.inc.php:33
-#: ../../templates/show_admin_tools.inc.php:60
-msgid "Gather Art"
-msgstr "Gather Art"
+#: ../../templates/show_manage_democratic.inc.php:69
+msgid "Create New Playlist"
+msgstr "Create New Playlist"
+
+#: ../../templates/show_now_playing_row.inc.php:46
+msgid "Show Lyrics"
+msgstr "Show Lyrics"
+
+#: ../../templates/show_install_config.inc.php:52
+#: ../../templates/show_install.inc.php:59
+msgid "Step 2 - Creating the Ampache.cfg.php file"
+msgstr "Step 2 - Creating the Ampache.cfg.php file"
+
+#: ../../templates/show_install_config.inc.php:54
+#, fuzzy, php-format
+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 %s"
+msgstr ""
+"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"
+
+#: ../../templates/show_install_config.inc.php:60
+msgid "Generate Config File"
+msgstr "Generate Config File"
+
+#: ../../templates/show_install_config.inc.php:65
+#: ../../templates/show_test.inc.php:223
+msgid "Web Path"
+msgstr "Web Path"
+
+#: ../../templates/show_install_config.inc.php:69
+#: ../../templates/show_install.inc.php:68
+msgid "Desired Database Name"
+msgstr "Desired Database Name"
+
+#: ../../templates/show_install_config.inc.php:73
+#: ../../templates/show_install.inc.php:72
+msgid "MySQL Hostname"
+msgstr "MySQL Hostname"
+
+#: ../../templates/show_install_config.inc.php:77
+msgid "MySQL Username"
+msgstr "MySQL Username"
+
+#: ../../templates/show_install_config.inc.php:81
+msgid "MySQL Password"
+msgstr "MySQL Password"
+
+#: ../../templates/show_install_config.inc.php:86
+msgid "Write Config"
+msgstr "Write Config"
+
+#: ../../templates/show_install_config.inc.php:93
+msgid "Ampache.cfg.php Exists"
+msgstr "Ampache.cfg.php Exists"
+
+#: ../../templates/show_install_config.inc.php:108
+#: ../../templates/show_test.inc.php:166
+msgid "Ampache.cfg.php Configured?"
+msgstr "Ampache.cfg.php Configured?"
+
+#: ../../templates/show_install_config.inc.php:127
+msgid "Check for Config"
+msgstr "Check for Config"
+
+#: ../../templates/show_install_config.inc.php:133
+msgid "Continue to Step 3"
+msgstr "Continue to Step 3"
+
+#: ../../templates/show_edit_user.inc.php:23
+msgid "Editing existing User"
+msgstr "Editing existing User"
+
+#: ../../templates/show_edit_user.inc.php:28
+msgid "User Properties"
+msgstr "User Properties"
+
+#: ../../templates/show_edit_user.inc.php:47
+#: ../../templates/show_user_registration.inc.php:92
+#: ../../templates/show_add_user.inc.php:44
+#: ../../templates/show_account.inc.php:33
+msgid "E-mail"
+msgstr "E-mail"
+
+#: ../../templates/show_edit_user.inc.php:72
+#: ../../templates/show_add_user.inc.php:69
+msgid "User Access Level"
+msgstr "User Access Level"
+
+#: ../../templates/show_edit_user.inc.php:79
+#: ../../templates/show_create_democratic.inc.php:43
+#: ../../templates/show_add_user.inc.php:76
+#: ../../templates/show_preference_box.inc.php:60
+#: ../../lib/class/democratic.class.php:151
+msgid "Content Manager"
+msgstr "Content Manager"
+
+#: ../../templates/show_edit_user.inc.php:80
+#: ../../templates/show_create_democratic.inc.php:44
+#: ../../templates/show_add_user.inc.php:77
+#: ../../templates/show_preference_box.inc.php:61
+#: ../../lib/class/democratic.class.php:154
+msgid "Catalog Manager"
+msgstr "Catalog Manager"
+
+#: ../../templates/show_edit_user.inc.php:86
+msgid "Other Options"
+msgstr "Other Options"
+
+#: ../../templates/show_edit_user.inc.php:89
+msgid "Config Preset"
+msgstr "Config Preset"
+
+#: ../../templates/show_edit_user.inc.php:94
+#: ../../templates/sidebar.inc.php:28
+#: ../../templates/sidebar_localplay.inc.php:32
+#: ../../templates/show_playtype_switch.inc.php:34
+#: ../../templates/sidebar_home.inc.php:100 ../../lib/preferences.php:183
+msgid "Localplay"
+msgstr "Localplay"
+
+#: ../../templates/show_edit_user.inc.php:95
+msgid "Flash"
+msgstr "Flash"
+
+#: ../../templates/show_edit_user.inc.php:96
+#: ../../templates/show_playtype_switch.inc.php:32
+#: ../../lib/preferences.php:177
+msgid "Stream"
+msgstr "Stream"
+
+#: ../../templates/show_edit_user.inc.php:101
+msgid "Prevent Preset Override"
+msgstr "Prevent Preset Override"
+
+#: ../../templates/show_edit_user.inc.php:103
+msgid "This Affects all non-Admin accounts"
+msgstr "This Affects all non-Admin accounts"
+
+#: ../../templates/show_edit_user.inc.php:107
+#: ../../templates/show_account.inc.php:52
+#: ../../templates/show_manage_catalogs.inc.php:33
+msgid "Clear Stats"
+msgstr "Clear Stats"
+
+#: ../../templates/show_edit_user.inc.php:115
+msgid "Update User"
+msgstr "Update User"
+
+#: ../../templates/show_edit_album_row.inc.php:35
+#: ../../lib/class/album.class.php:257 ../../lib/class/album.class.php:258
+msgid "Various"
+msgstr "Various"
+
+#: ../../templates/show_debug.inc.php:23
+msgid "Debug Tools"
+msgstr "Debug Tools"
+
+#: ../../templates/show_debug.inc.php:27 ../../templates/show_debug.inc.php:28
+msgid "Generate Configuration"
+msgstr "Generate Configuration"
+
+#: ../../templates/show_debug.inc.php:31 ../../templates/show_debug.inc.php:32
+msgid "Set Database Charset"
+msgstr "Set Database Charset"
+
+#: ../../templates/show_debug.inc.php:37
+msgid "PHP Settings"
+msgstr "PHP Settings"
+
+#: ../../templates/show_debug.inc.php:44
+msgid "Setting"
+msgstr "Setting"
+
+#: ../../templates/show_debug.inc.php:48
+msgid "Memory Limit"
+msgstr "Memory Limit"
+
+#: ../../templates/show_debug.inc.php:52
+msgid "Maximum Execution Time"
+msgstr "Maximum Execution Time"
+
+#: ../../templates/show_debug.inc.php:56
+msgid "Override Execution Time"
+msgstr "Override Execution Time"
+
+#: ../../templates/show_debug.inc.php:57
+msgid "Failed"
+msgstr "Failed"
+
+#: ../../templates/show_debug.inc.php:57
+msgid "Succeeded"
+msgstr "Succeeded"
+
+#: ../../templates/show_debug.inc.php:60
+msgid "Safe Mode"
+msgstr "Safe Mode"
+
+#: ../../templates/show_debug.inc.php:68
+msgid "Zlib Support"
+msgstr "Zlib Support"
+
+#: ../../templates/show_debug.inc.php:72
+msgid "GD Support"
+msgstr "GD Support"
+
+#: ../../templates/show_debug.inc.php:76
+msgid "Iconv Support"
+msgstr "Iconv Support"
+
+#: ../../templates/show_debug.inc.php:80
+#: ../../templates/show_install_check.inc.php:128
+msgid "Gettext Support"
+msgstr "Gettext Support"
+
+#: ../../templates/show_debug.inc.php:86
+msgid "Current Configuration"
+msgstr "Current Configuration"
+
+#: ../../templates/show_debug.inc.php:93
+#: ../../templates/show_preference_admin.inc.php:30
+#: ../../templates/show_preference_admin.inc.php:49
+#: ../../templates/show_preference_box.inc.php:40
+#: ../../templates/show_preference_box.inc.php:70
+#: ../../templates/show_user_preferences.inc.php:36
+msgid "Preference"
+msgstr "Preference"
+
+#: ../../templates/show_search_bar.inc.php:29
+#: ../../templates/show_search.inc.php:144 ../../lib/ui.lib.php:324
+msgid "Search"
+msgstr "Search"
+
+#: ../../templates/show_search_bar.inc.php:30
+msgid "Advanced Search"
+msgstr "Advanced Search"
+
+#: ../../templates/show_add_shout.inc.php:23
+msgid "Post to Shoutbox"
+msgstr "Post to Shoutbox"
+
+#: ../../templates/show_add_shout.inc.php:27
+#: ../../templates/show_edit_shout.inc.php:31
+msgid "Comment:"
+msgstr "Comment:"
+
+#: ../../templates/show_add_shout.inc.php:34
+#: ../../templates/show_edit_shout.inc.php:37
+msgid "Make Sticky"
+msgstr "Make Sticky"
+
+#: ../../templates/show_add_shout.inc.php:41
+#: ../../templates/show_add_playlist.inc.php:42
+msgid "Create"
+msgstr "Create"
 
 #: ../../templates/show_create_democratic.inc.php:22
 #: ../../templates/show_democratic.inc.php:34
@@ -2045,8 +1963,8 @@ msgid "Cooldown Time"
 msgstr "Cooldown Time"
 
 #: ../../templates/show_create_democratic.inc.php:35
-#: ../../templates/show_search.inc.php:77
-#: ../../lib/class/democratic.class.php:140 ../../lib/class/video.class.php:77
+#: ../../templates/show_search.inc.php:77 ../../lib/class/video.class.php:77
+#: ../../lib/class/democratic.class.php:140
 msgid "minutes"
 msgstr "minutes"
 
@@ -2058,187 +1976,344 @@ msgstr "Make Default"
 msgid "Force Democratic Play"
 msgstr "Force Democratic Play"
 
-#: ../../templates/show_account.inc.php:39
-msgid "New Password"
-msgstr "New Password"
+#: ../../templates/show_create_democratic.inc.php:59
+#: ../../templates/show_edit_shout.inc.php:41
+#: ../../templates/show_preference_admin.inc.php:55
+#: ../../templates/show_edit_access.inc.php:84
+#: ../../templates/show_playlist_edit.inc.php:47
+#: ../../templates/show_play_selected.inc.php:64
+#: ../../templates/show_catalog_row.inc.php:32
+#: ../../templates/show_manage_catalogs.inc.php:42
+msgid "Update"
+msgstr "Update"
 
-#: ../../templates/show_account.inc.php:62
-msgid "Update Account"
-msgstr "Update Account"
+#: ../../templates/show_install_check.inc.php:23
+msgid "Required"
+msgstr "Required"
 
-#: ../../templates/show_edit_song.inc.php:23
-msgid "Edit Song"
-msgstr "Edit Song"
+#: ../../templates/show_install_check.inc.php:26
+#: ../../templates/show_install_check.inc.php:31
+#: ../../templates/show_test.inc.php:147
+#, fuzzy, php-format
+msgid "%s is readable"
+msgstr "%s is not readable by ampache"
 
-#: ../../templates/show_edit_song.inc.php:40
-#: ../../templates/show_edit_song.inc.php:48
-#: ../../templates/show_search.inc.php:119
-#: ../../templates/show_dynamic.inc.php:64
-#: ../../templates/show_rename_artist.inc.php:33
-msgid "OR"
-msgstr "OR"
+#: ../../templates/show_install_check.inc.php:40
+#: ../../templates/show_install_check.inc.php:53
+#: ../../templates/show_test.inc.php:45
+msgid "PHP Version"
+msgstr "PHP Version"
 
-#: ../../templates/show_edit_song.inc.php:53
-#: ../../templates/show_localplay_playlist.inc.php:33
-#: ../../templates/show_localplay_playlist.inc.php:59
-#: ../../templates/show_songs.inc.php:44 ../../templates/show_songs.inc.php:73
-#: ../../templates/show_playlist_songs.inc.php:41
-#: ../../templates/show_playlist_songs.inc.php:46
-#: ../../templates/show_playlist_songs.inc.php:62
-#: ../../templates/show_playlist_songs.inc.php:67
-msgid "Track"
-msgstr "Track"
+#: ../../templates/show_install_check.inc.php:51
+#: ../../templates/show_test.inc.php:51
+msgid "Hash Function Exists"
+msgstr "Hash Function Exists"
 
-#: ../../templates/show_edit_song.inc.php:80
-msgid "Update Song"
-msgstr "Update Song"
+#: ../../templates/show_install_check.inc.php:51
+#: ../../templates/show_test.inc.php:51
+msgid "SHA256 Support"
+msgstr "SHA256 Support"
 
-#: ../../templates/show_democratic_playlist.inc.php:42
-msgid "Playing from base Playlist"
-msgstr "Playing from base Playlist"
+#: ../../templates/show_install_check.inc.php:61
+#: ../../templates/show_install_check.inc.php:66
+#: ../../templates/show_test.inc.php:65
+msgid "Mysql for PHP"
+msgstr "Mysql for PHP"
 
-#: ../../templates/show_democratic_playlist.inc.php:55
-#: ../../templates/show_democratic_playlist.inc.php:95
-msgid "Votes"
-msgstr "Votes"
+#: ../../templates/show_install_check.inc.php:74
+#: ../../templates/show_install_check.inc.php:79
+#: ../../templates/show_test.inc.php:82
+msgid "PHP Session Support"
+msgstr "PHP Session Support"
 
-#: ../../templates/show_democratic_playlist.inc.php:74
-msgid "Remove Vote"
-msgstr "Remove Vote"
+#: ../../templates/show_install_check.inc.php:87
+#: ../../templates/show_install_check.inc.php:92
+#: ../../templates/show_test.inc.php:99
+msgid "PHP ICONV Support"
+msgstr "PHP ICONV Support"
 
-#: ../../templates/show_democratic_playlist.inc.php:76
-msgid "Add Vote"
-msgstr "Add Vote"
+#: ../../templates/show_install_check.inc.php:100
+#: ../../templates/show_install_check.inc.php:105
+#: ../../templates/show_test.inc.php:115
+msgid "PHP PCRE Support"
+msgstr "PHP PCRE Support"
 
-#: ../../templates/show_localplay_edit_instance.inc.php:23
-msgid "Edit Localplay Instance"
-msgstr "Edit Localplay Instance"
+#: ../../templates/show_install_check.inc.php:113
+#: ../../templates/show_install_check.inc.php:118
+#: ../../templates/show_test.inc.php:131
+msgid "PHP PutENV Support"
+msgstr "PHP PutENV Support"
 
-#: ../../templates/show_localplay_edit_instance.inc.php:34
-msgid "Update Instance"
-msgstr "Update Instance"
+#: ../../templates/show_install_check.inc.php:126
+msgid "Optional"
+msgstr "Optional"
 
-#: ../../templates/show_search_bar.inc.php:29
-#: ../../templates/show_search.inc.php:144 ../../lib/ui.lib.php:324
-msgid "Search"
-msgstr "Search"
+#: ../../templates/show_install_check.inc.php:132
+msgid "Gettext Emulator will be used"
+msgstr "Gettext Emulator will be used"
 
-#: ../../templates/show_search_bar.inc.php:30
-msgid "Advanced Search"
-msgstr "Advanced Search"
+#: ../../templates/show_install_check.inc.php:140
+msgid "Mbstring Support"
+msgstr "Mbstring Support"
 
-#: ../../templates/show_stats.inc.php:28
-msgid "Connected Users"
-msgstr "Connected Users"
+#: ../../templates/show_install_check.inc.php:144
+#, fuzzy
+msgid "Multibyte Character may not detect correct"
+msgstr "Multibyte Chracter may not detect correct"
 
-#: ../../templates/show_stats.inc.php:29
-msgid "Total Users"
-msgstr "Total Users"
+#: ../../templates/show_install_check.inc.php:152
+#, fuzzy
+msgid "PHP Memory Limit"
+msgstr "Memory Limit"
 
-#: ../../templates/show_stats.inc.php:33 ../../templates/show_stats.inc.php:69
-msgid "Video"
-msgstr "Video"
+#: ../../templates/show_install_check.inc.php:156
+msgid "Memory Limit less then recommended size"
+msgstr ""
 
-#: ../../templates/show_stats.inc.php:35 ../../templates/show_stats.inc.php:70
-msgid "Catalog Size"
-msgstr "Catalog Size"
+#: ../../templates/show_install_check.inc.php:165
+#, fuzzy
+msgid "PHP Execution timelimit"
+msgstr "Maximum Execution Time"
 
-#: ../../templates/show_stats.inc.php:36
-msgid "Catalog Time"
-msgstr "Catalog Time"
+#: ../../templates/show_install_check.inc.php:169
+msgid "Execution timelimit less the recommended"
+msgstr ""
 
-#. HINT: Username
-#: ../../templates/show_ip_history.inc.php:23
+#: ../../templates/show_install_check.inc.php:172
+#, fuzzy
+msgid "seconds"
+msgstr "seconds ago"
+
+#: ../../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:83
+msgid "Private"
+msgstr "Private"
+
+#: ../../templates/show_confirmation.inc.php:27
+#: ../../templates/show_update_items.inc.php:27
+msgid "Continue"
+msgstr "Continue"
+
+#: ../../templates/show_confirmation.inc.php:32
+#: ../../templates/show_similar_artists.inc.php:78
+msgid "Cancel"
+msgstr "Cancel"
+
+#: ../../templates/sidebar.inc.php:27 ../../lib/ui.lib.php:309
+msgid "Home"
+msgstr "Home"
+
+#: ../../templates/sidebar.inc.php:29
+#: ../../templates/sidebar_preferences.inc.php:29
+#: ../../templates/show_user_row.inc.php:39 ../../lib/ui.lib.php:327
+msgid "Preferences"
+msgstr "Preferences"
+
+#: ../../templates/sidebar.inc.php:61
+msgid "Logout"
+msgstr "Logout"
+
+#. HINT: Catalog Name
+#: ../../templates/show_verify_catalog.inc.php:24
 #, php-format
-msgid "%s IP History"
-msgstr "%s IP History"
+msgid "Updating the %s catalog"
+msgstr "Updating the %s catalog"
 
-#: ../../templates/show_ip_history.inc.php:29
-msgid "Show Unique"
-msgstr "Show Unique"
+#: ../../templates/show_verify_catalog.inc.php:26
+#, php-format
+msgid "%d item found checking tag information"
+msgid_plural "%d items found checking tag information"
+msgstr[0] "%d item found checking tag information"
+msgstr[1] "%d items found checking tag information"
 
-#: ../../templates/show_ip_history.inc.php:32
-#: ../../templates/show_admin_info.inc.php:38
-msgid "Show All"
-msgstr "Show All"
+#: ../../templates/show_verify_catalog.inc.php:28
+msgid "Verifed"
+msgstr "Verifed"
 
-#: ../../templates/show_ip_history.inc.php:45
-#: ../../templates/show_ip_history.inc.php:59
-msgid "Date"
-msgstr "Date"
+#: ../../templates/show_shoutbox.inc.php:22
+msgid "Shoutbox"
+msgstr "Shoutbox"
 
-#: ../../templates/show_ip_history.inc.php:46
-#: ../../templates/show_ip_history.inc.php:60
-msgid "IP Address"
-msgstr "IP Address"
+#: ../../templates/show_genres.inc.php:60
+#: ../../templates/show_playlist.inc.php:35
+#: ../../templates/show_playlist.inc.php:36
+#: ../../templates/show_search_options.inc.php:32
+#: ../../templates/show_search_options.inc.php:33
+#: ../../templates/show_artist_row.inc.php:35
+#: ../../templates/show_album_row.inc.php:50
+#: ../../templates/show_playlist_row.inc.php:33
+#: ../../templates/rightbar.inc.php:49
+msgid "Batch Download"
+msgstr "Batch Download"
 
-#: ../../templates/show_embed_xspf.inc.php:54
-msgid "XSPF Player"
-msgstr "XSPF Player"
+#. HINT: Democratic Name
+#: ../../templates/show_democratic.inc.php:22
+#, php-format
+msgid "%s Playlist"
+msgstr "%s Playlist"
 
-#: ../../templates/show_play_selected.inc.php:28
-msgid "Play Selected"
-msgstr "Play Selected"
+#: ../../templates/show_democratic.inc.php:22
+#: ../../lib/class/browse.class.php:214
+msgid "Democratic Playlist"
+msgstr "Democratic Playlist"
 
-#: ../../templates/show_play_selected.inc.php:31
-msgid "Download Selected"
-msgstr "Download Selected"
+#: ../../templates/show_democratic.inc.php:40
+msgid "Play Democratic Playlist"
+msgstr "Play Democratic Playlist"
 
-#: ../../templates/show_play_selected.inc.php:40
-msgid "Set Track Numbers"
-msgstr "Set Track Numbers"
+#: ../../templates/show_localplay_control.inc.php:25
+msgid "Previous"
+msgstr "Previous"
 
-#: ../../templates/show_play_selected.inc.php:41
-msgid "Remove Selected Tracks"
-msgstr "Remove Selected Tracks"
+#: ../../templates/show_localplay_control.inc.php:26
+msgid "Stop"
+msgstr "Stop"
 
-#: ../../templates/show_play_selected.inc.php:47
-msgid "Add to"
-msgstr "Add to"
+#: ../../templates/show_localplay_control.inc.php:27
+msgid "Pause"
+msgstr "Pause"
 
-#: ../../templates/show_play_selected.inc.php:58
-#: ../../templates/show_genres.inc.php:37
-#: ../../templates/show_genres.inc.php:73 ../../templates/show_song.inc.php:44
-#: ../../templates/show_playlist_songs.inc.php:45
-#: ../../templates/show_playlist_songs.inc.php:66 ../../lib/ui.lib.php:370
-msgid "Genre"
-msgstr "Genre"
+#: ../../templates/show_localplay_control.inc.php:29
+#: ../../templates/list_header.inc.php:101
+msgid "Next"
+msgstr "Next"
 
-#: ../../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
-msgid "Object"
-msgstr "Object"
+#: ../../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 "Description"
 
-#: ../../templates/show_flagged.inc.php:38
-#: ../../templates/show_flagged.inc.php:57
-msgid "Status"
-msgstr "Status"
+#: ../../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
+msgid "Version"
+msgstr "Version"
 
-#: ../../templates/show_stats_popular.inc.php:25
-#: ../../templates/show_mail_users.inc.php:46
-#: ../../templates/show_all_popular.inc.php:29
-msgid "Most Popular Albums"
-msgstr "Most Popular Albums"
+#: ../../templates/show_localplay_controllers.inc.php:44
+#: ../../templates/show_duplicates.inc.php:36
+#: ../../templates/show_duplicates.inc.php:75
+#: ../../templates/show_user_row.inc.php:46 ../../lib/preferences.php:166
+#: ../../lib/preferences.php:273
+msgid "Disable"
+msgstr "Disable"
 
-#: ../../templates/show_stats_popular.inc.php:31
-#: ../../templates/show_mail_users.inc.php:57
-#: ../../templates/show_all_popular.inc.php:26
-msgid "Most Popular Artists"
-msgstr "Most Popular Artists"
+#: ../../templates/show_localplay_controllers.inc.php:48
+#: ../../templates/show_plugins.inc.php:42
+msgid "Activate"
+msgstr "Activate"
 
-#: ../../templates/show_user_recommendations.inc.php:29
-msgid "Recommended Artists"
-msgstr "Recommended Artists"
+#: ../../templates/show_install.inc.php:57
+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_user_recommendations.inc.php:40
-msgid "Recommended Albums"
-msgstr "Recommended Albums"
+#: ../../templates/show_install.inc.php:64
+msgid "Insert Ampache Database"
+msgstr "Insert Ampache Database"
 
-#: ../../templates/show_user_recommendations.inc.php:51
-msgid "Recommended Songs"
-msgstr "Recommended Songs"
+#: ../../templates/show_install.inc.php:76
+msgid "MySQL Administrative Username"
+msgstr "MySQL Administrative Username"
+
+#: ../../templates/show_install.inc.php:80
+msgid "MySQL Administrative Password"
+msgstr "MySQL Administrative Password"
+
+#: ../../templates/show_install.inc.php:84
+msgid "Create Database User for New Database"
+msgstr "Create Database User for New Database"
+
+#: ../../templates/show_install.inc.php:88
+msgid "Ampache Database Username"
+msgstr "Ampache Database Username"
+
+#: ../../templates/show_install.inc.php:92
+msgid "Ampache Database User Password"
+msgstr "Ampache Database User Password"
+
+#: ../../templates/show_install.inc.php:96
+msgid "Overwrite Existing"
+msgstr "Overwrite Existing"
+
+#: ../../templates/show_install.inc.php:100
+msgid "Use Existing Database"
+msgstr "Use Existing Database"
+
+#: ../../templates/show_install.inc.php:105
+msgid "Insert Database"
+msgstr "Insert Database"
+
+#: ../../templates/show_localplay_edit_instance.inc.php:23
+msgid "Edit Localplay Instance"
+msgstr "Edit Localplay Instance"
+
+#: ../../templates/show_localplay_edit_instance.inc.php:34
+msgid "Update Instance"
+msgstr "Update Instance"
+
+#: ../../templates/show_similar_artists.inc.php:23
+msgid "Similar Artists"
+msgstr "Similar Artists"
+
+#: ../../templates/show_similar_artists.inc.php:25
+msgid "Please check the artists you want to merge with the current one"
+msgstr "Please check the artists you want to merge with the current one"
+
+#: ../../templates/show_similar_artists.inc.php:58
+msgid "No Similar Artists found"
+msgstr "No Similar Artists found"
+
+#: ../../templates/show_similar_artists.inc.php:66
+msgid "Back"
+msgstr "Back"
+
+#: ../../templates/show_similar_artists.inc.php:77
+msgid "Rename selected"
+msgstr "Rename selected"
+
+#: ../../templates/show_similar_artists.inc.php:91
+msgid "Advanced Options"
+msgstr "Advanced Options"
+
+#: ../../templates/show_similar_artists.inc.php:152
+msgid "Search Again"
+msgstr "Search Again"
+
+#: ../../templates/show_add_playlist.inc.php:24
+msgid "Create a new playlist"
+msgstr "Create a new playlist"
+
+#. HINT: Artist Name
+#: ../../templates/show_rename_artist.inc.php:29
+#, php-format
+msgid "Rename %s"
+msgstr "Rename %s"
+
+#: ../../templates/show_rename_artist.inc.php:35
+msgid "Insert current"
+msgstr "Insert current"
+
+#: ../../templates/show_rename_artist.inc.php:37
+msgid "Update id3 tags"
+msgstr "Update id3 tags"
+
+#: ../../templates/show_rename_artist.inc.php:38
+msgid "Rename"
+msgstr "Rename"
 
 #: ../../templates/show_edit_shout.inc.php:23
 msgid "Edit existing Shoutbox Post"
@@ -2250,153 +2325,151 @@ msgstr "Edit existing Shoutbox Post"
 msgid "Created by: %s for %s"
 msgstr "Created by: %s for %s"
 
-#: ../../templates/show_edit_shout.inc.php:31
-#: ../../templates/show_add_shout.inc.php:27
-msgid "Comment:"
-msgstr "Comment:"
-
-#: ../../templates/show_edit_shout.inc.php:37
-#: ../../templates/show_add_shout.inc.php:34
-msgid "Make Sticky"
-msgstr "Make Sticky"
-
-#: ../../templates/show_object_rating_static.inc.php:34
-#: ../../templates/show_object_rating.inc.php:34
-msgid "Current rating: "
-msgstr "Current rating: "
-
-#: ../../templates/show_object_rating_static.inc.php:36
-#: ../../templates/show_object_rating.inc.php:36
-msgid "not rated yet"
-msgstr "not rated yet"
-
-#: ../../templates/show_object_rating_static.inc.php:38
-#: ../../templates/show_object_rating.inc.php:38
+#. HINT: Playlist Type, Playlist Name
+#: ../../templates/show_playlist.inc.php:26
 #, php-format
-msgid "%s of 5"
-msgstr "%s of 5"
-
-#: ../../templates/show_object_rating_static.inc.php:44
-msgid "out of"
-msgstr "out of"
+msgid "%s %s Playlist"
+msgstr "%s %s Playlist"
 
-#: ../../templates/show_export.inc.php:51
-msgid "Format"
-msgstr "Format"
+#: ../../templates/show_playlist.inc.php:30
+#: ../../templates/show_playlist.inc.php:31
+msgid "Normalize Tracks"
+msgstr "Normalize Tracks"
 
-#: ../../templates/show_export.inc.php:61
-msgid "Export"
-msgstr "Export"
+#: ../../templates/show_playlist.inc.php:40
+#: ../../templates/show_playlist.inc.php:41
+msgid "Add All"
+msgstr "Add All"
 
-#: ../../templates/show_edit_album.inc.php:23
-msgid "Edit Album"
-msgstr "Edit Album"
+#: ../../templates/show_playlist.inc.php:44
+#: ../../templates/show_playlist.inc.php:45
+msgid "Add Random"
+msgstr "Add Random"
 
-#: ../../templates/show_edit_album.inc.php:47
-msgid "Update Album"
-msgstr "Update Album"
+#: ../../templates/show_localplay_add_instance.inc.php:24
+msgid "Add Localplay Instance"
+msgstr "Add Localplay Instance"
 
-#: ../../templates/show_album_art.inc.php:47
-msgid "Invalid"
-msgstr "Invalid"
+#: ../../templates/show_localplay_add_instance.inc.php:35
+#: ../../templates/sidebar_localplay.inc.php:35
+msgid "Add Instance"
+msgstr "Add Instance"
 
-#: ../../templates/show_album_art.inc.php:49
-#: ../../templates/show_disabled_songs.inc.php:33
-#: ../../templates/show_disabled_songs.inc.php:56
-msgid "Select"
-msgstr "Select"
+#: ../../templates/header.inc.php:37
+#: ../../templates/show_recently_played.inc.php:25
+#: ../../lib/class/ampacherss.class.php:71
+msgid "Recently Played"
+msgstr "Recently Played"
 
-#: ../../templates/show_localplay_status.inc.php:26
-msgid "Localplay Control"
-msgstr "Localplay Control"
+#: ../../templates/header.inc.php:62
+msgid "Log out"
+msgstr "Log out"
 
-#: ../../templates/show_localplay_status.inc.php:31
-msgid "Mute"
-msgstr "Mute"
+#: ../../templates/header.inc.php:78
+msgid "Error Config File Out of Date"
+msgstr "Error Config File Out of Date"
 
-#: ../../templates/show_localplay_status.inc.php:32
-msgid "Decrease Volume"
-msgstr "Decrease Volume"
+#: ../../templates/show_albums.inc.php:42
+#: ../../templates/show_albums.inc.php:73
+msgid "Cover"
+msgstr "Cover"
 
-#: ../../templates/show_localplay_status.inc.php:33
-msgid "Increase Volume"
-msgstr "Increase Volume"
+#: ../../templates/show_albums.inc.php:47
+#: ../../templates/show_albums.inc.php:78
+#: ../../templates/show_search.inc.php:60
+#: ../../templates/show_edit_song.inc.php:59
+#: ../../templates/show_edit_album.inc.php:33
+#: ../../templates/show_play_selected.inc.php:61
+msgid "Year"
+msgstr "Year"
 
-#: ../../templates/show_localplay_status.inc.php:34
-msgid "Volume"
-msgstr "Volume"
+#: ../../templates/show_preference_admin.inc.php:22
+msgid "Preference Administration"
+msgstr "Preference Administration"
 
-#: ../../templates/show_localplay_status.inc.php:39
-msgid "Repeat"
-msgstr "Repeat"
+#: ../../templates/show_stats.inc.php:24
+#: ../../templates/sidebar_home.inc.php:115 ../../lib/ui.lib.php:374
+msgid "Statistics"
+msgstr "Statistics"
 
-#: ../../templates/show_admin_info.inc.php:30
-msgid "Last Ten Flagged Records"
-msgstr "Last Ten Flagged Records"
+#: ../../templates/show_stats.inc.php:28
+msgid "Connected Users"
+msgstr "Connected Users"
 
-#: ../../templates/show_admin_info.inc.php:34
-#: ../../templates/show_mail_users.inc.php:78
-msgid "Disabled Songs"
-msgstr "Disabled Songs"
+#: ../../templates/show_stats.inc.php:29
+msgid "Total Users"
+msgstr "Total Users"
 
-#: ../../templates/show_add_access_current.inc.php:22
-#: ../../templates/show_access_list.inc.php:32
-#: ../../templates/show_access_list.inc.php:33
-msgid "Add Current Host"
-msgstr "Add Current Host"
+#: ../../templates/show_stats.inc.php:30
+#: ../../templates/show_artists.inc.php:39
+#: ../../templates/show_artists.inc.php:67
+#: ../../templates/show_genre.inc.php:33
+#: ../../templates/show_popular.inc.php:26
+#: ../../templates/sidebar_home.inc.php:33
+#: ../../templates/sidebar_home.inc.php:78
+#: ../../lib/class/browse.class.php:148 ../../lib/ui.lib.php:362
+msgid "Albums"
+msgstr "Albums"
 
-#: ../../templates/show_localplay_instances.inc.php:23
-msgid "Show Localplay Instances"
-msgstr "Show Localplay Instances"
+#: ../../templates/show_stats.inc.php:31 ../../templates/show_genre.inc.php:36
+#: ../../templates/show_popular.inc.php:29
+#: ../../templates/sidebar_home.inc.php:34
+#: ../../lib/class/browse.class.php:159 ../../lib/class/album.class.php:257
+#: ../../lib/ui.lib.php:366
+msgid "Artists"
+msgstr "Artists"
 
-#: ../../templates/show_localplay_instances.inc.php:39
-msgid "Edit Instance"
-msgstr "Edit Instance"
+#: ../../templates/show_stats.inc.php:33 ../../templates/show_stats.inc.php:69
+msgid "Video"
+msgstr "Video"
 
-#: ../../templates/show_update_items.inc.php:22
-msgid "Starting Update from Tags"
-msgstr "Starting Update from Tags"
+#: ../../templates/show_stats.inc.php:35 ../../templates/show_stats.inc.php:70
+msgid "Catalog Size"
+msgstr "Catalog Size"
 
-#: ../../templates/show_update_items.inc.php:26
-msgid "Update from Tags Complete"
-msgstr "Update from Tags Complete"
+#: ../../templates/show_stats.inc.php:36
+msgid "Catalog Time"
+msgstr "Catalog Time"
 
-#: ../../templates/show_user_stats.inc.php:30
-msgid "Favorite Artists"
-msgstr "Favorite Artists"
+#: ../../templates/show_recently_played.inc.php:23
+#: ../../lib/class/ampacherss.class.php:175
+msgid "seconds ago"
+msgstr "seconds ago"
 
-#: ../../templates/show_user_stats.inc.php:43
-msgid "Favorite Albums"
-msgstr "Favorite Albums"
+#: ../../templates/show_recently_played.inc.php:23
+#: ../../lib/class/ampacherss.class.php:175
+msgid "minutes ago"
+msgstr "minutes ago"
 
-#: ../../templates/show_user_stats.inc.php:56
-msgid "Favorite Songs"
-msgstr "Favorite Songs"
+#: ../../templates/show_recently_played.inc.php:23
+#: ../../lib/class/ampacherss.class.php:175
+msgid "hours ago"
+msgstr "hours ago"
 
-#: ../../templates/show_random_rules.inc.php:22
-msgid "Rules"
-msgstr "Rules"
+#: ../../templates/show_recently_played.inc.php:23
+#: ../../lib/class/ampacherss.class.php:175
+msgid "days ago"
+msgstr "days ago"
 
-#: ../../templates/show_random_rules.inc.php:32
-#: ../../templates/show_dynamic.inc.php:31
-msgid "Field"
-msgstr "Field"
+#: ../../templates/show_recently_played.inc.php:23
+#: ../../lib/class/ampacherss.class.php:175
+msgid "weeks ago"
+msgstr "weeks ago"
 
-#: ../../templates/show_random_rules.inc.php:33
-#: ../../templates/show_search.inc.php:115
-#: ../../templates/show_dynamic.inc.php:32
-msgid "Operator"
-msgstr "Operator"
+#: ../../templates/show_recently_played.inc.php:23
+#: ../../lib/class/ampacherss.class.php:175
+msgid "months ago"
+msgstr "months ago"
 
-#: ../../templates/show_random_rules.inc.php:35
-#: ../../templates/show_search.inc.php:124
-#: ../../templates/show_dynamic.inc.php:34
-msgid "Method"
-msgstr "Method"
+#: ../../templates/show_recently_played.inc.php:23
+#: ../../lib/class/ampacherss.class.php:175
+msgid "years ago"
+msgstr "years ago"
 
-#: ../../templates/show_shoutbox.inc.php:22
-msgid "Shoutbox"
-msgstr "Shoutbox"
+#: ../../templates/show_recently_played.inc.php:42
+#: ../../templates/show_recently_played.inc.php:104
+msgid "Last Played"
+msgstr "Last Played"
 
 #: ../../templates/show_search.inc.php:26
 msgid "Search Ampache"
@@ -2406,6 +2479,18 @@ msgstr "Search Ampache"
 msgid "Keywords"
 msgstr "Keywords"
 
+#: ../../templates/show_search.inc.php:54
+#: ../../templates/show_live_streams.inc.php:39
+#: ../../templates/show_live_streams.inc.php:61
+msgid "Tag"
+msgstr "Tag"
+
+#: ../../templates/show_search.inc.php:79
+#: ../../templates/show_videos.inc.php:38
+#: ../../templates/show_videos.inc.php:62
+msgid "Codec"
+msgstr "Codec"
+
 #: ../../templates/show_search.inc.php:85
 msgid "Played"
 msgstr "Played"
@@ -2442,11 +2527,6 @@ msgstr "Four Stars"
 msgid "Five Stars"
 msgstr "Five Stars"
 
-#: ../../templates/show_search.inc.php:118
-#: ../../templates/show_dynamic.inc.php:65
-msgid "AND"
-msgstr "AND"
-
 #: ../../templates/show_search.inc.php:127
 msgid "Fuzzy"
 msgstr "Fuzzy"
@@ -2465,107 +2545,201 @@ msgstr "Maximum Results"
 msgid "Unlimited"
 msgstr "Unlimited"
 
-#: ../../templates/show_add_playlist.inc.php:24
-msgid "Create a new playlist"
-msgstr "Create a new playlist"
+#: ../../templates/show_add_live_stream.inc.php:24
+#: ../../templates/show_live_stream.inc.php:26
+msgid "Add Radio Station"
+msgstr "Add Radio Station"
 
-#: ../../templates/show_add_playlist.inc.php:42
-#: ../../templates/show_add_shout.inc.php:41
-msgid "Create"
-msgstr "Create"
+#: ../../templates/show_add_live_stream.inc.php:35
+#: ../../templates/show_edit_live_stream_row.inc.php:28
+msgid "Homepage"
+msgstr "Homepage"
 
-#: ../../templates/show_run_add_catalog.inc.php:24
-#: ../../templates/show_adds_catalog.inc.php:26
-msgid "Found"
-msgstr "Found"
+#: ../../templates/show_add_live_stream.inc.php:42
+#: ../../templates/show_edit_live_stream_row.inc.php:27
+msgid "Stream URL"
+msgstr "Stream URL"
 
-#: ../../templates/show_install.inc.php:57
-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_add_live_stream.inc.php:49
+#: ../../templates/show_live_streams.inc.php:38
+#: ../../templates/show_live_streams.inc.php:60
+#: ../../templates/show_edit_live_stream_row.inc.php:30
+msgid "Frequency"
+msgstr "Frequency"
 
-#: ../../templates/show_install.inc.php:64
-msgid "Insert Ampache Database"
-msgstr "Insert Ampache Database"
+#: ../../templates/show_add_live_stream.inc.php:55
+#: ../../templates/show_live_streams.inc.php:37
+#: ../../templates/show_live_streams.inc.php:59
+#: ../../templates/show_edit_live_stream_row.inc.php:29
+msgid "Callsign"
+msgstr "Callsign"
 
-#: ../../templates/show_install.inc.php:76
-msgid "MySQL Administrative Username"
-msgstr "MySQL Administrative Username"
+#: ../../templates/show_add_live_stream.inc.php:61
+#: ../../templates/show_export.inc.php:32
+msgid "Catalog"
+msgstr "Catalog"
 
-#: ../../templates/show_install.inc.php:80
-msgid "MySQL Administrative Password"
-msgstr "MySQL Administrative Password"
+#: ../../templates/show_edit_access.inc.php:22
+msgid "Edit Access Control List"
+msgstr "Edit Access Control List"
 
-#: ../../templates/show_install.inc.php:84
-msgid "Create Database User for New Database"
-msgstr "Create Database User for New Database"
+#: ../../templates/show_edit_access.inc.php:30
+#: ../../templates/show_add_access.inc.php:48
+msgid "ACL Type"
+msgstr "ACL Type"
 
-#: ../../templates/show_install.inc.php:88
-msgid "Ampache Database Username"
-msgstr "Ampache Database Username"
+#: ../../templates/show_edit_access.inc.php:37
+#: ../../templates/show_add_access.inc.php:54
+#: ../../templates/show_add_access_rpc.inc.php:50
+#: ../../templates/show_add_access_rpc.inc.php:51
+#: ../../templates/show_add_access_rpc.inc.php:52
+msgid "RPC"
+msgstr "RPC"
 
-#: ../../templates/show_install.inc.php:92
-msgid "Ampache Database User Password"
-msgstr "Ampache Database User Password"
+#: ../../templates/show_user_registration.inc.php:29
+#: ../../templates/show_user_registration.inc.php:36
+#: ../../templates/show_registration_confirmation.inc.php:29
+#: ../../templates/show_user_activate.inc.php:29
+#: ../../templates/show_user_activate.inc.php:36
+msgid "Registration"
+msgstr "Registration"
 
-#: ../../templates/show_install.inc.php:96
-msgid "Overwrite Existing"
-msgstr "Overwrite Existing"
+#: ../../templates/show_user_registration.inc.php:54
+msgid "User Agreement"
+msgstr "User Agreement"
 
-#: ../../templates/show_install.inc.php:100
-msgid "Use Existing Database"
-msgstr "Use Existing Database"
+#: ../../templates/show_user_registration.inc.php:63
+msgid "I Accept"
+msgstr "I Accept"
 
-#: ../../templates/show_install.inc.php:105
-msgid "Insert Database"
-msgstr "Insert Database"
+#: ../../templates/show_user_registration.inc.php:69
+msgid "User Information"
+msgstr "User Information"
 
-#: ../../templates/show_install_account.inc.php:51
-msgid "Step 2 - Creating the ampache.cfg.php file"
-msgstr "Step 2 - Creating the ampache.cfg.php file"
+#: ../../templates/show_user_registration.inc.php:118
+msgid "* Required fields"
+msgstr "* Required fields"
 
-#: ../../templates/show_install_account.inc.php:54
-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_user_registration.inc.php:131
+msgid "Register User"
+msgstr "Register User"
 
-#: ../../templates/show_install_account.inc.php:58
-msgid "Create Admin Account"
-msgstr "Create Admin Account"
+#: ../../templates/show_login_form.inc.php:66
+msgid "Remember Me"
+msgstr "Remember Me"
 
-#: ../../templates/show_install_account.inc.php:75
-msgid "Create Account"
-msgstr "Create Account"
+#: ../../templates/show_login_form.inc.php:73
+msgid "Login"
+msgstr "Login"
 
-#: ../../templates/show_gather_art.inc.php:23
-msgid "Starting Album Art Search"
-msgstr "Starting Album Art Search"
+#: ../../templates/show_login_form.inc.php:78
+msgid "Register"
+msgstr "Register"
 
-#: ../../templates/show_gather_art.inc.php:24
-msgid "Searched"
-msgstr "Searched"
+#: ../../templates/show_login_form.inc.php:90
+msgid "Message of the Day"
+msgstr "Message of the Day"
 
-#: ../../templates/show_add_shout.inc.php:23
-msgid "Post to Shoutbox"
-msgstr "Post to Shoutbox"
+#: ../../templates/show_login_form.inc.php:99
+#: ../../templates/footer.inc.php:32
+msgid "Queries:"
+msgstr "Queries:"
 
-#: ../../templates/show_stats_newest.inc.php:22
-#: ../../lib/class/ampacherss.class.php:72
-msgid "Newest Albums"
-msgstr "Newest Albums"
+#: ../../templates/show_login_form.inc.php:99
+#: ../../templates/footer.inc.php:32
+msgid "Cache Hits:"
+msgstr "Cache Hits:"
 
-#: ../../templates/show_stats_newest.inc.php:26
-#: ../../lib/class/ampacherss.class.php:73
-msgid "Newest Artists"
-msgstr "Newest Artists"
+#: ../../templates/show_localplay_instances.inc.php:23
+msgid "Show Localplay Instances"
+msgstr "Show Localplay Instances"
+
+#: ../../templates/show_localplay_instances.inc.php:39
+msgid "Edit Instance"
+msgstr "Edit Instance"
+
+#. HINT: Artist Fullname
+#: ../../templates/show_artist.inc.php:23
+#, php-format
+msgid "Albums by %s"
+msgstr "Albums by %s"
+
+#. HINT: Object type, Artist Fullname
+#: ../../templates/show_artist.inc.php:27
+#, php-format
+msgid "%s by %s"
+msgstr "%s by %s"
+
+#. HINT: Artist Fullname
+#: ../../templates/show_artist.inc.php:38
+#: ../../templates/show_artist.inc.php:39
+#, php-format
+msgid "Show All Songs By %s"
+msgstr "Show All Songs By %s"
+
+#: ../../templates/show_artist.inc.php:44
+#, php-format
+msgid "Add All Songs By %s"
+msgstr "Add All Songs By %s"
+
+#: ../../templates/show_artist.inc.php:49
+#, php-format
+msgid "Add Random Songs By %s"
+msgstr "Add Random Songs By %s"
+
+#: ../../templates/show_artist.inc.php:53
+#: ../../templates/show_artist.inc.php:54
+#: ../../templates/show_album.inc.php:70 ../../templates/show_album.inc.php:71
+msgid "Update from tags"
+msgstr "Update from tags"
+
+#: ../../templates/show_artist.inc.php:64
+#: ../../templates/sidebar_home.inc.php:64
+msgid "Show Art"
+msgstr "Show Art"
+
+#: ../../templates/show_all_popular.inc.php:26
+#: ../../templates/show_mail_users.inc.php:57
+#: ../../templates/show_stats_popular.inc.php:31
+msgid "Most Popular Artists"
+msgstr "Most Popular Artists"
+
+#: ../../templates/show_all_popular.inc.php:29
+#: ../../templates/show_mail_users.inc.php:46
+#: ../../templates/show_stats_popular.inc.php:25
+msgid "Most Popular Albums"
+msgstr "Most Popular Albums"
+
+#: ../../templates/show_all_popular.inc.php:32
+msgid "Most Popular Genres"
+msgstr "Most Popular Genres"
+
+#: ../../templates/show_all_popular.inc.php:38
+#: ../../templates/show_mail_users.inc.php:68
+msgid "Most Popular Songs"
+msgstr "Most Popular Songs"
+
+#: ../../templates/show_all_popular.inc.php:41
+msgid "Most Popular Live Streams"
+msgstr "Most Popular Live Streams"
+
+#: ../../templates/show_all_popular.inc.php:44
+msgid "Most Popular Tags"
+msgstr "Most Popular Tags"
+
+#: ../../templates/show_edit_song.inc.php:23
+msgid "Edit Song"
+msgstr "Edit Song"
+
+#: ../../templates/show_edit_song.inc.php:73
+#: ../../templates/show_edit_artist.inc.php:35
+#: ../../templates/show_edit_album.inc.php:41
+msgid "Flag for Retagging"
+msgstr "Flag for Retagging"
+
+#: ../../templates/show_edit_song.inc.php:80
+msgid "Update Song"
+msgstr "Update Song"
 
 #: ../../templates/show_mail_users.inc.php:23
 msgid "Send E-mail to Users"
@@ -2591,15 +2765,15 @@ msgstr "Latest Artist Additions"
 msgid "Latest Album Additions"
 msgstr "Latest 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 "Flagged Songs"
 
+#: ../../templates/show_mail_users.inc.php:78
+#: ../../templates/show_admin_info.inc.php:34
+msgid "Disabled Songs"
+msgstr "Disabled Songs"
+
 #: ../../templates/show_mail_users.inc.php:86
 msgid "Most Popular Threshold in days"
 msgstr "Most Popular Threshold in days"
@@ -2616,6 +2790,108 @@ msgstr "Message"
 msgid "Send Mail"
 msgstr "Send Mail"
 
+#: ../../templates/show_add_user.inc.php:23
+msgid "Adding a New User"
+msgstr "Adding a New User"
+
+#: ../../templates/show_add_user.inc.php:85
+#: ../../templates/sidebar_admin.inc.php:33
+msgid "Add User"
+msgstr "Add User"
+
+#: ../../templates/show_preference_box.inc.php:43
+#: ../../templates/show_preference_box.inc.php:73
+msgid "Apply to All"
+msgstr "Apply to All"
+
+#: ../../templates/show_preference_box.inc.php:44
+#: ../../templates/show_preference_box.inc.php:74
+msgid "Access Level"
+msgstr "Access Level"
+
+#: ../../templates/show_playlist_edit.inc.php:26
+msgid "Editing Playlist"
+msgstr "Editing Playlist"
+
+#: ../../templates/show_registration_confirmation.inc.php:36
+msgid "Registration Complete"
+msgstr "Registration Complete"
+
+#: ../../templates/show_registration_confirmation.inc.php:42
+msgid ""
+"Your account has been created. An activation key has been sent to the e-mail "
+"address you provided. Please check your e-mail for further information"
+msgstr ""
+"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"
+
+#: ../../templates/show_registration_confirmation.inc.php:44
+msgid "Return to Login Page"
+msgstr "Return to Login Page"
+
+#: ../../templates/show_denied.inc.php:32
+#: ../../templates/sidebar_localplay.inc.php:66
+msgid "Access Denied"
+msgstr "Access Denied"
+
+#: ../../templates/show_denied.inc.php:38
+msgid ""
+"You've been redirected to this page because you do not have access to this "
+"function."
+msgstr ""
+"You've been redirected to this page because you do not have access to this "
+"function."
+
+#: ../../templates/show_denied.inc.php:39
+msgid ""
+"If you believe this is an error please contact an Ampache administrator."
+msgstr ""
+"If you believe this is an error please contact an Ampache administrator."
+
+#: ../../templates/show_denied.inc.php:40
+msgid "This event has been logged"
+msgstr "This event has been logged"
+
+#: ../../templates/show_denied.inc.php:44
+msgid ""
+"You've been redirected to this page because you've attempted to access a "
+"function that is disabled in the demo."
+msgstr ""
+"You've been redirected to this page because you've attempted to access a "
+"function that is disabled in the demo."
+
+#: ../../templates/show_denied.inc.php:45
+msgid ""
+"Functions are disabled in the demo because previous users of the demo have "
+"used the functionality to post inappropriate materials"
+msgstr ""
+"Functions are disabled in the demo because previous users of the demo have "
+"used the functionality to post inappropriate materials"
+
+#: ../../templates/show_duplicates.inc.php:22
+msgid "Duplicate Songs"
+msgstr "Duplicate Songs"
+
+#: ../../templates/show_duplicates.inc.php:42
+#: ../../templates/show_duplicates.inc.php:81
+msgid "Size"
+msgstr "Size"
+
+#: ../../templates/show_gather_art.inc.php:23
+msgid "Starting Album Art Search"
+msgstr "Starting Album Art Search"
+
+#: ../../templates/show_gather_art.inc.php:24
+msgid "Searched"
+msgstr "Searched"
+
+#: ../../templates/show_gather_art.inc.php:24
+#: ../../templates/sidebar_localplay.inc.php:44
+#: ../../templates/show_adds_catalog.inc.php:26 ../../lib/preferences.php:175
+#: ../../lib/preferences.php:217 ../../lib/ui.lib.php:571
+msgid "None"
+msgstr "None"
+
 #: ../../templates/show_random.inc.php:22
 msgid "Play Random Selection"
 msgstr "Play Random Selection"
@@ -2624,12 +2900,6 @@ msgstr "Play Random Selection"
 msgid "Item count"
 msgstr "Item count"
 
-#: ../../templates/show_random.inc.php:43 ../../templates/show_song.inc.php:45
-#: ../../templates/show_duplicates.inc.php:40
-#: ../../templates/show_duplicates.inc.php:79
-msgid "Length"
-msgstr "Length"
-
 #: ../../templates/show_random.inc.php:47
 #: ../../templates/show_random.inc.php:48
 #, php-format
@@ -2681,34 +2951,55 @@ msgstr "Size Limit"
 msgid "Enqueue"
 msgstr "Enqueue"
 
-#: ../../templates/show_search_options.inc.php:23
-msgid "Options"
-msgstr "Options"
+#. HINT: Genre Name
+#: ../../templates/show_genre.inc.php:30
+#, php-format
+msgid "Viewing %s Genre"
+msgstr "Viewing %s Genre"
 
-#: ../../templates/show_search_options.inc.php:27
-#: ../../templates/show_search_options.inc.php:28
-msgid "Add Search Results"
-msgstr "Add Search Results"
+#: ../../templates/sidebar_preferences.inc.php:38
+msgid "Account"
+msgstr "Account"
 
-#: ../../templates/show_dynamic.inc.php:22
-msgid "Advanced Random Rules"
-msgstr "Advanced Random Rules"
+#: ../../templates/show_duplicate.inc.php:27
+msgid "Search Type"
+msgstr "Search Type"
 
-#: ../../templates/show_dynamic.inc.php:56
-msgid "Like"
-msgstr "Like"
+#: ../../templates/show_duplicate.inc.php:34
+msgid "Artist and Title"
+msgstr "Artist and Title"
 
-#: ../../templates/show_dynamic.inc.php:71
-msgid "Add Rule"
-msgstr "Add Rule"
+#: ../../templates/show_duplicate.inc.php:35
+msgid "Artist, Album and Title"
+msgstr "Artist, Album and Title"
 
-#: ../../templates/show_dynamic.inc.php:74
-msgid "Save Rules As"
-msgstr "Save Rules As"
+#: ../../templates/show_duplicate.inc.php:37
+msgid "Search Disabled Songs"
+msgstr "Search Disabled Songs"
 
-#: ../../templates/show_dynamic.inc.php:77
-msgid "Load Saved Rules"
-msgstr "Load Saved Rules"
+#: ../../templates/sidebar_localplay.inc.php:36
+msgid "Show instances"
+msgstr "Show instances"
+
+#: ../../templates/sidebar_localplay.inc.php:38
+msgid "Show Playlist"
+msgstr "Show Playlist"
+
+#: ../../templates/sidebar_localplay.inc.php:42
+msgid "Active Instance"
+msgstr "Active Instance"
+
+#: ../../templates/sidebar_localplay.inc.php:60
+msgid "Localplay Disabled"
+msgstr "Localplay Disabled"
+
+#: ../../templates/sidebar_localplay.inc.php:62
+msgid "Allow Localplay set to False"
+msgstr "Allow Localplay set to False"
+
+#: ../../templates/sidebar_localplay.inc.php:64
+msgid "Localplay Controller Not Defined"
+msgstr "Localplay Controller Not Defined"
 
 #: ../../templates/show_get_albumart.inc.php:23
 msgid "Customize Search"
@@ -2726,426 +3017,239 @@ msgstr "Local Image"
 msgid "Get Art"
 msgstr "Get Art"
 
-#. HINT: Catalog Name
-#: ../../templates/show_adds_catalog.inc.php:24
-#, php-format
-msgid "Starting New Song Search on %s catalog"
-msgstr "Starting New Song Search on %s catalog"
-
-#: ../../templates/show_recently_played.inc.php:23
-#: ../../lib/class/ampacherss.class.php:175
-msgid "seconds ago"
-msgstr "seconds ago"
-
-#: ../../templates/show_recently_played.inc.php:23
-#: ../../lib/class/ampacherss.class.php:175
-msgid "minutes ago"
-msgstr "minutes ago"
-
-#: ../../templates/show_recently_played.inc.php:23
-#: ../../lib/class/ampacherss.class.php:175
-msgid "hours ago"
-msgstr "hours ago"
-
-#: ../../templates/show_recently_played.inc.php:23
-#: ../../lib/class/ampacherss.class.php:175
-msgid "days ago"
-msgstr "days ago"
-
-#: ../../templates/show_recently_played.inc.php:23
-#: ../../lib/class/ampacherss.class.php:175
-msgid "weeks ago"
-msgstr "weeks ago"
-
-#: ../../templates/show_recently_played.inc.php:23
-#: ../../lib/class/ampacherss.class.php:175
-msgid "months ago"
-msgstr "months ago"
-
-#: ../../templates/show_recently_played.inc.php:23
-#: ../../lib/class/ampacherss.class.php:175
-msgid "years ago"
-msgstr "years ago"
+#: ../../templates/show_test_config.inc.php:40
+#: ../../templates/sidebar_admin.inc.php:45
+#: ../../templates/show_test.inc.php:32
+msgid "Ampache Debug"
+msgstr "Ampache Debug"
 
-#: ../../templates/show_recently_played.inc.php:38
-#: ../../templates/show_recently_played.inc.php:101
-#: ../../templates/show_duplicates.inc.php:37
-#: ../../templates/show_duplicates.inc.php:76
-#: ../../templates/show_lyrics_song.inc.php:42
-#: ../../templates/show_now_playing_row.inc.php:54
-msgid "Song"
-msgstr "Song"
+#: ../../templates/show_search_options.inc.php:23
+msgid "Options"
+msgstr "Options"
 
-#: ../../templates/show_recently_played.inc.php:42
-#: ../../templates/show_recently_played.inc.php:104
-msgid "Last Played"
-msgstr "Last Played"
+#: ../../templates/show_search_options.inc.php:27
+#: ../../templates/show_search_options.inc.php:28
+msgid "Add Search Results"
+msgstr "Add Search Results"
 
-#. HINT: Artist Fullname
-#: ../../templates/show_artist.inc.php:23
+#. HINT: Catalog Name
+#: ../../templates/show_edit_catalog.inc.php:22
 #, php-format
-msgid "Albums by %s"
-msgstr "Albums by %s"
+msgid "Settings for %s"
+msgstr "Settings for %s"
 
-#. HINT: Object type, Artist Fullname
-#: ../../templates/show_artist.inc.php:27
-#, php-format
-msgid "%s by %s"
-msgstr "%s by %s"
+#: ../../templates/show_edit_catalog.inc.php:29
+#: ../../templates/show_add_catalog.inc.php:35
+msgid "Auto-inserted Fields"
+msgstr "Auto-inserted Fields"
 
-#. HINT: Artist Fullname
-#: ../../templates/show_artist.inc.php:38
-#: ../../templates/show_artist.inc.php:39
-#, php-format
-msgid "Show All Songs By %s"
-msgstr "Show All Songs By %s"
+#: ../../templates/show_edit_catalog.inc.php:30
+#: ../../templates/show_add_catalog.inc.php:36
+msgid "album name"
+msgstr "album name"
 
-#: ../../templates/show_artist.inc.php:44
-#, php-format
-msgid "Add All Songs By %s"
-msgstr "Add All Songs By %s"
+#: ../../templates/show_edit_catalog.inc.php:31
+#: ../../templates/show_add_catalog.inc.php:37
+msgid "artist name"
+msgstr "artist name"
 
-#: ../../templates/show_artist.inc.php:49
-#, php-format
-msgid "Add Random Songs By %s"
-msgstr "Add Random Songs By %s"
+#: ../../templates/show_edit_catalog.inc.php:32
+#: ../../templates/show_add_catalog.inc.php:38
+msgid "id3 comment"
+msgstr "id3 comment"
 
-#: ../../templates/show_artist.inc.php:53
-#: ../../templates/show_artist.inc.php:54
-#: ../../templates/show_album.inc.php:70 ../../templates/show_album.inc.php:71
-msgid "Update from tags"
-msgstr "Update from tags"
+#: ../../templates/show_edit_catalog.inc.php:33
+#: ../../templates/show_add_catalog.inc.php:39
+msgid "track number (padded with leading 0)"
+msgstr "track number (padded with leading 0)"
 
-#. HINT: Democratic Name
-#: ../../templates/show_democratic.inc.php:22
-#, php-format
-msgid "%s Playlist"
-msgstr "%s Playlist"
+#: ../../templates/show_edit_catalog.inc.php:34
+#: ../../templates/show_add_catalog.inc.php:40
+msgid "song title"
+msgstr "song title"
 
-#: ../../templates/show_democratic.inc.php:22
-#: ../../lib/class/browse.class.php:214
-msgid "Democratic Playlist"
-msgstr "Democratic Playlist"
+#: ../../templates/show_edit_catalog.inc.php:35
+#: ../../templates/show_add_catalog.inc.php:41
+msgid "year"
+msgstr "year"
 
-#: ../../templates/show_democratic.inc.php:40
-msgid "Play Democratic Playlist"
-msgstr "Play Democratic Playlist"
+#: ../../templates/show_edit_catalog.inc.php:36
+#: ../../templates/show_add_catalog.inc.php:42
+msgid "other"
+msgstr "other"
 
-#. HINT: Catalog Name
-#: ../../templates/show_verify_catalog.inc.php:24
-#, php-format
-msgid "Updating the %s catalog"
-msgstr "Updating the %s catalog"
+#: ../../templates/show_edit_catalog.inc.php:40
+#: ../../templates/show_add_catalog.inc.php:51
+msgid "Catalog Type"
+msgstr "Catalog Type"
 
-#: ../../templates/show_verify_catalog.inc.php:26
-#, php-format
-msgid "%d item found checking tag information"
-msgid_plural "%d items found checking tag information"
-msgstr[0] "%d item found checking tag information"
-msgstr[1] "%d items found checking tag information"
+#: ../../templates/show_edit_catalog.inc.php:44
+#: ../../templates/show_add_catalog.inc.php:60
+msgid "XML-RPC Key"
+msgstr "XML-RPC Key"
 
-#: ../../templates/show_verify_catalog.inc.php:28
-msgid "Verifed"
-msgstr "Verifed"
+#: ../../templates/show_edit_catalog.inc.php:46
+#: ../../templates/show_add_catalog.inc.php:61
+msgid "Required for Remote Catalogs"
+msgstr "Required for Remote Catalogs"
 
-#: ../../templates/show_denied.inc.php:38
-msgid ""
-"You've been redirected to this page because you do not have access to this "
-"function."
-msgstr ""
-"You've been redirected to this page because you do not have access to this "
-"function."
+#: ../../templates/show_edit_catalog.inc.php:50
+msgid "Filename pattern"
+msgstr "Filename pattern"
 
-#: ../../templates/show_denied.inc.php:39
-msgid ""
-"If you believe this is an error please contact an Ampache administrator."
-msgstr ""
-"If you believe this is an error please contact an Ampache administrator."
+#: ../../templates/show_edit_catalog.inc.php:57
+#: ../../templates/show_add_catalog.inc.php:69
+msgid "Folder Pattern"
+msgstr "Folder Pattern"
 
-#: ../../templates/show_denied.inc.php:40
-msgid "This event has been logged"
-msgstr "This event has been logged"
+#: ../../templates/show_edit_catalog.inc.php:57
+#: ../../templates/show_add_catalog.inc.php:69
+msgid "(no leading or ending '/')"
+msgstr "(no leading or ending '/')"
 
-#: ../../templates/show_denied.inc.php:44
-msgid ""
-"You've been redirected to this page because you've attempted to access a "
-"function that is disabled in the demo."
-msgstr ""
-"You've been redirected to this page because you've attempted to access a "
-"function that is disabled in the demo."
+#: ../../templates/show_edit_catalog.inc.php:67
+msgid "Save Catalog Settings"
+msgstr "Save Catalog Settings"
 
-#: ../../templates/show_denied.inc.php:45
-msgid ""
-"Functions are disabled in the demo because previous users of the demo have "
-"used the functionality to post inappropriate materials"
-msgstr ""
-"Functions are disabled in the demo because previous users of the demo have "
-"used the functionality to post inappropriate materials"
+#: ../../templates/show_democratic_playlist.inc.php:42
+msgid "Playing from base Playlist"
+msgstr "Playing from base Playlist"
 
-#: ../../templates/show_album.inc.php:27 ../../lib/class/album.class.php:245
-msgid "Disk"
-msgstr "Disk"
+#: ../../templates/show_democratic_playlist.inc.php:55
+#: ../../templates/show_democratic_playlist.inc.php:95
+msgid "Votes"
+msgstr "Votes"
 
-#: ../../templates/show_album.inc.php:34
-#: ../../lib/class/catalog.class.php:1994
-#: ../../lib/class/catalog.class.php:2097
-msgid "Unknown (Orphaned)"
-msgstr "Unknown (Orphaned)"
+#: ../../templates/show_democratic_playlist.inc.php:74
+msgid "Remove Vote"
+msgstr "Remove Vote"
 
-#: ../../templates/show_album.inc.php:52
-msgid "Add Album"
-msgstr "Add Album"
+#: ../../templates/show_democratic_playlist.inc.php:76
+msgid "Add Vote"
+msgstr "Add Vote"
 
-#: ../../templates/show_album.inc.php:56
-msgid "Add Random from Album"
-msgstr "Add Random from Album"
+#: ../../templates/show_edit_artist.inc.php:23
+msgid "Edit Artist"
+msgstr "Edit Artist"
 
-#: ../../templates/show_album.inc.php:60 ../../templates/show_album.inc.php:61
-msgid "Reset Album Art"
-msgstr "Reset Album Art"
+#: ../../templates/show_edit_artist.inc.php:41
+msgid "Update Artist"
+msgstr "Update Artist"
 
-#: ../../templates/show_album.inc.php:65 ../../templates/show_album.inc.php:66
-msgid "Find Album Art"
-msgstr "Find Album Art"
+#: ../../templates/show_user_activate.inc.php:48
+msgid "User Activated"
+msgstr "User Activated"
 
-#. HINT: Song Title
-#: ../../templates/show_lyrics.inc.php:33
+#. HINT: Start A tag, End A tag
+#: ../../templates/show_user_activate.inc.php:52
 #, php-format
-msgid "%s Lyrics"
-msgstr "%s Lyrics"
-
-#: ../../templates/show_lyrics.inc.php:40 ../../lib/class/artist.class.php:359
-msgid "Sorry Lyrics Not Found."
-msgstr "Sorry Lyrics Not Found."
-
-#: ../../templates/show_localplay_add_instance.inc.php:24
-msgid "Add Localplay Instance"
-msgstr "Add Localplay Instance"
-
-#: ../../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
-msgid "Register"
-msgstr "Register"
+msgid "This User ID is activated and can be used %sLogin%s"
+msgstr "This User ID is activated and can be used %sLogin%s"
 
-#: ../../templates/show_login_form.inc.php:90
-msgid "Message of the Day"
-msgstr "Message of the Day"
+#: ../../templates/show_user_activate.inc.php:55
+msgid "Validation Failed"
+msgstr "Validation Failed"
 
-#: ../../templates/show_all_popular.inc.php:32
-msgid "Most Popular Genres"
-msgstr "Most Popular Genres"
+#: ../../templates/show_user_activate.inc.php:56
+msgid "The validation key used isn't correct"
+msgstr "The validation key used isn't correct"
 
-#: ../../templates/show_all_popular.inc.php:41
-msgid "Most Popular Live Streams"
-msgstr "Most Popular Live Streams"
+#: ../../templates/show_popular.inc.php:22
+#: ../../templates/sidebar_home.inc.php:113
+#: ../../templates/show_newest.inc.php:22
+msgid "Information"
+msgstr "Information"
 
-#: ../../templates/show_all_popular.inc.php:44
-msgid "Most Popular Tags"
-msgstr "Most Popular Tags"
+#: ../../templates/show_album_art.inc.php:47
+msgid "Invalid"
+msgstr "Invalid"
 
-#: ../../templates/show_song.inc.php:25
-msgid "Details"
-msgstr "Details"
+#: ../../templates/show_edit_album.inc.php:23
+msgid "Edit Album"
+msgstr "Edit Album"
 
-#: ../../templates/show_song.inc.php:31
-msgid "Link"
-msgstr "Link"
+#: ../../templates/show_edit_album.inc.php:47
+msgid "Update Album"
+msgstr "Update Album"
 
-#: ../../templates/show_song.inc.php:47
-msgid "Label"
-msgstr "Label"
+#: ../../templates/show_admin_info.inc.php:30
+msgid "Last Ten Flagged Records"
+msgstr "Last Ten Flagged Records"
 
-#: ../../templates/show_song.inc.php:48
-msgid "Song Language"
-msgstr "Song Language"
+#: ../../templates/show_admin_info.inc.php:38
+#: ../../templates/show_ip_history.inc.php:32
+msgid "Show All"
+msgstr "Show All"
 
-#: ../../templates/show_song.inc.php:49
-msgid "Catalog Number"
-msgstr "Catalog Number"
+#: ../../templates/show_plugins.inc.php:46
+msgid "Deactivate"
+msgstr "Deactivate"
 
-#: ../../templates/show_song.inc.php:50
-#: ../../templates/show_duplicates.inc.php:41
-#: ../../templates/show_duplicates.inc.php:80
-msgid "Bitrate"
-msgstr "Bitrate"
+#: ../../templates/show_videos.inc.php:39
+#: ../../templates/show_videos.inc.php:63
+msgid "Resolution"
+msgstr "Resolution"
 
-#: ../../templates/show_song.inc.php:55
-msgid "Last Updated"
-msgstr "Last Updated"
+#: ../../templates/show_update_items.inc.php:22
+msgid "Starting Update from Tags"
+msgstr "Starting Update from Tags"
 
-#: ../../templates/show_song.inc.php:57 ../../lib/class/catalog.class.php:1348
-#: ../../admin/access.php:93
-msgid "Added"
-msgstr "Added"
+#: ../../templates/show_update_items.inc.php:26
+msgid "Update from Tags Complete"
+msgstr "Update from Tags Complete"
 
-#: ../../templates/show_disabled_songs.inc.php:38
-#: ../../templates/show_disabled_songs.inc.php:61
-msgid "Addition Time"
-msgstr "Addition Time"
+#: ../../templates/show_playtype_switch.inc.php:38
+#: ../../lib/preferences.php:185
+msgid "Flash Player"
+msgstr "Flash Player"
 
-#: ../../templates/show_disabled_songs.inc.php:65
-msgid "Remove"
-msgstr "Remove"
+#: ../../templates/show_play_selected.inc.php:28
+msgid "Play Selected"
+msgstr "Play Selected"
 
-#: ../../templates/show_edit_album_row.inc.php:35
-#: ../../lib/class/album.class.php:257 ../../lib/class/album.class.php:258
-msgid "Various"
-msgstr "Various"
+#: ../../templates/show_play_selected.inc.php:31
+msgid "Download Selected"
+msgstr "Download Selected"
 
-#: ../../templates/list_header.inc.php:100
-msgid "Prev"
-msgstr "Prev"
+#: ../../templates/show_play_selected.inc.php:40
+msgid "Set Track Numbers"
+msgstr "Set Track Numbers"
 
-#: ../../templates/show_duplicates.inc.php:22
-msgid "Duplicate Songs"
-msgstr "Duplicate Songs"
+#: ../../templates/show_play_selected.inc.php:41
+msgid "Remove Selected Tracks"
+msgstr "Remove Selected Tracks"
 
-#: ../../templates/show_duplicates.inc.php:42
-#: ../../templates/show_duplicates.inc.php:81
-msgid "Size"
-msgstr "Size"
+#: ../../templates/show_play_selected.inc.php:47
+msgid "Add to"
+msgstr "Add to"
 
 #: ../../templates/show_live_stream.inc.php:22
 msgid "Manage Radio Stations"
 msgstr "Manage Radio Stations"
 
-#: ../../templates/show_manage_catalogs.inc.php:28
-msgid "Gather All Art"
-msgstr "Gather All Art"
-
-#: ../../templates/show_manage_catalogs.inc.php:29
-#: ../../templates/show_admin_tools.inc.php:80
-msgid "Add to All"
-msgstr "Add to All"
-
-#: ../../templates/show_manage_catalogs.inc.php:30
-#: ../../templates/show_admin_tools.inc.php:79
-msgid "Verify All"
-msgstr "Verify All"
-
-#: ../../templates/show_manage_catalogs.inc.php:31
-#: ../../templates/show_admin_tools.inc.php:78
-msgid "Clean All"
-msgstr "Clean All"
-
-#: ../../templates/show_manage_catalogs.inc.php:32
-#: ../../templates/show_admin_tools.inc.php:81
-msgid "Update All"
-msgstr "Update All"
-
-#. HINT: /data/myNewMusic
-#: ../../templates/show_manage_catalogs.inc.php:38
-#, php-format
-msgid "Add From %s"
-msgstr "Add From %s"
-
-#. HINT: /data/myUpdatedMusic
-#: ../../templates/show_manage_catalogs.inc.php:40
-#, php-format
-msgid "Update From %s"
-msgstr "Update From %s"
-
-#: ../../templates/show_admin_tools.inc.php:59
-msgid "Fast"
-msgstr "Fast"
-
-#: ../../templates/show_admin_tools.inc.php:68
-msgid "No Catalogs Found"
-msgstr "No Catalogs Found"
-
-#: ../../templates/show_admin_tools.inc.php:83
-msgid "Clear Catalog Stats"
-msgstr "Clear Catalog Stats"
-
-#: ../../templates/show_admin_tools.inc.php:84
-#: ../../templates/show_add_catalog.inc.php:74
-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
-msgid "Preferences Permissions"
-msgstr "Preferences Permissions"
-
-#: ../../templates/show_admin_tools.inc.php:94
-msgid "Export To Itunes DB"
-msgstr "Export To Itunes DB"
-
-#: ../../templates/show_admin_tools.inc.php:95
-msgid "Show Inactive Users"
-msgstr "Show Inactive Users"
-
-#: ../../templates/show_admin_tools.inc.php:96
-msgid "Check for New Version"
-msgstr "Check for New Version"
-
-#: ../../templates/show_access_list.inc.php:50
-msgid "Access Control Entries"
-msgstr "Access Control Entries"
-
-#: ../../templates/show_access_list.inc.php:56
-msgid "Start Address"
-msgstr "Start Address"
-
-#: ../../templates/show_access_list.inc.php:57
-msgid "End Address"
-msgstr "End Address"
-
-#: ../../templates/show_access_list.inc.php:60
-msgid "Key"
-msgstr "Key"
-
-#. HINT: Artist Name
-#: ../../templates/show_rename_artist.inc.php:29
+#. HINT: Username
+#: ../../templates/show_ip_history.inc.php:23
 #, php-format
-msgid "Rename %s"
-msgstr "Rename %s"
-
-#: ../../templates/show_rename_artist.inc.php:35
-msgid "Insert current"
-msgstr "Insert current"
-
-#: ../../templates/show_rename_artist.inc.php:37
-msgid "Update id3 tags"
-msgstr "Update id3 tags"
-
-#: ../../templates/show_rename_artist.inc.php:38
-msgid "Rename"
-msgstr "Rename"
-
-#: ../../templates/show_user_registration.inc.php:54
-msgid "User Agreement"
-msgstr "User Agreement"
-
-#: ../../templates/show_user_registration.inc.php:63
-msgid "I Accept"
-msgstr "I Accept"
+msgid "%s IP History"
+msgstr "%s IP History"
 
-#: ../../templates/show_user_registration.inc.php:69
-msgid "User Information"
-msgstr "User Information"
+#: ../../templates/show_ip_history.inc.php:29
+msgid "Show Unique"
+msgstr "Show Unique"
 
-#: ../../templates/show_user_registration.inc.php:118
-msgid "* Required fields"
-msgstr "* Required fields"
+#: ../../templates/show_ip_history.inc.php:45
+#: ../../templates/show_ip_history.inc.php:59
+msgid "Date"
+msgstr "Date"
 
-#: ../../templates/show_user_registration.inc.php:131
-msgid "Register User"
-msgstr "Register User"
+#: ../../templates/show_ip_history.inc.php:46
+#: ../../templates/show_ip_history.inc.php:60
+msgid "IP Address"
+msgstr "IP Address"
 
-#: ../../templates/show_playlist_edit.inc.php:26
-msgid "Editing Playlist"
-msgstr "Editing Playlist"
+#: ../../templates/footer.inc.php:25
+msgid "Using Old Password Encryption, Please Reset your Password"
+msgstr "Using Old Password Encryption, Please Reset your Password"
 
 #: ../../templates/show_add_catalog.inc.php:27
 msgid ""
@@ -3179,109 +3283,136 @@ msgstr "Build Playlists from m3u Files"
 msgid "Add Catalog"
 msgstr "Add Catalog"
 
-#: ../../templates/show_registration_confirmation.inc.php:36
-msgid "Registration Complete"
-msgstr "Registration Complete"
+#. HINT: Song Title
+#: ../../templates/show_lyrics.inc.php:33
+#, php-format
+msgid "%s Lyrics"
+msgstr "%s Lyrics"
 
-#: ../../templates/show_registration_confirmation.inc.php:42
-msgid ""
-"Your account has been created. An activation key has been sent to the e-mail "
-"address you provided. Please check your e-mail for further information"
-msgstr ""
-"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"
+#: ../../templates/show_lyrics.inc.php:40 ../../lib/class/artist.class.php:359
+msgid "Sorry Lyrics Not Found."
+msgstr "Sorry Lyrics Not Found."
 
-#: ../../templates/show_registration_confirmation.inc.php:44
-msgid "Return to Login Page"
-msgstr "Return to Login Page"
+#: ../../templates/show_export.inc.php:28
+#: ../../templates/sidebar_admin.inc.php:47
+msgid "Export Catalog"
+msgstr "Export Catalog"
 
-#: ../../templates/show_debug.inc.php:23
-msgid "Debug Tools"
-msgstr "Debug Tools"
+#: ../../templates/show_export.inc.php:51
+msgid "Format"
+msgstr "Format"
 
-#: ../../templates/show_debug.inc.php:27 ../../templates/show_debug.inc.php:28
-msgid "Generate Configuration"
-msgstr "Generate Configuration"
+#: ../../templates/show_export.inc.php:61
+msgid "Export"
+msgstr "Export"
 
-#: ../../templates/show_debug.inc.php:31 ../../templates/show_debug.inc.php:32
-msgid "Set Database Charset"
-msgstr "Set Database Charset"
+#: ../../templates/show_user_recommendations.inc.php:29
+msgid "Recommended Artists"
+msgstr "Recommended Artists"
 
-#: ../../templates/show_debug.inc.php:37
-msgid "PHP Settings"
-msgstr "PHP Settings"
+#: ../../templates/show_user_recommendations.inc.php:40
+msgid "Recommended Albums"
+msgstr "Recommended Albums"
 
-#: ../../templates/show_debug.inc.php:44
-msgid "Setting"
-msgstr "Setting"
+#: ../../templates/show_user_recommendations.inc.php:51
+msgid "Recommended Songs"
+msgstr "Recommended Songs"
 
-#: ../../templates/show_debug.inc.php:48
-msgid "Memory Limit"
-msgstr "Memory Limit"
+#: ../../templates/show_import_playlist.inc.php:23
+msgid "Importing a Playlist from a File"
+msgstr "Importing a Playlist from a File"
 
-#: ../../templates/show_debug.inc.php:52
-msgid "Maximum Execution Time"
-msgstr "Maximum Execution Time"
+#: ../../templates/show_import_playlist.inc.php:34
+msgid "Playlist Type"
+msgstr "Playlist Type"
 
-#: ../../templates/show_debug.inc.php:56
-msgid "Override Execution Time"
-msgstr "Override Execution Time"
+#: ../../templates/show_import_playlist.inc.php:46
+msgid "Import Playlist"
+msgstr "Import Playlist"
 
-#: ../../templates/show_debug.inc.php:57
-msgid "Failed"
-msgstr "Failed"
+#: ../../templates/show_user_stats.inc.php:30
+msgid "Favorite Artists"
+msgstr "Favorite Artists"
 
-#: ../../templates/show_debug.inc.php:57
-msgid "Succeeded"
-msgstr "Succeeded"
+#: ../../templates/show_user_stats.inc.php:43
+msgid "Favorite Albums"
+msgstr "Favorite Albums"
 
-#: ../../templates/show_debug.inc.php:60
-msgid "Safe Mode"
-msgstr "Safe Mode"
+#: ../../templates/show_user_stats.inc.php:56
+msgid "Favorite Songs"
+msgstr "Favorite Songs"
 
-#: ../../templates/show_debug.inc.php:68
-msgid "Zlib Support"
-msgstr "Zlib Support"
+#: ../../templates/sidebar_home.inc.php:24
+msgid "Browse"
+msgstr "Browse"
 
-#: ../../templates/show_debug.inc.php:72
-msgid "GD Support"
-msgstr "GD Support"
+#: ../../templates/sidebar_home.inc.php:32
+msgid "Song Titles"
+msgstr "Song Titles"
 
-#: ../../templates/show_debug.inc.php:76
-msgid "Iconv Support"
-msgstr "Iconv Support"
+#: ../../templates/sidebar_home.inc.php:35 ../../browse.php:68
+#: ../../lib/class/browse.class.php:203
+msgid "Tag Cloud"
+msgstr "Tag Cloud"
 
-#: ../../templates/show_debug.inc.php:86
-msgid "Current Configuration"
-msgstr "Current Configuration"
+#: ../../templates/sidebar_home.inc.php:36
+#: ../../lib/class/browse.class.php:172
+msgid "Playlists"
+msgstr "Playlists"
 
-#: ../../templates/show_now_playing_row.inc.php:46
-msgid "Show Lyrics"
-msgstr "Show Lyrics"
+#: ../../templates/sidebar_home.inc.php:37
+#: ../../lib/class/browse.class.php:166
+msgid "Radio Stations"
+msgstr "Radio Stations"
 
-#: ../../templates/sidebar_modules.inc.php:27
-msgid "Localplay Modules"
-msgstr "Localplay Modules"
+#: ../../templates/sidebar_home.inc.php:38
+#: ../../lib/class/browse.class.php:209
+msgid "Videos"
+msgstr "Videos"
 
-#: ../../templates/sidebar_modules.inc.php:28
-msgid "Available Plugins"
-msgstr "Available Plugins"
+#: ../../templates/sidebar_home.inc.php:42
+msgid "Filters"
+msgstr "Filters"
 
-#: ../../templates/sidebar_modules.inc.php:34
-msgid "Mail Users"
-msgstr "Mail Users"
+#: ../../templates/sidebar_home.inc.php:46
+msgid "Starts With"
+msgstr "Starts With"
 
-#: ../../templates/sidebar_modules.inc.php:35
-msgid "Manage Flagged"
-msgstr "Manage Flagged"
+#: ../../templates/sidebar_home.inc.php:52
+msgid "Minimum Count"
+msgstr "Minimum Count"
 
-#: ../../templates/sidebar_modules.inc.php:36
-msgid "Show Disabled"
-msgstr "Show Disabled"
+#: ../../templates/sidebar_home.inc.php:56
+msgid "Rated"
+msgstr "Rated"
 
-#: ../../templates/sidebar_modules.inc.php:43
-msgid "Manage Playlist"
-msgstr "Manage Playlist"
+#: ../../templates/sidebar_home.inc.php:60
+msgid "Unplayed"
+msgstr "Unplayed"
+
+#: ../../templates/sidebar_home.inc.php:69
+msgid "All Playlists"
+msgstr "All Playlists"
+
+#: ../../templates/sidebar_home.inc.php:89
+msgid "Currently Playing"
+msgstr "Currently Playing"
+
+#: ../../templates/sidebar_home.inc.php:102
+msgid "Import"
+msgstr "Import"
+
+#: ../../templates/sidebar_home.inc.php:110
+msgid "Advanced"
+msgstr "Advanced"
+
+#: ../../templates/sidebar_home.inc.php:116
+msgid "Newest"
+msgstr "Newest"
+
+#: ../../templates/sidebar_home.inc.php:117
+msgid "Popular"
+msgstr "Popular"
 
 #: ../../templates/show_manage_shoutbox.inc.php:36
 #: ../../templates/show_manage_shoutbox.inc.php:60
@@ -3293,169 +3424,330 @@ msgstr "Sticky"
 msgid "Date Added"
 msgstr "Date Added"
 
-#: ../../artists.php:181
-msgid "Show Artists starting with"
-msgstr "Show Artists starting with"
+#: ../../templates/sidebar_admin.inc.php:27
+#: ../../templates/show_manage_catalogs.inc.php:22
+msgid "Show Catalogs"
+msgstr "Show Catalogs"
 
-#: ../../flag.php:45
-msgid "Item Flagged"
-msgstr "Item Flagged"
+#: ../../templates/sidebar_admin.inc.php:31
+msgid "User Tools"
+msgstr "User Tools"
 
-#: ../../flag.php:45
-msgid "The specified item has been flagged"
-msgstr "The specified item has been flagged"
+#: ../../templates/sidebar_admin.inc.php:34
+msgid "Browse Users"
+msgstr "Browse Users"
 
-#: ../../register.php:73
-msgid "Error Captcha Required"
-msgstr "Error Captcha Required"
+#: ../../templates/sidebar_admin.inc.php:39
+msgid "Add ACL"
+msgstr "Add ACL"
 
-#: ../../register.php:80
-msgid "Error Captcha Failed"
-msgstr "Error Captcha Failed"
+#: ../../templates/sidebar_admin.inc.php:40
+msgid "Show ACL(s)"
+msgstr "Show ACL(s)"
 
-#: ../../register.php:87
-msgid "You <U>must</U> accept the user agreement"
-msgstr "You <U>must</U> accept the user agreement"
+#: ../../templates/sidebar_admin.inc.php:49
+msgid "Manage Shoutbox"
+msgstr "Manage Shoutbox"
 
-#: ../../register.php:92
-msgid "You did not enter a username"
-msgstr "You did not enter a username"
+#: ../../templates/sidebar_admin.inc.php:54
+msgid "Server Config"
+msgstr "Server Config"
 
-#: ../../register.php:96
-msgid "Please fill in your full name (Firstname Lastname)"
-msgstr "Please fill in your full name (Firstname Lastname)"
+#. HINT: Catalog Name
+#: ../../templates/show_clean_catalog.inc.php:24
+#, php-format
+msgid "Cleaning the %s Catalog"
+msgstr "Cleaning the %s Catalog"
 
-#: ../../register.php:117
-msgid "Error Email address not confirmed"
-msgstr "Error Email address not confirmed"
+#: ../../templates/show_clean_catalog.inc.php:26
+msgid "Checking"
+msgstr "Checking"
 
-#: ../../register.php:123
-msgid "You must enter a password"
-msgstr "You must enter a password"
+#. HINT: Catalog Name
+#: ../../templates/show_adds_catalog.inc.php:24
+#, php-format
+msgid "Starting New Song Search on %s catalog"
+msgstr "Starting New Song Search on %s catalog"
 
-#: ../../register.php:127
-msgid "Your passwords do not match"
-msgstr "Your passwords do not match"
+#: ../../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"
 
-#: ../../register.php:131 ../../admin/users.php:110
-msgid "Error Username already exists"
-msgstr "Error Username already exists"
+#: ../../templates/show_test.inc.php:38
+msgid "CHECK"
+msgstr "CHECK"
 
-#: ../../register.php:159 ../../admin/users.php:117
-msgid "Error: Insert Failed"
-msgstr "Error: Insert Failed"
+#: ../../templates/show_test.inc.php:40
+msgid "STATUS"
+msgstr "STATUS"
 
-#: ../../login.php:73
-msgid "User Disabled please contact Admin"
-msgstr "User Disabled please contact Admin"
+#: ../../templates/show_test.inc.php:42
+msgid "DESCRIPTION"
+msgstr "DESCRIPTION"
 
-#: ../../login.php:89
-msgid "Unable to create new account"
-msgstr "Unable to create new account"
+#: ../../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."
 
-#: ../../login.php:98
-msgid "No local account found"
-msgstr "No local account found"
+#: ../../templates/show_test.inc.php:78
+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."
 
-#: ../../login.php:115
-msgid "User Already Logged in"
-msgstr "User Already Logged in"
+#: ../../templates/show_test.inc.php:95
+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."
 
-#: ../../democratic.php:56
-msgid "The Requested Playlist has been deleted."
-msgstr "The Requested Playlist has been deleted."
+#: ../../templates/show_test.inc.php:111
+msgid ""
+"This test checks to make sure you have Iconv support installed. Iconv "
+"support is required for Ampache"
+msgstr ""
+"This test checks to make sure you have Iconv support installed. Iconv "
+"support is required for Ampache"
 
-#: ../../lib/rating.lib.php:51
-msgid "Don't Play"
-msgstr "Don't Play"
+#: ../../templates/show_test.inc.php:127
+msgid ""
+"This test makes sure you have PCRE support compiled into your version of "
+"PHP, this is required for Ampache."
+msgstr ""
+"This test makes sure you have PCRE support compiled into your version of "
+"PHP, this is required for Ampache."
 
-#: ../../lib/rating.lib.php:54
-msgid "It's Pretty Bad"
-msgstr "It's Pretty Bad"
+#: ../../templates/show_test.inc.php:143
+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 ""
+"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"
 
-#: ../../lib/rating.lib.php:57
-msgid "It's Ok"
-msgstr "It's Ok"
+#: ../../templates/show_test.inc.php:160
+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/rating.lib.php:60
-msgid "It's Pretty Good"
-msgstr "It's Pretty Good"
+#: ../../templates/show_test.inc.php:182
+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 ""
+"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"
 
-#: ../../lib/rating.lib.php:63
-msgid "I Love It!"
-msgstr "I Love It!"
+#: ../../templates/show_test.inc.php:186
+msgid "DB Connection"
+msgstr "DB Connection"
 
-#: ../../lib/rating.lib.php:66
-msgid "It's Insane"
-msgstr "It's Insane"
+#: ../../templates/show_test.inc.php:200
+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/rating.lib.php:70
-msgid "Off the Charts!"
-msgstr "Off the Charts!"
+#: ../../templates/show_test.inc.php:204
+msgid "DB Inserted"
+msgstr "DB Inserted"
 
-#: ../../lib/ui.lib.php:312
-msgid "Upload"
-msgstr "Upload"
+#: ../../templates/show_test.inc.php:218
+msgid ""
+"This checks a few key tables to make sure that you have successfully "
+"inserted the ampache database and that the user has access to the database"
+msgstr ""
+"This checks a few key tables to make sure that you have successfully "
+"inserted the ampache database and that the user has access to the database"
 
-#: ../../lib/ui.lib.php:315
-msgid "Local Play"
-msgstr "Local Play"
+#: ../../templates/show_test.inc.php:247
+msgid ""
+"This test makes sure that your web_path variable is set correctly and that "
+"we are able to get to the index page. If you do not see a check mark here "
+"then your web_path is not set correctly."
+msgstr ""
+"This test makes sure that your web_path variable is set correctly and that "
+"we are able to get to the index page. If you do not see a check mark here "
+"then your web_path is not set correctly."
 
-#: ../../lib/ui.lib.php:318
-msgid "Random Play"
-msgstr "Random Play"
+#. HINT: Editing Username preferences
+#. HINT: Username
+#: ../../templates/show_user_preferences.inc.php:28
+#: ../../templates/show_preferences.inc.php:28
+#, php-format
+msgid "Editing %s preferences"
+msgstr "Editing %s preferences"
 
-#: ../../lib/ui.lib.php:330 ../../lib/ui.lib.php:334
-msgid "Admin-Catalog"
-msgstr "Admin-Catalog"
+#: ../../templates/show_user_preferences.inc.php:50
+#: ../../templates/show_preferences.inc.php:34
+msgid "Update Preferences"
+msgstr "Update Preferences"
 
-#: ../../lib/ui.lib.php:338
-msgid "Admin-User Management"
-msgstr "Admin-User Management"
+#: ../../templates/show_index.inc.php:38
+msgid "Loading..."
+msgstr "Loading..."
 
-#: ../../lib/ui.lib.php:342
-msgid "Admin-Mail Users"
-msgstr "Admin-Mail Users"
+#: ../../templates/show_account.inc.php:39
+msgid "New Password"
+msgstr "New Password"
 
-#: ../../lib/ui.lib.php:346
-msgid "Admin-Manage Access Lists"
-msgstr "Admin-Manage Access Lists"
+#: ../../templates/show_account.inc.php:62
+msgid "Update Account"
+msgstr "Update Account"
 
-#: ../../lib/ui.lib.php:350
-msgid "Admin-Site Preferences"
-msgstr "Admin-Site Preferences"
+#: ../../templates/list_header.inc.php:100
+msgid "Prev"
+msgstr "Prev"
 
-#: ../../lib/ui.lib.php:354
-msgid "Admin-Manage Modules"
-msgstr "Admin-Manage Modules"
+#: ../../templates/rightbar.inc.php:28
+msgid "Add to Playlist"
+msgstr "Add to Playlist"
 
-#: ../../lib/ui.lib.php:358
-msgid "Browse Music"
-msgstr "Browse Music"
+#: ../../templates/rightbar.inc.php:31
+msgid "Add to New Playlist"
+msgstr "Add to New Playlist"
 
-#: ../../lib/ui.lib.php:465
-msgid "Add New"
-msgstr "Add New"
+#: ../../templates/rightbar.inc.php:57
+msgid "Add Dynamic Items"
+msgstr "Add Dynamic Items"
 
-#: ../../lib/class/browse.class.php:154
-msgid "Manage Users"
-msgstr "Manage Users"
+#: ../../templates/rightbar.inc.php:60 ../../lib/class/random.class.php:421
+msgid "Pure Random"
+msgstr "Pure Random"
 
-#: ../../lib/class/browse.class.php:177
-msgid "Playlist Songs"
-msgstr "Playlist Songs"
+#: ../../templates/rightbar.inc.php:63 ../../lib/class/random.class.php:418
+msgid "Related Artist"
+msgstr "Related Artist"
 
-#: ../../lib/class/browse.class.php:182
-msgid "Current Playlist"
-msgstr "Current Playlist"
+#: ../../templates/rightbar.inc.php:66 ../../lib/class/random.class.php:412
+msgid "Related Album"
+msgstr "Related Album"
 
-#: ../../lib/class/browse.class.php:192
-msgid "Shoutbox Records"
-msgstr "Shoutbox Records"
+#: ../../templates/rightbar.inc.php:69
+msgid "Related Tag"
+msgstr "Related Tag"
 
-#: ../../lib/class/browse.class.php:197
-msgid "Flagged Records"
-msgstr "Flagged Records"
+#: ../../templates/rightbar.inc.php:112
+msgid "More"
+msgstr "More"
+
+#: ../../templates/show_album.inc.php:27 ../../lib/class/album.class.php:245
+msgid "Disk"
+msgstr "Disk"
+
+#: ../../templates/show_album.inc.php:34
+#: ../../lib/class/catalog.class.php:1994
+#: ../../lib/class/catalog.class.php:2097
+msgid "Unknown (Orphaned)"
+msgstr "Unknown (Orphaned)"
+
+#: ../../templates/show_album.inc.php:52
+msgid "Add Album"
+msgstr "Add Album"
+
+#: ../../templates/show_album.inc.php:56
+msgid "Add Random from Album"
+msgstr "Add Random from Album"
+
+#: ../../templates/show_album.inc.php:60 ../../templates/show_album.inc.php:61
+msgid "Reset Album Art"
+msgstr "Reset Album Art"
+
+#: ../../templates/show_album.inc.php:65 ../../templates/show_album.inc.php:66
+msgid "Find Album Art"
+msgstr "Find Album Art"
+
+#: ../../templates/show_playlists.inc.php:35
+#: ../../templates/show_playlists.inc.php:58
+msgid "Playlist Name"
+msgstr "Playlist Name"
+
+#: ../../templates/show_playlists.inc.php:37
+#: ../../templates/show_playlists.inc.php:60
+msgid "# Songs"
+msgstr "# Songs"
+
+#: ../../templates/show_playlists.inc.php:38
+#: ../../templates/show_playlists.inc.php:61
+msgid "Owner"
+msgstr "Owner"
+
+#: ../../templates/show_stats_newest.inc.php:22
+#: ../../lib/class/ampacherss.class.php:72
+msgid "Newest Albums"
+msgstr "Newest Albums"
+
+#: ../../templates/show_stats_newest.inc.php:26
+#: ../../lib/class/ampacherss.class.php:73
+msgid "Newest Artists"
+msgstr "Newest Artists"
+
+#: ../../templates/show_manage_catalogs.inc.php:28
+msgid "Gather All Art"
+msgstr "Gather All Art"
+
+#. HINT: /data/myNewMusic
+#: ../../templates/show_manage_catalogs.inc.php:38
+#, php-format
+msgid "Add From %s"
+msgstr "Add From %s"
+
+#. HINT: /data/myUpdatedMusic
+#: ../../templates/show_manage_catalogs.inc.php:40
+#, php-format
+msgid "Update From %s"
+msgstr "Update From %s"
+
+#: ../../server/xml.server.php:80
+msgid "Error Invalid Handshake - "
+msgstr "Error Invalid Handshake - "
+
+#: ../../server/xml.server.php:345 ../../server/xml.server.php:394
+#: ../../server/xml.server.php:402
+msgid "Invalid Request"
+msgstr "Invalid Request"
+
+#: ../../server/xml.server.php:360 ../../server/xml.server.php:373
+msgid "Media Object Invalid or Not Specified"
+msgstr "Media Object Invalid or Not Specified"
+
+#: ../../democratic.php:56
+msgid "The Requested Playlist has been deleted."
+msgstr "The Requested Playlist has been deleted."
+
+#: ../../shout.php:41
+msgid "Invalid Object Selected"
+msgstr "Invalid Object Selected"
+
+#: ../../lib/class/random.class.php:415
+msgid "Related Genre"
+msgstr "Related Genre"
+
+#: ../../lib/class/vauth.class.php:484 ../../lib/class/vauth.class.php:508
+#: ../../lib/class/vauth.class.php:547
+msgid "Error Username or Password incorrect, please try again"
+msgstr "Error Username or Password incorrect, please try again"
 
 #: ../../lib/class/access.class.php:102 ../../lib/class/access.class.php:106
 #: ../../lib/class/access.class.php:146 ../../lib/class/access.class.php:150
@@ -3471,6 +3763,14 @@ msgstr "IP Address Version Mismatch"
 msgid "API/RPC"
 msgstr "API/RPC"
 
+#: ../../lib/class/democratic.class.php:141
+msgid "Primary"
+msgstr "Primary"
+
+#: ../../lib/class/ampacherss.class.php:116
+msgid "RSS Feed"
+msgstr "RSS Feed"
+
 #: ../../lib/class/flag.class.php:312
 msgid "Approved"
 msgstr "Approved"
@@ -3483,44 +3783,122 @@ msgstr "Pending"
 msgid "Re-Tag"
 msgstr "Re-Tag"
 
-#: ../../lib/class/localplay.class.php:642
-msgid "Stopped"
-msgstr "Stopped"
+#: ../../lib/class/registration.class.php:51
+#: ../../lib/class/registration.class.php:53
+msgid "From: Ampache "
+msgstr "From: Ampache "
 
-#: ../../lib/class/localplay.class.php:645
-msgid "Paused"
-msgstr "Paused"
+#. HINT: Site Title
+#: ../../lib/class/registration.class.php:56
+#, php-format
+msgid "New User Registration at %s"
+msgstr "New User Registration at %s"
 
-#: ../../lib/class/democratic.class.php:141
-msgid "Primary"
-msgstr "Primary"
+#: ../../lib/class/registration.class.php:69
+#, 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 ""
+"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"
+
+#: ../../lib/class/registration.class.php:99
+#, 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 ""
+"A new user has registered\n"
+"The following values were entered.\n"
+"\n"
+"Username: %s\n"
+"Fullname: %s\n"
+"E-mail: %s\n"
+"\n"
 
 #: ../../lib/class/artist.class.php:346
 msgid "Fault"
 msgstr "Fault"
 
-#: ../../lib/class/artist.class.php:354 ../../lib/class/catalog.class.php:1240
-#: ../../admin/users.php:143
-msgid "Error"
-msgstr "Error"
+#: ../../lib/class/browse.class.php:154
+msgid "Manage Users"
+msgstr "Manage Users"
 
-#: ../../lib/class/user.class.php:379 ../../admin/users.php:55
-#: ../../admin/users.php:105
-msgid "Error Username Required"
-msgstr "Error Username Required"
+#: ../../lib/class/browse.class.php:177
+msgid "Playlist Songs"
+msgstr "Playlist Songs"
 
-#: ../../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/browse.class.php:182
+msgid "Current Playlist"
+msgstr "Current Playlist"
 
-#: ../../lib/class/album.class.php:490 ../../lib/class/catalog.class.php:462
-msgid "Error: Unable to open"
-msgstr "Error: Unable to open"
+#: ../../lib/class/browse.class.php:192
+msgid "Shoutbox Records"
+msgstr "Shoutbox Records"
 
-#: ../../lib/class/ampacherss.class.php:116
-msgid "RSS Feed"
-msgstr "RSS Feed"
+#: ../../lib/class/browse.class.php:197
+msgid "Flagged Records"
+msgstr "Flagged Records"
+
+#: ../../lib/class/xmlrpcclient.class.php:64
+#: ../../lib/class/xmlrpcclient.class.php:97
+#: ../../lib/class/catalog.class.php:1278
+#: ../../lib/class/catalog.class.php:1352
+#: ../../lib/class/catalog.class.php:1385
+#: ../../lib/class/catalog.class.php:2395
+msgid "Error connecting to"
+msgstr "Error connecting to"
+
+#: ../../lib/class/xmlrpcclient.class.php:64
+#: ../../lib/class/xmlrpcclient.class.php:97
+#: ../../lib/class/catalog.class.php:1278
+#: ../../lib/class/catalog.class.php:1352
+#: ../../lib/class/catalog.class.php:1385
+#: ../../lib/class/catalog.class.php:2395
+msgid "Code"
+msgstr "Code"
+
+#: ../../lib/class/xmlrpcclient.class.php:64
+#: ../../lib/class/catalog.class.php:1278
+#: ../../lib/class/catalog.class.php:1352
+#: ../../lib/class/catalog.class.php:1385
+#: ../../lib/class/catalog.class.php:2395
+msgid "Reason"
+msgstr "Reason"
 
 #: ../../lib/class/catalog.class.php:208
 msgid "day"
@@ -3538,6 +3916,10 @@ msgstr[1] "hours"
 msgid "Running Remote Sync"
 msgstr "Running Remote Sync"
 
+#: ../../lib/class/catalog.class.php:462 ../../lib/class/album.class.php:490
+msgid "Error: Unable to open"
+msgstr "Error: Unable to open"
+
 #: ../../lib/class/catalog.class.php:469 ../../lib/class/catalog.class.php:512
 msgid "Error: Unable to change to directory"
 msgstr "Error: Unable to change to directory"
@@ -3560,12 +3942,6 @@ msgstr "%s is not readable by ampache"
 msgid "%s does not match site charset"
 msgstr "%s does not match site charset"
 
-#: ../../lib/class/catalog.class.php:1032
-#: ../../lib/class/catalog.class.php:1936 ../../preferences.php:111
-#: ../../admin/access.php:109
-msgid "Updated"
-msgstr "Updated"
-
 #: ../../lib/class/catalog.class.php:1039
 msgid "No Update Needed"
 msgstr "No Update Needed"
@@ -3598,32 +3974,6 @@ msgstr "Songs Per Seconds"
 msgid "Unable to load pear XMLRPC library, make sure XML-RPC is enabled"
 msgstr "Unable to load pear XMLRPC library, make sure XML-RPC is enabled"
 
-#: ../../lib/class/catalog.class.php:1278
-#: ../../lib/class/catalog.class.php:1352
-#: ../../lib/class/catalog.class.php:1385
-#: ../../lib/class/catalog.class.php:2395
-#: ../../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:1278
-#: ../../lib/class/catalog.class.php:1352
-#: ../../lib/class/catalog.class.php:1385
-#: ../../lib/class/catalog.class.php:2395
-#: ../../lib/class/xmlrpcclient.class.php:64
-#: ../../lib/class/xmlrpcclient.class.php:97
-msgid "Code"
-msgstr "Code"
-
-#: ../../lib/class/catalog.class.php:1278
-#: ../../lib/class/catalog.class.php:1352
-#: ../../lib/class/catalog.class.php:1385
-#: ../../lib/class/catalog.class.php:2395
-#: ../../lib/class/xmlrpcclient.class.php:64
-msgid "Reason"
-msgstr "Reason"
-
 #: ../../lib/class/catalog.class.php:1307
 msgid "Completed updating remote catalog(s)"
 msgstr "Completed updating remote catalog(s)"
@@ -3700,89 +4050,13 @@ msgid_plural "Parsing %s - Not Found: %d Songs. Please check your m3u file."
 msgstr[0] "Parsing %s - Not Found: %d Song. Please check your m3u file."
 msgstr[1] "Parsing %s - Not Found: %d Songs. Please check your m3u file."
 
-#: ../../lib/class/random.class.php:415
-msgid "Related Genre"
-msgstr "Related Genre"
-
-#: ../../lib/class/vauth.class.php:484 ../../lib/class/vauth.class.php:508
-#: ../../lib/class/vauth.class.php:547
-msgid "Error Username or Password incorrect, please try again"
-msgstr "Error Username or Password incorrect, please try again"
-
-#: ../../lib/class/registration.class.php:51
-#: ../../lib/class/registration.class.php:53
-msgid "From: Ampache "
-msgstr "From: Ampache "
-
-#. HINT: Site Title
-#: ../../lib/class/registration.class.php:56
-#, php-format
-msgid "New User Registration at %s"
-msgstr "New User Registration at %s"
-
-#: ../../lib/class/registration.class.php:69
-#, 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 ""
-"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"
-
-#: ../../lib/class/registration.class.php:99
-#, 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 ""
-"A new user has registered\n"
-"The following values were entered.\n"
-"\n"
-"Username: %s\n"
-"Fullname: %s\n"
-"E-mail: %s\n"
-"\n"
-
-#: ../../lib/general.lib.php:406
-msgid "On"
-msgstr "On"
+#: ../../lib/class/localplay.class.php:642
+msgid "Stopped"
+msgstr "Stopped"
 
-#: ../../lib/general.lib.php:409
-msgid "Off"
-msgstr "Off"
+#: ../../lib/class/localplay.class.php:645
+msgid "Paused"
+msgstr "Paused"
 
 #: ../../lib/preferences.php:192
 msgid "M3U"
@@ -3832,6 +4106,42 @@ msgstr "Clear on Send"
 msgid "Always"
 msgstr "Always"
 
+#: ../../lib/rating.lib.php:51
+msgid "Don't Play"
+msgstr "Don't Play"
+
+#: ../../lib/rating.lib.php:54
+msgid "It's Pretty Bad"
+msgstr "It's Pretty Bad"
+
+#: ../../lib/rating.lib.php:57
+msgid "It's Ok"
+msgstr "It's Ok"
+
+#: ../../lib/rating.lib.php:60
+msgid "It's Pretty Good"
+msgstr "It's Pretty Good"
+
+#: ../../lib/rating.lib.php:63
+msgid "I Love It!"
+msgstr "I Love It!"
+
+#: ../../lib/rating.lib.php:66
+msgid "It's Insane"
+msgstr "It's Insane"
+
+#: ../../lib/rating.lib.php:70
+msgid "Off the Charts!"
+msgstr "Off the Charts!"
+
+#: ../../lib/general.lib.php:406
+msgid "On"
+msgstr "On"
+
+#: ../../lib/general.lib.php:409
+msgid "Off"
+msgstr "Off"
+
 #: ../../lib/install.php:81
 msgid "Unable to connect to database, check your ampache config"
 msgstr "Unable to connect to database, check your ampache config"
@@ -3856,73 +4166,49 @@ msgstr "No Username/Password specified"
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: ../../shout.php:41
-msgid "Invalid Object Selected"
-msgstr "Invalid Object Selected"
-
-#: ../../server/xml.server.php:80
-msgid "Error Invalid Handshake - "
-msgstr "Error Invalid Handshake - "
-
-#: ../../server/xml.server.php:345 ../../server/xml.server.php:394
-#: ../../server/xml.server.php:402
-msgid "Invalid Request"
-msgstr "Invalid Request"
-
-#: ../../server/xml.server.php:360 ../../server/xml.server.php:373
-msgid "Media Object Invalid or Not Specified"
-msgstr "Media Object Invalid or Not Specified"
-
-#: ../../preferences.php:40 ../../preferences.php:75
-msgid "Server"
-msgstr "Server"
+#: ../../lib/ui.lib.php:312
+msgid "Upload"
+msgstr "Upload"
 
-#: ../../preferences.php:107
-msgid "Error Update Failed"
-msgstr "Error Update Failed"
+#: ../../lib/ui.lib.php:315
+msgid "Local Play"
+msgstr "Local Play"
 
-#: ../../preferences.php:112
-msgid "Your Account has been updated"
-msgstr "Your Account has been updated"
+#: ../../lib/ui.lib.php:318
+msgid "Random Play"
+msgstr "Random Play"
 
-#: ../../play/index.php:84
-msgid "Session Expired: please log in again at"
-msgstr "Session Expired: please log in again at"
+#: ../../lib/ui.lib.php:330 ../../lib/ui.lib.php:334
+msgid "Admin-Catalog"
+msgstr "Admin-Catalog"
 
-#: ../../radio.php:50
-msgid "Radio Station Added"
-msgstr "Radio Station Added"
+#: ../../lib/ui.lib.php:338
+msgid "Admin-User Management"
+msgstr "Admin-User Management"
 
-#: ../../install.php:184
-msgid "Error: Config file not found or Unreadable"
-msgstr "Error: Config file not found or Unreadable"
+#: ../../lib/ui.lib.php:342
+msgid "Admin-Mail Users"
+msgstr "Admin-Mail Users"
 
-#: ../../update.php:47 ../../update.php:51
-msgid "Ampache Update"
-msgstr "Ampache Update"
+#: ../../lib/ui.lib.php:346
+msgid "Admin-Manage Access Lists"
+msgstr "Admin-Manage Access Lists"
 
-#: ../../update.php:56
-#, php-format
-msgid ""
-"This page handles all database updates to Ampache starting with "
-"<strong>3.3.3.5</strong>. According to your database your current version "
-"is: <strong>%s</strong>."
-msgstr ""
-"This page handles all database updates to Ampache starting with "
-"<strong>3.3.3.5</strong>. According to your database your current version "
-"is: <strong>%s</strong>."
+#: ../../lib/ui.lib.php:350
+msgid "Admin-Site Preferences"
+msgstr "Admin-Site Preferences"
 
-#: ../../update.php:57
-msgid "the following updates need to be performed"
-msgstr "the following updates need to be performed"
+#: ../../lib/ui.lib.php:354
+msgid "Admin-Manage Modules"
+msgstr "Admin-Manage Modules"
 
-#: ../../update.php:64
-msgid "Update Now!"
-msgstr "Update Now!"
+#: ../../lib/ui.lib.php:358
+msgid "Browse Music"
+msgstr "Browse Music"
 
-#: ../../update.php:68
-msgid "Ampache Installation."
-msgstr "Ampache Installation."
+#: ../../lib/ui.lib.php:465
+msgid "Add New"
+msgstr "Add New"
 
 #: ../../albums.php:32
 msgid "Album Art Cleared"
@@ -3948,25 +4234,33 @@ msgstr ""
 msgid "Album Art Inserted"
 msgstr "Album Art Inserted"
 
-#: ../../playlist.php:57
-msgid "Playlist Created"
-msgstr "Playlist Created"
+#: ../../modules/localplay/shoutcast.controller.php:237
+#: ../../modules/localplay/httpq.controller.php:216
+#: ../../modules/localplay/mpd.controller.php:232
+msgid "Instance Name"
+msgstr "Instance Name"
 
-#: ../../playlist.php:57
-msgid " has been created"
-msgstr " has been created"
+#: ../../modules/localplay/shoutcast.controller.php:238
+msgid "PID File"
+msgstr "PID File"
 
-#: ../../playlist.php:89
-msgid "Playlist Not Imported"
-msgstr "Playlist Not Imported"
+#: ../../modules/localplay/shoutcast.controller.php:239
+msgid "Playlist File"
+msgstr "Playlist File"
 
-#: ../../playlist.php:93
-msgid "Playlist Imported"
-msgstr "Playlist Imported"
+#: ../../modules/localplay/shoutcast.controller.php:240
+msgid "Local Path to Files"
+msgstr "Local Path to Files"
 
-#: ../../playlist.php:125
-msgid "Empty Playlists Deleted"
-msgstr "Empty Playlists Deleted"
+#: ../../modules/localplay/httpq.controller.php:217
+#: ../../modules/localplay/mpd.controller.php:233
+msgid "Hostname"
+msgstr "Hostname"
+
+#: ../../modules/localplay/httpq.controller.php:218
+#: ../../modules/localplay/mpd.controller.php:234
+msgid "Port"
+msgstr "Port"
 
 #: ../../modules/horde/Browser.php:867
 msgid "file"
@@ -4001,300 +4295,55 @@ msgid ""
 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 "Instance Name"
-
-#: ../../modules/localplay/mpd.controller.php:233
-#: ../../modules/localplay/httpq.controller.php:217
-msgid "Hostname"
-msgstr "Hostname"
-
-#: ../../modules/localplay/mpd.controller.php:234
-#: ../../modules/localplay/httpq.controller.php:218
-msgid "Port"
-msgstr "Port"
-
-#: ../../modules/localplay/shoutcast.controller.php:238
-msgid "PID File"
-msgstr "PID File"
-
-#: ../../modules/localplay/shoutcast.controller.php:239
-msgid "Playlist File"
-msgstr "Playlist File"
-
-#: ../../modules/localplay/shoutcast.controller.php:240
-msgid "Local Path to Files"
-msgstr "Local Path to Files"
-
-#: ../../admin/mail.php:79
-msgid "E-mail Sent"
-msgstr "E-mail Sent"
-
-#: ../../admin/mail.php:80
-msgid "Your E-mail was successfully sent."
-msgstr "Your E-mail was successfully sent."
-
-#: ../../admin/modules.php:38
-msgid "Install Failed, Controller Error"
-msgstr "Install Failed, Controller Error"
-
-#: ../../admin/modules.php:56 ../../admin/modules.php:101
-msgid "Are you sure you want to remove this plugin?"
-msgstr "Are you sure you want to remove this plugin?"
-
-#: ../../admin/modules.php:68 ../../admin/modules.php:120
-msgid "Plugin Deactivated"
-msgstr "Plugin Deactivated"
-
-#: ../../admin/modules.php:83
-msgid "Unable to Install Plugin"
-msgstr "Unable to Install Plugin"
-
-#: ../../admin/modules.php:94
-msgid "Plugin Activated"
-msgstr "Plugin Activated"
-
-#: ../../admin/modules.php:129
-msgid "Plugins"
-msgstr "Plugins"
-
-#: ../../admin/modules.php:135
-msgid "Localplay Controllers"
-msgstr "Localplay Controllers"
-
-#: ../../admin/flag.php:88
-msgid "Song Updated"
-msgstr "Song Updated"
-
-#: ../../admin/flag.php:88
-msgid "The requested song has been updated"
-msgstr "The requested song has been updated"
-
-#: ../../admin/flag.php:130
-msgid "Album Updated"
-msgstr "Album Updated"
-
-#: ../../admin/flag.php:172
-msgid "Artist Updated"
-msgstr "Artist Updated"
-
-#: ../../admin/flag.php:237
-msgid "Songs Updated"
-msgstr "Songs Updated"
-
-#: ../../admin/flag.php:245
-msgid "Flag Removed"
-msgstr "Flag Removed"
-
-#: ../../admin/flag.php:246
-msgid "Flag Removed from"
-msgstr "Flag Removed from"
-
-#: ../../admin/flag.php:261
-msgid "Flags Updated"
-msgstr "Flags Updated"
-
-#: ../../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 "Shoutbox Post Updated"
-
-#: ../../admin/shout.php:47
-msgid "Shoutbox Post Deleted"
-msgstr "Shoutbox Post Deleted"
-
-#: ../../admin/access.php:35
-msgid "Deleted"
-msgstr "Deleted"
-
-#: ../../admin/access.php:35
-msgid "Your Access List Entry has been removed"
-msgstr "Your Access List Entry has been removed"
-
-#: ../../admin/access.php:93
-msgid "Your new Access Control List(s) have been created"
-msgstr "Your new Access Control List(s) have been created"
-
-#: ../../admin/access.php:109
-msgid "Access List Entry updated"
-msgstr "Access List Entry updated"
-
-#: ../../admin/users.php:83
-msgid "User Updated"
-msgstr "User Updated"
-
-#: ../../admin/users.php:83
-msgid "updated"
-msgstr "updated"
-
-#. HINT: %1 Username, %2 Access num
-#: ../../admin/users.php:130
-msgid "New User Added"
-msgstr "New User Added"
-
-#: ../../admin/users.php:130
-#, php-format
-msgid "%1$s has been created with an access level of %2$s"
-msgstr ""
-
-#: ../../admin/users.php:135
-msgid "User Enabled"
-msgstr "User Enabled"
-
-#: ../../admin/users.php:140
-msgid "User Disabled"
-msgstr "User Disabled"
-
-#: ../../admin/users.php:143
-msgid "Unable to Disabled last Administrator"
-msgstr "Unable to Disabled last Administrator"
-
-#: ../../admin/users.php:155
-msgid "User Deleted"
-msgstr "User Deleted"
+#: ../../playlist.php:57
+msgid "Playlist Created"
+msgstr "Playlist Created"
 
-#: ../../admin/users.php:155
-#, fuzzy, php-format
-msgid "%s has been Deleted"
+#: ../../playlist.php:57
+msgid " has been created"
 msgstr " has been created"
 
-#: ../../admin/users.php:158
-msgid "Delete Error"
-msgstr "Delete Error"
-
-#: ../../admin/users.php:158
-msgid "Unable to delete last Admin User"
-msgstr "Unable to delete last Admin User"
-
-#: ../../admin/users.php:164
-msgid "Deletion Request"
-msgstr "Deletion Request"
-
-#: ../../admin/users.php:165
-#, fuzzy, php-format
-msgid "Are you sure you want to permanently delete %s?"
-msgstr "Are you sure you want to permanently delete"
-
-#: ../../admin/system.php:49
-msgid "Database Charset Updated"
-msgstr "Database Charset Updated"
-
-#: ../../admin/system.php:49
-msgid ""
-"Your Database and associated tables have been updated to match your "
-"currently configured charset"
-msgstr ""
-"Your Database and associated tables have been updated to match your "
-"currently configured charset"
-
-#: ../../admin/catalog.php:54 ../../admin/catalog.php:74
-#: ../../admin/catalog.php:99 ../../admin/catalog.php:171
-msgid "Catalog Updated"
-msgstr "Catalog Updated"
-
-#: ../../admin/catalog.php:116
-msgid "Catalog Deleted"
-msgstr "Catalog Deleted"
-
-#: ../../admin/catalog.php:116
-msgid "The Catalog and all associated records have been deleted"
-msgstr "The Catalog and all associated records have been deleted"
-
-#: ../../admin/catalog.php:122
-msgid "Catalog Delete"
-msgstr "Catalog Delete"
-
-#: ../../admin/catalog.php:122
-msgid "Confirm Deletion Request"
-msgstr "Confirm Deletion Request"
-
-#: ../../admin/catalog.php:131
-msgid "Song Removed"
-msgid_plural "Songs Removed"
-msgstr[0] "Song Removed"
-msgstr[1] "Songs Removed"
-
-#: ../../admin/catalog.php:134
-msgid "No Songs Removed"
-msgstr "No Songs Removed"
-
-#: ../../admin/catalog.php:137
-msgid "Disabled Song Processed"
-msgid_plural "Disabled Songs Processed"
-msgstr[0] "Disabled Song Processed"
-msgstr[1] "Disabled Songs Processed"
-
-#: ../../admin/catalog.php:158
-msgid "Catalog Cleaned"
-msgstr "Catalog Cleaned"
-
-#: ../../admin/catalog.php:202
-msgid "Error: Name and path not specified"
-msgstr ""
-
-#: ../../admin/catalog.php:206
-msgid "Error: Remote selected, but path is not a URL"
-msgstr ""
-
-#: ../../admin/catalog.php:210
-msgid "Error: Remote Catalog specified, but no key provided"
-msgstr ""
+#: ../../playlist.php:89
+msgid "Playlist Not Imported"
+msgstr "Playlist Not Imported"
 
-#: ../../admin/catalog.php:215
-msgid "Error: Defined Path is inside an existing catalog"
-msgstr "Error: Defined Path is inside an existing catalog"
+#: ../../playlist.php:93
+msgid "Playlist Imported"
+msgstr "Playlist Imported"
 
-#: ../../admin/catalog.php:234
-msgid "Catalog Created"
-msgstr "Catalog Created"
+#: ../../playlist.php:125
+msgid "Empty Playlists Deleted"
+msgstr "Empty Playlists Deleted"
 
-#: ../../admin/catalog.php:251
-msgid "Catalog statistics cleared"
-msgstr "Catalog statistics cleared"
+#: ../../login.php:73
+msgid "User Disabled please contact Admin"
+msgstr "User Disabled please contact Admin"
 
-#: ../../admin/catalog.php:264
-msgid "Now Playing Cleared"
-msgstr "Now Playing Cleared"
+#: ../../login.php:89
+msgid "Unable to create new account"
+msgstr "Unable to create new account"
 
-#: ../../admin/catalog.php:264
-msgid "All now playing data has been cleared"
-msgstr "All now playing data has been cleared"
+#: ../../login.php:98
+msgid "No local account found"
+msgstr "No local account found"
 
-#: ../../admin/catalog.php:275
-msgid "No Disabled songs found"
-msgstr "No Disabled songs found"
+#: ../../login.php:115
+msgid "User Already Logged in"
+msgstr "User Already Logged in"
 
-#: ../../admin/catalog.php:284
-msgid "Delete Catalog"
-msgstr "Delete Catalog"
+#: ../../install.php:184
+msgid "Error: Config file not found or Unreadable"
+msgstr "Error: Config file not found or Unreadable"
 
-#: ../../admin/catalog.php:284
-msgid "Do you really want to delete this catalog?"
-msgstr "Do you really want to delete this catalog?"
+#: ../../search.php:38
+msgid "Error: No Keyword Entered"
+msgstr "Error: No Keyword Entered"
 
-#: ../../admin/catalog.php:304
-msgid "Album Art Search Finished"
-msgstr "Album Art Search Finished"
+#: ../../artists.php:181
+msgid "Show Artists starting with"
+msgstr "Show Artists starting with"
 
-#: ../../bin/print_tags.inc:68
+#: ../../bin/print_tags.inc:66
 msgid ""
 "[print_tags.php.inc]\n"
 "This commandline script will display the tag information for the specified "
@@ -4308,7 +4357,7 @@ msgstr ""
 "appear to Ampache. \n"
 "        \n"
 
-#: ../../bin/print_tags.inc:74
+#: ../../bin/print_tags.inc:72
 msgid "Filename:"
 msgstr "Filename:"