changeset 3779:7f42752acf4d

Automated merge with ssh://hg.atheme.org//hg/audacious
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 17 Oct 2007 23:02:12 +0300
parents b4fe7d2a0d0d (current diff) cbfc986d17d6 (diff)
children ec989c2cde74
files
diffstat 26 files changed, 1230 insertions(+), 1269 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Wed Oct 17 23:01:59 2007 +0300
+++ b/configure.ac	Wed Oct 17 23:02:12 2007 +0300
@@ -157,11 +157,7 @@
 dnl Ok, first we find out what flags we need to use.
 BUILDSYS_PROG_IMPLIB
 BUILDSYS_SHARED_LIB
-if test x"$PROG_IMPLIB_NEEDED" = x"yes"; then
-	IMPLIB_LIBS='-L../audacious -laudacious.exe'
-else
-	IMPLIB_LIBS=''
-fi
+IMPLIB_LIBS=''
 AC_SUBST(IMPLIB_LIBS)
 
 dnl XXX
@@ -177,13 +173,10 @@
 		LDFLAGS="$LDFLAGS -framework CoreFoundation -framework CoreServices -framework Carbon"
 		;;
 	*)
-		EXPORTDYN="-Wl,-export-dynamic"
 		AC_MSG_RESULT([no])
 		;;
 esac
 
