Updated: merged from r1885

Added: Norwegian Language #398 (Thx Retrievil_Knievil)

2 files changed, 182 insertions, 156 deletions

diff --git a/locale/en_GB/LC_MESSAGES/messages.mo b/locale/en_GB/LC_MESSAGES/messages.mo
index f5443f47..3084f68b 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 d09bc4f5..897be6b9 100644
--- a/locale/en_GB/LC_MESSAGES/messages.po
+++ b/locale/en_GB/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ampache 3.5.0\n"
 "Report-Msgid-Bugs-To: translations at ampache.org\n"
-"POT-Creation-Date: 2009-02-05 10:49+0900\n"
+"POT-Creation-Date: 2009-02-19 11:31+0900\n"
 "PO-Revision-Date: 2009-02-02 07:46+0900\n"
 "Last-Translator: momo-i <webmaster at momo-i.org>\n"
 "Language-Team: English (British)\n"
@@ -56,13 +56,13 @@ msgstr "Add"
 #: ../../templates/show_album_row.inc.php:24
 #: ../../templates/sidebar_home.inc.php:103
 #: ../../templates/show_artist_row.inc.php:24
-#: ../../templates/show_localplay_status.inc.php:43
+#: ../../templates/show_localplay_status.inc.php:44
 #: ../../templates/show_artist.inc.php:41
 #: ../../templates/show_album.inc.php:55
 #: ../../templates/show_playlist_row.inc.php:24
 #: ../../lib/class/stream.class.php:400
 #: ../../modules/localplay/mpd.controller.php:495
-#: ../../modules/localplay/httpq.controller.php:493
+#: ../../modules/localplay/httpq.controller.php:492
 msgid "Random"
 msgstr "Random"
 
@@ -108,6 +108,8 @@ msgstr "Preference"
 #: ../../templates/show_user_preferences.inc.php:37
 #: ../../templates/show_preference_box.inc.php:41
 #: ../../templates/show_preference_box.inc.php:71
+#: ../../templates/show_random_rules.inc.php:33
+#: ../../templates/show_random.inc.php:32
 #: ../../templates/show_debug.inc.php:45 ../../templates/show_debug.inc.php:94
 msgid "Value"
 msgstr "Value"
@@ -143,6 +145,8 @@ msgstr "Pause"
 #: ../../templates/show_localplay_control.inc.php:28
 #: ../../templates/show_manage_democratic.inc.php:57
 #: ../../templates/rightbar.inc.php:25
+#: ../../templates/show_democratic.inc.php:30
+#: ../../templates/show_democratic.inc.php:31
 msgid "Play"
 msgstr "Play"
 
@@ -315,6 +319,8 @@ msgstr "Cover"
 #: ../../templates/show_albums.inc.php:75
 #: ../../templates/sidebar_home.inc.php:105
 #: ../../templates/show_edit_song.inc.php:37
+#: ../../templates/show_democratic_playlist.inc.php:56
+#: ../../templates/show_democratic_playlist.inc.php:96
 #: ../../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
@@ -341,6 +347,8 @@ msgstr "Album"
 #: ../../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:57
+#: ../../templates/show_democratic_playlist.inc.php:97
 #: ../../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
@@ -366,7 +374,7 @@ msgstr "Artist"
 #: ../../templates/show_genre.inc.php:38
 #: ../../templates/show_genres.inc.php:38
 #: ../../templates/show_genres.inc.php:74
-#: ../../lib/class/browse.class.php:1096
+#: ../../lib/class/browse.class.php:1097
 msgid "Songs"
 msgstr "Songs"
 
@@ -386,7 +394,6 @@ msgstr "Year"
 #: ../../templates/show_videos.inc.php:38
 #: ../../templates/show_videos.inc.php:60
 #: ../../templates/show_songs.inc.php:43 ../../templates/show_songs.inc.php:72
-#: ../../templates/show_random.inc.php:41
 msgid "Tags"
 msgstr "Tags"
 
