Updated: merged from r1885

Added: Norwegian Language #398 (Thx Retrievil_Knievil)

2 files changed, 185 insertions, 159 deletions

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index cc1116f1..53a12a0f 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.mo
+++ b/locale/fr_FR/LC_MESSAGES/messages.mo
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 73160d33..5063b7e4 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -12,7 +12,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: 2008-08-01 00:52+0200\n"
 "Last-Translator: Erwan Velu <erwan.velu@free.fr>\n"
 "Language-Team: French <kde-i18n-doc@lists.kde.org>\n"
@@ -62,13 +62,13 @@ msgstr "Ajouter"
 #: ../../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 "Al&eacute;atoire"
 
@@ -114,6 +114,8 @@ msgstr "Pr&eacute;f&eacute;rence"
 #: ../../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 "Valeur"
@@ -150,6 +152,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 "Jouer"
 
@@ -319,6 +323,8 @@ msgstr "Jacquette"
 #: ../../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
@@ -345,6 +351,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
@@ -370,7 +378,7 @@ msgstr "Artiste"
 #: ../../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 "Morceaux"
 
@@ -390,7 +398,6 @@ msgstr "Ann&eacute;e"
 #: ../../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
 #, fuzzy
 msgid "Tags"
 msgstr "Re-marquer"
@@ -483,13 +490,14 @@ msgstr "Derni&egrave;res IPs"
 #: ../../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
@@ -510,8 +518,8 @@ msgid "On-line"
 msgstr "En ligne"
 
 #: ../../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 "Jamais"
 
@@ -519,7 +527,7 @@ msgstr "Jamais"
 #: ../../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 "Inconnu"
 
@@ -614,8 +622,8 @@ msgstr "Gestionnaire de catalogues "
 #: ../../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
@@ -740,14 +748,14 @@ msgstr "Sauver les changements"
 #: ../../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
@@ -768,6 +776,8 @@ msgstr "Type de recherche"
 #: ../../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
@@ -851,7 +861,7 @@ msgid "Song Title"
 msgstr "Titre du morceau"
 
 #: ../../templates/sidebar_home.inc.php:35
-#: ../../lib/class/browse.class.php:1156
+#: ../../lib/class/browse.class.php:1157
 msgid "Tag Cloud"
 msgstr ""
 
@@ -864,7 +874,7 @@ msgid "Playlist"
 msgstr "Liste de lecture"
 
 #: ../../templates/sidebar_home.inc.php:37
-#: ../../lib/class/browse.class.php:1119
+#: ../../lib/class/browse.class.php:1120
 msgid "Radio Stations"
 msgstr "Stations de Radio"
 
@@ -910,7 +920,7 @@ msgstr "En cours de lecture"
 #: ../../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 "Democratique"
 
@@ -1046,6 +1056,7 @@ msgid "Base Playlist"
 msgstr "Liste de lecture accueil"
 
 #: ../../templates/show_manage_democratic.inc.php:36
+#: ../../templates/show_democratic.inc.php:27
 msgid "Cooldown"
 msgstr "Temps avant de rejouer la piste"
 
@@ -1115,7 +1126,6 @@ msgstr "Lire/Ecrire"
 #: ../../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
@@ -1125,7 +1135,6 @@ msgstr "Tout"
 #: ../../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"
@@ -1433,7 +1442,7 @@ msgstr "Raison du marquage"
 
 #: ../../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
@@ -1636,7 +1645,7 @@ msgstr "Avanc&eacute;"
 
 #: ../../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 "Catalogues"
 
@@ -1725,7 +1734,7 @@ msgstr "Total des utilisateurs"
 
 #: ../../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 "Artistes"
 
@@ -1796,7 +1805,9 @@ msgid "Add to New Playlist"
 msgstr "Ajouter &agrave; une nouvelle liste de lecture"
 
 #: ../../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 "Effacer liste de lecture"
 
@@ -1826,7 +1837,7 @@ msgid "More"
 msgstr "Plus"
 
 #: ../../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
@@ -1991,31 +2002,21 @@ msgstr "Piste"
 msgid "Update Song"
 msgstr "Mettre &agrave; jour la chanson"
 
-#: ../../templates/show_democratic_playlist.inc.php:39
+#: ../../templates/show_democratic_playlist.inc.php:41
 msgid "Playing from base Playlist"
 msgstr "Jouer une liste de lecture"
 