-AC_SUBST(EXPORTDYN)
-
 dnl chardet support
 dnl ========================
 AC_ARG_ENABLE(chardet,
--- a/extra.mk.in	Wed Oct 17 23:01:59 2007 +0300
+++ b/extra.mk.in	Wed Oct 17 23:02:12 2007 +0300
@@ -339,5 +339,4 @@
 TRANSPORT_PLUGIN_DIR ?= @TRANSPORT_PLUGIN_DIR@
 TRANSPORT_PLUGINS ?= @TRANSPORT_PLUGINS@
 PCH ?= @PCH@
-EXPORTDYN ?= @EXPORTDYN@
 IMPLIB_LIBS = @IMPLIB_LIBS@
--- a/m4/buildsys.m4	Wed Oct 17 23:01:59 2007 +0300
+++ b/m4/buildsys.m4	Wed Oct 17 23:02:12 2007 +0300
@@ -21,11 +21,6 @@
 AC_DEFUN([BUILDSYS_PROG_IMPLIB], [
 	AC_MSG_CHECKING(whether we need an implib)
 	case "$target" in
-		*-*-cygwin | *-*-mingw32)
-			AC_MSG_RESULT(yes)
-			PROG_IMPLIB_NEEDED='yes'
-			PROG_IMPLIB_LDFLAGS='-Wl,-export-all-symbols,--out-implib,lib${PROG}.a'
-			;;
 		*)
 			AC_MSG_RESULT(no)
 			PROG_IMPLIB_NEEDED='no'
--- a/po/fr.po	Wed Oct 17 23:01:59 2007 +0300
+++ b/po/fr.po	Wed Oct 17 23:02:12 2007 +0300
@@ -1,24 +1,21 @@
-# translation of fr.po to
 # French language translation for beep-multimedia-player
 # Copyright (C) 2003 David Le Brun <david@dyn-ns.net>
 #
-#
-# David Le Brun <david@dyn-ns.net>, 2003.
+# Adapted for Audacious by :
 # Adam C辿cile (Le_Vert) <gandalf@le-vert.net>, 2006.
+# Stanislas Zeller <skogkatt@orange.fr>, 2007.
+# Stany Henry (StrassBoy) <StrassBoy@gmail.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: fr\n"
+"Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n"
 "POT-Creation-Date: 2007-10-13 14:15+0200\n"
-"PO-Revision-Date: 2007-09-30 17:44+0100\n"
-"Last-Translator: stanislas zeller <skogkatt@orange.fr>\n"
-"Language-Team:  <fr@li.org>\n"
+"PO-Revision-Date: 2007-10-17 03:45+0100\n"
+"Last-Translator: Stany Henry <StrassBoy@gmail.com>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"NPOT-Creation-Date: 2003-08-08 19:35+0200\n"
-"Plural-Forms: nplurals=2; plural=n>1;\n"
-"X-Generator: KBabel 1.11.4\n"
 
 #: src/audacious/glade.c:45
 #, c-format
@@ -29,12 +26,11 @@
 msgstr ""
 "<b><big>Impossible de cr辿er %s.</big></b>\n"
 "\n"
-"Ne peut ouvrir le fichier glade (%s). Veuillez v辿rifier votre "
-"configuration.\n"
+"Impossible d'ouvrir le fichier 'glade' (%s). Veuillez v辿rifier l'installation.\n"
 
 #: src/audacious/glade/fileinfo.glade:8
 msgid "Track Information"
-msgstr "Information de la Piste"
+msgstr "Informations sur le morceau"
 
 #: src/audacious/glade/fileinfo.glade:81
 msgid "<span size=\"small\">Title</span>"
@@ -42,7 +38,7 @@
 
 #: src/audacious/glade/fileinfo.glade:139
 msgid "<span size=\"small\">Artist</span>"
-msgstr "<span size=\"small\">Artiste</span>"
+msgstr "<span size=\"small\">Title</span>"
 
 #: src/audacious/glade/fileinfo.glade:197
 msgid "<span size=\"small\">Album</span>"
@@ -66,15 +62,15 @@
 
 #: src/audacious/glade/fileinfo.glade:499
 msgid "<span size=\"small\">Location</span>"
-msgstr "<span size=\"small\">Location</span>"
+msgstr "<span size=\"small\">Emplacement</span>"
 
 #: src/audacious/glade/prefswin.glade:8
 msgid "Audacious Preferences"
-msgstr "Pr辿f辿rences"
+msgstr "Pr辿f辿rences d'Audacious"
 
 #: src/audacious/glade/prefswin.glade:115
 msgid "_Decoder list:"
-msgstr "_D辿codeur"
+msgstr "_Liste des d辿codeurs :"
 
 #: src/audacious/glade/prefswin.glade:219
 msgid "<span size=\"medium\"><b>Decoders</b></span>"
@@ -82,7 +78,7 @@
 
 #: src/audacious/glade/prefswin.glade:261
 msgid "_General plugin list:"
-msgstr "Liste des greffons _g辿n辿raux:"
+msgstr "_Liste des modules g辿n辿raux :"
 
 #: src/audacious/glade/prefswin.glade:365
 msgid "<span size=\"medium\"><b>General</b></span>"
@@ -90,31 +86,32 @@
 
 #: src/audacious/glade/prefswin.glade:407
 msgid "_Visualization plugin list:"
-msgstr "Liste des greffons _d'effets visuels:"
+msgstr "_Liste des modules de visualisation :"
 
 #: src/audacious/glade/prefswin.glade:511
 msgid "<b>Visualization</b>"
-msgstr "<b>Visuel</b>"
+msgstr "<b>Visualisation</b>"
 
 #: src/audacious/glade/prefswin.glade:553
 msgid "_Effect plugin list:"
-msgstr "Liste des greffons d'_effets sonores:"
+msgstr "_Liste des modules d'effets :"
 
 #: src/audacious/glade/prefswin.glade:657
 msgid "<b>Effects</b>"
 msgstr "<b>Effets</b>"
 
-#: src/audacious/glade/prefswin.glade:693 src/audacious/ui_preferences.c:117
+#: src/audacious/glade/prefswin.glade:693
+#: src/audacious/ui_preferences.c:117
 msgid "Plugins"
-msgstr "Greffons"
+msgstr "Modules"
 
 #: src/audacious/glade/prefswin.glade:758
 msgid "<b>_Skin</b>"
-msgstr "<b>_Th竪mes</b>"
+msgstr "<b>_Th竪me</b>"
 
 #: src/audacious/glade/prefswin.glade:811
 msgid "Refresh skin list"
-msgstr "Rafraichir la liste de skins"
+msgstr "Actualiser la liste des th竪mes"
 
 #: src/audacious/glade/prefswin.glade:926
 msgid "<b>_Fonts</b>"
@@ -122,31 +119,27 @@
 
 #: src/audacious/glade/prefswin.glade:975
 msgid "_Player:"
-msgstr "Lecteur:"
+msgstr "_Fen棚tre principale"
 
 #: src/audacious/glade/prefswin.glade:1018
 msgid "_Playlist:"
-msgstr "Liste:"
+msgstr "_Liste de lecture"
 
 #: src/audacious/glade/prefswin.glade:1050
 msgid "Select main player window font:"
-msgstr "Choix de la police du lecteur principal"
+msgstr "Police de la fen棚tre principale :"
 
 #: src/audacious/glade/prefswin.glade:1072
 msgid "Select playlist font:"
-msgstr "Choisir la police:"
+msgstr "Police de la liste de lecture :"
 
 #: src/audacious/glade/prefswin.glade:1112
-msgid ""
-"Use bitmap fonts if they are available. Bitmap fonts do not support Unicode "
-"strings."
-msgstr ""
-"Utiliser les polices Bitmap si disponibles. Les polices Bitmap ne supportent "
-"pas les caract竪res Unicode."
+msgid "Use bitmap fonts if they are available. Bitmap fonts do not support Unicode strings."
+msgstr "Cette option permet d'utiliser les polices matricielles ('bitmap'). Ces polices ne g竪rent pas la norme 'Unicode' (caract竪res accentu辿s)."
 
 #: src/audacious/glade/prefswin.glade:1114
 msgid "Use Bitmap fonts if available"
-msgstr "Utiliser les polices Bitmap si disponibles"
+msgstr "Utiliser les polices matricielles (si elles sont disponibles)"
 
 #: src/audacious/glade/prefswin.glade:1161
 msgid "<b>_Miscellaneous</b>"
@@ -154,50 +147,42 @@
 
 #: src/audacious/glade/prefswin.glade:1202
 msgid "Show track numbers in playlist"
-msgstr "Afficher la position des morceaux dans la liste d'辿coute"
+msgstr "Afficher la position des morceaux dans la liste de lecture"
 
 #: src/audacious/glade/prefswin.glade:1237
 msgid "Show separators in playlist"
-msgstr "Montrer les s辿parateurs dans la liste d'辿coute"
+msgstr "Afficher les barres de s辿paration dans la liste de lecture"
 
 #: src/audacious/glade/prefswin.glade:1272
 msgid "Use custom cursors"
-msgstr "Utiliser les curseurs du th竪me"
+msgstr "Utiliser des pointeurs de souris personnalis辿s"
 
 #: src/audacious/glade/prefswin.glade:1306
 msgid "This enables the window manager to show decorations for windows."
-msgstr ""
-"Ceci active le gestionnaire de fen棚tre montrant les d辿corations pour les "
-"fen棚tres."
+msgstr "Cette option affiche les ornements propres au gestionnaire de fen棚tres."
 
 #: src/audacious/glade/prefswin.glade:1308
 msgid "Show window manager decoration"
-msgstr "Montrer la d辿coration du gestionnaire de fen棚tre"
+msgstr "Montrer la d辿coration du gestionnaire de fen棚tres"
 
 #: src/audacious/glade/prefswin.glade:1342
-msgid ""
-"This enables the XMMS/GTK1-style file selection dialogs. This selector is "
-"provided by Audacious itself and is faster than the default GTK2 selector "
-"(but sadly not as user-friendly)."
-msgstr ""
-"Ceci active le dialogue de fichier de s辿lection XMMS/GTK1. Ce s辿lecteur est "
-"fourni par Audacious et est plus rapide que le s辿lecteur en GTK2 par d辿faut."
+msgid "This enables the XMMS/GTK1-style file selection dialogs. This selector is provided by Audacious itself and is faster than the default GTK2 selector (but sadly not as user-friendly)."
+msgstr "Cette option active les bo樽tes de s辿lection de fichiers 'XMMS/GTK1'. Comme ce syst竪me est g辿r辿 par Audacious, il est plus rapide que la version 'GTK2' par d辿faut. Cependant, il n'est pas tr竪s esth辿tique."
 
 #: src/audacious/glade/prefswin.glade:1344
 msgid "Use XMMS-style file selector instead of the default selector"
-msgstr "Utiliser le s辿lecteur de fichier XMMS comme le s辿lecteur par d辿faut"
+msgstr "Utiliser le syst竪me de s辿lection de fichiers de XMMS � la place du syst竪me par d辿faut"
 
 #: src/audacious/glade/prefswin.glade:1378
-msgid ""
-"If selected, the file information text in the main window will scroll back "
-"and forth. If not selected, the text will only scroll in one direction."
-msgstr ""
+msgid "If selected, the file information text in the main window will scroll back and forth. If not selected, the text will only scroll in one direction."
+msgstr "Si cette option est coch辿e, le texte d'information relatif au morceau d辿filera, dans la fen棚tre principale, vers la gauche et vers la droite. Sinon, le texte d辿filera dans une seule direction."
 
 #: src/audacious/glade/prefswin.glade:1380
 msgid "Use two-way text scroller"
-msgstr ""
+msgstr "Utiliser le d辿filement de texte bidirectionnel"
 
-#: src/audacious/glade/prefswin.glade:1422 src/audacious/ui_preferences.c:111
+#: src/audacious/glade/prefswin.glade:1422
+#: src/audacious/ui_preferences.c:111
 msgid "Appearance"
 msgstr "Apparence"
 
@@ -211,7 +196,7 @@
 
 #: src/audacious/glade/prefswin.glade:1595
 msgid "Scrolls playlist by"
-msgstr "D辿filement de la liste d'辿coute de"
+msgstr "D辿filement de la liste de lecture de"
 
 #: src/audacious/glade/prefswin.glade:1623
 msgid "percent"
@@ -219,45 +204,44 @@
 
 #: src/audacious/glade/prefswin.glade:1651
 msgid "Changes volume by"
-msgstr "Changement du volume de"
+msgstr "Ajustement du niveau sonore de"
 
-#: src/audacious/glade/prefswin.glade:1701 src/audacious/ui_preferences.c:115
+#: src/audacious/glade/prefswin.glade:1701
+#: src/audacious/ui_preferences.c:115
 msgid "Mouse"
 msgstr "Souris"
 
 #: src/audacious/glade/prefswin.glade:1748
 msgid "<b>Filename</b>"
-msgstr "<b>Nom de fichier</b>"
+msgstr "<b>Nom des fichiers</b>"
 
 #: src/audacious/glade/prefswin.glade:1788
 msgid "Convert underscores to blanks"
-msgstr "Convertir underscore en blancs"
+msgstr "Remplacer les caract竪res '__' par des espaces"
 
 #: src/audacious/glade/prefswin.glade:1823
 msgid "Convert %20 to blanks"
-msgstr "Convertir %20 en blancs"
+msgstr "Remplacer les cha樽nes '%20' par des espaces"
 
 #: src/audacious/glade/prefswin.glade:1858
 msgid "Convert backslash '\\' to forward slash '/'"
-msgstr "Convertir '\\' en '/'"
+msgstr "Remplacer les caract竪res '\\' par '/'"
 
 #: src/audacious/glade/prefswin.glade:1892
 msgid "<b>Metadata</b>"
-msgstr "<b>M辿ta-donn辿es</b>"
+msgstr "<b>M辿tadonn辿es</b>"
 
 #: src/audacious/glade/prefswin.glade:1931
 msgid "Load metadata (tag information) from music files."
-msgstr "Charger les m辿ta-donn辿es (tags) � partir des fichiers musicaux."
+msgstr "Lit les m辿tadonn辿es ('tags') des fichiers musicaux."
 
 #: src/audacious/glade/prefswin.glade:1933
 msgid "Load metadata from playlists and files"
-msgstr "Charger les m辿ta-donn辿es des listes et fichiers"
+msgstr "Lire les m辿tadonn辿es des listes de lecture et des fichiers"
 
 #: src/audacious/glade/prefswin.glade:1971
 msgid "Load metadata when adding the file to the playlist or opening it"
-msgstr ""
-"Charger les m辿ta-donn辿es quand un fichier est ajout辿 � la liste d'辿coute, ou "
-"ouvert."
+msgstr "Lit les m辿tadonn辿es lors de l'ouverture ou de l'ajout des fichiers"
 
 #: src/audacious/glade/prefswin.glade:1973
 msgid "On load"
@@ -265,9 +249,7 @@
 
 #: src/audacious/glade/prefswin.glade:1993
 msgid "Load metadata on demand when displaying the file in the playlist"
-msgstr ""
-"Charger les m辿ta-donn辿es sur demande quand le fichier s'affiche dans la "
-"liste d'辿coute."
+msgstr "Charge les m辿tadonn辿es � la demande, lors de l'affichage des fichiers dans la liste de lecture"
 
 #: src/audacious/glade/prefswin.glade:1995
 msgid "On display"
@@ -275,48 +257,35 @@
 
 #: src/audacious/glade/prefswin.glade:2025
 msgid "Auto character encoding detector for:"
-msgstr "Codage automatique d辿tect辿 pour:"
+msgstr "D辿tection automatique de l'encodage pour  "
 
 #: src/audacious/glade/prefswin.glade:2070
-msgid ""
-"List of character encodings used for fall back conversion of metadata. If "
-"automatic character encoding detector failed or has been disabled, encodings "
-"in this list would be treated as candidates of the encoding of metadata, and "
-"fall back conversion from these encodings to UTF-8 would be attempted."
-msgstr ""
-"Liste des carat竪res de codage utilis辿s pour la conversion des m辿tadonn辿es. "
-"Si la d辿tection des caract竪res de codage automatique 辿choue ou a 辿t辿 "
-"d辿sactiv辿e, les codages dans la liste seront 辿ligibles comme codage des "
-"m辿tadonn辿es, et le recours � la conversion de ces codages vers l'UTF-8 "
-"seront tent辿s."
+msgid "List of character encodings used for fall back conversion of metadata. If automatic character encoding detector failed or has been disabled, encodings in this list would be treated as candidates of the encoding of metadata, and fall back conversion from these encodings to UTF-8 would be attempted."
+msgstr "Ce champ reprend les divers types d'encodages utilis辿s pour la conversion des m辿tadonn辿es. Si la d辿tection automatique de l'encodage 辿choue ou n'a pas 辿t辿 activ辿e, les 辿l辿ments de cette liste seront consid辿r辿s comme des encodages possibles et la conversion des m辿tadonn辿es en UTF-8 sera tent辿e � partir de ces encodages."
 
 #: src/audacious/glade/prefswin.glade:2094
 msgid "Fallback character encodings:"
-msgstr "Codage suppl辿mentaire:"
+msgstr "Encodages suppl辿mentaires :"
 
 #: src/audacious/glade/prefswin.glade:2150
 msgid "<b>File Dialog</b>"
-msgstr "<b>Fen棚tre du Fichier</b>"
+msgstr "<b>Fen棚tre de s辿lection des fichiers</b>"
 
 #: src/audacious/glade/prefswin.glade:2189
-msgid ""
-"Always refresh the file dialog (this will slow opening the dialog on large "
-"directories, and Gnome VFS should handle automatically)."
-msgstr ""
-"Toujours rafraichir le dialogue de fichier (l'ouverture sera lente pour des "
-"gros r辿pertoires, et GNOME VFZ devrait le supporter automatiquement)."
+msgid "Always refresh the file dialog (this will slow opening the dialog on large directories, and Gnome VFS should handle automatically)."
+msgstr "R辿actualise syst辿matiquement l'arborescence de la bo樽te de s辿lection des fichiers (l'op辿ration peut ralentir l'ouverture de r辿pertoires contenant beaucoup de fichiers et le syst竪me 'VFS' de Gnome proc竪de d辿j� � une r辿actualisation automatique)."
 
 #: src/audacious/glade/prefswin.glade:2191
 msgid "Always refresh directory when opening file dialog"
-msgstr "Toujours rafra樽chir le r辿pertoire � l'ouverture"
+msgstr "Toujours r辿actualiser le r辿pertoire � l'ouverture de la fen棚tre"
 
 #: src/audacious/glade/prefswin.glade:2225
 msgid "<b>Song Display</b>"
-msgstr "<b>Affichage des Morceaux</b>"
+msgstr "<b>Affichage du morceau</b>"
 
 #: src/audacious/glade/prefswin.glade:2273
 msgid "Show information about titlestring format"
-msgstr "Montrer les Informations au sujet des format de titlestring"
+msgstr "Affiche des informations sur le format du titre"
 
 #: src/audacious/glade/prefswin.glade:2302
 msgid ""
@@ -338,79 +307,75 @@
 
 #: src/audacious/glade/prefswin.glade:2347
 msgid "Custom string:"
-msgstr "Format personnalis辿:"
+msgstr "Format personnalis辿 :"
 
 #: src/audacious/glade/prefswin.glade:2375
 msgid "Title format:"
-msgstr "Format du titre:"
+msgstr "Format du titre :"
 
 #: src/audacious/glade/prefswin.glade:2424
 msgid "<b>Popup Information</b>"
-msgstr "<b>Popup Information</b>"
+msgstr "<b>Fen棚tre d'informations contextuelle</b>"
 
 #: src/audacious/glade/prefswin.glade:2475
-msgid ""
-"Toggles popup information window for the pointed entry in the playlist. The "
-"window shows title of song, name of album, genre, year of publish, track "
-"number, track length, and artwork."
-msgstr ""
-"Afficher la fen棚tre d'information pour les morceaux de la liste d'辿coute. La "
-"fen棚tre montre le titre du morceau, nom de l'album, genre, ann辿e de "
-"publication, num辿ro de piste, longueur de la piste et la photo de la "
-"pochette."
+msgid "Toggles popup information window for the pointed entry in the playlist. The window shows title of song, name of album, genre, year of publish, track number, track length, and artwork."
+msgstr "Affiche une fen棚tre d'informations sur l'entr辿e de la liste de lecture point辿e par le curseur de la souris. La fen棚tre pr辿sente le titre du morceau, le nom de l'album, le genre, l'ann辿e de publication, le num辿ro de la piste, la dur辿e du morceau, ainsi que la pochette de l'album."
 
 #: src/audacious/glade/prefswin.glade:2477
 msgid "Show popup information for playlist entries"
-msgstr "Montrer les informations du popup pour l'entr辿e de la liste d'辿coute"
+msgstr "Montrer la fen棚tre d'informations pour les entr辿es de la liste de lecture"
 
 #: src/audacious/glade/prefswin.glade:2504
 msgid "Edit settings for popup information"
-msgstr "Editer la fen棚tre d'information"
+msgstr "Modifie les pr辿f辿rences de la fen棚tre d'informations contextuelle"
 
-#: src/audacious/glade/prefswin.glade:2553 src/audacious/ui_manager.c:203
-#: src/audacious/ui_playlist_manager.c:402 src/audacious/ui_preferences.c:116
+#: src/audacious/glade/prefswin.glade:2553
+#: src/audacious/ui_manager.c:203
+#: src/audacious/ui_playlist_manager.c:402
+#: src/audacious/ui_preferences.c:116
 msgid "Playlist"
-msgstr "Liste d'辿coute"
+msgstr "Liste de lecture"
 
 #: src/audacious/glade/prefswin.glade:2612
 msgid "<b>Presets</b>"
-msgstr "<b>Pr辿-r辿glages</b>"
+msgstr "<b>Pr辿r辿glages</b>"
 
 #: src/audacious/glade/prefswin.glade:2666
 msgid "File preset extension:"
-msgstr "Extension des fichiers :"
+msgstr "Extension des fichiers de pr辿r辿glages :"
 
 #: src/audacious/glade/prefswin.glade:2694
 msgid "Directory preset file:"
-msgstr "R辿pertoire du fichier :"
+msgstr "R辿pertoire des fichiers de pr辿r辿glages :"
 
 #: src/audacious/glade/prefswin.glade:2788
 msgid "Available _Presets:"
-msgstr "_Pr辿-r辿glages disponibles:"
+msgstr "_Pr辿r辿glages disponibles :"
 
-#: src/audacious/glade/prefswin.glade:2921 src/audacious/ui_preferences.c:114
+#: src/audacious/glade/prefswin.glade:2921
+#: src/audacious/ui_preferences.c:114
 msgid "Equalizer"
-msgstr "�qualiseur"
+msgstr "�galiseur"
 
 #: src/audacious/glade/prefswin.glade:2968
 msgid "<b>Proxy Configuration</b>"
-msgstr "<b>Configuration du Proxy</b>"
+msgstr "<b>Configuration du serveur mandataire</b>"
 
 #: src/audacious/glade/prefswin.glade:3026
 msgid "Enable proxy usage"
-msgstr "Activer l'usage du proxy"
+msgstr "Activer l'utilisation du serveur mandataire"
 
 #: src/audacious/glade/prefswin.glade:3103
 msgid "Proxy port:"
-msgstr "Port :"
+msgstr "Port du serveur :"
 
 #: src/audacious/glade/prefswin.glade:3131
 msgid "Proxy hostname:"
-msgstr "Nom d'h担te :"
+msgstr "Nom du serveur :"
 
 #: src/audacious/glade/prefswin.glade:3179
 msgid "Use authentication with proxy"
-msgstr "Utiliser l'authentification avec le proxy"
+msgstr "Utiliser l'authentification avec le serveur mandataire"
 
 #: src/audacious/glade/prefswin.glade:3256
 msgid "Proxy password:"
@@ -421,12 +386,8 @@
 msgstr "Nom d'utilisateur :"
 
 #: src/audacious/glade/prefswin.glade:3354
-msgid ""
-"<span size=\"small\">Changing these settings will require a restart of "
-"Audacious.</span>"
-msgstr ""
-"<span size=\"small\">Modifier ces pr辿f辿rences requiert le red辿marrage "
-"d'Audacious.</span>"
+msgid "<span size=\"small\">Changing these settings will require a restart of Audacious.</span>"
+msgstr "<span size=\"small\">La modification de ces pr辿f辿rences n辿cessite le red辿marrage d'Audacious.</span>"
 
 #: src/audacious/glade/prefswin.glade:3493
 msgid "<b>Audio System</b>"
@@ -438,88 +399,69 @@
 
 #: src/audacious/glade/prefswin.glade:3593
 msgid ""
-"<span size=\"small\">This is the amount of time to prebuffer audio streams "
-"by, in milliseconds.\n"
+"<span size=\"small\">This is the amount of time to prebuffer audio streams by, in milliseconds.\n"
 "Increase this value if you are experiencing audio skipping.\n"
-"Please note however, that high values will result in Audacious performing "
-"poorly.</span>"
+"Please note however, that high values will result in Audacious performing poorly.</span>"
 msgstr ""
-"<span size=\"small\">Ceci est la taille de temps du tampon audio en cours, "
-"en milisecondes.\n"
-"Augmentez cette valeur si vous 棚tes un utilisateur averti.\n"
-"Veuillez noter cependant, que une valeur haute d辿t辿riorera les performances "
-"d'Audacious.</span>"
+"<span size=\"small\">Ce champ d辿termine la dur辿e du tampon � allouer aux flux, en millisecondes.\n"
+"Augmentez cette valeur, si la lecture du flux est saccad辿e.\n"
+"Sachez, toutefois, que des valeurs 辿lev辿es d辿t辿rioreront les performances d'Audacious.</span>"
 
 #: src/audacious/glade/prefswin.glade:3663
 msgid "Current output plugin:"
-msgstr "Greffon de sortie"
+msgstr "Module de sortie actuel :"
 
 #: src/audacious/glade/prefswin.glade:3769
 msgid "Output Plugin Preferences"
-msgstr "Pr辿f辿rences"
+msgstr "Pr辿f辿rences du module"
 
 #: src/audacious/glade/prefswin.glade:3844
 msgid "Output Plugin Information"
-msgstr "Informations"
+msgstr "Informations sur le module"
 
 #: src/audacious/glade/prefswin.glade:3896
 msgid "<b>Format Detection</b>"
-msgstr "<b>D辿tection du Format</b>"
+msgstr "<b>D辿tection du format audio</b>"
 
 #: src/audacious/glade/prefswin.glade:3935
-msgid ""
-"When checked, Audacious will detect file formats on demand. This can result "
-"in a messier playlist, but delivers a major speed benefit."
-msgstr ""
-"Si coch辿, Audacious d辿tectera les formats de fichier sur demande. Ceci peut "
-"avoir pour r辿sultat une liste d'辿coute incoh辿rente, mais avec une rapidit辿 "
-"d'affichage accrue."
+msgid "When checked, Audacious will detect file formats on demand. This can result in a messier playlist, but delivers a major speed benefit."
+msgstr "Si cette option est activ辿e, Audacious d辿tectera les formats audio � la demande. Cette m辿thode peut affecter l'organisation de la liste de lecture, mais elle offre une rapidit辿 sensiblement sup辿rieure."
 
 #: src/audacious/glade/prefswin.glade:3937
 msgid "Detect file formats on demand, instead of immediately."
-msgstr "D辿tecter et afficher le format de fichier (affichage rapide)."
+msgstr "D辿terminer les formats audio � la demande, au lieu de les d辿tecter imm辿diatement."
 
 #: src/audacious/glade/prefswin.glade:3971
-msgid ""
-"When checked, Audacious will detect file formats based by extension. This is "
-"slightly slower than detection on demand, but still provides a minimal level "
-"of format detection."
-msgstr ""
-"Si coch辿, Audacious d辿tectera les formats de fichier bas辿s sur les "
-"extension. Ceci sera l辿g竪rement plus lent que la d辿tection sur demande."
+msgid "When checked, Audacious will detect file formats based by extension. This is slightly slower than detection on demand, but still provides a minimal level of format detection."
+msgstr "Si cette option est activ辿e, Audacious d辿tectera les formats audio d'apr竪s l'extension des fichiers. Cette m辿thode est un peu plus lente que la d辿tection � la demande, mais elle offre un certain niveau de d辿tection."
 
 #: src/audacious/glade/prefswin.glade:3973
 msgid "Detect file formats by extension."
-msgstr "D辿tecter les formats de fichier par extension."
+msgstr "D辿terminer les formats audio en fonction de l'extension des fichiers."
 
 #: src/audacious/glade/prefswin.glade:4007
 msgid "<b>Playback</b>"
-msgstr "<b>Encha樽nement</b>"
+msgstr "<b>Lecture</b>"
 
 #: src/audacious/glade/prefswin.glade:4046
-msgid ""
-"When Audacious starts, automatically begin playing from the point where we "
-"stopped before."
-msgstr ""
-"Quand Audacious d辿marre, commencer la lecture automatiquement au dernier "
-"endroit lu."
+msgid "When Audacious starts, automatically begin playing from the point where we stopped before."
+msgstr "Au d辿marrage d'Audacious, la lecture reprendra l� o湛 elle s'辿tait arr棚t辿e lors de la session pr辿c辿dente."
 
 #: src/audacious/glade/prefswin.glade:4048
 msgid "Continue playback on startup"
-msgstr "Poursuivre la lecture au d辿marrage"
+msgstr "Reprendre la lecture au d辿marrage"
 
 #: src/audacious/glade/prefswin.glade:4082
 msgid "When finished playing a song, don't automatically advance to the next."
-msgstr ""
-"Quand un morceau est termin辿, ne pas lire automatiquement le morceau suivant."
+msgstr "� la fin d'un morceau, ne pas lire automatiquement le titre suivant."
 
 #: src/audacious/glade/prefswin.glade:4084
 msgid "Don't advance in the playlist"
-msgstr "Ne pas avancer dans la liste"
+msgstr "Ne pas avancer dans la liste de lecture"
 
 #: src/audacious/glade/prefswin.glade:4119
 msgid "Pause between songs"
-msgstr "Pause entre chaque morceau"
+msgstr "Pause entre les morceaux"
 
 #: src/audacious/glade/prefswin.glade:4157
 msgid "Pause for"
@@ -531,15 +473,15 @@
 
 #: src/audacious/glade/prefswin.glade:4249
 msgid "<b>Sampling Rate Converter</b>"
-msgstr "<b>Convertion du taux d'辿chantillonage</b>"
+msgstr "<b>Conversion du taux d'辿chantillonnage</b>"
 
 #: src/audacious/glade/prefswin.glade:4289
 msgid "Enable Sampling Rate Converter"
-msgstr "Activer la convertion du taux d'辿chantillonage"
+msgstr "Activer la conversion du taux d'辿chantillonnage"
 
 #: src/audacious/glade/prefswin.glade:4361
 msgid "Interpolation Engine:"
-msgstr ""
+msgstr "Algorithme d'interpolation :"
 
 #: src/audacious/glade/prefswin.glade:4389
 msgid ""
@@ -547,51 +489,41 @@
 "This should be the max supported sampling rate of\n"
 "the sound card or output plugin.</span>"
 msgstr ""
-"<span size=\"small\">Tous les streams seront convertis avec ce taux "
-"d'辿chantillonage.\n"
-"Ce taux est le taux d'辿chantillonage maximum de\n"
-"la carte son ou du greffon audio.</span>"
+"<span size=\"small\">Tous les flux seront convertis dans le taux sp辿cifi辿.\n"
+"Id辿alement, ce taux devrait correspondre au taux d'辿chantillonnage\n"
+"maximal que supporte la carte son ou le module d'extension de sortie.</span>"
 
 #: src/audacious/glade/prefswin.glade:4461
 msgid "Sampling Rate [Hz]:"
-msgstr "Taux d'Echantillonage [Hz]:"
+msgstr "Taux d'辿chantillonnage [Hz] :"
 
 #: src/audacious/glade/prefswin.glade:4517
-#, fuzzy
 msgid "<b>Volume Control</b>"
-msgstr "<b>Molette de la souris</b>"
+msgstr "<b>Contr担le du volume</b>"
 
 #: src/audacious/glade/prefswin.glade:4556
-msgid ""
-"Use software volume control. This may be useful for situations where your "
-"audio system does not support controlling the playback volume."
-msgstr ""
+msgid "Use software volume control. This may be useful for situations where your audio system does not support controlling the playback volume."
+msgstr "Utilise le contr担le du volume logiciel. Cette option peut se r辿v辿ler utile, si votre syst竪me audio ne dispose pas de support de contr担le du volume."
 
 #: src/audacious/glade/prefswin.glade:4558
 msgid "Use software volume control"
-msgstr ""
+msgstr "Utiliser le contr担le du volume logiciel"
 
 #: src/audacious/glade/prefswin.glade:4746
 msgid "Reload Plugins"
-msgstr "Recharger Greffons"
+msgstr "Recharger les modules"
 
 #: src/audacious/glade/prefswin.glade:4807
 msgid "Popup Information Settings"
-msgstr "Configuration des informations Popup"
+msgstr "Pr辿f辿rences de la fen棚tre contextuelle"
 
 #: src/audacious/glade/prefswin.glade:4831
 msgid "<b>Cover image retrieve</b>"
-msgstr "<b>R辿cup辿ration de l'Image</b>"
+msgstr "<b>R辿cup辿ration des pochettes</b>"
 
 #: src/audacious/glade/prefswin.glade:4856
-msgid ""
-"While searching for the album's cover, Audacious looks for certain words in "
-"the filename. You can specify those words in the lists below, separated "
-"using commas."
-msgstr ""
-"Pendant la recherche d'une pochette d'album, Audacious recherche certains "
-"mots dans le nom du fichier. Vous pouvez sp辿cifier ces mots dans les listes "
-"en dessous, s辿par辿s par des virgules."
+msgid "While searching for the album's cover, Audacious looks for certain words in the filename. You can specify those words in the lists below, separated using commas."
+msgstr "Lors de la recherche de la pochette d'un album, Audacious v辿rifie certains mots dans le nom du fichier. Vous pouvez sp辿cifier ces mots dans les listes ci-dessous, s辿par辿s par des virgules."
 
 #: src/audacious/glade/prefswin.glade:4911
 msgid "Exclude:"
@@ -603,15 +535,15 @@
 
 #: src/audacious/glade/prefswin.glade:5008
 msgid "Recursively search for cover"
-msgstr "Chercher r辿cursivement les pochettes"
+msgstr "Chercher les pochettes de mani竪re r辿cursive"
 
 #: src/audacious/glade/prefswin.glade:5046
 msgid "Search depth: "
-msgstr "Chercher:"
+msgstr "Profondeur de la recherche :"
 
 #: src/audacious/glade/prefswin.glade:5112
 msgid "Use per-file cover"
-msgstr "Utiliser une pochette par fichier"
+msgstr "Chercher les pochettes d'apr竪s le nom exact des fichiers audio"
 
 #: src/audacious/glade/prefswin.glade:5132
 msgid "<b>Miscellaneous</b>"
@@ -619,23 +551,19 @@
 
 #: src/audacious/glade/prefswin.glade:5170
 msgid "Show Progress bar for the current track"
-msgstr "Voir la barre de progression de la piste courante"
+msgstr "Montrer une barre de progression pour le morceau 辿cout辿"
 
 #: src/audacious/glade/prefswin.glade:5208
 msgid "Delay until filepopup comes up: "
-msgstr "D辿lai avant affichage:"
+msgstr "D辿lai avant l'affichage de la fen棚tre :"
 
 #: src/audacious/glade/prefswin.glade:5302
 msgid "Color Adjustment"
-msgstr "Ajustement de la Couleur"
+msgstr "Ajustement des couleurs"
 
 #: src/audacious/glade/prefswin.glade:5325
-msgid ""
-"Audacious allows you to alter the color balance of the skinned UI. The "
-"sliders below will allow you to do this."
-msgstr ""
-"Audacious vous permet d'alt辿rer la balance des couleurs de l'Interface "
-"Utilisateur skinn辿. Le curseur ci-dessous vous permettra de le faire."
+msgid "Audacious allows you to alter the color balance of the skinned UI. The sliders below will allow you to do this."
+msgstr "Audacious permet de modifier la balance des couleurs de l'interface, � l'aide des curseurs ci-dessous."
 
 #: src/audacious/glade/prefswin.glade:5359
 msgid "Blue"
@@ -652,27 +580,29 @@
 #: src/audacious/input.c:627
 #, c-format
 msgid "audacious: %s"
-msgstr "audacious: %s"
+msgstr "audacious : %s"
 
 #: src/audacious/input.c:643
 msgid "Filename:"
-msgstr "Nom du fichier:"
+msgstr "Nom du fichier :"
 
 #: src/audacious/input.c:662
 msgid "No input plugin recognized this file"
-msgstr "Aucun greffon d'entr辿e ne supporte ce type de fichier"
+msgstr "Aucun module d'entr辿e ne supporte ce type de fichier."
 
 #: src/audacious/input.c:664
 #, c-format
 msgid "Input plugin: %s"
-msgstr "Greffon d'entr辿e: %s"
+msgstr "Module d'entr辿e : %s"
 
 #: src/audacious/logger.c:125
 #, c-format
 msgid "Unable to create log file (%s)!\n"
-msgstr "Impossible d'辿crire le fichier de log (%s)!\n"
+msgstr "Impossible de cr辿er le fichier journal (%s)!\n"
 
-#: src/audacious/main.c:90 src/audacious/main.c:92 src/audacious/ui_main.c:491
+#: src/audacious/main.c:90
+#: src/audacious/main.c:92
+#: src/audacious/ui_main.c:491
 #: src/audacious/ui_main.c:2466
 msgid "Audacious"
 msgstr "Audacious"
@@ -684,43 +614,43 @@
 
 #: src/audacious/main.c:1065
 msgid "Select which Audacious session ID to use"
-msgstr "S辿lectionner la session Audacious (Par d辿faut: 0)"
+msgstr "Choisir l'identifiant de la session Audacious � utiliser"
 
 #: src/audacious/main.c:1066
 msgid "Skip backwards in playlist"
-msgstr "Recule dans la liste d'辿coute"
+msgstr "Reculer dans la liste d'辿coute"
 
 #: src/audacious/main.c:1067
 msgid "Start playing current playlist"
-msgstr "Commence � jouer la liste d'辿coute courante"
+msgstr "Commencer � lire la liste de lecture active"
 
 #: src/audacious/main.c:1068
 msgid "Pause current song"
-msgstr "Met en pause la lecture du morceau"
+msgstr "Mettre en pause la chanson en cours de lecture"
 
 #: src/audacious/main.c:1069
 msgid "Stop current song"
-msgstr "Stoppe la lecture du morceau"
+msgstr "Arr棚ter la chanson en cours de lecture"
 
 #: src/audacious/main.c:1070
 msgid "Pause if playing, play otherwise"
-msgstr "Met en pause sinon joue le morceau"
+msgstr "Mettre en pause, sinon commencer la lecture"
 
 #: src/audacious/main.c:1071
 msgid "Skip forward in playlist"
-msgstr "Avance dans la liste d'辿coute"
+msgstr "Avancer dans la liste de lecture"
 
 #: src/audacious/main.c:1072
 msgid "Display Jump to File dialog"
-msgstr "Afficher le Saut vers le Dialogue de Fichier"
+msgstr "Afficher la fen棚tre 'Aller au fichier...'"
 
 #: src/audacious/main.c:1073
 msgid "Don't clear the playlist"
-msgstr "Ne vide pas la liste d'辿coute"
+msgstr "Ne pas effacer la liste de lecture"
 
 #: src/audacious/main.c:1074
 msgid "Add new files to a temporary playlist"
-msgstr "Ajouter de nouveaux fichiers � la liste d'辿coute"
+msgstr "Ajouter les nouveaux fichiers � une liste de lecture provisoire"
 
 #: src/audacious/main.c:1075
 msgid "Display the main window"
@@ -728,19 +658,19 @@
 
 #: src/audacious/main.c:1076
 msgid "Display all open Audacious windows"
-msgstr "Afficher toutes les fen棚tres ouvertes"
+msgstr "Afficher toutes les fen棚tres ouvertes d'Audacious"
 
 #: src/audacious/main.c:1077
 msgid "Enable headless operation"
-msgstr ""
+msgstr "Activer le mode 'serveur'"
 
 #: src/audacious/main.c:1078
 msgid "Print all errors and warnings to stdout"
-msgstr "Imprimer toutes les erreurs et avertissements vers stdout"
+msgstr "Afficher toutes les erreurs et tous les avertissements dans 'stdout'"
 
 #: src/audacious/main.c:1079
 msgid "Show version and builtin features"
-msgstr "Montrer les caract辿ristiques de version et construction"
+msgstr "Afficher le num辿ro de version et les notes de compilation"
 
 #: src/audacious/main.c:1080
 msgid "FILE..."
@@ -751,30 +681,27 @@
 msgid ""
 "<b><big>Unable to load skin.</big></b>\n"
 "\n"
-"Check that skin at '%s' is usable and default skin is properly installed at "
-"'%s'\n"
+"Check that skin at '%s' is usable and default skin is properly installed at '%s'\n"
 msgstr ""
 "<b><big>Impossible de charger le th竪me.</big></b>\n"
 "\n"
-"V辿rifier que le th竪me '%s' soit correct et que le th竪me par d辿faut soit bien "
-"install辿 dans '%s'\n"
+"V辿rifier que le th竪me '%s' est valide et que le th竪me par d辿faut est bien install辿 dans '%s'\n"
 
 #: src/audacious/main.c:1320
 msgid ""
 "Sorry, threads isn't supported on your platform.\n"
 "\n"
-"If you're on a libc5 based linux system and installed Glib & GTK+ before "
-"you\n"
+"If you're on a libc5 based linux system and installed Glib & GTK+ before you\n"
 "installed LinuxThreads you need to recompile Glib & GTK+.\n"
 msgstr ""
-"D辿sol辿, les threads ne sont pas support辿s par votre syst竪me d'exploitation.\n"
+"D辿sol辿, mais votre plate-forme ne g竪re pas les processus multiples.\n"
 "\n"
-"Si vous 棚tes sur un syst竪me Linux bas辿 sur libc5 et que vous avez install辿 \n"
-"GLIB et GTK+ avant les LinuxThreads, vous devez recompiler GLIB et GTK+.\n"
+"Si vous utilisez un syst竪me Linux bas辿 sur 'libc5' et que vous avez install辿\n"
+"'Glib' et 'GTK+' avant 'LinuxThreads', vous devez recompiler 'Glib' et 'GTK+'.\n"
 
 #: src/audacious/main.c:1351
 msgid "- play multimedia files"
-msgstr "- jouer les fichiers multim辿dia"
+msgstr "- lire les fichiers multim辿dia"
 
 #: src/audacious/main.c:1358
 #, c-format
@@ -783,20 +710,20 @@
 "Try `%s --help' for more information.\n"
 msgstr ""
 "%s: %s\n"
-"Essayer `%s --help' pour plus d'information.\n"
+"Essayez '%s --help' pour davantage d'informations.\n"
 
 #: src/audacious/main.c:1368
 #, c-format
 msgid "%s: Unable to open display, exiting.\n"
-msgstr "%s : Impossible d'acc辿der � la session d'affichage.\n"
+msgstr "%s: Impossible d'acc辿der � la session d'affichage.\n"
 
 #: src/audacious/playback.c:343
 msgid ""
 "<b><big>No output plugin selected.</big></b>\n"
 "You have not selected an output plugin."
 msgstr ""
-"<b><big>Pas de greffon de sortie s辿lectionn辿s</big></b>\n"
-"Vous n'avez pas s辿lectionn辿 de greffon de sortie."
+"<b><big>Aucun module de sortie n'a 辿t辿 s辿lectionn辿.</big></b>\n"
+"Vous n'avez pas choisi de module de sortie audio."
 
 #: src/audacious/signals.c:49
 msgid ""
@@ -804,48 +731,41 @@
 "Audacious has caught signal 11 (SIGSEGV).\n"
 "\n"
 "We apologize for the inconvenience, but Audacious has crashed.\n"
-"This is a bug in the program, and should never happen under normal "
-"circumstances.\n"
+"This is a bug in the program, and should never happen under normal circumstances.\n"
 "Your current configuration has been saved and should not be damaged.\n"
 "\n"
-"You can help improve the quality of Audacious by filing a bug at http://bugs-"
-"meta.atheme.org\n"
-"Please include the entire text of this message and a description of what you "
-"were doing when\n"
-"this crash occured in order to quickly expedite the handling of your bug "
-"report:\n"
+"You can help improve the quality of Audacious by filing a bug at http://bugs-meta.atheme.org\n"
+"Please include the entire text of this message and a description of what you were doing when\n"
+"this crash occured in order to quickly expedite the handling of your bug report:\n"
 "\n"
 msgstr ""
 "\n"
-"Audacious a re巽u un signal 11 (SIGSEGV).\n"
-"\n"
-"Nous nous excusons pour ce d辿sagr辿ment, mais Audacious a plant辿.\n"
-"C'est un bug du programme qui ne devrait pas arriver dans des circonstances "
-"normales.\n"
-"Votre configuration courante a 辿t辿 sauv辿e et ne sera pas endommag辿e.\n"
+"Audacious a re巽u un signal 11 ('SIGSEGV').\n"
 "\n"
-"Vous pouvez aider � am辿liorer la qualit辿 d'Audacious en remontant un bug sur "
-"http://bugs-meta.atheme.org\n"
-"Veuillez joindre le texte entier du message et une description de ce que "
-"vous faisiez quand\n"
-"le plantage s'est produit pour nous occuper rapidement de votre rapport de "
-"bug.\n"
+"Nous sommes d辿sol辿s pour ce d辿sagr辿ment, mais la session d'Audacious s'est interrompue.\n"
+"La situation r辿sulte d'une erreur dans Audacious : elle ne devrait pas survenir dans des conditions normales.\n"
+"Votre configuration actuelle a toutefois 辿t辿 enregistr辿e : elle ne devrait pas avoir 辿t辿 alt辿r辿e.\n"
+"\n"
+"Vous pouvez nous aider � am辿liorer la qualit辿 d'Audacious en soumettant cette erreur � l'adresse suivante : http://bugs-meta.atheme.org\n"
+"Veillez � joindre le message suivant � votre rapport, ainsi qu'une description (en anglais) de ce que vous faisiez\n"
+"lorsque cette erreur s'est produite, de mani竪re � ce que nous puissions traiter votre rapport dans les plus brefs d辿lais :\n"
+"\n"
 
 #: src/audacious/signals.c:80
 msgid ""
 "\n"
-"Bugs can be reported at http://bugs-meta.atheme.org against the Audacious "
-"product.\n"
+"Bugs can be reported at http://bugs-meta.atheme.org against the Audacious product.\n"
 msgstr ""
 "\n"
-"Les bugs peuvent 棚tre rapport辿s sur http://bugs-meta.atheme.org dans la "
-"cat辿gorie Audacious.\n"
+"Les erreurs relatives � Audacious peuvent 棚tre soumises � l'adresse suivantes : http://bugs-meta.atheme.org\n"
 
 #: src/audacious/signals.c:266
 msgid ""
 "Your signaling implementation is broken.\n"
 "Expect unusable crash reports.\n"
 msgstr ""
+"Le syst竪me de gestion des signaux d'erreur de votre syst竪me semble corrompu.\n"
+"Attendez-vous � des rapports d'erreurs inutilisables.\n"
 
 #: src/audacious/strings.c:170
 msgid "  (invalid UTF-8)"
@@ -859,21 +779,23 @@
 "Copyright (C) 2005-2007 Audacious Development Team"
 msgstr ""
 "<big><b>Audacious %s</b></big>\n"
-"Le futur du multim辿dia sous UNIX\n"
 "\n"
-"Copyright (C) 2005-2006 L'辿quipe de d辿veloppement d'Audacious"
+"Droits d'utilisation (C) 2005-2007, �quipe de D辿veloppement Audacious"
 
-#: src/audacious/ui_about.c:125 src/audacious/ui_credits.c:357
-#: src/audacious/ui_manager.c:391 src/audacious/ui_manager.c:392
+#: src/audacious/ui_about.c:125
+#: src/audacious/ui_credits.c:357
+#: src/audacious/ui_manager.c:391
+#: src/audacious/ui_manager.c:392
 msgid "About Audacious"
-msgstr "� Propos d'Audacious"
+msgstr "� propos d'Audacious"
 
-#: src/audacious/ui_about.c:174 src/audacious/ui_credits.c:400
+#: src/audacious/ui_about.c:174
+#: src/audacious/ui_credits.c:400
 msgid "Credits"
 msgstr "Cr辿dits"
 
 #: src/audacious/ui_credits.c:47
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<big><b>Audacious %s</b></big>\n"
 "A skinned multimedia player for many platforms.\n"
@@ -881,65 +803,65 @@
 "Copyright (C) 2005-2007 Audacious Development Team\n"
 msgstr ""
 "<big><b>Audacious %s</b></big>\n"
-"Le futur du multim辿dia sous UNIX.\n"
+"Un lecteur multimedia personnalisable, disponible pour de nombreuses plateformes.\n"
 "\n"
-"Copyright (C) 2005-2006 L'辿quipe de d辿veloppement d'Audacious\n"
+"Droits d'utilisation : (C) 2005-2007, �quipe de D辿veloppement Audacious\n"
 
 #: src/audacious/ui_credits.c:53
 msgid "Audacious core developers:"
-msgstr "D辿veloppeurs:"
+msgstr "D辿veloppeurs du noyau :"
 
 #: src/audacious/ui_credits.c:71
 msgid "Graphics:"
-msgstr "Graphismes:"
+msgstr "Graphismes :"
 
 #: src/audacious/ui_credits.c:76
 msgid "Default skin:"
-msgstr "Th竪me par d辿faut:"
+msgstr "Th竪me par d辿faut :"
 
 #: src/audacious/ui_credits.c:81
 msgid "Plugin development:"
-msgstr "D辿veloppement des greffons:"
+msgstr "D辿veloppeurs des modules :"
 
 #: src/audacious/ui_credits.c:97
 msgid "Patch authors:"
-msgstr "Auteurs de patchs:"
+msgstr "Modifications/correctifs :"
 
 #: src/audacious/ui_credits.c:117
 msgid "0.1.x developers:"
-msgstr "D辿veloppeurs de la version 0.1.x:"
+msgstr "D辿veloppeurs de la branche 0.1.x :"
 
 #: src/audacious/ui_credits.c:123
 msgid "BMP Developers:"
-msgstr "D辿veloppeurs de BMP:"
+msgstr "D辿veloppeurs de BMP :"
 
 #: src/audacious/ui_credits.c:155
 msgid "Brazilian Portuguese:"
-msgstr "Br辿silien:"
+msgstr "Br辿silien portugais :"
 
 #: src/audacious/ui_credits.c:159
 msgid "Breton:"
-msgstr "Breton:"
+msgstr "Breton :"
 
 #: src/audacious/ui_credits.c:162
 msgid "Bulgarian:"
-msgstr "Bulgare:"
+msgstr "Bulgare :"
 
 #: src/audacious/ui_credits.c:165
 msgid "Catalan:"
-msgstr "Catalan:"
+msgstr "Catalan :"
 
 #: src/audacious/ui_credits.c:168
 msgid "Croatian:"
-msgstr "Croate:"
+msgstr "Croate :"
 
 #: src/audacious/ui_credits.c:171
 msgid "Czech:"
-msgstr "Tch竪que:"
+msgstr "Tch竪que :"
 
 #: src/audacious/ui_credits.c:174
 msgid "Dutch:"
-msgstr "N辿erlandais:"
+msgstr "N辿erlandais :"
 
 #: src/audacious/ui_credits.c:178
 msgid "Finnish:"
@@ -947,91 +869,91 @@
 
 #: src/audacious/ui_credits.c:181
 msgid "French:"
-msgstr "Fran巽ais:"
+msgstr "Fran巽ais :"
 
 #: src/audacious/ui_credits.c:185
 msgid "German:"
-msgstr "Allemand:"
+msgstr "Allemand :"
 
 #: src/audacious/ui_credits.c:190
 msgid "Georgian:"
-msgstr "G辿orgien:"
+msgstr "G辿orgien :"
 
 #: src/audacious/ui_credits.c:193
 msgid "Greek:"
-msgstr "Grec:"
+msgstr "Grec :"
 
 #: src/audacious/ui_credits.c:198
 msgid "Hindi:"
-msgstr "Hindi:"
+msgstr "Hindi :"
 
 #: src/audacious/ui_credits.c:201
 msgid "Hungarian:"
-msgstr "Hongrois:"
+msgstr "Hongrois :"
 
 #: src/audacious/ui_credits.c:204
 msgid "Italian:"
-msgstr "Italien:"
+msgstr "Italien :"
 
 #: src/audacious/ui_credits.c:208
 msgid "Japanese:"
-msgstr "Japonais:"
+msgstr "Japonais :"
 
 #: src/audacious/ui_credits.c:211
 msgid "Korean:"
-msgstr "Cor辿en:"
+msgstr "Kor辿enn :"
 
 #: src/audacious/ui_credits.c:214
 msgid "Lithuanian:"
-msgstr "Lituanien:"
+msgstr "Lituanien :"
 
 #: src/audacious/ui_credits.c:217
 msgid "Macedonian:"
-msgstr "Mac辿donien:"
+msgstr "Mac辿donien :"
 
 #: src/audacious/ui_credits.c:220
 msgid "Polish:"
-msgstr "Polonais:"
+msgstr "Polonais :"
 
 #: src/audacious/ui_credits.c:223
 msgid "Romanian:"
-msgstr "Roumain:"
+msgstr "Roumain :"
 
 #: src/audacious/ui_credits.c:227
 msgid "Russian:"
-msgstr "Russe:"
+msgstr "Russe :"
 
 #: src/audacious/ui_credits.c:230
 msgid "Serbian (Latin):"
-msgstr "Serbe (Latin):"
+msgstr "Serbe (latin) :"
 
 #: src/audacious/ui_credits.c:233
 msgid "Serbian (Cyrillic):"
-msgstr "Serbe (Cyrillic):"
+msgstr "Serbe (cyrillique) :"
 
 #: src/audacious/ui_credits.c:236
 msgid "Simplified Chinese:"
-msgstr "Chinois Simplifi辿:"
+msgstr "Chinois simplifi辿 :"
 
 #: src/audacious/ui_credits.c:239
 msgid "Slovak:"
-msgstr "Slovaque:"
+msgstr "Slovaque :"
 
 #: src/audacious/ui_credits.c:242
 msgid "Spanish:"
-msgstr "Espagnol:"
+msgstr "Espagnol :"
 
 #: src/audacious/ui_credits.c:245
 msgid "Swedish:"
-msgstr "Su辿dois:"
+msgstr "Su辿dois :"
 
 #: src/audacious/ui_credits.c:248
 msgid "Traditional Chinese:"
-msgstr "Chinois Traditionnel:"
+msgstr "Chinois traditionnel :"
 
 #: src/audacious/ui_credits.c:251
 msgid "Turkish:"
-msgstr "Turque:"
+msgstr "Turc :"
 
 #: src/audacious/ui_credits.c:255
 msgid "Ukrainian:"
@@ -1039,7 +961,7 @@
 
 #: src/audacious/ui_credits.c:258
 msgid "Welsh:"
-msgstr "Gallois:"
+msgstr "Gallois :"
 
 #: src/audacious/ui_credits.c:404
 msgid "Translators"
@@ -1047,53 +969,59 @@
 
 #: src/audacious/ui_equalizer.c:535
 msgid "Audacious Equalizer"
-msgstr "�qualiseur"
+msgstr "�galiseur d'Audacious"
 
 #: src/audacious/ui_equalizer.c:1169
 msgid "Presets"
-msgstr "Pr辿-r辿glages"
+msgstr "Pr辿r辿glages"
 
 #: src/audacious/ui_fileinfo.c:158
 msgid "Track Information Window"
-msgstr "Fen棚tre d'information de la piste"
+msgstr "Fen棚tre d'informations sur le morceau"
 
-#: src/audacious/ui_fileinfopopup.c:252 src/audacious/ui_fileinfopopup.c:364
+#: src/audacious/ui_fileinfopopup.c:252
+#: src/audacious/ui_fileinfopopup.c:364
 #: src/audacious/ui_preferences.c:125
 msgid "Title"
 msgstr "Titre"
 
-#: src/audacious/ui_fileinfopopup.c:255 src/audacious/ui_preferences.c:123
+#: src/audacious/ui_fileinfopopup.c:255
+#: src/audacious/ui_preferences.c:123
 msgid "Artist"
 msgstr "Artiste"
 
-#: src/audacious/ui_fileinfopopup.c:258 src/audacious/ui_preferences.c:124
+#: src/audacious/ui_fileinfopopup.c:258
+#: src/audacious/ui_preferences.c:124
 msgid "Album"
 msgstr "Album"
 
-#: src/audacious/ui_fileinfopopup.c:261 src/audacious/ui_preferences.c:127
+#: src/audacious/ui_fileinfopopup.c:261
+#: src/audacious/ui_preferences.c:127
 msgid "Genre"
 msgstr "Genre"
 
-#: src/audacious/ui_fileinfopopup.c:264 src/audacious/ui_preferences.c:131
+#: src/audacious/ui_fileinfopopup.c:264
+#: src/audacious/ui_preferences.c:131
 msgid "Year"
 msgstr "Ann辿e"
 
 #: src/audacious/ui_fileinfopopup.c:267
 msgid "Track Number"
-msgstr "Num辿ro de Piste"
+msgstr "Piste"
 
 #: src/audacious/ui_fileinfopopup.c:271
 msgid "Track Length"
-msgstr "Dur辿e du Morceau"
+msgstr "Dur辿e"
 
-#: src/audacious/ui_fileinfopopup.c:373 src/audacious/ui_preferences.c:128
+#: src/audacious/ui_fileinfopopup.c:373
+#: src/audacious/ui_preferences.c:128
 #: src/audacious/ui_preferences.c:420
 msgid "Filename"
 msgstr "Nom du fichier"
 
 #: src/audacious/ui_fileopener.c:127
 msgid "Open Files"
-msgstr "Ouvrir les fichiers"
+msgstr "Ouvrir des fichiers"
 
 #: src/audacious/ui_fileopener.c:127
 msgid "Add Files"
@@ -1101,43 +1029,46 @@
 
 #: src/audacious/ui_fileopener.c:129
 msgid "Close dialog on Open"
-msgstr "Fermer la fen棚tre apr竪s l'ouverture"
+msgstr "Fermer la fen棚tre apr竪s l'ouverture des fichiers"
 
 #: src/audacious/ui_fileopener.c:129
 msgid "Close dialog on Add"
-msgstr "Fermer la fen棚tre apr竪s l'ajout"
+msgstr "Fermer la fen棚tre apr竪s l'ajout des fichiers"
 
 #: src/audacious/ui_fileopener.c:356
 msgid "Play files"
-msgstr "Jouer les fichiers"
+msgstr "Lire des fichiers"
 
 #: src/audacious/ui_fileopener.c:358
 msgid "Load files"
-msgstr "Charger les fichiers"
+msgstr "Charger des fichiers"
 
 #: src/audacious/ui_jumptotrack.c:138
 msgid "Un_queue"
-msgstr "_Retirer de la file"
+msgstr "Enlever de la file d'attente"
 
-#: src/audacious/ui_jumptotrack.c:140 src/audacious/ui_jumptotrack.c:603
+#: src/audacious/ui_jumptotrack.c:140
+#: src/audacious/ui_jumptotrack.c:603
 msgid "_Queue"
 msgstr "_Mettre dans la file"
 
 #: src/audacious/ui_jumptotrack.c:518
 msgid "Jump to Track"
-msgstr "Aller au morceau"
+msgstr "Aller au morceau..."
 
 #: src/audacious/ui_jumptotrack.c:559
 msgid "Filter: "
-msgstr "Filtre:"
+msgstr "Filtre :"
 
 #: src/audacious/ui_jumptotrack.c:560
 msgid "_Filter:"
-msgstr "_Filtre:"
+msgstr "_Filtre :"
 
 #: src/audacious/ui_jumptotrack.c:594
 msgid "Close on Jump"
-msgstr "Fermer"
+msgstr ""
+"Fermeture apr竪s\n"
+"la s辿lection"
 
 #: src/audacious/ui_main.c:489
 #, c-format
@@ -1148,18 +1079,21 @@
 msgid "VBR"
 msgstr "VBR"
 
-#: src/audacious/ui_main.c:761 src/audacious/ui_main.c:765
+#: src/audacious/ui_main.c:761
+#: src/audacious/ui_main.c:765
 msgid "stereo"
 msgstr "st辿r辿o"
 
-#: src/audacious/ui_main.c:761 src/audacious/ui_main.c:765
+#: src/audacious/ui_main.c:761
+#: src/audacious/ui_main.c:765
 msgid "mono"
 msgstr "mono"
 
-#: src/audacious/ui_main.c:1060 src/audacious/ui_manager.c:420
+#: src/audacious/ui_main.c:1060
+#: src/audacious/ui_manager.c:420
 #: src/audacious/ui_manager.c:421
 msgid "Jump to Time"
-msgstr "Aller au Temps"
+msgstr "Aller au temps..."
 
 #: src/audacious/ui_main.c:1081
 msgid "minutes:seconds"
@@ -1167,15 +1101,15 @@
 
 #: src/audacious/ui_main.c:1091
 msgid "Track length:"
-msgstr "Dur辿e du morceau:"
+msgstr "Dur辿e du morceau :"
 
 #: src/audacious/ui_main.c:1228
 msgid "Audacious - visibility warning"
-msgstr "Audacious - Alerte"
+msgstr "Audacious - avertissement quant � la visibilit辿"
 
 #: src/audacious/ui_main.c:1230
 msgid "Show main player window"
-msgstr "Voir la fen棚tre du lecteur principal"
+msgstr "Montrer la fen棚tre principale"
 
 #: src/audacious/ui_main.c:1231
 msgid "Ignore"
@@ -1184,74 +1118,73 @@
 #: src/audacious/ui_main.c:1235
 msgid ""
 "Audacious has been started with all of its windows hidden.\n"
-"You may want to show the player window again to control Audacious; "
-"otherwise, you'll have to control it remotely via audtool or enabled plugins "
-"(such as the statusicon plugin)."
+"You may want to show the player window again to control Audacious; otherwise, you'll have to control it remotely via audtool or enabled plugins (such as the statusicon plugin)."
 msgstr ""
-"Audacious a 辿t辿 d辿marr辿 avec toutes les fen棚tres cach辿es.\n"
-"Vous voudriez encore voir la fen棚tre du lecteur pour controler Audacious; "
-"Sinon, vous devrez le contr担ler avec Audtool ou des greffons compil辿s (comme "
-"le greffon Statusicon)."
+"Audacious a d辿marr辿, mais toutes les fen棚tres de l'interface sont cach辿es.\n"
+"Peut-棚tre voulez-vous voir � nouveau la fen棚tre principale, afin de pouvoir\n"
+"contr担ler Audacious. Dans le cas contraire, vous devrez utiliser les commandes\n"
+"distantes, par l'interm辿diaire de 'audtool' ou des extensions activ辿es\n"
+"('statusicon', par exemple)."
 
 #: src/audacious/ui_main.c:1241
 msgid "Always ignore, show/hide is controlled remotely"
-msgstr "Toujours ignor辿, voir/cach辿 est controll辿 automatiquement"
+msgstr "Toujours ignorer : la fonction 'montrer'/'cacher' est contr担l辿e de mani竪re distante."
 
 #: src/audacious/ui_main.c:1259
 msgid "Enter location to play:"
-msgstr "Entrer l'emplacement � jouer :"
+msgstr "Emplacement � lire :"
 
 #: src/audacious/ui_main.c:1504
 #, c-format
 msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
-msgstr "Rechercher �: %d:%-2.2d/%d:%-2.2d (%d%%)"
+msgstr "Aller a : %d:%-2.2d/%d:%-2.2d (%d%%)"
 
 #: src/audacious/ui_main.c:1536
 #, c-format
 msgid "Volume: %d%%"
-msgstr "Volume: %d%%"
+msgstr "Volume : %d%%"
 
 #: src/audacious/ui_main.c:1566
 #, c-format
 msgid "Balance: %d%% left"
-msgstr "Balance: %d%% gauche"
+msgstr "Balance : %d%% gauche"
 
 #: src/audacious/ui_main.c:1570
 msgid "Balance: center"
-msgstr "Balance: centre"
+msgstr "Balance : centre"
 
 #: src/audacious/ui_main.c:1574
 #, c-format
 msgid "Balance: %d%% right"
-msgstr "Balance: %d%% droite"
+msgstr "Balance : %d%% droite"
 
 #: src/audacious/ui_main.c:1916
 msgid "Options Menu"
-msgstr "Menu des Options"
+msgstr "Menu des options"
 
 #: src/audacious/ui_main.c:1920
 msgid "Disable 'Always On Top'"
-msgstr "D辿sactiver Toujours au-dessus"
+msgstr "Annuler 'Toujours au premier plan'"
 
 #: src/audacious/ui_main.c:1922
 msgid "Enable 'Always On Top'"
-msgstr "Activer Toujours au-dessus"
+msgstr "Activer 'Toujours au premier plan'"
 
 #: src/audacious/ui_main.c:1925
 msgid "File Info Box"
-msgstr "Info du Fichier"
+msgstr "Informations sur le fichier"
 
 #: src/audacious/ui_main.c:1929
 msgid "Disable 'Doublesize'"
-msgstr "D辿sactiver 'Doublesize'"
+msgstr "Annuler 'Taille double'"
 
 #: src/audacious/ui_main.c:1931
 msgid "Enable 'Doublesize'"
-msgstr "Activer 'Doublesize'"
+msgstr "Activer 'Taille double'"
 
 #: src/audacious/ui_main.c:1934
 msgid "Visualization Menu"
-msgstr "Menu Visualisation"
+msgstr "Menu des effets visuels"
 
 #: src/audacious/ui_main.c:1982
 msgid ""
@@ -1262,109 +1195,127 @@
 "2. No other programs is blocking the soundcard.\n"
 "3. Your soundcard is configured properly.\n"
 msgstr ""
-"<b><big>Probl竪me d'utilisation audio.</big></b>\n"
+"<b><big>Le p辿riph辿rique audio n'a pas pu 棚tre ouvert.</big></b>\n"
 "\n"
-"Veuillez v辿rifier que:\n"
-"1. vous avez choisi le bon greffon de sortie.\n"
-"2. aucun programme n'utilise d辿j� la carte son.\n"
+"Veuillez vous assurer que\n"
+"1. vous avez s辿lectionn辿 le module de sortie ad辿quat.\n"
+"2. d'autres programmes ne bloquent pas le syst竪me audio.\n"
 "3. votre carte son est correctement configur辿e.\n"
 
 #: src/audacious/ui_main.c:2446
 msgid "Error in Audacious."
-msgstr "Erruer dans Audacious"
+msgstr "Erreur dans Audacious."
 
-#: src/audacious/ui_manager.c:48 src/audacious/ui_manager.c:49
+#: src/audacious/ui_manager.c:48
+#: src/audacious/ui_manager.c:49
 msgid "Autoscroll Songname"
 msgstr "D辿filement du titre"
 
-#: src/audacious/ui_manager.c:51 src/audacious/ui_manager.c:52
+#: src/audacious/ui_manager.c:51
+#: src/audacious/ui_manager.c:52
 msgid "Stop after Current Song"
-msgstr "Arr棚ter la lecture du morceau"
+msgstr "Arr棚ter apr竪s le titre en cours de lecture"
 
-#: src/audacious/ui_manager.c:54 src/audacious/ui_manager.c:55
+#: src/audacious/ui_manager.c:54
+#: src/audacious/ui_manager.c:55
 msgid "Peaks"
 msgstr "Pics"
 
-#: src/audacious/ui_manager.c:57 src/audacious/ui_manager.c:58
+#: src/audacious/ui_manager.c:57
+#: src/audacious/ui_manager.c:58
 msgid "Repeat"
 msgstr "R辿p辿ter"
 
-#: src/audacious/ui_manager.c:60 src/audacious/ui_manager.c:61
+#: src/audacious/ui_manager.c:60
+#: src/audacious/ui_manager.c:61
 msgid "Shuffle"
-msgstr "M辿langer"
+msgstr "Mode al辿atoire"
 
-#: src/audacious/ui_manager.c:63 src/audacious/ui_manager.c:64
+#: src/audacious/ui_manager.c:63
+#: src/audacious/ui_manager.c:64
 msgid "No Playlist Advance"
-msgstr "Ne pas avancer dans la liste"
+msgstr "Ne pas avancer dans la liste de lecture"
 
-#: src/audacious/ui_manager.c:66 src/audacious/ui_manager.c:67
+#: src/audacious/ui_manager.c:66
+#: src/audacious/ui_manager.c:67
 msgid "Show Player"
 msgstr "Montrer le lecteur"
 
-#: src/audacious/ui_manager.c:69 src/audacious/ui_manager.c:70
+#: src/audacious/ui_manager.c:69
+#: src/audacious/ui_manager.c:70
 msgid "Show Playlist Editor"
-msgstr "Montrer la liste d'辿coute"
+msgstr "Montrer l'辿diteur de liste"
 
-#: src/audacious/ui_manager.c:72 src/audacious/ui_manager.c:73
+#: src/audacious/ui_manager.c:72
+#: src/audacious/ui_manager.c:73
 msgid "Show Equalizer"
-msgstr "�qualiseur"
+msgstr "Montrer l'辿galiseur"
 
-#: src/audacious/ui_manager.c:75 src/audacious/ui_manager.c:76
+#: src/audacious/ui_manager.c:75
+#: src/audacious/ui_manager.c:76
 msgid "Always on Top"
-msgstr "Toujours au-dessus"
+msgstr "Toujours au premier plan"
 
-#: src/audacious/ui_manager.c:78 src/audacious/ui_manager.c:79
+#: src/audacious/ui_manager.c:78
+#: src/audacious/ui_manager.c:79
 msgid "Put on All Workspaces"
-msgstr "Visible partout"
+msgstr "Afficher sur tous les bureaux"
 
-#: src/audacious/ui_manager.c:81 src/audacious/ui_manager.c:82
+#: src/audacious/ui_manager.c:81
+#: src/audacious/ui_manager.c:82
 msgid "Roll up Player"
 msgstr "Enrouler le lecteur"
 
-#: src/audacious/ui_manager.c:84 src/audacious/ui_manager.c:85
+#: src/audacious/ui_manager.c:84
+#: src/audacious/ui_manager.c:85
 msgid "Roll up Playlist Editor"
 msgstr "Enrouler l'辿diteur de liste"
 
-#: src/audacious/ui_manager.c:87 src/audacious/ui_manager.c:88
+#: src/audacious/ui_manager.c:87
+#: src/audacious/ui_manager.c:88
 msgid "Roll up Equalizer"
-msgstr "Enrouler l'辿qualiseur"
+msgstr "Enrouler l'辿galiseur"
 
-#: src/audacious/ui_manager.c:90 src/audacious/ui_manager.c:91
+#: src/audacious/ui_manager.c:90
+#: src/audacious/ui_manager.c:91
 msgid "DoubleSize"
-msgstr "Double Taille"
+msgstr "Taille double"
 
-#: src/audacious/ui_manager.c:93 src/audacious/ui_manager.c:94
+#: src/audacious/ui_manager.c:93
+#: src/audacious/ui_manager.c:94
 msgid "Easy Move"
-msgstr "Easy Move"
+msgstr "D辿placement facile"
 
 #: src/audacious/ui_manager.c:102
 msgid "Analyzer"
-msgstr "Type Analyseur"
+msgstr "Analyseur"
 
 #: src/audacious/ui_manager.c:103
 msgid "Scope"
-msgstr "Type Scope"
+msgstr "Oscilloscope"
 
 #: src/audacious/ui_manager.c:104
 msgid "Voiceprint"
-msgstr "Type Analyseur/Feu"
+msgstr "Spectrogramme"
 
 #: src/audacious/ui_manager.c:105
 msgid "Off"
-msgstr "Off"
+msgstr "Arr棚t"
 
-#: src/audacious/ui_manager.c:109 src/audacious/ui_manager.c:126
+#: src/audacious/ui_manager.c:109
+#: src/audacious/ui_manager.c:126
 #: src/audacious/ui_manager.c:132
 msgid "Normal"
 msgstr "Normal"
 
-#: src/audacious/ui_manager.c:110 src/audacious/ui_manager.c:127
+#: src/audacious/ui_manager.c:110
+#: src/audacious/ui_manager.c:127
 msgid "Fire"
-msgstr "Fire"
+msgstr "Feu"
 
 #: src/audacious/ui_manager.c:111
 msgid "Vertical Lines"
-msgstr "Type Analyseur/Lignes verticales"
+msgstr "Lignes verticales"
 
 #: src/audacious/ui_manager.c:115
 msgid "Lines"
@@ -1372,63 +1323,68 @@
 
 #: src/audacious/ui_manager.c:116
 msgid "Bars"
-msgstr "Bars"
+msgstr "Barres"
 
 #: src/audacious/ui_manager.c:120
 msgid "Dot Scope"
-msgstr "Type Scope/Point"
+msgstr "En points"
 
 #: src/audacious/ui_manager.c:121
 msgid "Line Scope"
-msgstr "Type Scope/Ligne"
+msgstr "En lignes"
 
 #: src/audacious/ui_manager.c:122
 msgid "Solid Scope"
-msgstr "Type Scope/Solide"
+msgstr "En vagues"
 
 #: src/audacious/ui_manager.c:128
 msgid "Ice"
-msgstr "Ice"
+msgstr "Glace"
 
 #: src/audacious/ui_manager.c:133
 msgid "Smooth"
-msgstr "Smooth"
+msgstr "Liss辿"
 
 #: src/audacious/ui_manager.c:137
 msgid "Full (~50 fps)"
-msgstr "Taux de Rafra樽chissement/Max (~50 fps)"
+msgstr "Complet (~50 fps)"
 
 #: src/audacious/ui_manager.c:138
 msgid "Half (~25 fps)"
-msgstr "Taux de Rafra樽chissement/Haut (~25 fps)"
+msgstr "Moiti辿 (~25 fps)"
 
 #: src/audacious/ui_manager.c:139
 msgid "Quarter (~13 fps)"
-msgstr "Taux de Rafra樽chissement/Moyen (~13 fps)"
+msgstr "Quart (~13 fps)"
 
 #: src/audacious/ui_manager.c:140
 msgid "Eighth (~6 fps)"
-msgstr "Taux de Rafra樽chisement/Bas (~6 fps)"
+msgstr "Huiti竪me (~6 fps)"
 
-#: src/audacious/ui_manager.c:144 src/audacious/ui_manager.c:152
+#: src/audacious/ui_manager.c:144
+#: src/audacious/ui_manager.c:152
 msgid "Slowest"
-msgstr "Plus lent"
+msgstr "Tr竪s lente"
 
-#: src/audacious/ui_manager.c:145 src/audacious/ui_manager.c:153
+#: src/audacious/ui_manager.c:145
+#: src/audacious/ui_manager.c:153
 msgid "Slow"
-msgstr "Lent"
+msgstr "Lente"
 
-#: src/audacious/ui_manager.c:146 src/audacious/ui_manager.c:154
+#: src/audacious/ui_manager.c:146
+#: src/audacious/ui_manager.c:154
 msgid "Medium"
-msgstr "Moyen"
+msgstr "Moyenne"
 
-#: src/audacious/ui_manager.c:147 src/audacious/ui_manager.c:155
+#: src/audacious/ui_manager.c:147
+#: src/audacious/ui_manager.c:155
 msgid "Fast"
 msgstr "Rapide"
 
-#: src/audacious/ui_manager.c:148 src/audacious/ui_manager.c:156
+#: src/audacious/ui_manager.c:148
+#: src/audacious/ui_manager.c:156
 msgid "Fastest"
-msgstr "Plus rapide"
+msgstr "Tr竪s rapide"
 
 #: src/audacious/ui_manager.c:160
 msgid "Time Elapsed"
@@ -1440,131 +1396,140 @@
 
 #: src/audacious/ui_manager.c:170
 msgid "Playback"
-msgstr "_Lecture"
+msgstr "Lecture"
 
-#: src/audacious/ui_manager.c:172 src/audacious/ui_manager.c:173
+#: src/audacious/ui_manager.c:172
+#: src/audacious/ui_manager.c:173
 msgid "Play"
 msgstr "Lecture"
 
-#: src/audacious/ui_manager.c:175 src/audacious/ui_manager.c:176
+#: src/audacious/ui_manager.c:175
+#: src/audacious/ui_manager.c:176
 msgid "Pause"
 msgstr "Pause"
 
-#: src/audacious/ui_manager.c:178 src/audacious/ui_manager.c:179
+#: src/audacious/ui_manager.c:178
+#: src/audacious/ui_manager.c:179
 msgid "Stop"
-msgstr "Stop"
+msgstr "Arr棚t"
 
-#: src/audacious/ui_manager.c:181 src/audacious/ui_manager.c:182
+#: src/audacious/ui_manager.c:181
+#: src/audacious/ui_manager.c:182
 msgid "Previous"
 msgstr "Pr辿c辿dent"
 
-#: src/audacious/ui_manager.c:184 src/audacious/ui_manager.c:185
+#: src/audacious/ui_manager.c:184
+#: src/audacious/ui_manager.c:185
 msgid "Next"
 msgstr "Suivant"
 
 #: src/audacious/ui_manager.c:190
 msgid "Visualization"
-msgstr "Type de graph_ique"
+msgstr "Visualisation"
 
 #: src/audacious/ui_manager.c:191
 msgid "Visualization Mode"
-msgstr "Type de graphique"
+msgstr "Type de visualisation"
 
 #: src/audacious/ui_manager.c:192
 msgid "Analyzer Mode"
-msgstr "Type Analyseur/Feu"
+msgstr "Mode analyseur"
 
 #: src/audacious/ui_manager.c:193
 msgid "Scope Mode"
-msgstr "Type Scope"
+msgstr "Mode oscilloscope"
 
 #: src/audacious/ui_manager.c:194
 msgid "Voiceprint Mode"
-msgstr "Type Analyseur/Feu"
+msgstr "Mode spectrogramme"
 
 #: src/audacious/ui_manager.c:195
 msgid "WindowShade VU Mode"
-msgstr "Mode Fen棚tre R辿duite"
+msgstr "Mode VU en fen棚tre r辿duite"
 
 #: src/audacious/ui_manager.c:196
 msgid "Refresh Rate"
-msgstr "Taux de Rafra樽chissement"
+msgstr "Taux de rafra樽chissement"
 
 #: src/audacious/ui_manager.c:197
 msgid "Analyzer Falloff"
-msgstr "Effet Retomb辿e Analyseur"
+msgstr "Retomb辿e de l'analyseur"
 
 #: src/audacious/ui_manager.c:198
 msgid "Peaks Falloff"
-msgstr "Effet Retomb辿e Cr棚tes"
+msgstr "Retomb辿e des pics"
 
-#: src/audacious/ui_manager.c:205 src/audacious/ui_manager.c:206
+#: src/audacious/ui_manager.c:205
+#: src/audacious/ui_manager.c:206
 msgid "New Playlist"
-msgstr "Nouvelle Liste d'Ecoute"
+msgstr "Nouvelle liste"
 
-#: src/audacious/ui_manager.c:208 src/audacious/ui_manager.c:209
+#: src/audacious/ui_manager.c:208
+#: src/audacious/ui_manager.c:209
 msgid "Select Next Playlist"
-msgstr "S辿lectionner la Prochaine Liste d'Ecoute"
+msgstr "Liste suivante"
 
-#: src/audacious/ui_manager.c:211 src/audacious/ui_manager.c:212
+#: src/audacious/ui_manager.c:211
+#: src/audacious/ui_manager.c:212
 msgid "Select Previous Playlist"
-msgstr "S辿lectionner la Liste d'Ecoute Pr辿c辿dente"
+msgstr "Liste pr辿c辿dente"
 
-#: src/audacious/ui_manager.c:214 src/audacious/ui_manager.c:215
+#: src/audacious/ui_manager.c:214
+#: src/audacious/ui_manager.c:215
 msgid "Delete Playlist"
-msgstr "Effacer la Liste d'Ecoute"
+msgstr "Supprimer la liste"
 
 #: src/audacious/ui_manager.c:217
 msgid "Load List"
-msgstr "Charger"
+msgstr "Charger une liste"
 
 #: src/audacious/ui_manager.c:218
 msgid "Loads a playlist file into the selected playlist."
-msgstr "Charger une liste d'辿coute dans la liste d'辿coute s辿lectionn辿e"
+msgstr "Importer une liste de lecture dans la liste active."
 
 #: src/audacious/ui_manager.c:220
 msgid "Save List"
-msgstr "Sauver"
+msgstr "Enregistrer la liste"
 
 #: src/audacious/ui_manager.c:221
 msgid "Saves the selected playlist."
-msgstr "Sauver la Liste d'辿coute."
+msgstr "Enregistrer la liste de lecture active."
 
 #: src/audacious/ui_manager.c:223
 msgid "Save Default List"
-msgstr "Sauver la Liste par D辿faut"
+msgstr "Enregistrer comme liste par d辿faut"
 
 #: src/audacious/ui_manager.c:224
 msgid "Saves the selected playlist to the default location."
-msgstr "Sauver la liste d'辿coute s辿lectionn辿es vers l'emplacement par d辿faut."
+msgstr "Enregistre la liste de lecture active en tant que liste par d辿faut."
 
 #: src/audacious/ui_manager.c:227
 msgid "Refresh List"
-msgstr "Rafraichir"
+msgstr "Actualiser la liste"
 
 #: src/audacious/ui_manager.c:228
 msgid "Refreshes metadata associated with a playlist entry."
-msgstr "Rafraichir les m辿ta-donn辿es associ辿es avec la liste d'辿coute"
+msgstr "Actualise les m辿tadonn辿es associ辿es � une entr辿e de la liste."
 
 #: src/audacious/ui_manager.c:231
 msgid "List Manager"
-msgstr "Gestionnaire de Listes"
+msgstr "Gestionnaire de listes"
 
 #: src/audacious/ui_manager.c:232
 msgid "Opens the playlist manager."
-msgstr "Ouvrir le gestionnaire de liste d'辿coute."
+msgstr "Ouvre le gestionnaire de listes de lecture."
 
 #: src/audacious/ui_manager.c:238
 msgid "View"
-msgstr "Voir"
+msgstr "Affichage"
 
 #: src/audacious/ui_manager.c:242
 msgid "Add Internet Address..."
-msgstr "Ajouter une adresse Internet..."
+msgstr "Ajouter un flux Internet..."
 
 #: src/audacious/ui_manager.c:243
 msgid "Adds a remote track to the playlist."
-msgstr "Ajouter une piste al辿atoire � la liste d'辿coute"
+msgstr "Ajoute un flux distant � la liste de lecture."
 
 #: src/audacious/ui_manager.c:246
 msgid "Add Files..."
@@ -1572,19 +1537,15 @@
 
 #: src/audacious/ui_manager.c:247
 msgid "Adds files to the playlist."
-msgstr "Ajouter des fichiers � la liste d'辿coute."
+msgstr "Ajoute des fichiers � la liste de lecture."
 
 #: src/audacious/ui_manager.c:252
 msgid "Search and Select"
-msgstr "Chercher et S辿lectionner"
+msgstr "Chercher et s辿lectionner"
 
 #: src/audacious/ui_manager.c:253
-msgid ""
-"Searches the playlist and selects playlist entries based on specific "
-"criteria."
-msgstr ""
-"Chercher et s辿lectionner les entr辿es de la liste d'辿coute bas辿es sur des "
-"crit竪res sp辿cifiques."
+msgid "Searches the playlist and selects playlist entries based on specific criteria."
+msgstr "Effectue une recherche dans la liste de lecture et s辿lectionne des entr辿es en fonction de crit竪res d辿finis."
 
 #: src/audacious/ui_manager.c:256
 msgid "Invert Selection"
@@ -1592,158 +1553,172 @@
 
 #: src/audacious/ui_manager.c:257
 msgid "Inverts the selected and unselected entries."
-msgstr "Inverser la s辿lection et les entr辿es non-s辿lectionn辿es."
+msgstr "Inverse les entr辿es s辿lectionn辿es et les entr辿es non s辿lectionn辿es"
 
 #: src/audacious/ui_manager.c:260
 msgid "Select All"
-msgstr "Tous"
+msgstr "Tout s辿lectionner"
 
 #: src/audacious/ui_manager.c:261
 msgid "Selects all of the playlist entries."
-msgstr "S辿lectionner toutes les listes d'辿coute."
+msgstr "S辿lectionne toutes les entr辿es de la liste."
 
 #: src/audacious/ui_manager.c:264
 msgid "Select None"
-msgstr "Ne Rien S辿lectionner"
+msgstr "Ne rien s辿lectionner"
 
 #: src/audacious/ui_manager.c:265
 msgid "Deselects all of the playlist entries."
-msgstr "D辿s辿lectionner toutes les listes d'辿coute"
+msgstr "Annule la s辿lection de toutes les entr辿es de la liste."
 
 #: src/audacious/ui_manager.c:270
 msgid "Clear Queue"
-msgstr "Vider la File"
+msgstr "Vider la file"
 
 #: src/audacious/ui_manager.c:271
 msgid "Clears the queue associated with this playlist."
-msgstr "Effacer la queue associ辿e avec cette liste d'辿coute."
+msgstr "Vide la file associ辿e � la liste de lecture."
 
 #: src/audacious/ui_manager.c:274
 msgid "Remove Unavailable Files"
-msgstr "Enlever les fichiers inexistants"
+msgstr "Effacer les fichiers inexistants"
 
 #: src/audacious/ui_manager.c:275
 msgid "Removes unavailable files from the playlist."
-msgstr "Enlever les fichiers inexistants"
+msgstr "Efface les fichiers inexistants de la liste de lecture."
 
 #: src/audacious/ui_manager.c:278
 msgid "Remove Duplicates"
-msgstr "Enlever les fichiers dupliqu辿s"
+msgstr "Effacer les 辿l辿ments redondants"
 
-#: src/audacious/ui_manager.c:280 src/audacious/ui_manager.c:316
+#: src/audacious/ui_manager.c:280
+#: src/audacious/ui_manager.c:316
 #: src/audacious/ui_manager.c:346
 msgid "By Title"
-msgstr "Par Titre"
+msgstr "Par titre"
 
 #: src/audacious/ui_manager.c:281
 msgid "Removes duplicate entries from the playlist by title."
-msgstr "Enlever les entr辿es dupliqu辿es de la liste d'辿coute par titre."
+msgstr "Efface les entr辿es redondantes, en fonction de leur titre."
 
-#: src/audacious/ui_manager.c:284 src/audacious/ui_manager.c:324
+#: src/audacious/ui_manager.c:284
+#: src/audacious/ui_manager.c:324
 #: src/audacious/ui_manager.c:354
 msgid "By Filename"
-msgstr "Par Nom du fichier"
+msgstr "Par nom de fichier"
 
 #: src/audacious/ui_manager.c:285
 msgid "Removes duplicate entries from the playlist by filename."
-msgstr "Enlever les fichiers dupliqu辿s par nom de fichier."
+msgstr "Efface les entr辿es redondantes, en fonction de leur nom de fichier."
 
-#: src/audacious/ui_manager.c:288 src/audacious/ui_manager.c:328
+#: src/audacious/ui_manager.c:288
+#: src/audacious/ui_manager.c:328
 #: src/audacious/ui_manager.c:358
 msgid "By Path + Filename"
-msgstr "Par Chemin + Nom de Fichier"
+msgstr "Par chemin et nom de fichier"
 
 #: src/audacious/ui_manager.c:289
 msgid "Removes duplicate entries from the playlist by their full path."
-msgstr "Enlever les entr辿es dupliqu辿es de la liste d'辿coute par emplacement."
+msgstr "Efface les entr辿es redondantes, en fonction de leur chemin complet."
 
 #: src/audacious/ui_manager.c:292
 msgid "Remove All"
-msgstr "Tout Supprimer"
+msgstr "Effacer toutes les entr辿es"
 
 #: src/audacious/ui_manager.c:293
 msgid "Removes all entries from the playlist."
-msgstr "Enlever toutes les entr辿es de la liste d'辿coute."
+msgstr "Efface toutes les entr辿es de la liste de lecture."
 
 #: src/audacious/ui_manager.c:296
 msgid "Remove Unselected"
-msgstr "Supprimer Non-s辿lectionn辿es"
+msgstr "Ne garder que la s辿lection"
 
 #: src/audacious/ui_manager.c:297
 msgid "Remove unselected entries from the playlist."
-msgstr "Enlever les entr辿es non-s辿lectionn辿es de la liste d'辿coute."
+msgstr "Efface les entr辿es non s辿lectionn辿es de la liste de lecture"
 
 #: src/audacious/ui_manager.c:300
 msgid "Remove Selected"
-msgstr "Supprimer S辿lectionn辿es"
+msgstr "Effacer la s辿lection"
 
 #: src/audacious/ui_manager.c:301
 msgid "Remove selected entries from the playlist."
-msgstr "Enlever les entr辿es s辿lectionn辿es de la liste d'辿coute."
+msgstr "Efface les entr辿es s辿lectionn辿es de la liste de lecture."
 
 #: src/audacious/ui_manager.c:306
 msgid "Randomize List"
-msgstr "M辿langer la Liste"
+msgstr "M辿langer la liste"
 
 #: src/audacious/ui_manager.c:307
 msgid "Randomizes the playlist."
-msgstr "M辿langer la liste d'辿coute"
+msgstr "M辿lange la liste de lecture."
 
 #: src/audacious/ui_manager.c:310
 msgid "Reverse List"
-msgstr "Inverser la Liste"
+msgstr "Inverser la liste"
 
 #: src/audacious/ui_manager.c:311
 msgid "Reverses the playlist."
-msgstr "Renverser la liste d'辿coute."
+msgstr "Inverse la liste de lecture."
 
 #: src/audacious/ui_manager.c:314
 msgid "Sort List"
 msgstr "Trier la liste"
 
-#: src/audacious/ui_manager.c:317 src/audacious/ui_manager.c:347
+#: src/audacious/ui_manager.c:317
+#: src/audacious/ui_manager.c:347
 msgid "Sorts the list by title."
-msgstr "Trier la liste par titre"
+msgstr "Trie la liste, en fonction du titre des entr辿es."
 
-#: src/audacious/ui_manager.c:320 src/audacious/ui_manager.c:350
+#: src/audacious/ui_manager.c:320
+#: src/audacious/ui_manager.c:350
 msgid "By Artist"
-msgstr "Par Artiste"
+msgstr "Par artiste"
 
-#: src/audacious/ui_manager.c:321 src/audacious/ui_manager.c:351
+#: src/audacious/ui_manager.c:321
+#: src/audacious/ui_manager.c:351
 msgid "Sorts the list by artist."
-msgstr "Trier la liste par artiste"
+msgstr "Trie la liste, en fonction de l'artiste."
 
-#: src/audacious/ui_manager.c:325 src/audacious/ui_manager.c:355
+#: src/audacious/ui_manager.c:325
+#: src/audacious/ui_manager.c:355
 msgid "Sorts the list by filename."
-msgstr "Trier la liste par nom de fichier"
+msgstr "Trie la liste, en fonction du nom de fichier des entr辿es."
 
-#: src/audacious/ui_manager.c:329 src/audacious/ui_manager.c:359
+#: src/audacious/ui_manager.c:329
+#: src/audacious/ui_manager.c:359
 msgid "Sorts the list by full pathname."
-msgstr "Tri de la liste par nom d'emplacement."
+msgstr "Trie la liste, en fonction du chemin complet des entr辿es."
 
-#: src/audacious/ui_manager.c:332 src/audacious/ui_manager.c:362
+#: src/audacious/ui_manager.c:332
+#: src/audacious/ui_manager.c:362
 msgid "By Date"
-msgstr "Par Date"
+msgstr "Par date"
 
-#: src/audacious/ui_manager.c:333 src/audacious/ui_manager.c:363
+#: src/audacious/ui_manager.c:333
+#: src/audacious/ui_manager.c:363
 msgid "Sorts the list by modification time."
-msgstr "Tri de la liste par temps de modification."
+msgstr "Trie la liste, en fonction de la date de modification."
 
-#: src/audacious/ui_manager.c:336 src/audacious/ui_manager.c:366
+#: src/audacious/ui_manager.c:336
+#: src/audacious/ui_manager.c:366
 msgid "By Track Number"
-msgstr "Par Num辿ro de Piste"
+msgstr "Par num辿ro de piste"
 
-#: src/audacious/ui_manager.c:337 src/audacious/ui_manager.c:367
+#: src/audacious/ui_manager.c:337
+#: src/audacious/ui_manager.c:367
 msgid "Sorts the list by track number."
-msgstr "Trier la Liste par num辿ro de piste"
+msgstr "Trie la liste, en fonction du num辿ro des pistes."
 
-#: src/audacious/ui_manager.c:340 src/audacious/ui_manager.c:370
+#: src/audacious/ui_manager.c:340
+#: src/audacious/ui_manager.c:370
 msgid "By Playlist Entry"
-msgstr "Trier la Liste par entr辿e de la liste d'辿coute"
+msgstr "Par entr辿e de liste"
 
-#: src/audacious/ui_manager.c:341 src/audacious/ui_manager.c:371
+#: src/audacious/ui_manager.c:341
+#: src/audacious/ui_manager.c:371
 msgid "Sorts the list by playlist entry."
-msgstr "Trier la Liste par entr辿e de la liste d'辿coute."
+msgstr "Trie la liste, en fonction des entr辿es qu'elle contient."
 
 #: src/audacious/ui_manager.c:344
 msgid "Sort Selected"
@@ -1759,44 +1734,45 @@
 
 #: src/audacious/ui_manager.c:383
 msgid "Plugin Services"
-msgstr "Services Greffon"
+msgstr "Services des modules"
 
-#: src/audacious/ui_manager.c:385 src/audacious/ui_manager.c:388
+#: src/audacious/ui_manager.c:385
+#: src/audacious/ui_manager.c:388
 msgid "View Track Details"
-msgstr "Afficher le D辿tail"
+msgstr "Afficher les d辿tails"
 
-#: src/audacious/ui_manager.c:386 src/audacious/ui_manager.c:389
+#: src/audacious/ui_manager.c:386
+#: src/audacious/ui_manager.c:389
 msgid "View track details"
-msgstr "Afficher le D辿tail"
+msgstr "Affiche les informations relatives au morceau."
 
 #: src/audacious/ui_manager.c:394
 msgid "Play File"
-msgstr "Jouer le Fichier"
+msgstr "Lire un fichier..."
 
 #: src/audacious/ui_manager.c:395
 msgid "Load and play a file"
-msgstr "Charger et jouer un fichier"
+msgstr "Charge et lit un fichier."
 
 #: src/audacious/ui_manager.c:397
 msgid "Play Location"
-msgstr "Jouer le Chemin"
+msgstr "Lire un emplacement..."
 
 #: src/audacious/ui_manager.c:398
 msgid "Play media from the selected location"
-msgstr "Lire le m辿dia de la location s辿lectionn辿e"
+msgstr "Lit les m辿dia de l'emplacement s辿lectionn辿."
 
 #: src/audacious/ui_manager.c:400
-#, fuzzy
 msgid "Plugin services"
-msgstr "Services Greffon"
+msgstr "Menu des services"
 
 #: src/audacious/ui_manager.c:402
 msgid "Preferences"
-msgstr "Pr辿f辿rences"
+msgstr "Pr辿f辿rences..."
 
 #: src/audacious/ui_manager.c:403
 msgid "Open preferences window"
-msgstr "Ouvrir les Pr辿f辿rences"
+msgstr "Ouvre la fen棚tre des pr辿f辿rences."
 
 #: src/audacious/ui_manager.c:405
 msgid "_Quit"
@@ -1804,31 +1780,35 @@
 
 #: src/audacious/ui_manager.c:406
 msgid "Quit Audacious"
-msgstr "Quitter Audacious"
+msgstr "Ferme Audacious."
 
-#: src/audacious/ui_manager.c:408 src/audacious/ui_manager.c:409
+#: src/audacious/ui_manager.c:408
+#: src/audacious/ui_manager.c:409
 msgid "Set A-B"
-msgstr "Activer A-B"
+msgstr "Marquer A-B"
 
-#: src/audacious/ui_manager.c:411 src/audacious/ui_manager.c:412
+#: src/audacious/ui_manager.c:411
+#: src/audacious/ui_manager.c:412
 msgid "Clear A-B"
 msgstr "Effacer A-B"
 
-#: src/audacious/ui_manager.c:414 src/audacious/ui_manager.c:415
+#: src/audacious/ui_manager.c:414
+#: src/audacious/ui_manager.c:415
 msgid "Jump to Playlist Start"
-msgstr "Retourner au d辿but de la liste"
+msgstr "Aller au d辿but de la liste"
 
-#: src/audacious/ui_manager.c:417 src/audacious/ui_manager.c:418
+#: src/audacious/ui_manager.c:417
+#: src/audacious/ui_manager.c:418
 msgid "Jump to File"
-msgstr "Aller au Fichier"
+msgstr "Aller au fichier..."
 
 #: src/audacious/ui_manager.c:423
 msgid "Queue Toggle"
-msgstr "Basculer dans la file"
+msgstr "Mettre dans la file d'attente"
 
 #: src/audacious/ui_manager.c:424
 msgid "Enables/disables the entry in the playlist's queue."
-msgstr "Activer/D辿sactiver l'entr辿e dans la file de la liste d'辿coute."
+msgstr "Active/d辿sactive l'entr辿e dans la file d'attente de la liste."
 
 #: src/audacious/ui_manager.c:431
 msgid "Load"
@@ -1840,159 +1820,154 @@
 
 #: src/audacious/ui_manager.c:433
 msgid "Save"
-msgstr "Sauver"
+msgstr "Enregistrer"
 
 #: src/audacious/ui_manager.c:434
 msgid "Delete"
 msgstr "Effacer"
 
-#: src/audacious/ui_manager.c:436 src/audacious/ui_manager.c:457
+#: src/audacious/ui_manager.c:436
+#: src/audacious/ui_manager.c:457
 #: src/audacious/ui_manager.c:472
 msgid "Preset"
-msgstr "Pr辿-r辿glage"
+msgstr "Pr辿r辿glage g辿n辿ral"
 
 #: src/audacious/ui_manager.c:437
 msgid "Load preset"
-msgstr "Charger pr辿-r辿glages"
+msgstr "Charge un pr辿r辿glage g辿n辿ral."
 
-#: src/audacious/ui_manager.c:439 src/audacious/ui_manager.c:460
+#: src/audacious/ui_manager.c:439
+#: src/audacious/ui_manager.c:460
 #: src/audacious/ui_manager.c:475
 msgid "Auto-load preset"
-msgstr "Charger le pr辿-r辿glage"
+msgstr "Pr辿r辿glage sp辿cifique"
 
 #: src/audacious/ui_manager.c:440
 msgid "Load auto-load preset"
-msgstr "Charger le pr辿-r辿glage"
+msgstr "Charge un pr辿r辿glage sp辿cifique."
 
-#: src/audacious/ui_manager.c:442 src/audacious/ui_manager.c:463
+#: src/audacious/ui_manager.c:442
+#: src/audacious/ui_manager.c:463
 msgid "Default"
-msgstr "D辿faut"
+msgstr "Pr辿r辿glage par d辿faut"
 
 #: src/audacious/ui_manager.c:443
 msgid "Load default preset into equalizer"
-msgstr "Charger le preset par d辿faut dans l'辿qualiseur"
+msgstr "Charge le pr辿r辿glage par d辿faut dans l'辿galiseur."
 
 #: src/audacious/ui_manager.c:445
 msgid "Zero"
-msgstr "Z辿ro"
+msgstr "Remise � z辿ro"
 
 #: src/audacious/ui_manager.c:446
 msgid "Set equalizer preset levels to zero"
-msgstr "Preset de l'辿qualiseur au niveau z辿ro"
+msgstr "R辿initialise le niveau des pr辿r辿glages."
 
 #: src/audacious/ui_manager.c:448
 msgid "From file"
-msgstr "/A partir du fichier"
+msgstr "� partir d'un fichier"
 
 #: src/audacious/ui_manager.c:449
 msgid "Load preset from file"
-msgstr "Charger les preset � partir du fichier"
+msgstr "Charge un pr辿r辿glage � partir d'un fichier."
 
 #: src/audacious/ui_manager.c:451
 msgid "From WinAMP EQF file"
-msgstr "A partir d'un fichier EQF de Winamp"
+msgstr "� partir d'un fichier EQF WinAMP"
 
 #: src/audacious/ui_manager.c:452
 msgid "Load preset from WinAMP EQF file"
-msgstr "Charger un preset � partir d'un fichier EQF de Winamp"
+msgstr "Charge un pr辿r辿glage � partir d'un fichier EQF de WinAMP."
 
 #: src/audacious/ui_manager.c:454
 msgid "WinAMP Presets"
-msgstr "Pr辿-r辿glages Winamp"
+msgstr "Pr辿r辿glages WinAMP"
 
 #: src/audacious/ui_manager.c:455
 msgid "Import WinAMP presets"
-msgstr "Importer les pr辿-r辿glages Winamp"
+msgstr "Importe les pr辿r辿glages de WinAMP."
 
 #: src/audacious/ui_manager.c:458
 msgid "Save preset"
-msgstr "Sauver pr辿-r辿glages"
+msgstr "Enregistre comme pr辿r辿glage g辿n辿ral."
 
 #: src/audacious/ui_manager.c:461
 msgid "Save auto-load preset"
-msgstr "Sauver le pr辿-r辿glage"
+msgstr "Enregistre comme pr辿r辿glage sp辿cifique."
 
 #: src/audacious/ui_manager.c:464
 msgid "Save default preset"
-msgstr "Sauver pr辿-r辿glages auto"
+msgstr "Enregistre comme pr辿r辿glage par d辿faut."
 
 #: src/audacious/ui_manager.c:466
 msgid "To file"
-msgstr "Vers le fichier"
+msgstr "Dans un fichier"
 
 #: src/audacious/ui_manager.c:467
 msgid "Save preset to file"
-msgstr "Sauver le preset vers le fichier"
+msgstr "Enregistre le pr辿r辿glage dans un fichier."
 
 #: src/audacious/ui_manager.c:469
 msgid "To WinAMP EQF file"
-msgstr "Vers un fichier EQF de Winamp"
+msgstr "Dans un fichier EQF WinAMP"
 
 #: src/audacious/ui_manager.c:470
 msgid "Save preset to WinAMP EQF file"
-msgstr "Sauver le preset vers un fichier EQF de Winamp"
+msgstr "Enregistre le pr辿r辿glage dans un fichier EQF de WinAMP."
 
 #: src/audacious/ui_manager.c:473
 msgid "Delete preset"
-msgstr "Effacer pr辿-r辿glages"
+msgstr "Efface un pr辿r辿glage."
 
 #: src/audacious/ui_manager.c:476
 msgid "Delete auto-load preset"
-msgstr "Effacer le pr辿-r辿glage charg辿 auto."
+msgstr "Efface un pr辿r辿glage sp辿cifique."
 
 #: src/audacious/ui_playlist.c:477
 msgid "Search entries in active playlist"
-msgstr "Chercher les entr辿es dans la liste d'辿coute active"
+msgstr "Chercher des entr辿es dans la liste active"
 
 #: src/audacious/ui_playlist.c:485
-msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular "
-"expressions syntax, case-insensitive. If you don't know how regular "
-"expressions work, simply insert a literal portion of what you're searching "
-"for."
-msgstr ""
-"S辿lectionner les entr辿es dans la liste d'辿coute en fichant un ou plusieurs "
-"champs. Les champs utilise des syntaxes d'expressions r辿guli竪res, des cases "
-"insensitives. Si vous ne connaissez pas comment fonctionne des expressions "
-"r辿guli竪res, ins辿rer simplement une portion litt辿rale de ce que vous cherchez."
+msgid "Select entries in playlist by filling one or more fields. Fields use regular expressions syntax, case-insensitive. If you don't know how regular expressions work, simply insert a literal portion of what you're searching for."
+msgstr "Le choix des entr辿es de la liste de lecture s'effectue au moyen des champs ci-dessous. La syntaxe utilis辿e est celle des expressions r辿guli竪res et est sensible � la casse. Si vous ne savez pas comment fonctionnent les expressions r辿guli竪res, vous pouvez simplement indiquer une expression litt辿rale de ce que vous cherchez."
 
 #: src/audacious/ui_playlist.c:493
 msgid "Title: "
-msgstr "Titre:"
+msgstr "Titre du morceau : "
 
 #: src/audacious/ui_playlist.c:500
 msgid "Album: "
-msgstr "Album:"
+msgstr "Titre de l'album : "
 
 #: src/audacious/ui_playlist.c:507
 msgid "Artist: "
-msgstr "Artiste:"
+msgstr "Nom de l'artiste : "
 
 #: src/audacious/ui_playlist.c:514
 msgid "Filename: "
-msgstr "Nom du Fichier:"
+msgstr "Nom du fichier : "
 
 #: src/audacious/ui_playlist.c:522
 msgid "Clear previous selection before searching"
-msgstr "Effacer la pr辿c辿dente s辿lection avant de rechercher"
+msgstr "Effacer la s辿lection pr辿c辿dente avant d'effectuer la recherche"
 
 #: src/audacious/ui_playlist.c:525
 msgid "Automatically toggle queue for matching entries"
-msgstr ""
+msgstr "Mettre automatiquement dans la file d'attente les entr辿es trouv辿es"
 
 #: src/audacious/ui_playlist.c:528
 msgid "Create a new playlist with matching entries"
-msgstr "Cr辿er une nouvelle liste d'辿coute avec des entr辿es assorties"
+msgstr "Cr辿er une nouvelle liste avec les entr辿es trouv辿es"
 
 #: src/audacious/ui_playlist.c:748
 #, c-format
 msgid "Error writing playlist \"%s\": %s"
-msgstr "Erreur � l'辿criture de la liste \"%s\": %s"
+msgstr "Erreur lors de l'辿criture de la liste \"%s\": %s"
 
 #: src/audacious/ui_playlist.c:770
 #, c-format
 msgid "%s already exist. Continue?"
-msgstr "%s existe d辿j�. Continuer ?"
+msgstr "%s existe d辿j�. Faut-il continuer ?"
 
 #: src/audacious/ui_playlist.c:785
 #, c-format
@@ -2001,33 +1976,33 @@
 "\n"
 "Unknown file type for '%s'.\n"
 msgstr ""
-"<b><big>Impossible de sauver la liste.</big></b>\n"
+"<b><big>Impossible d'enregistrer la liste.</big></b>\n"
 "\n"
 "Type de fichier inconnu pour '%s'.\n"
 
 #: src/audacious/ui_playlist.c:911
 msgid "Save as Static Playlist"
-msgstr "Sauver comme liste d'辿coute statique"
+msgstr "Enregistrer comme liste statique"
 
 #: src/audacious/ui_playlist.c:918
 msgid "Use Relative Path"
-msgstr "Utiliser un emplacement relatif"
+msgstr "Utiliser une arborescence relative"
 
 #: src/audacious/ui_playlist.c:940
 msgid "Load Playlist"
-msgstr "Charger Liste d'辿coute"
+msgstr "Charger une liste de lecture"
 
 #: src/audacious/ui_playlist.c:953
 msgid "Save Playlist"
-msgstr "Sauver la Liste d'辿coute"
+msgstr "Enregistrer la liste"
 
 #: src/audacious/ui_playlist.c:1508
 msgid "Audacious Playlist Editor"
-msgstr "�diteur de liste d'辿coute"
+msgstr "�diteur de liste d'Audacious"
 
 #: src/audacious/ui_playlist_manager.c:363
 msgid "Playlist Manager"
-msgstr "/Gestionnaire de liste d'辿coute"
+msgstr "Gestionnaire de listes de lecture"
 
 #: src/audacious/ui_playlist_manager.c:409
 msgid "Entries"
@@ -2043,11 +2018,11 @@
 
 #: src/audacious/ui_preferences.c:113
 msgid "Connectivity"
-msgstr "Proxy"
+msgstr "Connectivit辿"
 
 #: src/audacious/ui_preferences.c:126
 msgid "Tracknumber"
-msgstr "Num辿ro de piste"
+msgstr "Num辿ro de la piste"
 
 #: src/audacious/ui_preferences.c:129
 msgid "Filepath"
@@ -2071,27 +2046,26 @@
 
 #: src/audacious/ui_preferences.c:155
 msgid "localhost"
-msgstr "localhost"
+msgstr "h担te local"
 
 #: src/audacious/ui_preferences.c:390
 msgid "Enabled"
-msgstr "Actif"
+msgstr "Activ辿"
 
 #: src/audacious/ui_preferences.c:406
 msgid "Description"
 msgstr "Description"
 
-#: src/audacious/ui_preferences.c:1395
 msgid "Category"
-msgstr "Rubrique"
+msgstr "Cat辿gorie"
 
 #: src/audacious/ui_preferences.c:1963
 msgid "Preferences Window"
-msgstr "Fen棚tre des Pr辿f辿rences"
+msgstr "Fen棚tre des pr辿f辿rences"
 
 #: src/audacious/ui_skinned_equalizer_slider.c:386
 msgid "PREAMP"
-msgstr "PREAMP"
+msgstr "PREAMPLIFICATION"
 
 #: src/audacious/ui_skinned_equalizer_slider.c:386
 msgid "60HZ"
@@ -2135,468 +2109,13 @@
 
 #: src/audacious/ui_skinselector.c:178
 msgid "Archived Winamp 2.x skin"
-msgstr "Skin Winamp 2.x archiv辿"
+msgstr "Th竪me Winamp 2.x archiv辿"
 
 #: src/audacious/ui_skinselector.c:183
 msgid "Unarchived Winamp 2.x skin"
-msgstr "Skin Winamp 2.x non-archiv辿"
+msgstr "Th竪me Winamp 2.x non archiv辿"
 
 #: src/audacious/ui_urlopener.c:88
 msgid "Add/Open URL Dialog"
-msgstr "Ajouter / Ouvrir un URL"
-
-#~ msgid "Show window manager decorations"
-#~ msgstr "Montrer les d辿corations du gestionnaire de fen棚tre"
-
-#~ msgid "Not last.fm stream"
-#~ msgstr "Ceci n'est pas un stream last.fm"
-
-#~ msgid "<b>Artist:</b> %s"
-#~ msgstr "<b>Artist:</b> %s"
-
-#~ msgid "<b>Title:</b> %s"
-#~ msgstr "<b>Title:</b> %s"
-
-#~ msgid "<b>Album:</b> %s"
-#~ msgstr "<b>Album</b> %s"
-
-#~ msgid ""
-#~ "<b><big>Couldn't find your lastfm login data.</big></b>\n"
-#~ "\n"
-#~ "Check if your Scrobbler's plugin login settings are configured properly.\n"
-#~ msgstr ""
-#~ "<b><big>Votre login lastfm est introuvable.</big></b>\n"
-#~ "\n"
-#~ "V辿rifiez si le login du greffon de Scrobbler a 辿t辿 correctement "
-#~ "configur辿.\n"
-
-#~ msgid "Audacious last.fm radio tuner"
-#~ msgstr "Radio Tuner Last.fm"
-
-#~ msgid "Station:"
-#~ msgstr "Station:"
-
-#~ msgid "<b>Artist:</b>"
-#~ msgstr "<b>Artiste</b>"
-
-#~ msgid "<b>Title:</b>"
-#~ msgstr "<b>Titre</b>"
-
-#~ msgid "<b>Album:</b>"
-#~ msgstr "<b>Album</b>"
-
-#~ msgid "Love"
-#~ msgstr "Favoris"
-
-#~ msgid "Ban"
-#~ msgstr "Bannis"
-
-#~ msgid "Skip"
-#~ msgstr "Sauter"
-
-#~ msgid "Tune in"
-#~ msgstr "Ecouter"
-
-#~ msgid "Neighbours' radio"
-#~ msgstr "Radio voisine"
-
-#~ msgid "Personal radio"
-#~ msgstr "Radio personnelle"
-
-#~ msgid ""
-#~ "<b><big>The lastfm radio plugin could not be found.</big></b>\n"
-#~ "\n"
-#~ "Check if the AudioScrobbler plugin was compiled in\n"
-#~ msgstr ""
-#~ "<b><big>Le greffon radio lastfm ne peut 棚tre trouv辿</big></b>\n"
-#~ "\n"
-#~ "V辿rifiez si le greffon AudioScrobbler a 辿t辿 compil辿 avec Audacious\n"
-
-#~ msgid "VOLUME: %d%%"
-#~ msgstr "VOLUME: %d%%"
-
-#~ msgid "BALANCE: %d%% LEFT"
-#~ msgstr "BALANCE: %d%% GAUCHE"
-
-#~ msgid "BALANCE: CENTER"
-#~ msgstr "BALANCE: CENTR�E"
-
-#~ msgid "BALANCE: %d%% RIGHT"
-#~ msgstr "BALANCE: %d%% DROITE"
-
-#~ msgid "Last.fm radio"
-#~ msgstr "Radio Last.fm"
-
-#~ msgid "Play Last.fm radio"
-#~ msgstr "Jouer Last.fm"
-
-#~ msgid ""
-#~ "<b><big>Unable to play files.</big></b>\n"
-#~ "\n"
-#~ "The following files could not be played. Please check that:\n"
-#~ "1. they are accessible.\n"
-#~ "2. you have enabled the media plugins required."
-#~ msgstr ""
-#~ "<b><big>Impossible de jouer des fichiers.</big></b>\n"
-#~ "\n"
-#~ "Les fichiers suivants ne peuvent 棚tre lus. Veuillez v辿rifier que:\n"
-#~ "1. ils sont accessibles.\n"
-#~ "2. vous avez activ辿 le greffon pour le m辿dia correspondant."
-
-#~ msgid "Don't show this warning anymore"
-#~ msgstr "Ne plus afficher cet avertissement"
-
-#~ msgid "Show more _details"
-#~ msgstr "Afficher plus de _d辿tails"
-
-#~ msgid ""
-#~ "Sorry, your GTK+ version (%d.%d.%d) does not work with Audacious.\n"
-#~ "Please use GTK+ %s or newer.\n"
-#~ msgstr ""
-#~ "D辿sol辿, votre version de GTK+ (%d.%d.%d) ne fonctionne pas avec "
-#~ "Audacious.\n"
-#~ "Mettez � jour GTK+ vers la version %s ou plus.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Received SIGSEGV\n"
-#~ "\n"
-#~ "This could be a bug in Audacious. If you don't know why this happened, "
-#~ "file a bug at http://bugs-meta.atheme.org/\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "SIGSEGV re巽u\n"
-#~ "\n"
-#~ "Il est possible que ce soit un bug d'Audacious. Si vous ne comprenez pas "
-#~ "comment \n"
-#~ "c'est arriv辿, envoyez un mail (en anglais) expliquant clairement vos "
-#~ "manipulations � http://bugs-meta.atheme.org/\n"
-
-#~ msgid "OPTIONS MENU"
-#~ msgstr "MENU OPTIONS"
-
-#~ msgid "DISABLE ALWAYS ON TOP"
-#~ msgstr "DESACTIVER TOUJOURS AU-DESSUS"
-
-#~ msgid "ENABLE ALWAYS ON TOP"
-#~ msgstr "ACTIVER TOUJOURS AU-DESSUS"
-
-#~ msgid "FILE INFO BOX"
-#~ msgstr "INFOS FICHIER"
-
-#~ msgid "DISABLE DOUBLESIZE"
-#~ msgstr "DESACTIVER DOUBLE-TAILLE"
-
-#~ msgid "ENABLE DOUBLESIZE"
-#~ msgstr "ACTIVER DOUBLE-TAILLE"
-
-#~ msgid "VISUALIZATION MENU"
-#~ msgstr "MENU DES EFFETS VISUELS"
-
-#~ msgid ""
-#~ "<b><big>No playable CD found.</big></b>\n"
-#~ "\n"
-#~ "No CD inserted, or inserted CD is not an audio CD.\n"
-#~ msgstr ""
-#~ "<b><big>Pas de CD jouable.</big></b>\n"
-#~ "\n"
-#~ "Pas de CD � lire, ou le CD ins辿r辿 n'est pas un CD audio.\n"
-
-#~ msgid "Play CD"
-#~ msgstr "Lecture du CD"
-
-#~ msgid "Add CD..."
-#~ msgstr "Ajouter un CD..."
-
-#~ msgid "Adds a CD to the playlist."
-#~ msgstr "Ajouter un CD � la playlist."
-
-#~ msgid "Track name: "
-#~ msgstr "Nom du Morceau:"
-
-#~ msgid "Album name: "
-#~ msgstr "Nom Album:"
-
-#~ msgid "Performer/Artist"
-#~ msgstr "Artiste"
-
-#~ msgid "File name"
-#~ msgstr "Nom du fichier"
-
-#~ msgid "File path"
-#~ msgstr "Chemin du fichier"
-
-#~ msgid "File extension"
-#~ msgstr "Extension du fichier"
-
-#~ msgid "Track name"
-#~ msgstr "Nom du morceau"
-
-#~ msgid "Track number"
-#~ msgstr "Num辿ro de piste"
-
-#~ msgid "%{n:...%}: Display \"...\" only if element %n is present"
-#~ msgstr "%{n:...%}: Affiche \"...\" si plus de %n 辿l辿ments sont pr辿sents"
-
-#~ msgid "Enable playlist transparency"
-#~ msgstr "Activer la transparence de la liste d'辿coute"
-
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: l'option '%s' est ambig端e\n"
-
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s l'option '--%s' n'accepte pas de param竪tre\n"
-
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: l'option '%c%s' n'accepte pas de param竪tre\n"
-
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: l'option '%s' n辿cessite un param竪tre\n"
-
-#~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: option '--%s' inconnue\n"
-
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: option '%c%s' inconnue\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: option interdite -- %c\n"
-
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: option incorrecte -- %c\n"
-
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: option n辿cessitant un param竪tre -- %c\n"
-
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: l'option `-W %s' est ambig端e\n"
+msgstr "Ouvrir/Ajouter un flux"
 
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: l'option '-W %s' n'accepte pas de param竪tre\n"
-
-#~ msgid ""
-#~ "Usage: audacious [options] [files] ...\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "--------\n"
-#~ msgstr ""
-#~ "Usage: audacious [options] [fichiers] ...\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "--------\n"
-
-#~ msgid "Display this text and exit"
-#~ msgstr "Affiche ce message et quitte"
-
-#~ msgid "Activate Audacious"
-#~ msgstr "Activer Audacious"
-
-#~ msgid "Previous session ID"
-#~ msgstr "ID de la session pr辿c辿dente"
-
-#~ msgid "Disable error/warning interception (logging)"
-#~ msgstr "D辿sactiver les logs d'erreurs/mises en garde"
-
-#~ msgid "Print version number and exit\n"
-#~ msgstr "Affiche le num辿ro de version et quitte\n"
-
-#~ msgid "Add/Open Files dialog"
-#~ msgstr "Fen棚tre d'Ajout/Ouverture de fichiers"
-
-#~ msgid "Close Dialog on Add"
-#~ msgstr "Fermer la fen棚tre apr竪s l'ajout"
-
-#~ msgid "Deselect All"
-#~ msgstr "Aucun"
-
-#~ msgid "Track Information Popup"
-#~ msgstr "Popup d'information de la piste"
-
-#~ msgid "Artist Popup"
-#~ msgstr "Fen棚tre Artiste"
-
-#~ msgid "<i>Genre</i>"
-#~ msgstr "<i>Genre</i>"
-
-#~ msgid "<i>Year</i>"
-#~ msgstr "<i>Ann辿e</i>"
-
-#~ msgid "<i>Track Number</i>"
-#~ msgstr "<i>Num辿ro de piste</i>"
-
-#~ msgid "<i>Track Length</i>"
-#~ msgstr "<i>Dur辿e du Morceau</i>"
-
-#~ msgid "label65"
-#~ msgstr "label65"
-
-#~ msgid "label76"
-#~ msgstr "label76"
-
-#~ msgid "/View Track Details"
-#~ msgstr "/Afficher le d辿tail"
-
-#~ msgid "/Visualization Mode/Analyzer"
-#~ msgstr "/Type de graphique/Analyseur"
-
-#~ msgid "/Visualization Mode/Scope"
-#~ msgstr "/Type de graphique/Scope"
-
-#, fuzzy
-#~ msgid "/Visualization Mode/Voiceprint"
-#~ msgstr "/Type de graphique/Scope"
-
-#~ msgid "/Visualization Mode/Off"
-#~ msgstr "/Type de graphique/Aucun"
-
-#~ msgid "/Analyzer Mode/Normal"
-#~ msgstr "/Type Analyseur/Normal"
-
-#~ msgid "/Analyzer Mode/Lines"
-#~ msgstr "/Type Analyseur/Lignes"
-
-#~ msgid "/Analyzer Mode/Bars"
-#~ msgstr "/Type Analyseur/Barres"
-
-#~ msgid "/Analyzer Mode/Peaks"
-#~ msgstr "/Type Analyseur/Cr棚tes"
-
-#, fuzzy
-#~ msgid "/Voiceprint mode/Normal"
-#~ msgstr "/Type Analyseur/Normal"
-
-#~ msgid "/WindowShade VU Mode/Normal"
-#~ msgstr "/Mode Fen棚tre R辿duite/Normale"
-
-#~ msgid "/WindowShade VU Mode/Smooth"
-#~ msgstr "/Mode Fen棚tre R辿duite/Liss辿e"
-
-#~ msgid "/Analyzer Falloff/Slowest"
-#~ msgstr "/Effet Retomb辿e Analyseur/Le plus lent"
-
-#~ msgid "/Analyzer Falloff/Slow"
-#~ msgstr "/Effet Retomb辿e Analyseur/Lent"
-
-#~ msgid "/Analyzer Falloff/Medium"
-#~ msgstr "/Effet Retomb辿e Analyseur/Moyen"
-
-#~ msgid "/Analyzer Falloff/Fast"
-#~ msgstr "/Effet Retomb辿e Analyseur/Rapide"
-
-#~ msgid "/Analyzer Falloff/Fastest"
-#~ msgstr "/Effet Retomb辿e Analyseur/Le plus rapide"
-
-#~ msgid "/Peaks Falloff/Slowest"
-#~ msgstr "/Effet Retomb辿e Cr棚tes/Le plus lent"
-
-#~ msgid "/Peaks Falloff/Slow"
-#~ msgstr "/Effet Retomb辿e Cr棚tes/Lent"
-
-#~ msgid "/Peaks Falloff/Medium"
-#~ msgstr "/Effet Retomb辿e Cr棚tes/Moyen"
-
-#~ msgid "/Peaks Falloff/Fast"
-#~ msgstr "/Effet Retomb辿e Cr棚tes/Rapide"
-
-#~ msgid "/Peaks Falloff/Fastest"
-#~ msgstr "/Effet Retomb辿e Cr棚tes/Le plus rapide"
-
-#~ msgid "/-"
-#~ msgstr "/-"
-
-#~ msgid "/Jump to Time"
-#~ msgstr "/Aller au Temps"
-
-#~ msgid "/About Audacious"
-#~ msgstr "/A Propos d'Audacious"
-
-#~ msgid "/Files..."
-#~ msgstr "/Fichiers..."
-
-#~ msgid "/Internet location..."
-#~ msgstr "/Adresse Internet..."
-
-#, fuzzy
-#~ msgid "New List"
-#~ msgstr "/Nouvelle Liste"
-
-#, fuzzy
-#~ msgid "Creates a new playlist."
-#~ msgstr "Montrer les s辿parateurs dans la liste d'辿coute"
-
-#, fuzzy
-#~ msgid "Displays track information."
-#~ msgstr "Information de la Piste"
-
-#~ msgid "Chinese:"
-#~ msgstr "Chinois:"
-
-#~ msgid "/Load/Preset"
-#~ msgstr "/Charger/un pr辿-r辿glage"
-
-#~ msgid "/Load/Default"
-#~ msgstr "/Charger/le pr辿-r辿glage par d辿faut"
-
-#~ msgid "/Load/Zero"
-#~ msgstr "/Charger/remise � z辿ro"
-
-#~ msgid "/Save/Preset"
-#~ msgstr "/Sauver/le pr辿-r辿glage"
-
-#~ msgid "/Save/Default"
-#~ msgstr "/Sauver/le pr辿-r辿glage par d辿faut"
-
-#~ msgid "/Save/To file"
-#~ msgstr "/Sauver/dans un fichier"
-
-#~ msgid "/Delete/Preset"
-#~ msgstr "/Effacer/le pr辿-r辿glage"
-
-#~ msgid "Load auto-preset"
-#~ msgstr "Charger pr辿-r辿glages auto."
-
-#~ msgid "Load equalizer preset"
-#~ msgstr "Charger pr辿-r辿glages de l'辿qualiseur"
-
-#~ msgid "Delete auto-preset"
-#~ msgstr "Effacer pr辿-r辿glages auto."
-
-#~ msgid "/Show Popup Info"
-#~ msgstr "/Montrer les infos Popup"
-
-#~ msgid "/Remove Duplicates/By Title"
-#~ msgstr "/Enlever les fichiers dupliqu辿s/Par Titre"
-
-#~ msgid "/Remove Duplicates/By Filename"
-#~ msgstr "/Enlever les fichiers dupliqu辿s/Par Nom de Fichier"
-
-#~ msgid "/Update View"
-#~ msgstr "/Rafra樽chir la Liste"
-
-#~ msgid "/Select All"
-#~ msgstr "/S辿lectionner tout"
-
-#~ msgid "/Sort List/By Date"
-#~ msgstr "/Trier la liste/Par Date"
-
-#~ msgid "/Sort Selection/By Title"
-#~ msgstr "/Trier la s辿lection/Par Titre"
-
-#~ msgid "/Sort Selection/By Artist"
-#~ msgstr "/Trier la S辿lection/Par Artiste"
-
-#~ msgid "/Sort Selection/By Filename"
-#~ msgstr "/Trier la s辿lection/Par Nom de Fichier"
-
-#~ msgid "/Sort Selection/By Path + Filename"
-#~ msgstr "/Trier la s辿lection/Par Chemin + Nom de Fichier"
-
-#~ msgid "/Sort Selection/By Date"
-#~ msgstr "/Trier la s辿lection/Par Date"
-
-#~ msgid "/Sort Selection/By Track Number"
-#~ msgstr "/Trier la S辿lection/Par Num辿ro de Piste"
-
-#~ msgid "/Sort Selection/By Playlist Entry"
-#~ msgstr "/Trier la S辿lection/Par Entr辿e de Liste d'辿coute"
--- a/po/ja.po	Wed Oct 17 23:01:59 2007 +0300
+++ b/po/ja.po	Wed Oct 17 23:02:12 2007 +0300
@@ -14,7 +14,7 @@
 "Project-Id-Version: audacious HEAD\n"
 "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n"
 "POT-Creation-Date: 2007-10-13 14:15+0200\n"
-"PO-Revision-Date: 2007-09-10 09:20+0900\n"
+"PO-Revision-Date: 2007-10-14 22:22+0900\n"
 "Last-Translator: dai <d+po@vdr.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -191,10 +191,12 @@
 "If selected, the file information text in the main window will scroll back "
 "and forth. If not selected, the text will only scroll in one direction."
 msgstr ""
+"������篏帥������<�ゃ�潟���c�潟���������<�ゃ�����宴���㏍�鴻������緇����鴻���㏍�若�����障��鐚�"
+"�����с�������逸����㏍�鴻������劫�����帥���鴻���㏍�若�����障��鐚�"
 
 #: src/audacious/glade/prefswin.glade:1380
 msgid "Use two-way text scroller"
-msgstr ""
+msgstr "���劫�����㏍�鴻���鴻���㏍�若����篏帥��"
 
 #: src/audacious/glade/prefswin.glade:1422 src/audacious/ui_preferences.c:111
 msgid "Appearance"
@@ -551,19 +553,21 @@
 msgstr "�泣�潟�����潟�違���若�� [Hz]:"
 
 #: src/audacious/glade/prefswin.glade:4517
-#, fuzzy
 msgid "<b>Volume Control</b>"
-msgstr "<b>�����鴻�����c�若��</b>"
+msgstr "<b>�����ャ�若���潟�潟���㏍�若��</b>"
 
 #: src/audacious/glade/prefswin.glade:4556
 msgid ""
 "Use software volume control. This may be useful for situations where your "
 "audio system does not support controlling the playback volume."
 msgstr ""
+"�純�������с�≪�����ャ�若���潟�潟���㏍�若����篏帥���障��鐚����若���c���激�鴻������"
+"�����渇����潟�潟���㏍�若�����泣���若�������������倶��ф�����с������鐚�"
+
 
 #: src/audacious/glade/prefswin.glade:4558
 msgid "Use software volume control"
-msgstr ""
+msgstr "�純�������с�≪�����ャ�若���潟�潟���㏍�若����篏帥��"
 
 #: src/audacious/glade/prefswin.glade:4746
 msgid "Reload Plugins"
@@ -864,7 +868,7 @@
 msgstr "�����吾����"
 
 #: src/audacious/ui_credits.c:47
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<big><b>Audacious %s</b></big>\n"
 "A skinned multimedia player for many platforms.\n"
@@ -872,7 +876,7 @@
 "Copyright (C) 2005-2007 Audacious Development Team\n"
 msgstr ""
 "<big><b>Audacious %s</b></big>\n"
-"The future of UNIX multimedia.\n"
+"紊�����������������若���������鴻�㏍�恰��巡��������<���c�≪�����若��.\n"
 "\n"
 "Copyright (C) 2005-2007 Audacious ���冴���若��\n"
 
@@ -1775,7 +1779,6 @@
 msgstr "�御�������贋�������<���c�≪��羲�絅�"
 
 #: src/audacious/ui_manager.c:400
-#, fuzzy
 msgid "Plugin services"
 msgstr "�����違�ゃ�潟�泣�若����"
 
@@ -2051,12 +2054,11 @@
 
 #: src/audacious/ui_preferences.c:133
 msgid "Codec"
-msgstr ""
+msgstr "�潟�若������"
 
 #: src/audacious/ui_preferences.c:134
-#, fuzzy
 msgid "Quality"
-msgstr "腟�篋�(_Q)"
+msgstr "�活蟹"
 
 #: src/audacious/ui_preferences.c:155
 msgid "localhost"
--- a/scripts/makerelease.sh	Wed Oct 17 23:01:59 2007 +0300
+++ b/scripts/makerelease.sh	Wed Oct 17 23:02:12 2007 +0300
@@ -85,8 +85,8 @@
 fi
 
 if [ "x$PUBLISH" = "xyes" ]; then
-	scp $RELEASENAME.tgz sidhe.atheme.org:/var/www/distfiles/htdocs
-	scp $RELEASENAME.tbz2 sidhe.atheme.org:/var/www/distfiles/htdocs
+	scp $RELEASENAME.tgz distfiles-master.atheme.org:/srv/distfiles
+	scp $RELEASENAME.tbz2 distfiles-master.atheme.org:/srv/distfiles
 
 	echo
 	echo "The releases have been published, and will be available to the entire"
--- a/src/audacious/Makefile	Wed Oct 17 23:01:59 2007 +0300
+++ b/src/audacious/Makefile	Wed Oct 17 23:02:12 2007 +0300
@@ -191,7 +191,7 @@
 	${LIBGLADE_LIBS}	\
 	${REGEX_LIBS}
 
-LDFLAGS += ${EXPORTDYN} ${PROG_IMPLIB_LDFLAGS}
+LDFLAGS += ${PROG_IMPLIB_LDFLAGS}
 
 build_stamp.c: 
 	if [ -d ../../.hg ]; then \
--- a/src/audacious/auddrct.c	Wed Oct 17 23:01:59 2007 +0300
+++ b/src/audacious/auddrct.c	Wed Oct 17 23:02:12 2007 +0300
@@ -36,14 +36,14 @@
 /* player */
 
 void
-audacious_drct_quit ( void )
+drct_quit ( void )
 {
   mainwin_quit_cb();
   return;
 }
 
 void
-audacious_drct_eject ( void )
+drct_eject ( void )
 {
   if (has_x11_connection)
     mainwin_eject_pushed();
@@ -51,7 +51,7 @@
 }
 
 void
-audacious_drct_jtf_show ( void )
+drct_jtf_show ( void )
 {
   if (has_x11_connection)
     ui_jump_to_track();
@@ -59,13 +59,13 @@
 }
 
 gboolean
-audacious_drct_main_win_is_visible ( void )
+drct_main_win_is_visible ( void )
 {
   return cfg.player_visible;
 }
 
 void
-audacious_drct_main_win_toggle ( gboolean show )
+drct_main_win_toggle ( gboolean show )
 {
   if (has_x11_connection)
     mainwin_show(show);
@@ -73,13 +73,13 @@
 }
 
 gboolean
-audacious_drct_eq_win_is_visible ( void )
+drct_eq_win_is_visible ( void )
 {
   return cfg.equalizer_visible;
 }
 
 void
-audacious_drct_eq_win_toggle ( gboolean show )
+drct_eq_win_toggle ( gboolean show )
 {
   if (has_x11_connection)
     equalizerwin_show(show);
@@ -87,13 +87,13 @@
 }
 
 gboolean
-audacious_drct_pl_win_is_visible ( void )
+drct_pl_win_is_visible ( void )
 {
   return cfg.playlist_visible;
 }
 
 void
-audacious_drct_pl_win_toggle ( gboolean show )
+drct_pl_win_toggle ( gboolean show )
 {
   if (has_x11_connection) {
     if (show)
@@ -104,13 +104,13 @@
   return;
 }
 
-void audacious_drct_set_skin(gchar *skinfile)
+void drct_set_skin(gchar *skinfile)
 {
     if (has_x11_connection)
         bmp_active_skin_load(skinfile);
 }
 
-void audacious_drct_activate(void)
+void drct_activate(void)
 {
     gtk_window_present(GTK_WINDOW(mainwin));
 }
@@ -118,7 +118,7 @@
 /* playback */
 
 void
-audacious_drct_play ( void )
+drct_play ( void )
 {
   if (playback_get_paused())
     playback_pause();
@@ -130,14 +130,14 @@
 }
 
 void
-audacious_drct_pause ( void )
+drct_pause ( void )
 {
   playback_pause();
   return;
 }
 
 void
-audacious_drct_stop ( void )
+drct_stop ( void )
 {
   ip_data.stop = TRUE;
   playback_stop();
@@ -147,31 +147,31 @@
 }
 
 gboolean
-audacious_drct_get_playing ( void )
+drct_get_playing ( void )
 {
   return playback_get_playing();
 }
 
 gboolean
-audacious_drct_get_paused ( void )
+drct_get_paused ( void )
 {
   return playback_get_paused();
 }
 
 gboolean
-audacious_drct_get_stopped ( void )
+drct_get_stopped ( void )
 {
   return !playback_get_playing();
 }
 
 void
-audacious_drct_get_info( gint *rate, gint *freq, gint *nch)
+drct_get_info( gint *rate, gint *freq, gint *nch)
 {
     playback_get_sample_params(rate, freq, nch);
 }
 
 gint
-audacious_drct_get_time ( void )
+drct_get_time ( void )
 {
   gint time;
   if (playback_get_playing())
@@ -182,7 +182,7 @@
 }
 
 void
-audacious_drct_seek ( guint pos )
+drct_seek ( guint pos )
 {
   if (playlist_get_current_length(playlist_get_active()) > 0 &&
       pos < (guint)playlist_get_current_length(playlist_get_active()))
@@ -191,14 +191,14 @@
 }
 
 void
-audacious_drct_get_volume ( gint *vl, gint *vr )
+drct_get_volume ( gint *vl, gint *vr )
 {
   input_get_volume(vl, vr);
   return;
 }
 
 void
-audacious_drct_set_volume ( gint vl, gint vr )
+drct_set_volume ( gint vl, gint vr )
 {
   if (vl > 100)
     vl = 100;
@@ -209,19 +209,19 @@
 }
 
 void
-audacious_drct_get_volume_main( gint *v )
+drct_get_volume_main( gint *v )
 {
   gint vl, vr;
-  audacious_drct_get_volume(&vl, &vr);
+  drct_get_volume(&vl, &vr);
   *v = (vl > vr) ? vl : vr;
   return;
 }
 
 void
-audacious_drct_set_volume_main ( gint v )
+drct_set_volume_main ( gint v )
 {
   gint b, vl, vr;
-  audacious_drct_get_volume_balance(&b);
+  drct_get_volume_balance(&b);
   if (b < 0) {
     vl = v;
     vr = (v * (100 - abs(b))) / 100;
@@ -232,11 +232,11 @@
   }
   else
     vl = vr = v;
-  audacious_drct_set_volume(vl, vr);
+  drct_set_volume(vl, vr);
 }
 
 void
-audacious_drct_get_volume_balance ( gint *b )
+drct_get_volume_balance ( gint *b )
 {
   gint vl, vr;
   input_get_volume(&vl, &vr);
@@ -252,14 +252,14 @@
 }
 
 void
-audacious_drct_set_volume_balance ( gint b )
+drct_set_volume_balance ( gint b )
 {
   gint v, vl, vr;
   if (b < -100)
     b = -100;
   if (b > 100)
     b = 100;
-  audacious_drct_get_volume_main(&v);
+  drct_get_volume_main(&v);
   if (b < 0) {
     vl = v;
     vr = (v * (100 - abs(b))) / 100;
@@ -273,7 +273,7 @@
     vl = v;
     vr = v;
   }
-  audacious_drct_set_volume(vl, vr);
+  drct_set_volume(vl, vr);
   return;
 }
 
@@ -281,71 +281,71 @@
 /* playlist */
 
 void
-audacious_drct_pl_next ( void )
+drct_pl_next ( void )
 {
   playlist_next(playlist_get_active());
   return;
 }
 
 void
-audacious_drct_pl_prev ( void )
+drct_pl_prev ( void )
 {
   playlist_prev(playlist_get_active());
   return;
 }
 
 gboolean
-audacious_drct_pl_repeat_is_enabled( void )
+drct_pl_repeat_is_enabled( void )
 {
     return cfg.repeat;
 }
 
 void
-audacious_drct_pl_repeat_toggle( void )
+drct_pl_repeat_toggle( void )
 {
   mainwin_repeat_pushed(!cfg.repeat);
   return;
 }
 
 gboolean
-audacious_drct_pl_repeat_is_shuffled( void )
+drct_pl_repeat_is_shuffled( void )
 {
     return cfg.shuffle;
 }
 
 void
-audacious_drct_pl_shuffle_toggle( void )
+drct_pl_shuffle_toggle( void )
 {
   mainwin_shuffle_pushed(!cfg.shuffle);
   return;
 }
 
 gchar *
-audacious_drct_pl_get_title( gint pos )
+drct_pl_get_title( gint pos )
 {
     return playlist_get_songtitle(playlist_get_active(), pos);
 }
 
 gint
-audacious_drct_pl_get_time( gint pos )
+drct_pl_get_time( gint pos )
 {
     return playlist_get_songtime(playlist_get_active(), pos);
 }
 
 gint
-audacious_drct_pl_get_pos( void )
+drct_pl_get_pos( void )
 {
     return playlist_get_position_nolock(playlist_get_active());
 }
 
 gchar *
-audacious_drct_pl_get_file( gint pos )
+drct_pl_get_file( gint pos )
 {
     return playlist_get_filename(playlist_get_active(), pos);
 }
 
 void
-audacious_drct_pl_add ( GList * list )
+drct_pl_add ( GList * list )
 {
   GList *node = list;
   while ( node != NULL )
@@ -357,7 +357,7 @@
 }
 
 void
-audacious_drct_pl_clear ( void )
+drct_pl_clear ( void )
 {
   playlist_clear(playlist_get_active());
   mainwin_clear_song_info();
@@ -367,7 +367,7 @@
 
 /* following functions are not tested yet. be careful. --yaz */
 void
-audacious_drct_pl_delete ( gint pos )
+drct_pl_delete ( gint pos )
 {
     GDK_THREADS_ENTER();
     playlist_delete_index(playlist_get_active(), pos);
@@ -375,7 +375,7 @@
 }
 
 void
-audacious_drct_pl_set_pos( gint pos )
+drct_pl_set_pos( gint pos )
 {
     Playlist *playlist = playlist_get_active();
     if (pos < (guint)playlist_get_length(playlist))
@@ -383,19 +383,19 @@
 }
 
 gint
-audacious_drct_pl_get_length( void )
+drct_pl_get_length( void )
 {
     return playlist_get_length(playlist_get_active());
 }
 
 void
-audacious_drct_pl_ins_url_string( gchar * string, gint pos )
+drct_pl_ins_url_string( gchar * string, gint pos )
 {
     playlist_ins_url(playlist_get_active(), string, pos);
 }
 
 void
-audacious_drct_pl_add_url_string( gchar * string )
+drct_pl_add_url_string( gchar * string )
 {
     GDK_THREADS_ENTER();
     playlist_add_url(playlist_get_active(), string);
@@ -403,7 +403,7 @@
 }
 
 void
-audacious_drct_pl_enqueue_to_temp( gchar * string )
+drct_pl_enqueue_to_temp( gchar * string )
 {
     Playlist *new_pl = playlist_new();
 
@@ -416,13 +416,13 @@
 
 /* playqueue */
 gint
-audacious_drct_pq_get_length( void )
+drct_pq_get_length( void )
 {
     return playlist_queue_get_length(playlist_get_active());
 }
 
 void
-audacious_drct_pq_add( gint pos )
+drct_pq_add( gint pos )
 {
     Playlist *playlist = playlist_get_active();
     if (pos < (guint)playlist_get_length(playlist))
@@ -430,7 +430,7 @@
 }
 
 void
-audacious_drct_pq_remove( gint pos )
+drct_pq_remove( gint pos )
 {
     Playlist *playlist = playlist_get_active();
     if (pos < (guint)playlist_get_length(playlist))
@@ -438,25 +438,25 @@
 }
 
 void
-audacious_drct_pq_clear( void )
+drct_pq_clear( void )
 {
     playlist_clear_queue(playlist_get_active());
 }
 
 gboolean
-audacious_drct_pq_is_queued( gint pos )
+drct_pq_is_queued( gint pos )
 {
     return playlist_is_position_queued(playlist_get_active(), pos);
 }
 
 gint
-audacious_drct_pq_get_position( gint pos )
+drct_pq_get_position( gint pos )
 {
     return playlist_get_queue_position_number(playlist_get_active(), pos);
 }
 
 gint
-audaciuos_drct_pq_get_queue_position( gint pos )
+drct_pq_get_queue_position( gint pos )
 {
     return playlist_get_queue_position_number(playlist_get_active(), pos);
 }
--- a/src/audacious/auddrct.h	Wed Oct 17 23:01:59 2007 +0300
+++ b/src/audacious/auddrct.h	Wed Oct 17 23:02:12 2007 +0300
@@ -27,63 +27,63 @@
 #include <glib.h>
 
 /* player */
-void audacious_drct_quit ( void );
-void audacious_drct_eject ( void );
-void audacious_drct_jtf_show ( void );
-gboolean audacious_drct_main_win_is_visible ( void );
-void audacious_drct_main_win_toggle ( gboolean );
-gboolean audacious_drct_eq_win_is_visible ( void );
-void audacious_drct_eq_win_toggle ( gboolean );
-gboolean audacious_drct_pl_win_is_visible ( void );
-void audacious_drct_pl_win_toggle ( gboolean );
-void audacious_drct_set_skin(gchar *skinfile);
-void audacious_drct_activate(void);
+void drct_quit ( void );
+void drct_eject ( void );
+void drct_jtf_show ( void );
+gboolean drct_main_win_is_visible ( void );
+void drct_main_win_toggle ( gboolean );
+gboolean drct_eq_win_is_visible ( void );
+void drct_eq_win_toggle ( gboolean );
+gboolean drct_pl_win_is_visible ( void );
+void drct_pl_win_toggle ( gboolean );
+void drct_set_skin(gchar *skinfile);
+void drct_activate(void);
 
 /* playback */
-void audacious_drct_play ( void );
-void audacious_drct_pause ( void );
-void audacious_drct_stop ( void );
-gboolean audacious_drct_get_playing ( void );
-gboolean audacious_drct_get_paused ( void );
-gboolean audacious_drct_get_stopped ( void );
-void audacious_drct_get_info( gint *rate, gint *freq, gint *nch);
-gint audacious_drct_get_time ( void );
-void audacious_drct_seek ( guint pos );
-void audacious_drct_get_volume( gint *vl, gint *vr );
-void audacious_drct_set_volume( gint vl, gint vr );
-void audacious_drct_get_volume_main( gint *v );
-void audacious_drct_set_volume_main( gint v );
-void audacious_drct_get_volume_balance( gint *b );
-void audacious_drct_set_volume_balance( gint b );
+void drct_play ( void );
+void drct_pause ( void );
+void drct_stop ( void );
+gboolean drct_get_playing ( void );
+gboolean drct_get_paused ( void );
+gboolean drct_get_stopped ( void );
+void drct_get_info( gint *rate, gint *freq, gint *nch);
+gint drct_get_time ( void );
+void drct_seek ( guint pos );
+void drct_get_volume( gint *vl, gint *vr );
+void drct_set_volume( gint vl, gint vr );
+void drct_get_volume_main( gint *v );
+void drct_set_volume_main( gint v );
+void drct_get_volume_balance( gint *b );
+void drct_set_volume_balance( gint b );
 
 /* playlist */
-void audacious_drct_pl_next( void );
-void audacious_drct_pl_prev( void );
-gboolean audacious_drct_pl_repeat_is_enabled ( void );
-void audacious_drct_pl_repeat_toggle ( void );
-gboolean audacious_drct_pl_repeat_is_shuffled ( void );
-void audacious_drct_pl_shuffle_toggle ( void );
-gchar *audacious_drct_pl_get_title( gint pos );
-gint audacious_drct_pl_get_time( gint pos );
-gint audacious_drct_pl_get_pos( void );
-gchar *audacious_drct_pl_get_file( gint pos );
-void audacious_drct_pl_add ( GList * list );
-void audacious_drct_pl_clear ( void );
-gint audacious_drct_pl_get_length( void );
-void audacious_drct_pl_delete ( gint pos );
-void audacious_drct_pl_set_pos( gint pos );
-void audacious_drct_pl_ins_url_string( gchar * string, gint pos );
-void audacious_drct_pl_add_url_string( gchar * string );
-void audacious_drct_pl_enqueue_to_temp( gchar * string );
+void drct_pl_next( void );
+void drct_pl_prev( void );
+gboolean drct_pl_repeat_is_enabled ( void );
+void drct_pl_repeat_toggle ( void );
+gboolean drct_pl_repeat_is_shuffled ( void );
+void drct_pl_shuffle_toggle ( void );
+gchar *drct_pl_get_title( gint pos );
+gint drct_pl_get_time( gint pos );
+gint drct_pl_get_pos( void );
+gchar *drct_pl_get_file( gint pos );
+void drct_pl_add ( GList * list );
+void drct_pl_clear ( void );
+gint drct_pl_get_length( void );
+void drct_pl_delete ( gint pos );
+void drct_pl_set_pos( gint pos );
+void drct_pl_ins_url_string( gchar * string, gint pos );
+void drct_pl_add_url_string( gchar * string );
+void drct_pl_enqueue_to_temp( gchar * string );
 
 /* playqueue */
-gint audacious_drct_pq_get_length( void );
-void audacious_drct_pq_add( gint pos );
-void audacious_drct_pq_remove( gint pos );
-void audacious_drct_pq_clear( void );
-gboolean audacious_drct_pq_is_queued( gint pos );
-gint audacious_drct_pq_get_position( gint pos );
-gint audaciuos_drct_pq_get_queue_position( gint pos );
+gint drct_pq_get_length( void );
+void drct_pq_add( gint pos );
+void drct_pq_remove( gint pos );
+void drct_pq_clear( void );
+gboolean drct_pq_is_queued( gint pos );
+gint drct_pq_get_position( gint pos );
+gint drct_pq_get_queue_position( gint pos );
 
 /* adjust naming scheme to audacious_remote_* functions */
 #define audacious_drct_show_jtf_box audacious_drct_jtf_show
--- a/src/audacious/dock.c	Wed Oct 17 23:01:59 2007 +0300
+++ b/src/audacious/dock.c	Wed Oct 17 23:02:12 2007 +0300
@@ -565,3 +565,8 @@
 
     return list;
 }
+
+GList *
+get_dock_window_list() {
+    return dock_window_list;
+}
--- a/src/audacious/dock.h	Wed Oct 17 23:01:59 2007 +0300
+++ b/src/audacious/dock.h	Wed Oct 17 23:02:12 2007 +0300
@@ -44,4 +44,6 @@
                                  gboolean decorated);
 void dock_window_resize(GtkWindow * widget, gint new_w, gint new_h, gint w, gint h);
 
+GList *get_dock_window_list();
+
 #endif
--- a/src/audacious/input.h	Wed Oct 17 23:01:59 2007 +0300
+++ b/src/audacious/input.h	Wed Oct 17 23:02:12 2007 +0300
@@ -40,11 +40,6 @@
     GMutex *playback_mutex;
 };
 
-typedef struct {
-    Tuple *tuple;
-    InputPlugin *ip;
-} ProbeResult;
-
 GList *get_input_list(void);
 InputPlayback *get_current_input_playback(void);
 void set_current_input_playback(InputPlayback * ip);
--- a/src/audacious/main.c	Wed Oct 17 23:01:59 2007 +0300
+++ b/src/audacious/main.c	Wed Oct 17 23:02:12 2007 +0300
@@ -1184,35 +1184,35 @@
             audacious_remote_activate(session);
     } else {
         if (options->rew)
-            audacious_drct_playlist_prev();
+            drct_pl_prev();
 
         if (options->play)
-            audacious_drct_play();
+            drct_play();
 
         if (options->pause)
-            audacious_drct_pause();
+            drct_pause();
 
         if (options->stop)
-            audacious_drct_stop();
+            drct_stop();
 
         if (options->fwd)
-            audacious_drct_playlist_next();
+            drct_pl_next();
 
         if (options->play_pause) {
-            if (audacious_drct_get_paused())
-                audacious_drct_play();
+            if (drct_get_paused())
+                drct_play();
             else
-                audacious_drct_pause();
+                drct_pause();
         }
 
         if (options->show_jump_box)
-            audacious_drct_show_jtf_box();
+            drct_jtf_show();
 
         if (options->mainwin)
-            audacious_drct_main_win_toggle(TRUE);
+            drct_main_win_toggle(TRUE);
 
         if (options->activate)
-            audacious_drct_activate();
+            drct_activate();
     }
 
     if(remote) {
--- a/src/audacious/main.h	Wed Oct 17 23:01:59 2007 +0300
+++ b/src/audacious/main.h	Wed Oct 17 23:02:12 2007 +0300
@@ -179,7 +179,7 @@
 
 extern GCond *cond_scan;
 extern GMutex *mutex_scan;
-#ifdef USE_DBUS
+#if defined(USE_DBUS) && defined(_AUDACIOUS_CORE)
 extern MprisPlayer *mpris;
 #endif
 
--- a/src/audacious/plugin.h	Wed Oct 17 23:01:59 2007 +0300
+++ b/src/audacious/plugin.h	Wed Oct 17 23:02:12 2007 +0300
@@ -56,8 +56,8 @@
 #define LOWLEVEL_PLUGIN(x) ((LowlevelPlugin *)(x))
 
 #define __AUDACIOUS_NEWVFS__
-#define __AUDACIOUS_PLUGIN_API__ 6
-#define __AUDACIOUS_INPUT_PLUGIN_API__ 6
+#define __AUDACIOUS_PLUGIN_API__ 7
+#define __AUDACIOUS_INPUT_PLUGIN_API__ 7
 
 typedef enum {
     FMT_U8,
@@ -89,10 +89,22 @@
 
 typedef struct _InputPlayback InputPlayback;
 
+typedef struct {
+    Tuple *tuple;
+    InputPlugin *ip;
+} ProbeResult;
+
+typedef GHashTable INIFile;
+
 #include "audacious/playlist.h"
 #include "audacious/input.h"
 #include "audacious/mime.h"
 #include "audacious/custom_uri.h"
+#include "audacious/hook.h"
+#include "audacious/xconvert.h"
+#include "audacious/ui_plugin_menu.h"
+#include "audacious/formatter.h"
+#include "audacious/flow.h"
 
 #define PLUGIN_COMMON_FIELDS		\
     gpointer handle;			\
@@ -289,6 +301,17 @@
                                    GCallback button_action,
                                    gpointer action_data);
     const gchar *(*get_gentitle_format)(void);
+    gchar *(*util_get_localdir)(void);
+    void (*util_menu_main_show)(gint x, gint y, guint button, guint time);
+
+    /* INI funcs */
+    INIFile *(*open_ini_file)(const gchar *filename);
+    void (*close_ini_file)(INIFile *key_file);
+    gchar *(*read_ini_string)(INIFile *key_file, const gchar *section,
+                                           const gchar *key);
+    GArray *(*read_ini_array)(INIFile *key_file, const gchar *section,
+                       const gchar *key);
+
 
     /* strings API */
     gchar *(*escape_shell_chars)(const gchar * string);
@@ -438,6 +461,131 @@
     /* state vars */
     InputPluginData *ip_state;
     BmpConfig *_cfg;
+
+    /* hook API */
+    void (*hook_register)(const gchar *name);
+    gint (*hook_associate)(const gchar *name, HookFunction func, gpointer user_data);
+    gint (*hook_dissociate)(const gchar *name, HookFunction func);
+    void (*hook_call)(const gchar *name, gpointer hook_data);
+
+    /* xconvert API */
+    struct xmms_convert_buffers *(*xmms_convert_buffers_new)(void);
+    void (*xmms_convert_buffers_free)(struct xmms_convert_buffers *buf);
+    void (*xmms_convert_buffers_destroy)(struct xmms_convert_buffers *buf);
+    convert_func_t (*xmms_convert_get_func)(AFormat output, AFormat input);
+    convert_channel_func_t (*xmms_convert_get_channel_func)(AFormat fmt,
+                                                     int output,
+                                                     int input);
+    convert_freq_func_t (*xmms_convert_get_frequency_func)(AFormat fmt,
+                                                    int channels);
+
+    /* PluginMenu API */
+    gint (*menu_plugin_item_add)(gint, GtkWidget *);
+    gint (*menu_plugin_item_remove)(gint, GtkWidget *);
+
+    /* DRCT API. */
+    void (*drct_quit) ( void );
+    void (*drct_eject) ( void );
+    void (*drct_jtf_show) ( void );
+    gboolean (*drct_main_win_is_visible)( void );
+    void (*drct_main_win_toggle) ( gboolean );
+    gboolean (*drct_eq_win_is_visible)( void );
+    void (*drct_eq_win_toggle) ( gboolean );
+    gboolean (*drct_pl_win_is_visible)( void );
+    void (*drct_pl_win_toggle) ( gboolean );
+    void (*drct_set_skin)(gchar *skinfile);
+    void (*drct_activate)(void);
+
+    /* DRCT API: playback */
+    void (*drct_play) ( void );
+    void (*drct_pause) ( void );
+    void (*drct_stop) ( void );
+    gboolean (*drct_get_playing)( void );
+    gboolean (*drct_get_paused)( void );
+    gboolean (*drct_get_stopped)( void );
+    void (*drct_get_info)( gint *rate, gint *freq, gint *nch);
+    gint (*drct_get_time )( void );
+    void (*drct_seek) ( guint pos );
+    void (*drct_get_volume)( gint *vl, gint *vr );
+    void (*drct_set_volume)( gint vl, gint vr );
+    void (*drct_get_volume_main)( gint *v );
+    void (*drct_set_volume_main)( gint v );
+    void (*drct_get_volume_balance)( gint *b );
+    void (*drct_set_volume_balance)( gint b );
+
+    /* DRCT API: playlist */
+    void (*drct_pl_next)( void );
+    void (*drct_pl_prev)( void );
+    gboolean (*drct_pl_repeat_is_enabled)( void );
+    void (*drct_pl_repeat_toggle) ( void );
+    gboolean (*drct_pl_repeat_is_shuffled)( void );
+    void (*drct_pl_shuffle_toggle) ( void );
+    gchar *(*drct_pl_get_title)( gint pos );
+    gint (*drct_pl_get_time)( gint pos );
+    gint (*drct_pl_get_pos)( void );
+    gchar *(*drct_pl_get_file)( gint pos );
+    void (*drct_pl_add) ( GList * list );
+    void (*drct_pl_clear) ( void );
+    gint (*drct_pl_get_length)( void );
+    void (*drct_pl_delete) ( gint pos );
+    void (*drct_pl_set_pos)( gint pos );
+    void (*drct_pl_ins_url_string)( gchar * string, gint pos );
+    void (*drct_pl_add_url_string)( gchar * string );
+    void (*drct_pl_enqueue_to_temp)( gchar * string );
+
+    /* DRCT API: playqueue */
+    gint (*drct_pq_get_length)( void );
+    void (*drct_pq_add)( gint pos );
+    void (*drct_pq_remove)( gint pos );
+    void (*drct_pq_clear)( void );
+    gboolean (*drct_pq_is_queued)( gint pos );
+    gint (*drct_pq_get_position)( gint pos );
+    gint (*drct_pq_get_queue_position)( gint pos );
+
+    /* Formatter API */
+    Formatter *(*formatter_new)(void);
+    void (*formatter_destroy)(Formatter * formatter);
+    void (*formatter_associate)(Formatter * formatter, guchar id,
+                                gchar * value);
+    void (*formatter_dissociate)(Formatter * formatter, guchar id);
+    gchar *(*formatter_format)(Formatter * formatter, gchar * format);
+
+    gint (*prefswin_page_new)(GtkWidget *container, gchar *name, gchar *imgurl);
+    void (*prefswin_page_destroy)(GtkWidget *container);
+
+    /* FileInfoPopup API */
+    GtkWidget *(*fileinfopopup_create)(void);
+    void (*fileinfopopup_destroy)(GtkWidget* fileinfopopup_win);
+    void (*fileinfopopup_show_from_tuple)(GtkWidget *fileinfopopup_win, Tuple *tuple);
+    void (*fileinfopopup_show_from_title)(GtkWidget *fileinfopopup_win, gchar *title);
+    void (*fileinfopopup_hide)(GtkWidget *filepopup_win, gpointer unused);
+
+    /* Probe */
+    ProbeResult *(*input_check_file)(const gchar * filename, gboolean show_warning);
+
+    /* InputPlayback */
+    InputPlayback *(*playback_new)(void);
+    void (*playback_run)(InputPlayback *);
+
+    /* Flows */
+    gsize (*flow_execute)(Flow *flow, gint time, gpointer *data, gsize len, AFormat fmt,
+                          gint srate, gint channels);
+    Flow *(*flow_new)(void);
+    void (*flow_link_element)(Flow *flow, FlowFunction func);
+    void (*flow_unlink_element)(Flow *flow, FlowFunction func);
+    void (*effect_flow)(FlowContext *context);
+    void (*iir_flow)(FlowContext *context);
+    void (*volumecontrol_flow)(FlowContext *context);
+    
+    /* Dock */
+    GList *(*get_dock_window_list)(void);
+    GList *(*dock_add_window)(GList * window_list, GtkWindow * window);
+    GList *(*dock_remove_window)(GList * window_list, GtkWindow * window);
+    void (*dock_move_press)(GList * window_list, GtkWindow * w,
+                         GdkEventButton * event, gboolean move_list);
+    void (*dock_move_motion)(GtkWindow * w, GdkEventMotion * event);
+    void (*dock_move_release)(GtkWindow * w);
+    gboolean (*dock_is_moving)(GtkWindow * w);
 };
 
 /* Convenience macros for accessing the public API. */