@@ -478,13 +485,14 @@ msgstr "Last Ip"
 #: ../../templates/show_manage_democratic.inc.php:40
 #: ../../templates/show_plugins.inc.php:35
 #: ../../templates/show_plugins.inc.php:64
-#: ../../templates/show_democratic_playlist.inc.php:51
-#: ../../templates/show_democratic_playlist.inc.php:86
+#: ../../templates/show_democratic_playlist.inc.php:53
+#: ../../templates/show_democratic_playlist.inc.php:93
 #: ../../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:34
 #: ../../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
@@ -505,8 +513,8 @@ msgid "On-line"
 msgstr "On-line"
 
 #: ../../templates/show_users.inc.php:53 ../../templates/show_user.inc.php:22
-#: ../../lib/class/user.class.php:663 ../../lib/class/catalog.class.php:161
-#: ../../lib/class/catalog.class.php:162 ../../lib/preferences.php:261
+#: ../../lib/class/user.class.php:663 ../../lib/class/catalog.class.php:145
+#: ../../lib/class/catalog.class.php:146 ../../lib/preferences.php:261
 msgid "Never"
 msgstr "Never"
 
@@ -514,7 +522,7 @@ msgstr "Never"
 #: ../../lib/class/flag.class.php:282 ../../lib/class/localplay.class.php:648
 #: ../../lib/class/user.class.php:667 ../../lib/general.lib.php:337
 #: ../../modules/localplay/mpd.controller.php:511
-#: ../../modules/localplay/httpq.controller.php:508
+#: ../../modules/localplay/httpq.controller.php:507
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -609,8 +617,8 @@ msgstr "Catalog Manager"
 #: ../../templates/show_preference_admin.inc.php:43
 #: ../../templates/sidebar.inc.php:31 ../../templates/show_add_user.inc.php:78
 #: ../../templates/show_create_democratic.inc.php:44
-#: ../../templates/show_democratic_playlist.inc.php:56
-#: ../../templates/show_democratic_playlist.inc.php:91
+#: ../../templates/show_democratic_playlist.inc.php:60
+#: ../../templates/show_democratic_playlist.inc.php:100
 #: ../../templates/show_mail_users.inc.php:32
 #: ../../lib/class/democratic.class.php:114 ../../lib/preferences.php:233
 #: ../../admin/users.php:127
@@ -735,14 +743,14 @@ msgstr "Save Changes"
 #: ../../templates/sidebar_home.inc.php:77
 #: ../../templates/show_local_catalog_info.inc.php:29
 #: ../../templates/show_genre.inc.php:32 ../../lib/ui.lib.php:408
-#: ../../lib/class/browse.class.php:1102
+#: ../../lib/class/browse.class.php:1103
 msgid "Albums"
 msgstr "Albums"
 
 #: ../../templates/show_artists.inc.php:40
 #: ../../templates/show_artists.inc.php:68
-#: ../../templates/show_democratic_playlist.inc.php:54
-#: ../../templates/show_democratic_playlist.inc.php:89
+#: ../../templates/show_democratic_playlist.inc.php:58
+#: ../../templates/show_democratic_playlist.inc.php:98
 #: ../../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
@@ -763,6 +771,8 @@ msgstr "Search Type"
 #: ../../templates/show_videos.inc.php:35
 #: ../../templates/show_videos.inc.php:57
 #: ../../templates/show_edit_song.inc.php:31
+#: ../../templates/show_democratic_playlist.inc.php:55
+#: ../../templates/show_democratic_playlist.inc.php:95
 #: ../../templates/show_search.inc.php:40
 #: ../../templates/show_disabled_songs.inc.php:34
 #: ../../templates/show_disabled_songs.inc.php:57
@@ -845,7 +855,7 @@ msgid "Song Title"
 msgstr "Song Title"
 
 #: ../../templates/sidebar_home.inc.php:35
-#: ../../lib/class/browse.class.php:1156
+#: ../../lib/class/browse.class.php:1157
 msgid "Tag Cloud"
 msgstr "Tag Cloud"
 