-#: ../../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
 #, fuzzy
 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 "Morceau"
-
-#: ../../templates/show_democratic_playlist.inc.php:68
+#: ../../templates/show_democratic_playlist.inc.php:73
 msgid "Remove Vote"
 msgstr "Annuler le vote"
 
-#: ../../templates/show_democratic_playlist.inc.php:70
+#: ../../templates/show_democratic_playlist.inc.php:75
 msgid "Add Vote"
 msgstr "Ajouter un vote"
 
@@ -2190,27 +2191,27 @@ msgstr "Mettre &agrave; jour l'album"
 msgid "Select"
 msgstr "Selectionner"
 
-#: ../../templates/show_localplay_status.inc.php:25
+#: ../../templates/show_localplay_status.inc.php:26
 msgid "Localplay Control"
 msgstr "Param&eacute;trage de la lecture locale"
 
-#: ../../templates/show_localplay_status.inc.php:30
+#: ../../templates/show_localplay_status.inc.php:31
 msgid "Mute"
 msgstr "Muet"
 
-#: ../../templates/show_localplay_status.inc.php:31
+#: ../../templates/show_localplay_status.inc.php:32
 msgid "Decrease Volume"
 msgstr "Réduire le volume"
 
-#: ../../templates/show_localplay_status.inc.php:32
+#: ../../templates/show_localplay_status.inc.php:33
 msgid "Increase Volume"
 msgstr "Augmenter le 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 "Rejouer"
 
@@ -2259,6 +2260,23 @@ msgstr "Albums favoris"
 msgid "Favorite Songs"
 msgstr "Morceaux favoris"
 
+#: ../../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 "Fichier"
+
+#: ../../templates/show_random_rules.inc.php:32
+#: ../../templates/show_search.inc.php:102
+#: ../../templates/show_random.inc.php:31
+msgid "Operator"
+msgstr "Op&eacute;rateur"
+
 #: ../../templates/show_shoutbox.inc.php:22
 msgid "Shoutbox"
 msgstr "Zone de commentaires"
@@ -2307,10 +2325,6 @@ msgstr "4 etoiles"
 msgid "Five Stars"
 msgstr "5 etoiles"
 
-#: ../../templates/show_search.inc.php:102
-msgid "Operator"
-msgstr "Op&eacute;rateur"
-
 #: ../../templates/show_search.inc.php:105
 msgid "AND"
 msgstr "ET"
@@ -2332,8 +2346,6 @@ msgid "Maximum Results"
 msgstr "Nombre de r&eacute;sultats"
 
 #: ../../templates/show_search.inc.php:121
-#: ../../templates/show_random.inc.php:49
-#: ../../templates/show_random.inc.php:84
 msgid "Unlimited"
 msgstr "Illimit&eacute;"
 
@@ -2494,69 +2506,27 @@ msgid "Send Mail"
 msgstr "Envoyer l'e-mail"
 
 #: ../../templates/show_random.inc.php:22
-msgid "Play Random Selection"
-msgstr "Jouer al&eacute;atoirement une s&eacute;lection"
-
-#: ../../templates/show_random.inc.php:26
-msgid "Item count"
-msgstr "Nombre d'&eacute;l&eacute;ments"
-
-#: ../../templates/show_random.inc.php:46
-#: ../../templates/show_duplicates.inc.php:40
-#: ../../templates/show_duplicates.inc.php:79
-msgid "Length"
-msgstr "Dur&eacute;e"
-
-#: ../../templates/show_random.inc.php:50
-#: ../../templates/show_random.inc.php:51
-#, fuzzy, php-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "minute"
-msgstr[1] ""
+#, fuzzy
+msgid "Advanced Random Rules"
+msgstr "Ajouter en mode al&eacute;toire"
 
-#: ../../templates/show_random.inc.php:52
-#: ../../templates/show_random.inc.php:53
 #: ../../templates/show_random.inc.php:54
-#: ../../templates/show_random.inc.php:55
-#: ../../templates/show_random.inc.php:56
-#, fuzzy, php-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "heure"
-msgstr[1] "heure"
-
-#: ../../templates/show_random.inc.php:64
-msgid "Standard"
-msgstr "Standard"
+#, fuzzy
+msgid "Like"
+msgstr "Liens"
 