@@ -656,6 +804,127 @@
 #define aud_ip_state				_audvt->ip_state
 #define aud_cfg					_audvt->_cfg
 
+#define aud_hook_associate			_audvt->hook_associate
+#define aud_hook_dissociate			_audvt->hook_dissociate
+#define aud_hook_register			_audvt->hook_register
+#define aud_hook_call				_audvt->hook_call
+
+#define aud_open_ini_file			_audvt->open_ini_file
+#define aud_close_ini_file			_audvt->close_ini_file
+#define aud_read_ini_string			_audvt->read_ini_string
+#define aud_read_ini_array			_audvt->read_ini_array
+
+#define aud_convert_buffers_new			_audvt->xmms_convert_buffers_new
+#define aud_convert_buffers_free		_audvt->xmms_convert_buffers_free
+#define aud_convert_buffers_destroy		_audvt->xmms_convert_buffers_destroy
+#define aud_convert_get_func			_audvt->xmms_convert_get_func
+#define aud_convert_get_channel_func		_audvt->xmms_convert_get_channel_func
+#define aud_convert_get_frequency_func		_audvt->xmms_convert_get_frequency_func
+
+#define audacious_menu_plugin_item_add		_audvt->menu_plugin_item_add
+#define audacious_menu_plugin_item_remove	_audvt->menu_plugin_item_remove
+#define aud_menu_plugin_item_add		_audvt->menu_plugin_item_add
+#define aud_menu_plugin_item_remove		_audvt->menu_plugin_item_remove
+
+#define audacious_drct_quit			_audvt->drct_quit
+#define audacious_drct_eject			_audvt->drct_eject
+#define audacious_drct_jtf_show			_audvt->drct_jtf_show
+#define audacious_drct_main_win_is_visible	_audvt->drct_main_win_is_visible
+#define audacious_drct_main_win_toggle		_audvt->drct_main_win_toggle
+#define audacious_drct_eq_win_is_visible	_audvt->drct_eq_win_is_visible
+#define audacious_drct_eq_win_toggle		_audvt->drct_eq_win_toggle
+#define audacious_drct_pl_win_is_visible	_audvt->drct_pl_win_is_visible
+#define audacious_drct_pl_win_toggle		_audvt->drct_pl_win_toggle
+#define audacious_drct_set_skin			_audvt->drct_set_skin
+#define audacious_drct_activate			_audvt->drct_activate
+
+#define audacious_drct_play			_audvt->drct_play
+#define audacious_drct_pause			_audvt->drct_pause
+#define audacious_drct_stop			_audvt->drct_stop
+#define audacious_drct_get_playing		_audvt->drct_get_playing
+#define audacious_drct_get_paused		_audvt->drct_get_paused
+#define audacious_drct_get_stopped		_audvt->drct_get_stopped
+#define audacious_drct_get_info			_audvt->drct_get_info
+#define audacious_drct_get_time			_audvt->drct_get_time
+#define audacious_drct_seek			_audvt->drct_seek
+#define audacious_drct_get_volume		_audvt->drct_get_volume
+#define audacious_drct_set_volume		_audvt->drct_set_volume
+#define audacious_drct_get_volume_main		_audvt->drct_get_volume_main
+#define audacious_drct_set_volume_main		_audvt->drct_set_volume_main
+#define audacious_drct_get_volume_balance	_audvt->drct_get_volume_balance
+#define audacious_drct_set_volume_balance	_audvt->drct_set_volume_balance
+
+#define audacious_drct_pl_next			_audvt->drct_pl_next
+#define audacious_drct_pl_prev			_audvt->drct_pl_prev
+#define audacious_drct_pl_repeat_is_enabled	_audvt->drct_pl_repeat_is_enabled
+#define audacious_drct_pl_repeat_toggle		_audvt->drct_pl_repeat_toggle
+#define audacious_drct_pl_repeat_is_shuffled	_audvt->drct_pl_repeat_is_shuffled
+#define audacious_drct_pl_shuffle_toggle	_audvt->drct_pl_shuffle_toggle
+#define audacious_drct_pl_get_title		_audvt->drct_pl_get_title
+#define audacious_drct_pl_get_time		_audvt->drct_pl_get_time
+#define audacious_drct_pl_get_pos		_audvt->drct_pl_get_pos
+#define audacious_drct_pl_get_file		_audvt->drct_pl_get_file
+#define audacious_drct_pl_add			_audvt->drct_pl_add
+#define audacious_drct_pl_clear			_audvt->drct_pl_clear
+#define audacious_drct_pl_get_length		_audvt->drct_pl_get_length
+#define audacious_drct_pl_delete		_audvt->drct_pl_delete
+#define audacious_drct_pl_set_pos		_audvt->drct_pl_set_pos
+#define audacious_drct_pl_ins_url_string	_audvt->drct_pl_ins_url_string
+#define audacious_drct_pl_add_url_string	_audvt->drct_pl_add_url_string
+#define audacious_drct_pl_enqueue_to_temp	_audvt->drct_pl_enqueue_to_temp
+
+#define audacious_drct_pq_get_length		_audvt->drct_pq_get_length
+#define audacious_drct_pq_add			_audvt->drct_pq_add
+#define audacious_drct_pq_remove		_audvt->drct_pq_remove
+#define audacious_drct_pq_clear			_audvt->drct_pq_clear
+#define audacious_drct_pq_is_queued		_audvt->drct_pq_is_queued
+#define audacious_drct_pq_get_position		_audvt->drct_pq_get_position
+#define audacious_drct_pq_get_queue_position	_audvt->drct_pq_get_queue_position
+
+#define aud_formatter_new			_audvt->formatter_new
+#define aud_formatter_destroy			_audvt->formatter_destroy
+#define aud_formatter_associate			_audvt->formatter_associate
+#define aud_formatter_dissociate		_audvt->formatter_dissociate
+#define aud_formatter_format			_audvt->formatter_format
+
+#define aud_prefswin_page_new			_audvt->prefswin_page_new
+#define aud_prefswin_page_destroy		_audvt->prefswin_page_destroy
+
+#define audacious_fileinfopopup_create			_audvt->fileinfopopup_create
+#define audacious_fileinfopopup_destroy			_audvt->fileinfopopup_destroy
+#define audacious_fileinfopopup_show_from_tuple		_audvt->fileinfopopup_show_from_tuple
+#define audacious_fileinfopopup_show_from_title		_audvt->fileinfopopup_show_from_title
+#define audacious_fileinfopopup_hide			_audvt->fileinfopopup_hide
+
+#define audacious_get_localdir			_audvt->util_get_localdir
+
+#define aud_input_check_file			_audvt->input_check_file
+
+#define aud_playback_new			_audvt->playback_new
+#define aud_playback_run			_audvt->playback_run
+#define aud_playback_free(x)			g_slice_free(InputPlayback, (x))
+
+#define aud_flow_execute			_audvt->flow_execute
+#define aud_flow_new				_audvt->flow_new
+#define aud_flow_link_element			_audvt->flow_link_element
+#define aud_flow_unlink_element			_audvt->flow_unlink_element
+#define aud_effect_flow				_audvt->effect_flow
+#define aud_iir_flow				_audvt->iir_flow
+#define aud_volumecontrol_flow			_audvt->volumecontrol_flow
+#define aud_flow_destroy(flow)			mowgli_object_unref(flow)
+
+#define audacious_menu_main_show		_audvt->util_menu_main_show
+
+#define aud_get_dock_window_list                _audvt->get_dock_window_list
+#define aud_dock_add_window                     _audvt->dock_add_window
+#define aud_dock_remove_window                  _audvt->dock_remove_window
+#define aud_dock_move_press                     _audvt->dock_move_press
+#define aud_dock_move_motion                    _audvt->dock_move_motion
+#define aud_dock_move_release                   _audvt->dock_move_release
+#define aud_dock_is_moving                      _audvt->dock_is_moving
+
+#include "audacious/auddrct.h"
+
 /* for multi-file plugins :( */
 extern struct _AudaciousFuncTableV1 *_audvt;
 