@@ -858,7 +868,7 @@ msgid "Playlist"
 msgstr "Playlist"
 
 #: ../../templates/sidebar_home.inc.php:37
-#: ../../lib/class/browse.class.php:1119
+#: ../../lib/class/browse.class.php:1120
 msgid "Radio Stations"
 msgstr "Radio Stations"
 
@@ -903,7 +913,7 @@ msgstr "Currently Playing"
 #: ../../templates/show_playtype_switch.inc.php:36
 #: ../../templates/sidebar_modules.inc.php:46 ../../lib/preferences.php:179
 #: ../../modules/localplay/mpd.controller.php:491
-#: ../../modules/localplay/httpq.controller.php:489
+#: ../../modules/localplay/httpq.controller.php:488
 msgid "Democratic"
 msgstr "Democratic"
 
@@ -1039,6 +1049,7 @@ msgid "Base Playlist"
 msgstr "Base Playlist"
 
 #: ../../templates/show_manage_democratic.inc.php:36
+#: ../../templates/show_democratic.inc.php:27
 msgid "Cooldown"
 msgstr "Cooldown"
 
@@ -1107,7 +1118,6 @@ msgstr "Read/Write"
 #: ../../templates/show_export.inc.php:35
 #: ../../templates/show_add_access_current.inc.php:40
 #: ../../templates/show_mail_users.inc.php:30
-#: ../../templates/show_random.inc.php:38
 #: ../../templates/show_admin_tools.inc.php:51 ../../lib/ui.lib.php:141
 #: ../../lib/ui.lib.php:150 ../../lib/ui.lib.php:632
 #: ../../lib/class/access.class.php:407 ../../lib/class/access.class.php:427
@@ -1117,7 +1127,6 @@ 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:61
 #: ../../templates/show_access_list.inc.php:61
 #: ../../templates/show_playlist_edit.inc.php:36
 msgid "Type"
@@ -1417,7 +1426,7 @@ msgstr "Reason to flag"
 
 #: ../../templates/show_flag.inc.php:56 ../../templates/rightbar.inc.php:105
 #: ../../templates/show_catalog_row.inc.php:33
-#: ../../templates/show_democratic_playlist.inc.php:78
+#: ../../templates/show_democratic_playlist.inc.php:85
 #: ../../templates/show_live_stream_row.inc.php:34
 #: ../../templates/show_localplay_instances.inc.php:40
 #: ../../templates/show_localplay_playlist.inc.php:50
@@ -1615,7 +1624,7 @@ msgstr "Advanced Add"
 
 #: ../../templates/sidebar_admin.inc.php:24
 #: ../../templates/show_admin_tools.inc.php:26
-#: ../../lib/class/browse.class.php:1140
+#: ../../lib/class/browse.class.php:1141
 msgid "Catalogs"
 msgstr "Catalogs"
 
@@ -1704,7 +1713,7 @@ msgstr "Total Users"
 
 #: ../../templates/show_local_catalog_info.inc.php:30
 #: ../../templates/show_genre.inc.php:35 ../../lib/ui.lib.php:412
-#: ../../lib/class/browse.class.php:1113 ../../lib/class/album.class.php:256
+#: ../../lib/class/browse.class.php:1114 ../../lib/class/album.class.php:256
 msgid "Artists"
 msgstr "Artists"
 
@@ -1772,7 +1781,9 @@ msgid "Add to New Playlist"
 msgstr "Add to New Playlist"
 
 #: ../../templates/rightbar.inc.php:54
-#: ../../templates/show_localplay_status.inc.php:46
+#: ../../templates/show_localplay_status.inc.php:47
+#: ../../templates/show_democratic.inc.php:34
+#: ../../templates/show_democratic.inc.php:35
 msgid "Clear Playlist"
 msgstr "Clear Playlist"
 
@@ -1801,7 +1812,7 @@ msgid "More"
 msgstr "More"
 
 #: ../../templates/header.inc.php:35