-#: ../../templates/show_random.inc.php:65
-msgid "Less Played"
-msgstr "Moins jou&eacute;"
+#: ../../templates/show_random.inc.php:63
+#, fuzzy
+msgid "Add Rule"
+msgstr "Ajouter tout"
 
 #: ../../templates/show_random.inc.php:66
-msgid "Full Albums"
-msgstr "Tous les albums"
-
-#: ../../templates/show_random.inc.php:67
-msgid "Full Artist"
-msgstr "Artiste complet"
+msgid "Save Rules As"
+msgstr ""
 
 #: ../../templates/show_random.inc.php:69
-msgid "Highest Rated"
-msgstr "Les mieux not&eacute;es"
-
-#: ../../templates/show_random.inc.php:75
-msgid "From catalog"
-msgstr "Depuis un catalogue"
-
-#: ../../templates/show_random.inc.php:81
-msgid "Size Limit"
-msgstr "Limite de Taille"
-
-#: ../../templates/show_random.inc.php:95
-msgid "Enqueue"
-msgstr "En Liste"
+msgid "Load Saved Rules"
+msgstr ""
 
 #: ../../templates/show_search_options.inc.php:23
 msgid "Options"
@@ -2622,6 +2592,14 @@ msgstr "mois"
 msgid "years ago"
 msgstr "ann&eacute;e"
 
+#: ../../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 "Morceau"
+
 #: ../../templates/show_recently_played.inc.php:42
 #: ../../templates/show_recently_played.inc.php:104
 msgid "Last Played"
@@ -2708,8 +2686,8 @@ msgid "Disk"
 msgstr "Disque"
 
 #: ../../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 "Inconnu (orphelin)"
 
@@ -2787,6 +2765,11 @@ msgstr "Pr&eacute;c&eacute;dant"
 msgid "Duplicate Songs"
 msgstr "Morceaux dupliqu&eacute;s"
 
+#: ../../templates/show_duplicates.inc.php:40
+#: ../../templates/show_duplicates.inc.php:79
+msgid "Length"
+msgstr "Dur&eacute;e"
+
 #: ../../templates/show_duplicates.inc.php:41
 #: ../../templates/show_duplicates.inc.php:80
 msgid "Bitrate"
@@ -3211,35 +3194,40 @@ msgstr "Parcourir"
 msgid "Add New"
 msgstr "Ajouter"
 
-#: ../../lib/class/browse.class.php:1108
+#: ../../lib/class/browse.class.php:1109
 msgid "Manage Users"
 msgstr "G&eacute;rer les utilisateurs"
 
-#: ../../lib/class/browse.class.php:1125
+#: ../../lib/class/browse.class.php:1126
 msgid "Playlists"
 msgstr "Listes de lecture"
 
-#: ../../lib/class/browse.class.php:1130
+#: ../../lib/class/browse.class.php:1131
 msgid "Playlist Songs"
 msgstr "Chansons de la liste de lecture"
 
-#: ../../lib/class/browse.class.php:1135
+#: ../../lib/class/browse.class.php:1136
 msgid "Current Playlist"
 msgstr "Liste de lecture actuelle"
 
-#: ../../lib/class/browse.class.php:1145
+#: ../../lib/class/browse.class.php:1146
 msgid "Shoutbox Records"
 msgstr "Zone de commentaires"
 
-#: ../../lib/class/browse.class.php:1150
+#: ../../lib/class/browse.class.php:1151
 msgid "Flagged Records"
 msgstr "Pistes Marqu&eacute;es"
 
-#: ../../lib/class/browse.class.php:1161
+#: ../../lib/class/browse.class.php:1162
 #, fuzzy
 msgid "Videos"
 msgstr "Divers"
 
+#: ../../lib/class/browse.class.php:1167
+#, fuzzy
+msgid "Democratic Playlist"
+msgstr "Cr&eacute;er une liste de lecture d&eacute;mocratique"
+
 #: ../../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"
@@ -3289,8 +3277,7 @@ msgstr "Erreur: Le nom d'utilisateur est obligatoire"
 msgid "Error Passwords don't match"
 msgstr "Erreur: Les mots de passe ne correspondent pas"
 
-#: ../../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 "Erreur: Impossible d'ouvrir"
 
@@ -3298,155 +3285,155 @@ msgstr "Erreur: Impossible d'ouvrir"
 msgid "RSS Feed"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:220