--- a/src/audacious/pluginenum.c	Wed Oct 17 23:01:59 2007 +0300
+++ b/src/audacious/pluginenum.c	Wed Oct 17 23:02:12 2007 +0300
@@ -37,6 +37,7 @@
 #include <string.h>
 
 #include "main.h"
+#include "dock.h"
 #include "ui_main.h"
 #include "playback.h"
 #include "playlist.h"
@@ -55,6 +56,13 @@
 #include "vfs_buffer.h"
 #include "vfs_buffered_file.h"
 
+#include "ui_preferences.h"
+#include "ui_fileinfopopup.h"
+
+#include "effect.h"
+#include "iir.h"
+#include "volumecontrol.h"
+
 const gchar *plugin_dir_list[] = {
     PLUGINSUBS,
     NULL
@@ -262,6 +270,118 @@
 
     .ip_state = &ip_data,
     ._cfg = &cfg,
+
+    .hook_associate = hook_associate,
+    .hook_dissociate = hook_dissociate,
+    .hook_register = hook_register,
+    .hook_call = hook_call,
+
+    .open_ini_file = open_ini_file,
+    .close_ini_file = close_ini_file,
+    .read_ini_string = read_ini_string,
+    .read_ini_array = read_ini_array,
+
+    .xmms_convert_buffers_new = xmms_convert_buffers_new,
+    .xmms_convert_buffers_free = xmms_convert_buffers_free,
+    .xmms_convert_buffers_destroy = xmms_convert_buffers_destroy,
+    .xmms_convert_get_func = xmms_convert_get_func,
+    .xmms_convert_get_channel_func = xmms_convert_get_channel_func,
+    .xmms_convert_get_frequency_func = xmms_convert_get_frequency_func,
+
+    .menu_plugin_item_add = menu_plugin_item_add,
+    .menu_plugin_item_remove = menu_plugin_item_remove,
+
+    .drct_quit = drct_quit,
+    .drct_eject = drct_eject,
+    .drct_jtf_show = drct_jtf_show,
+    .drct_main_win_is_visible = drct_main_win_is_visible,
+    .drct_main_win_toggle = drct_main_win_toggle,
+    .drct_eq_win_is_visible = drct_eq_win_is_visible,
+    .drct_eq_win_toggle = drct_eq_win_toggle,
+    .drct_pl_win_is_visible = drct_pl_win_is_visible,
+    .drct_pl_win_toggle = drct_pl_win_toggle,
+    .drct_set_skin = drct_set_skin,
+    .drct_activate = drct_activate,
+
+    .drct_play = drct_play,
+    .drct_pause = drct_pause,
+    .drct_stop = drct_stop,
+    .drct_get_playing = drct_get_playing,
+    .drct_get_paused = drct_get_paused,
+    .drct_get_stopped = drct_get_stopped,
+    .drct_get_info = drct_get_info,
+    .drct_get_time = drct_get_time,
+    .drct_seek = drct_seek,
+    .drct_get_volume = drct_get_volume,
+    .drct_set_volume = drct_set_volume,
+    .drct_get_volume_main = drct_get_volume_main,
+    .drct_set_volume_main = drct_set_volume_main,
+    .drct_get_volume_balance = drct_get_volume_balance,
+    .drct_set_volume_balance = drct_set_volume_balance,
+
+    .drct_pl_next = drct_pl_next,
+    .drct_pl_prev = drct_pl_prev,
+    .drct_pl_repeat_is_enabled = drct_pl_repeat_is_enabled,
+    .drct_pl_repeat_toggle = drct_pl_repeat_toggle,
+    .drct_pl_repeat_is_shuffled = drct_pl_repeat_is_shuffled,
+    .drct_pl_shuffle_toggle = drct_pl_shuffle_toggle,
+    .drct_pl_get_title = drct_pl_get_title,
+    .drct_pl_get_time = drct_pl_get_time,
+    .drct_pl_get_pos = drct_pl_get_pos,
+    .drct_pl_get_file = drct_pl_get_file,
+    .drct_pl_add = drct_pl_add,
+    .drct_pl_clear = drct_pl_clear,
+    .drct_pl_get_length = drct_pl_get_length,
+    .drct_pl_delete = drct_pl_delete,
+    .drct_pl_set_pos = drct_pl_set_pos,
+    .drct_pl_ins_url_string = drct_pl_ins_url_string,
+    .drct_pl_add_url_string = drct_pl_add_url_string,
+    .drct_pl_enqueue_to_temp = drct_pl_enqueue_to_temp,
+
+    .drct_pq_get_length = drct_pq_get_length,
+    .drct_pq_add = drct_pq_add,
+    .drct_pq_remove = drct_pq_remove,
+    .drct_pq_clear = drct_pq_clear,
+    .drct_pq_is_queued = drct_pq_is_queued,
+    .drct_pq_get_position = drct_pq_get_position,
+    .drct_pq_get_queue_position = drct_pq_get_queue_position,
+
+    .formatter_new = formatter_new,
+    .formatter_destroy = formatter_destroy,
+    .formatter_associate = formatter_associate,
+    .formatter_dissociate = formatter_dissociate,
+    .formatter_format = formatter_format,
+
+    .prefswin_page_new = prefswin_page_new,
+    .prefswin_page_destroy = prefswin_page_destroy,
+
+    .fileinfopopup_create = fileinfopopup_create,
+    .fileinfopopup_destroy = fileinfopopup_destroy,
+    .fileinfopopup_show_from_title = fileinfopopup_show_from_title,
+    .fileinfopopup_show_from_tuple = fileinfopopup_show_from_tuple,
+    .fileinfopopup_hide = fileinfopopup_hide,
+
+    .util_get_localdir = util_get_localdir,
+
+    .input_check_file = input_check_file,
+
+    .flow_new = flow_new,
+    .flow_execute = flow_execute,
+    .flow_link_element = flow_link_element,
+    .flow_unlink_element = flow_unlink_element,
+    .effect_flow = effect_flow,
+    .iir_flow = iir_flow,
+    .volumecontrol_flow = volumecontrol_flow,
+
+    .util_menu_main_show = util_menu_main_show,
+    
+    .get_dock_window_list = get_dock_window_list,
+    .dock_add_window = dock_add_window,
+    .dock_remove_window = dock_remove_window,
+    .dock_move_press = dock_move_press,
+    .dock_move_motion = dock_move_motion,
+    .dock_move_release = dock_move_release,
+    .dock_is_moving = dock_is_moving,
 };
 
 /*****************************************************************/