-#: ../../templates/show_localplay_status.inc.php:26
+#: ../../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
@@ -1965,30 +1976,20 @@ msgstr "Track"
 msgid "Update Song"
 msgstr "Update Song"
 
-#: ../../templates/show_democratic_playlist.inc.php:39
+#: ../../templates/show_democratic_playlist.inc.php:41
 msgid "Playing from base Playlist"
 msgstr "Playing from base Playlist"
 
-#: ../../templates/show_democratic_playlist.inc.php:52
-#: ../../templates/show_democratic_playlist.inc.php:87
+#: ../../templates/show_democratic_playlist.inc.php:54
+#: ../../templates/show_democratic_playlist.inc.php:94
 msgid "Votes"
 msgstr "Votes"
 
-#: ../../templates/show_democratic_playlist.inc.php:53
-#: ../../templates/show_democratic_playlist.inc.php:88
-#: ../../templates/show_recently_played.inc.php:38
-#: ../../templates/show_recently_played.inc.php:101
-#: ../../templates/show_duplicates.inc.php:37
-#: ../../templates/show_duplicates.inc.php:76
-#: ../../templates/show_now_playing_row.inc.php:45
-msgid "Song"
-msgstr "Song"
-
-#: ../../templates/show_democratic_playlist.inc.php:68
+#: ../../templates/show_democratic_playlist.inc.php:73
 msgid "Remove Vote"
 msgstr "Remove Vote"
 
-#: ../../templates/show_democratic_playlist.inc.php:70
+#: ../../templates/show_democratic_playlist.inc.php:75
 msgid "Add Vote"
 msgstr "Add Vote"
 
@@ -2159,27 +2160,27 @@ msgstr "Update Album"
 msgid "Select"
 msgstr "Select"
 
-#: ../../templates/show_localplay_status.inc.php:25
+#: ../../templates/show_localplay_status.inc.php:26
 msgid "Localplay Control"
 msgstr "Localplay Control"
 
-#: ../../templates/show_localplay_status.inc.php:30
+#: ../../templates/show_localplay_status.inc.php:31
 msgid "Mute"
 msgstr "Mute"
 
-#: ../../templates/show_localplay_status.inc.php:31
+#: ../../templates/show_localplay_status.inc.php:32
 msgid "Decrease Volume"
 msgstr "Decrease Volume"
 
-#: ../../templates/show_localplay_status.inc.php:32
+#: ../../templates/show_localplay_status.inc.php:33
 msgid "Increase Volume"
 msgstr "Increase Volume"
 
-#: ../../templates/show_localplay_status.inc.php:33
+#: ../../templates/show_localplay_status.inc.php:34
 msgid "Volume"
 msgstr "Volume"
 
-#: ../../templates/show_localplay_status.inc.php:38
+#: ../../templates/show_localplay_status.inc.php:39
 msgid "Repeat"
 msgstr "Repeat"
 
@@ -2226,6 +2227,23 @@ msgstr "Favorite Albums"
 msgid "Favorite Songs"
 msgstr "Favorite Songs"
 
+#: ../../templates/show_random_rules.inc.php:22
+#, fuzzy
+msgid "Rules"
+msgstr "Modules"
+
+#: ../../templates/show_random_rules.inc.php:31
+#: ../../templates/show_random.inc.php:30
+#, fuzzy
+msgid "Field"
+msgstr "Failed"
+
+#: ../../templates/show_random_rules.inc.php:32
+#: ../../templates/show_search.inc.php:102
+#: ../../templates/show_random.inc.php:31
+msgid "Operator"
+msgstr "Operator"
+
 #: ../../templates/show_shoutbox.inc.php:22
 msgid "Shoutbox"
 msgstr "Shoutbox"
@@ -2274,10 +2292,6 @@ msgstr "Four Stars"
 msgid "Five Stars"
 msgstr "Five Stars"
 