+#: ../../lib/class/catalog.class.php:204
 #, fuzzy
 msgid "day"
 msgid_plural "days"
 msgstr[0] "jour"
 msgstr[1] "jour"
 
-#: ../../lib/class/catalog.class.php:222
+#: ../../lib/class/catalog.class.php:206
 #, fuzzy
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "heure"
 msgstr[1] "heure"
 
-#: ../../lib/class/catalog.class.php:322
+#: ../../lib/class/catalog.class.php:306
 msgid "Running Remote Sync"
 msgstr "Synchronisation distante en cours"
 
-#: ../../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 "Erreur: Impossible de changer de r&eacute;pertoire"
 
-#: ../../lib/class/catalog.class.php:528
+#: ../../lib/class/catalog.class.php:512
 #, fuzzy, php-format
 msgid "Error: Unable to get filesize for %s"
 msgstr "Erreur: Impossible d'obtenir la taille de fichier de"
 
-#: ../../lib/class/catalog.class.php:534
+#: ../../lib/class/catalog.class.php:518
 #, fuzzy, php-format
 msgid "%s is not readable by ampache"
 msgstr "n'est pas lisible par ampache"
 
-#: ../../lib/class/catalog.class.php:542
+#: ../../lib/class/catalog.class.php:526
 #, fuzzy, php-format
 msgid "%s does not match site charset"
 msgstr "ne correspond pas &agrave; l'encodage de carat&egrave;res du site"
 
-#: ../../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 "Mis &agrave; jour"
 
-#: ../../lib/class/catalog.class.php:1088
+#: ../../lib/class/catalog.class.php:988
 msgid "No Update Needed"
 msgstr "Mise &agrave; jour non n&eacute;cessaire"
 
-#: ../../lib/class/catalog.class.php:1188
+#: ../../lib/class/catalog.class.php:1114
 msgid "Running Remote Update"
 msgstr "Mise &agrave; jour distante en cours"
 
-#: ../../lib/class/catalog.class.php:1215
+#: ../../lib/class/catalog.class.php:1141
 msgid "Added Playlist From"
 msgstr "Liste de lecture ajout&eacute;e &agrave; partir de"
 
-#: ../../lib/class/catalog.class.php:1244
+#: ../../lib/class/catalog.class.php:1170
 msgid "Catalog Update Finished"
 msgstr "Mise &agrave; jour du catalogue termin&eacute;e"
 
-#: ../../lib/class/catalog.class.php:1244
+#: ../../lib/class/catalog.class.php:1170
 msgid "Total Time"
 msgstr "Dur&eacute;e totale"
 
-#: ../../lib/class/catalog.class.php:1245
+#: ../../lib/class/catalog.class.php:1171
 msgid "Total Songs"
 msgstr "Total des morceaux"
 
-#: ../../lib/class/catalog.class.php:1245
+#: ../../lib/class/catalog.class.php:1171
 msgid "Songs Per Seconds"
 msgstr "Morceaux par secondes"
 
-#: ../../lib/class/catalog.class.php:1259 ../../admin/users.php:142
+#: ../../lib/class/catalog.class.php:1185 ../../admin/users.php:142
 msgid "Error"
 msgstr "Erreur"
 
-#: ../../lib/class/catalog.class.php:1259
+#: ../../lib/class/catalog.class.php:1185
 #, fuzzy
 msgid "Unable to load pear XMLRPC library, make sure XML-RPC is enabled"
 msgstr ""
 "Impossible de charger la biblioth&egrave;que XMLRPC, assurez-vous que XML-"
 "RPC est actif"
 
+#: ../../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 "Erreur de connexion &agrave;"
 
+#: ../../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 "Raison"
 
-#: ../../lib/class/catalog.class.php:1320
+#: ../../lib/class/catalog.class.php:1246
 msgid "Completed updating remote catalog(s)"
 msgstr "Mise &agrave; jour de(s) catalogue(s) distant(s) termin&eacute;e"
 
-#: ../../lib/class/catalog.class.php:1324
+#: ../../lib/class/catalog.class.php:1250
 msgid "Starting synchronisation of album images"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1326
+#: ../../lib/class/catalog.class.php:1252
 msgid "Completed synchronisation of album images"
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1361 ../../admin/access.php:93
+#: ../../lib/class/catalog.class.php:1287 ../../admin/access.php:93
 msgid "Added"
 msgstr "Ajout&eacute;"
 