--- a/src/audacious/skin.c	Wed Oct 17 23:01:59 2007 +0300
+++ b/src/audacious/skin.c	Wed Oct 17 23:02:12 2007 +0300
@@ -127,6 +127,8 @@
     {200, 200, 200}
 };
 
+static gchar *original_gtk_theme = NULL;
+
 static GdkBitmap *skin_create_transparent_mask(const gchar *,
                                                const gchar *,
                                                const gchar *,
@@ -1461,10 +1463,35 @@
     return TRUE;
 }
 
+static void
+skin_set_gtk_theme(GtkSettings * settings, Skin * skin, gboolean tmp_clean)
+{
+    if (original_gtk_theme == NULL)
+         g_object_get(settings, "gtk-theme-name", &original_gtk_theme, NULL);
+
+    gchar *tmp = g_strdup_printf("%s/.themes/aud-%s", g_get_home_dir(),
+                                 basename(skin->path));
+
+    gchar *troot = g_strdup_printf("%s/.themes", g_get_home_dir());
+    g_mkdir_with_parents(troot, 0755);
+    g_free(troot);
+
+    symlink(skin->path, tmp);
+    gtk_settings_set_string_property(settings, "gtk-theme-name",
+                                     basename(tmp), "audacious");
+
+    if (tmp_clean)
+    {
+        unlink(tmp);
+        g_free(tmp);
+    }
+}
+
 static gboolean
 skin_load_nolock(Skin * skin, const gchar * path, gboolean force)
 {
-    gchar *cpath;
+    GtkSettings *settings;
+    gchar *cpath, *gtkrcpath;
 
     g_return_val_if_fail(skin != NULL, FALSE);
     g_return_val_if_fail(path != NULL, FALSE);
@@ -1474,12 +1501,24 @@
         return FALSE;
    
     if (!force && skin->path && !strcmp(skin->path, path))
-	return FALSE;
+    return FALSE;
       
     skin_current_num++;
 
     skin->path = g_strdup(path);
 
+
+    settings = gtk_settings_get_default();
+    
+    if (original_gtk_theme != NULL)
+    {
+        gtk_settings_set_string_property(settings, "gtk-theme-name",
+                                         original_gtk_theme, "audacious");
+        g_free(original_gtk_theme);
+        original_gtk_theme = NULL;
+    }
+
+
     if (!file_is_archive(path)) {
         /* Parse the hints for this skin. */
         skin_parse_hints(skin, NULL);
@@ -1489,6 +1528,15 @@
 
         skin_load_cursor(skin, path);
 
+        gtkrcpath = find_file_recursively(skin->path, "gtkrc");
+
+#ifndef _WIN32
+        /* the way GTK does things can be very broken. --nenolod */
+        if (gtkrcpath != NULL) {
+            skin_set_gtk_theme(settings, skin, FALSE);
+        }
+#endif
+
         return TRUE;
     }
 
@@ -1497,6 +1545,8 @@
         return FALSE;
     }
 