-#: ../../templates/show_search.inc.php:102
-msgid "Operator"
-msgstr "Operator"
-
 #: ../../templates/show_search.inc.php:105
 msgid "AND"
 msgstr "AND"
@@ -2299,8 +2313,6 @@ msgid "Maximum Results"
 msgstr "Maximum Results"
 
 #: ../../templates/show_search.inc.php:121
-#: ../../templates/show_random.inc.php:49
-#: ../../templates/show_random.inc.php:84
 msgid "Unlimited"
 msgstr "Unlimited"
 
@@ -2455,69 +2467,26 @@ msgid "Send Mail"
 msgstr "Send Mail"
 
 #: ../../templates/show_random.inc.php:22
-msgid "Play Random Selection"
-msgstr "Play Random Selection"
-
-#: ../../templates/show_random.inc.php:26
-msgid "Item count"
-msgstr "Item count"
-
-#: ../../templates/show_random.inc.php:46
-#: ../../templates/show_duplicates.inc.php:40
-#: ../../templates/show_duplicates.inc.php:79
-msgid "Length"
-msgstr "Length"
-
-#: ../../templates/show_random.inc.php:50
-#: ../../templates/show_random.inc.php:51
-#, php-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minute"
-msgstr[1] "%d minutes"
+#, fuzzy
+msgid "Advanced Random Rules"
+msgstr "Add Random"
 
-#: ../../templates/show_random.inc.php:52
-#: ../../templates/show_random.inc.php:53
 #: ../../templates/show_random.inc.php:54
-#: ../../templates/show_random.inc.php:55
-#: ../../templates/show_random.inc.php:56
-#, php-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hour"
-msgstr[1] "%d hours"
-
-#: ../../templates/show_random.inc.php:64
-msgid "Standard"
-msgstr "Standard"
+msgid "Like"
+msgstr ""
 
-#: ../../templates/show_random.inc.php:65
-msgid "Less Played"
-msgstr "Less Played"
+#: ../../templates/show_random.inc.php:63
+#, fuzzy
+msgid "Add Rule"
+msgstr "Add All"
 
 #: ../../templates/show_random.inc.php:66
-msgid "Full Albums"
-msgstr "Full Albums"
-
-#: ../../templates/show_random.inc.php:67
-msgid "Full Artist"
-msgstr "Full Artist"
+msgid "Save Rules As"
+msgstr ""
 
 #: ../../templates/show_random.inc.php:69
-msgid "Highest Rated"
-msgstr "Highest Rated"
-
-#: ../../templates/show_random.inc.php:75
-msgid "From catalog"
-msgstr "From catalog"
-
-#: ../../templates/show_random.inc.php:81
-msgid "Size Limit"
-msgstr "Size Limit"
-
-#: ../../templates/show_random.inc.php:95
-msgid "Enqueue"
-msgstr "Enqueue"
+msgid "Load Saved Rules"
+msgstr ""
 
 #: ../../templates/show_search_options.inc.php:23
 msgid "Options"
@@ -2583,6 +2552,14 @@ msgstr "months ago"
 msgid "years ago"
 msgstr "years ago"
 
+#: ../../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_now_playing_row.inc.php:45
+msgid "Song"
+msgstr "Song"
+
 #: ../../templates/show_recently_played.inc.php:42
 #: ../../templates/show_recently_played.inc.php:104
 msgid "Last Played"
@@ -2675,8 +2652,8 @@ msgid "Disk"
 msgstr "Disk"
 
 #: ../../templates/show_album.inc.php:34
-#: ../../lib/class/catalog.class.php:1940
-#: ../../lib/class/catalog.class.php:2011
+#: ../../lib/class/catalog.class.php:1887
+#: ../../lib/class/catalog.class.php:1958
 msgid "Unknown (Orphaned)"
 msgstr "Unknown (Orphaned)"
 
@@ -2754,6 +2731,11 @@ msgstr "Prev"
 msgid "Duplicate Songs"
 msgstr "Duplicate Songs"
 