-#: ../../lib/class/catalog.class.php:1394
+#: ../../lib/class/catalog.class.php:1320
 msgid "images synchronized: "
 msgstr ""
 
-#: ../../lib/class/catalog.class.php:1523
+#: ../../lib/class/catalog.class.php:1449
 msgid "Catalog Root unreadable, stopping clean"
 msgstr "Le chemin du catalogue est inaccessible, nettoyage stopp&eacute;"
 
-#: ../../lib/class/catalog.class.php:1580
+#: ../../lib/class/catalog.class.php:1510
 msgid "Catalog Clean Done"
 msgstr "Nettoyage de catalogue termin&eacute;"
 
-#: ../../lib/class/catalog.class.php:1580
+#: ../../lib/class/catalog.class.php:1510
 msgid "files removed"
 msgstr "fichiers enlev&eacute;s"
 
-#: ../../lib/class/catalog.class.php:1581
+#: ../../lib/class/catalog.class.php:1511
 msgid "Optimizing Tables"
 msgstr "Optimisation des tables"
 
-#: ../../lib/class/catalog.class.php:1881
+#: ../../lib/class/catalog.class.php:1828
 msgid "Update Finished."
 msgstr "Mise &agrave; jour termin&eacute;e"
 
-#: ../../lib/class/catalog.class.php:1881
+#: ../../lib/class/catalog.class.php:1828
 msgid "Checked"
 msgstr "Vérifi&eacute;es"
 
-#: ../../lib/class/catalog.class.php:1881
+#: ../../lib/class/catalog.class.php:1828
 msgid "songs updated."
 msgstr "morceaux mis &agrave; jour"
 
@@ -3601,7 +3588,7 @@ msgstr "T&eacute;l&eacute;charger la s&eacute;lection"
 msgid "Error Invalid Handshake - "
 msgstr ""
 
-#: ../../server/xml.server.php:314
+#: ../../server/xml.server.php:315
 #, fuzzy
 msgid "Invalid Request"
 msgstr "Demande de suppression"
@@ -3618,7 +3605,7 @@ msgstr "Erreur: la mise &agrave; &eacute;chou&eacute;e"
 msgid "Your Account has been updated"
 msgstr "Votre compte &agrave; &eacute;t&eacute; mis &agrave jour"
 
-#: ../../play/index.php:82
+#: ../../play/index.php:84
 msgid "Session Expired: please log in again at"
 msgstr "Session expir&eacute;e : reconnectez vous sur"
 
@@ -4147,6 +4134,48 @@ msgstr "l'Interface"
 msgid "System"
 msgstr "élément"
 
+#~ msgid "Play Random Selection"
+#~ msgstr "Jouer al&eacute;atoirement une s&eacute;lection"
+
+#~ msgid "Item count"
+#~ msgstr "Nombre d'&eacute;l&eacute;ments"
+
+#, fuzzy
+#~ msgid "%d minute"
+#~ msgid_plural "%d minutes"
+#~ msgstr[0] "minute"
+#~ msgstr[1] ""
+
+#, fuzzy
+#~ msgid "%d hour"
+#~ msgid_plural "%d hours"
+#~ msgstr[0] "heure"
+#~ msgstr[1] "heure"
+
+#~ msgid "Standard"
+#~ msgstr "Standard"
+
+#~ msgid "Less Played"
+#~ msgstr "Moins jou&eacute;"
+
+#~ msgid "Full Albums"
+#~ msgstr "Tous les albums"
+
+#~ msgid "Full Artist"
+#~ msgstr "Artiste complet"
+
+#~ msgid "Highest Rated"
+#~ msgstr "Les mieux not&eacute;es"
+
+#~ msgid "From catalog"
+#~ msgstr "Depuis un catalogue"
+
+#~ msgid "Size Limit"
+#~ msgstr "Limite de Taille"
+
+#~ msgid "Enqueue"
+#~ msgstr "En Liste"
+
 #~ msgid "Edit ACL"
 #~ msgstr "Editer le contr&ocirc;le d'acc&egrave;s"
 
@@ -4277,9 +4306,6 @@ msgstr "élément"
 #~ msgid "Recommendations"
 #~ msgstr "Recommandations"
 
-#~ msgid "Links"
-#~ msgstr "Liens"
-
 #~ msgid "Find Missing Tracks"
 #~ msgstr "Chercher les pistes manquantes"