+    gtkrcpath = find_file_recursively(skin->path, "gtkrc");
+
     /* Parse the hints for this skin. */
     skin_parse_hints(skin, cpath);
 
@@ -1509,6 +1559,13 @@
 
     skin_load_cursor(skin, cpath);
 
+#ifndef _WIN32
+    /* the way GTK does things can be very broken. --nenolod */
+    if (gtkrcpath != NULL) {
+        skin_set_gtk_theme(settings, skin, TRUE);
+    }
+#endif
+
     del_directory(cpath);
     g_free(cpath);
 
--- a/src/audacious/ui_fileinfopopup.c	Wed Oct 17 23:01:59 2007 +0300
+++ b/src/audacious/ui_fileinfopopup.c	Wed Oct 17 23:02:12 2007 +0300
@@ -87,7 +87,7 @@
 }
 
 static gboolean
-audacious_fileinfopopup_progress_cb(gpointer filepopup_win)
+fileinfopopup_progress_cb(gpointer filepopup_win)
 {
     GtkWidget *progressbar =
         g_object_get_data(G_OBJECT(filepopup_win), "progressbar");
@@ -138,7 +138,7 @@
 }
 
 static gboolean
-audacious_fileinfopopup_progress_check_active(GtkWidget *filepopup_win)
+fileinfopopup_progress_check_active(GtkWidget *filepopup_win)
 {
     if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(filepopup_win),"progress_sid")) == 0)
         return FALSE;