+#: ../../templates/show_duplicates.inc.php:40
+#: ../../templates/show_duplicates.inc.php:79
+msgid "Length"
+msgstr "Length"
+
 #: ../../templates/show_duplicates.inc.php:41
 #: ../../templates/show_duplicates.inc.php:80
 msgid "Bitrate"
@@ -3174,34 +3156,39 @@ msgstr "Browse Music"
 msgid "Add New"
 msgstr "Add New"
 
-#: ../../lib/class/browse.class.php:1108
+#: ../../lib/class/browse.class.php:1109
 msgid "Manage Users"
 msgstr "Manage Users"
 
-#: ../../lib/class/browse.class.php:1125
+#: ../../lib/class/browse.class.php:1126
 msgid "Playlists"
 msgstr "Playlists"
 
-#: ../../lib/class/browse.class.php:1130
+#: ../../lib/class/browse.class.php:1131
 msgid "Playlist Songs"
 msgstr "Playlist Songs"
 
-#: ../../lib/class/browse.class.php:1135
+#: ../../lib/class/browse.class.php:1136
 msgid "Current Playlist"
 msgstr "Current Playlist"
 
-#: ../../lib/class/browse.class.php:1145
+#: ../../lib/class/browse.class.php:1146
 msgid "Shoutbox Records"
 msgstr "Shoutbox Records"
 
-#: ../../lib/class/browse.class.php:1150
+#: ../../lib/class/browse.class.php:1151
 msgid "Flagged Records"
 msgstr "Flagged Records"
 
-#: ../../lib/class/browse.class.php:1161
+#: ../../lib/class/browse.class.php:1162
 msgid "Videos"
 msgstr "Videos"
 
+#: ../../lib/class/browse.class.php:1167
+#, fuzzy
+msgid "Democratic Playlist"
+msgstr "Create Democratic Playlist"
+
 #: ../../lib/class/access.class.php:102 ../../lib/class/access.class.php:106
 #: ../../lib/class/access.class.php:146 ../../lib/class/access.class.php:150
 msgid "Invalid IPv4 / IPv6 Address Entered"
@@ -3250,8 +3237,7 @@ msgstr "Error Username Required"
 msgid "Error Passwords don't match"
 msgstr "Error Passwords don't match"
 
-#: ../../lib/class/album.class.php:479 ../../lib/class/catalog.class.php:442
-#: ../../lib/class/catalog.class.php:792
+#: ../../lib/class/album.class.php:479 ../../lib/class/catalog.class.php:426
 msgid "Error: Unable to open"
 msgstr "Error: Unable to open"
 
@@ -3259,150 +3245,150 @@ msgstr "Error: Unable to open"
 msgid "RSS Feed"
 msgstr "RSS Feed"
 
-#: ../../lib/class/catalog.class.php:220
+#: ../../lib/class/catalog.class.php:204
 msgid "day"
 msgid_plural "days"
 msgstr[0] "day"
 msgstr[1] "days"
 
-#: ../../lib/class/catalog.class.php:222
+#: ../../lib/class/catalog.class.php:206
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: ../../lib/class/catalog.class.php:322
+#: ../../lib/class/catalog.class.php:306
 msgid "Running Remote Sync"
 msgstr "Running Remote Sync"
 
-#: ../../lib/class/catalog.class.php:449 ../../lib/class/catalog.class.php:492
+#: ../../lib/class/catalog.class.php:433 ../../lib/class/catalog.class.php:476
 msgid "Error: Unable to change to directory"
 msgstr "Error: Unable to change to directory"
 
-#: ../../lib/class/catalog.class.php:528
+#: ../../lib/class/catalog.class.php:512
 #, php-format
 msgid "Error: Unable to get filesize for %s"
 msgstr "Error: Unable to get filesize for %s"
 
-#: ../../lib/class/catalog.class.php:534
+#: ../../lib/class/catalog.class.php:518
 #, php-format
 msgid "%s is not readable by ampache"
 msgstr "%s is not readable by ampache"
 