@@ -146,23 +146,23 @@
 }
 
 static void
-audacious_fileinfopopup_progress_init(GtkWidget *filepopup_win)
+fileinfopopup_progress_init(GtkWidget *filepopup_win)
 {
     g_object_set_data( G_OBJECT(filepopup_win) , "progress_sid" , GINT_TO_POINTER(0) );
 }
 
 static void
-audacious_fileinfopopup_progress_start(GtkWidget *filepopup_win)
+fileinfopopup_progress_start(GtkWidget *filepopup_win)
 {
     gint sid =
-        g_timeout_add(500, (GSourceFunc)audacious_fileinfopopup_progress_cb,
+        g_timeout_add(500, (GSourceFunc)fileinfopopup_progress_cb,
                       filepopup_win);
     g_object_set_data(G_OBJECT(filepopup_win), "progress_sid",
                       GINT_TO_POINTER(sid));
 }
 
 static void
-audacious_fileinfopopup_progress_stop(GtkWidget *filepopup_win)
+fileinfopopup_progress_stop(GtkWidget *filepopup_win)
 {
     gint sid = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(filepopup_win),
                                                  "progress_sid"));
@@ -174,7 +174,7 @@
 }
 
 static void
-audacious_fileinfopopup_add_category(GtkWidget *filepopup_win,
+fileinfopopup_add_category(GtkWidget *filepopup_win,
                                      GtkWidget *filepopup_data_table,
                                      const gchar *category,
                                      const gchar *header_data,
@@ -211,7 +211,7 @@
 
 
 GtkWidget *
-audacious_fileinfopopup_create(void)
+fileinfopopup_create(void)
 {
     GtkWidget *filepopup_win;
     GtkWidget *filepopup_hbox;
@@ -248,26 +248,26 @@
     gtk_box_pack_start(GTK_BOX(filepopup_hbox), filepopup_data_table,
                        TRUE, TRUE, 0);
 
-    audacious_fileinfopopup_add_category(filepopup_win, filepopup_data_table,
+    fileinfopopup_add_category(filepopup_win, filepopup_data_table,
                                          _("Title"),
                                          "header_title", "label_title", 0);
-    audacious_fileinfopopup_add_category(filepopup_win, filepopup_data_table,
+    fileinfopopup_add_category(filepopup_win, filepopup_data_table,
                                          _("Artist"),
                                          "header_artist", "label_artist", 1);
-    audacious_fileinfopopup_add_category(filepopup_win, filepopup_data_table,
+    fileinfopopup_add_category(filepopup_win, filepopup_data_table,
                                          _("Album"),
                                          "header_album", "label_album", 2);
-    audacious_fileinfopopup_add_category(filepopup_win, filepopup_data_table,
+    fileinfopopup_add_category(filepopup_win, filepopup_data_table,
                                          _("Genre"),
                                          "header_genre", "label_genre", 3);
-    audacious_fileinfopopup_add_category(filepopup_win, filepopup_data_table,
+    fileinfopopup_add_category(filepopup_win, filepopup_data_table,
                                          _("Year"),
                                          "header_year", "label_year", 4);
-    audacious_fileinfopopup_add_category(filepopup_win, filepopup_data_table,
+    fileinfopopup_add_category(filepopup_win, filepopup_data_table,
                                          _("Track Number"),
                                          "header_tracknum", "label_tracknum",
                                          5);
-    audacious_fileinfopopup_add_category(filepopup_win, filepopup_data_table,
+    fileinfopopup_add_category(filepopup_win, filepopup_data_table,
                                          _("Track Length"),
                                          "header_tracklen", "label_tracklen",
                                          6);
@@ -284,7 +284,7 @@
     g_object_set_data(G_OBJECT(filepopup_win), "file", NULL);
     g_object_set_data(G_OBJECT(filepopup_win), "progressbar",
                       filepopup_progress);
-    audacious_fileinfopopup_progress_init(filepopup_win);
+    fileinfopopup_progress_init(filepopup_win);
     
     /* this will realize all widgets contained in filepopup_hbox */
     gtk_widget_show_all(filepopup_hbox);
@@ -296,10 +296,10 @@
 }
 
 void
-audacious_fileinfopopup_destroy(GtkWidget *filepopup_win)
+fileinfopopup_destroy(GtkWidget *filepopup_win)
 {
     gchar *last_artwork;
-    audacious_fileinfopopup_progress_stop(filepopup_win);
+    fileinfopopup_progress_stop(filepopup_win);
 
     last_artwork =
         g_object_get_data(G_OBJECT(filepopup_win), "last_artwork");
@@ -310,7 +310,7 @@
 }
 
 static void
-audacious_fileinfopupup_update_data(GtkWidget *filepopup_win,
+fileinfopupup_update_data(GtkWidget *filepopup_win,
                                     const gchar *text,
                                     const gchar *label_data,
                                     const gchar *header_data)
@@ -329,7 +329,7 @@
 }
 
 void
-audacious_fileinfopopup_show_from_tuple(GtkWidget *filepopup_win,
+fileinfopopup_show_from_tuple(GtkWidget *filepopup_win,
                                         Tuple *tuple)
 {
     gchar *tmp = NULL;
@@ -378,17 +378,17 @@
         g_free(utf_filename);
     }
 
-    audacious_fileinfopupup_update_data(filepopup_win, tuple_get_string(tuple, FIELD_ARTIST, NULL),
+    fileinfopupup_update_data(filepopup_win, tuple_get_string(tuple, FIELD_ARTIST, NULL),
                                         "label_artist", "header_artist");
-    audacious_fileinfopupup_update_data(filepopup_win, tuple_get_string(tuple, FIELD_ALBUM, NULL),
+    fileinfopupup_update_data(filepopup_win, tuple_get_string(tuple, FIELD_ALBUM, NULL),
                                         "label_album", "header_album");
-    audacious_fileinfopupup_update_data(filepopup_win, tuple_get_string(tuple, FIELD_GENRE, NULL),
+    fileinfopupup_update_data(filepopup_win, tuple_get_string(tuple, FIELD_GENRE, NULL),
                                         "label_genre", "header_genre");
 
     length = tuple_get_int(tuple, FIELD_LENGTH, NULL);
     length_string = (length > 0) ?
         g_strdup_printf("%d:%02d", length / 60000, (length / 1000) % 60) : NULL;
-    audacious_fileinfopupup_update_data(filepopup_win, length_string,
+    fileinfopupup_update_data(filepopup_win, length_string,
                                         "label_tracklen", "header_tracklen");
     g_free(length_string);
 
@@ -398,12 +398,12 @@
       g_object_set_data( G_OBJECT(filepopup_win), "length" , GINT_TO_POINTER(-1) );
 
     year_string = (tuple_get_int(tuple, FIELD_YEAR, NULL) == 0) ? NULL : g_strdup_printf("%d", tuple_get_int(tuple, FIELD_YEAR, NULL));
-    audacious_fileinfopupup_update_data(filepopup_win, year_string,
+    fileinfopupup_update_data(filepopup_win, year_string,
                                         "label_year", "header_year");
     g_free(year_string);
 
     track_string = (tuple_get_int(tuple, FIELD_TRACK_NUMBER, NULL) == 0) ? NULL : g_strdup_printf("%d", tuple_get_int(tuple, FIELD_TRACK_NUMBER, NULL));
-    audacious_fileinfopupup_update_data(filepopup_win, track_string,
+    fileinfopupup_update_data(filepopup_win, track_string,
                                         "label_tracknum", "header_tracknum");
     g_free(track_string);
     
@@ -433,11 +433,11 @@
 
     /* start a timer that updates a progress bar if the tooltip
        is shown for the song that is being currently played */
-    if (audacious_fileinfopopup_progress_check_active(filepopup_win) == FALSE)
+    if (fileinfopopup_progress_check_active(filepopup_win) == FALSE)
     { 
-        audacious_fileinfopopup_progress_start(filepopup_win);
+        fileinfopopup_progress_start(filepopup_win);
         /* immediately run the callback once to update progressbar status */
-        audacious_fileinfopopup_progress_cb(filepopup_win);
+        fileinfopopup_progress_cb(filepopup_win);
     }
 
     gdk_window_get_pointer(gdk_get_default_root_window(), &x, &y, NULL);
@@ -450,21 +450,21 @@
 }
 
 void
-audacious_fileinfopopup_show_from_title(GtkWidget *filepopup_win, gchar *title)
+fileinfopopup_show_from_title(GtkWidget *filepopup_win, gchar *title)
 {
     Tuple * tuple = tuple_new();
     tuple_associate_string(tuple, FIELD_TITLE, NULL, title);
-    audacious_fileinfopopup_show_from_tuple(filepopup_win, tuple);
+    fileinfopopup_show_from_tuple(filepopup_win, tuple);
     mowgli_object_unref(tuple);
     return;
 }
 
 void
-audacious_fileinfopopup_hide(GtkWidget *filepopup_win, gpointer unused)
+fileinfopopup_hide(GtkWidget *filepopup_win, gpointer unused)
 {
     if (GTK_WIDGET_VISIBLE(filepopup_win))
     {
-        audacious_fileinfopopup_progress_stop(filepopup_win);
+        fileinfopopup_progress_stop(filepopup_win);
 
         gtk_widget_hide(filepopup_win);
 
--- a/src/audacious/ui_fileinfopopup.h	Wed Oct 17 23:01:59 2007 +0300
+++ b/src/audacious/ui_fileinfopopup.h	Wed Oct 17 23:02:12 2007 +0300
@@ -25,12 +25,12 @@
 #include <gtk/gtk.h>
 
 /* create/destroy */
-GtkWidget* audacious_fileinfopopup_create(void);
-void audacious_fileinfopopup_destroy(GtkWidget* fileinfopopup_win);
+GtkWidget* fileinfopopup_create(void);
+void fileinfopopup_destroy(GtkWidget* fileinfopopup_win);
 
 /* show/hide */
-void audacious_fileinfopopup_show_from_tuple(GtkWidget *fileinfopopup_win, Tuple *tuple);
-void audacious_fileinfopopup_show_from_title(GtkWidget *fileinfopopup_win, gchar *title);
-void audacious_fileinfopopup_hide(GtkWidget *filepopup_win, gpointer unused);
+void fileinfopopup_show_from_tuple(GtkWidget *fileinfopopup_win, Tuple *tuple);
+void fileinfopopup_show_from_title(GtkWidget *fileinfopopup_win, gchar *title);
+void fileinfopopup_hide(GtkWidget *filepopup_win, gpointer unused);
 
 #endif
--- a/src/audacious/ui_main.c	Wed Oct 17 23:01:59 2007 +0300
+++ b/src/audacious/ui_main.c	Wed Oct 17 23:02:12 2007 +0300
@@ -2640,7 +2640,7 @@
 
 
 void
-audacious_menu_main_show( gint x , gint y , guint button , guint time )
+util_menu_main_show( gint x , gint y , guint button , guint time )
 {
   /* convenience function that shows the main popup menu wherever requested */
   ui_manager_popup_menu_show( GTK_MENU(mainwin_general_menu),
--- a/src/audacious/ui_manager.c	Wed Oct 17 23:01:59 2007 +0300
+++ b/src/audacious/ui_manager.c	Wed Oct 17 23:02:12 2007 +0300
@@ -810,7 +810,7 @@
 
 
 gint
-audacious_menu_plugin_item_add( gint menu_id , GtkWidget * item )
+menu_plugin_item_add( gint menu_id , GtkWidget * item )
 {
   if ( menu_created )
   {
@@ -840,7 +840,7 @@
 
 
 gint
-audacious_menu_plugin_item_remove( gint menu_id , GtkWidget * item )
+menu_plugin_item_remove( gint menu_id , GtkWidget * item )
 {
   if ( menu_created )
   {
--- a/src/audacious/ui_plugin_menu.h	Wed Oct 17 23:01:59 2007 +0300
+++ b/src/audacious/ui_plugin_menu.h	Wed Oct 17 23:02:12 2007 +0300
@@ -35,8 +35,8 @@
 #define AUDACIOUS_MENU_PLAYLIST_SELECT  5
 #define AUDACIOUS_MENU_PLAYLIST_MISC    6
 
-gint audacious_menu_plugin_item_add( gint , GtkWidget * );
-gint audacious_menu_plugin_item_remove( gint , GtkWidget * );
+gint menu_plugin_item_add( gint , GtkWidget * );
+gint menu_plugin_item_remove( gint , GtkWidget * );
 
 
 #endif /* AUD_UIPLUGINMENU_H */
--- a/src/audacious/ui_skinned_playlist.c	Wed Oct 17 23:01:59 2007 +0300
+++ b/src/audacious/ui_skinned_playlist.c	Wed Oct 17 23:02:12 2007 +0300
@@ -164,7 +164,7 @@
     g_object_set_data(G_OBJECT(playlist), "timer_id", GINT_TO_POINTER(0));
     g_object_set_data(G_OBJECT(playlist), "timer_active", GINT_TO_POINTER(0));
 
-    GtkWidget *popup = audacious_fileinfopopup_create();
+    GtkWidget *popup = fileinfopopup_create();
     g_object_set_data(G_OBJECT(playlist), "popup", popup);
     g_object_set_data(G_OBJECT(playlist), "popup_active", GINT_TO_POINTER(0));
     g_object_set_data(G_OBJECT(playlist), "popup_position", GINT_TO_POINTER(-1));
@@ -1021,10 +1021,10 @@
         tuple = playlist_get_tuple(pl_active, pos);
         if ((tuple == NULL) || (tuple_get_int(tuple, FIELD_LENGTH, NULL) < 1)) {
            gchar *title = playlist_get_songtitle(pl_active, pos);
-           audacious_fileinfopopup_show_from_title(popup, title);
+           fileinfopopup_show_from_title(popup, title);
            g_free(title);
         } else {
-           audacious_fileinfopopup_show_from_tuple(popup , tuple);
+           fileinfopopup_show_from_tuple(popup , tuple);
         }
         g_object_set_data(G_OBJECT(widget), "popup_active" , GINT_TO_POINTER(1));
     }
@@ -1037,7 +1037,7 @@
     if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "popup_active")) == 1) {
         GtkWidget *popup = g_object_get_data(G_OBJECT(widget), "popup");
         g_object_set_data(G_OBJECT(widget), "popup_active", GINT_TO_POINTER(0));
-        audacious_fileinfopopup_hide(popup, NULL);
+        fileinfopopup_hide(popup, NULL);
     }
 }
 
--- a/src/audacious/util.c	Wed Oct 17 23:01:59 2007 +0300
+++ b/src/audacious/util.c	Wed Oct 17 23:02:12 2007 +0300
@@ -949,7 +949,7 @@
 
 
 /**
- * audacious_get_localdir:
+ * util_get_localdir:
  *
  * Returns a string with the full path of Audacious local datadir (where config files are placed).
  * It's useful in order to put in the right place custom config files for audacious plugins.
@@ -957,7 +957,7 @@
  * Return value: a string with full path of Audacious local datadir (should be freed after use)
  **/
 gchar*
-audacious_get_localdir(void)
+util_get_localdir(void)
 {
   gchar *datadir;
   gchar *tmp;
--- a/src/audacious/util.h	Wed Oct 17 23:01:59 2007 +0300
+++ b/src/audacious/util.h	Wed Oct 17 23:02:12 2007 +0300
@@ -37,9 +37,9 @@
 
 G_BEGIN_DECLS
 
-#define SWAP(a, b)      { a^=b; b^=a; a^=b; }
+#include "audacious/plugin.h"
 
-typedef GHashTable INIFile;
+#define SWAP(a, b)      { a^=b; b^=a; a^=b; }
 
 typedef gboolean(*DirForeachFunc) (const gchar * path,
                                    const gchar * basename,
@@ -100,10 +100,10 @@
 
 GdkPixbuf *audacious_create_colorized_pixbuf(GdkPixbuf *src, gint red, gint green, gint blue);
 
-gchar *audacious_get_localdir(void);
+gchar *util_get_localdir(void);
 
 /* menu-related function */
-void audacious_menu_main_show(gint x, gint y, guint button, guint time);
+void util_menu_main_show(gint x, gint y, guint button, guint time);
 
 
 G_END_DECLS
--- a/src/audacious/xconvert.h	Wed Oct 17 23:01:59 2007 +0300
+++ b/src/audacious/xconvert.h	Wed Oct 17 23:02:12 2007 +0300
@@ -4,6 +4,9 @@
  *  Licensed under GNU GPL version 3.
  */
 
+#ifndef _AUDACIOUS_XCONVERT_H
+#define _AUDACIOUS_XCONVERT_H
+
 #include <audacious/plugin.h>
 
 struct xmms_convert_buffers;
@@ -32,3 +35,5 @@
                                                      int input);
 convert_freq_func_t xmms_convert_get_frequency_func(AFormat fmt,
                                                     int channels);
+
+#endif