-#: ../../lib/class/catalog.class.php:542
+#: ../../lib/class/catalog.class.php:526
 #, php-format
 msgid "%s does not match site charset"
 msgstr "%s does not match site charset"
 
-#: ../../lib/class/catalog.class.php:1081 ../../preferences.php:111
+#: ../../lib/class/catalog.class.php:981 ../../preferences.php:111
 #: ../../admin/access.php:109
 msgid "Updated"
 msgstr "Updated"
 
-#: ../../lib/class/catalog.class.php:1088
+#: ../../lib/class/catalog.class.php:988
 msgid "No Update Needed"
 msgstr "No Update Needed"
 
-#: ../../lib/class/catalog.class.php:1188
+#: ../../lib/class/catalog.class.php:1114
 msgid "Running Remote Update"
 msgstr "Running Remote Update"
 
-#: ../../lib/class/catalog.class.php:1215
+#: ../../lib/class/catalog.class.php:1141
 msgid "Added Playlist From"
 msgstr "Added Playlist From"
 
-#: ../../lib/class/catalog.class.php:1244
+#: ../../lib/class/catalog.class.php:1170
 msgid "Catalog Update Finished"
 msgstr "Catalog Update Finished"
 
-#: ../../lib/class/catalog.class.php:1244
+#: ../../lib/class/catalog.class.php:1170
 msgid "Total Time"
 msgstr "Total Time"
 
-#: ../../lib/class/catalog.class.php:1245
+#: ../../lib/class/catalog.class.php:1171
 msgid "Total Songs"
 msgstr "Total Songs"
 
-#: ../../lib/class/catalog.class.php:1245
+#: ../../lib/class/catalog.class.php:1171
 msgid "Songs Per Seconds"
 msgstr "Songs Per Seconds"
 
-#: ../../lib/class/catalog.class.php:1259 ../../admin/users.php:142
+#: ../../lib/class/catalog.class.php:1185 ../../admin/users.php:142
 msgid "Error"
 msgstr "Error"
 
-#: ../../lib/class/catalog.class.php:1259
+#: ../../lib/class/catalog.class.php:1185
 msgid "Unable to load pear XMLRPC library, make sure XML-RPC is enabled"
 msgstr "Unable to load pear XMLRPC library, make sure XML-RPC is enabled"
 
+#: ../../lib/class/catalog.class.php:1217
 #: ../../lib/class/catalog.class.php:1291
-#: ../../lib/class/catalog.class.php:1365
-#: ../../lib/class/catalog.class.php:1398
+#: ../../lib/class/catalog.class.php:1324
 #: ../../lib/class/xmlrpcclient.class.php:64
 #: ../../lib/class/xmlrpcclient.class.php:97
 msgid "Error connecting to"
 msgstr "Error connecting to"
 
+#: ../../lib/class/catalog.class.php:1217
 #: ../../lib/class/catalog.class.php:1291
-#: ../../lib/class/catalog.class.php:1365
-#: ../../lib/class/catalog.class.php:1398
+#: ../../lib/class/catalog.class.php:1324
 #: ../../lib/class/xmlrpcclient.class.php:64
 #: ../../lib/class/xmlrpcclient.class.php:97
 msgid "Code"
 msgstr "Code"
 
+#: ../../lib/class/catalog.class.php:1217
 #: ../../lib/class/catalog.class.php:1291
-#: ../../lib/class/catalog.class.php:1365
-#: ../../lib/class/catalog.class.php:1398
+#: ../../lib/class/catalog.class.php:1324
 #: ../../lib/class/xmlrpcclient.class.php:64
 msgid "Reason"
 msgstr "Reason"
 
-#: ../../lib/class/catalog.class.php:1320
+#: ../../lib/class/catalog.class.php:1246
 msgid "Completed updating remote catalog(s)"
 msgstr "Completed updating remote catalog(s)"
 
-#: ../../lib/class/catalog.class.php:1324
+#: ../../lib/class/catalog.class.php:1250
 msgid "Starting synchronisation of album images"
 msgstr "Starting synchronisation of album images"
 
-#: ../../lib/class/catalog.class.php:1326
+#: ../../lib/class/catalog.class.php:1252
 msgid "Completed synchronisation of album images"
 msgstr "Completed synchronisation of album images"
 
-#: ../../lib/class/catalog.class.php:1361 ../../admin/access.php:93
+#: ../../lib/class/catalog.class.php:1287 ../../admin/access.php:93
 msgid "Added"
 msgstr "Added"
 
-#: ../../lib/class/catalog.class.php:1394
+#: ../../lib/class/catalog.class.php:1320
 msgid "images synchronized: "
 msgstr "images synchronized: "
 
-#: ../../lib/class/catalog.class.php:1523
+#: ../../lib/class/catalog.class.php:1449
 msgid "Catalog Root unreadable, stopping clean"
 msgstr "Catalog Root unreadable, stopping clean"
 
-#: ../../lib/class/catalog.class.php:1580
+#: ../../lib/class/catalog.class.php:1510
 msgid "Catalog Clean Done"
 msgstr "Catalog Clean Done"
 
-#: ../../lib/class/catalog.class.php:1580
+#: ../../lib/class/catalog.class.php:1510
 msgid "files removed"
 msgstr "files removed"
 
-#: ../../lib/class/catalog.class.php:1581
+#: ../../lib/class/catalog.class.php:1511
 msgid "Optimizing Tables"
 msgstr "Optimizing Tables"
 
-#: ../../lib/class/catalog.class.php:1881
+#: ../../lib/class/catalog.class.php:1828
 msgid "Update Finished."
 msgstr "Update Finished."
 
-#: ../../lib/class/catalog.class.php:1881
+#: ../../lib/class/catalog.class.php:1828
 msgid "Checked"
 msgstr "Checked"
 
-#: ../../lib/class/catalog.class.php:1881
+#: ../../lib/class/catalog.class.php:1828
 msgid "songs updated."
 msgstr "songs updated."
 
@@ -3573,7 +3559,7 @@ msgstr "Invalid Object Selected"
 msgid "Error Invalid Handshake - "
 msgstr "Error Invalid Handshake - "
 
-#: ../../server/xml.server.php:314
+#: ../../server/xml.server.php:315
 msgid "Invalid Request"
 msgstr "Invalid Request"
 
@@ -3589,7 +3575,7 @@ msgstr "Error Update Failed"
 msgid "Your Account has been updated"
 msgstr "Your Account has been updated"
 
-#: ../../play/index.php:82
+#: ../../play/index.php:84
 msgid "Session Expired: please log in again at"
 msgstr "Session Expired: please log in again at"
 
@@ -4072,3 +4058,43 @@ msgstr "Interface"
 #: Database words
 msgid "System"
 msgstr "System"
+
+#~ msgid "Play Random Selection"
+#~ msgstr "Play Random Selection"
+
+#~ msgid "Item count"
+#~ msgstr "Item count"
+
+#~ msgid "%d minute"
+#~ msgid_plural "%d minutes"
+#~ msgstr[0] "%d minute"
+#~ msgstr[1] "%d minutes"
+
+#~ msgid "%d hour"
+#~ msgid_plural "%d hours"
+#~ msgstr[0] "%d hour"
+#~ msgstr[1] "%d hours"
+
+#~ msgid "Standard"
+#~ msgstr "Standard"
+
+#~ msgid "Less Played"
+#~ msgstr "Less Played"
+
+#~ msgid "Full Albums"
+#~ msgstr "Full Albums"
+
+#~ msgid "Full Artist"
+#~ msgstr "Full Artist"
+
+#~ msgid "Highest Rated"
+#~ msgstr "Highest Rated"
+
+#~ msgid "From catalog"
+#~ msgstr "From catalog"
+
+#~ msgid "Size Limit"
+#~ msgstr "Size Limit"
+
+#~ msgid "Enqueue"
+#~ msgstr "Enqueue"